Merge branch 'development' into 'master'

Development

See merge request dsop/opensource/triton-inference-server/server!17

Dockerfile

@@ -10,10 +10,8 @@ RUN useradd -u 1818 triton
 
 ENV CUDA_VERSION 11.2.1
 
-RUN dnf upgrade && dnf -y install pkg-config libgomp libpng python38 && dnf clean all
-
-# nvidia-docker 1.0
-RUN echo "/usr/local/nvidia/lib" >> /etc/ld.so.conf.d/nvidia.conf && \
+RUN dnf -y upgrade && dnf -y install pkg-config libgomp libpng python38 && dnf clean all \
+  && echo "/usr/local/nvidia/lib" >> /etc/ld.so.conf.d/nvidia.conf && \
     echo "/usr/local/nvidia/lib64" >> /etc/ld.so.conf.d/nvidia.conf
 
 #ENV
@@ -29,74 +27,22 @@ ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
 ENV NVIDIA_REQUIRE_CUDA "cuda>=11.2 brand=tesla,driver>=418,driver<419 brand=tesla,driver>=440,driver<441 driver>=450,driver<451"
 
 #Args
-ARG TARBALL1=OCV.tar
-ARG TARBALL2=rpms.tar.gz
-ARG TARBALL6=libtensorflow_cc.so.1.tar.gz
-ARG TARBALL7=libtensorflow_cc.so.tar.gz
-ARG TARBALL8=libtensorflow_framework.so.1.tar.gz
-ARG TARBALL9=libtensorflow_framework.so.tar.gz
-ARG TARBALL10=libtensorflow_triton.so.1.tar.gz
-ARG TARBALL11=libtensorflow_triton.so.tar.gz
-ARG TARBALL12=libtriton_tensorflow1.so.tar.gz
-ARG TARBALL13=tritonserverwobe.tar.gz
-
-ARG TARBALLN1=nvidia.rpms.tar
+ARG TARBALL1=structure.tar.gz
+ARG TARBALLN=nvidia.rpms.tar
 
 COPY ["${TARBALL1}", "/"]
-
-COPY ["${TARBALLN1}", "${TARBALL13}", "${TARBALL2}","/opt/"]
+COPY ["${TARBALLN}","/opt/"]
 
 WORKDIR /
-RUN tar -xvf ./${TARBALL1} && rm -fv ./${TARBALL1}
-
-WORKDIR /opt
-
-#Untar
-RUN tar -xvf ./${TARBALLN1} && rm -fv ./${TARBALLN1}
-RUN tar -zxf ./${TARBALL2} && rm -fv ./${TARBALL2}
-RUN tar -zxf ./${TARBALL13} && rm -fv ./${TARBALL13}
-
-COPY ["${TARBALL6}", "${TARBALL7}", "${TARBALL8}", "${TARBALL9}", \
-       "${TARBALL10}", "${TARBALL11}", "${TARBALL12}", "/opt/tritonserver/backends/tensorflow1/"]
-
-WORKDIR tritonserver/backends/tensorflow1
-
-RUN tar -zxf ./${TARBALL6} && rm -fv ./${TARBALL6}
-RUN tar -zxf ./${TARBALL7} && rm -fv ./${TARBALL7}
-RUN tar -zxf ./${TARBALL8} && rm -fv ./${TARBALL8}
-RUN tar -zxf ./${TARBALL9} && rm -fv ./${TARBALL9}
-RUN tar -zxf ./${TARBALL10} && rm -fv ./${TARBALL10}
-RUN tar -zxf ./${TARBALL11} && rm -fv ./${TARBALL11}
-RUN tar -zxf ./${TARBALL12} && rm -fv ./${TARBALL12}
-
-
-#Move the tf backend parts to their spot
-#RUN mv libtensorflow_cc.so.1 libtensorflow_cc.so libtensorflow_framework.so.1 \
-# libtensorflow_framework.so libtensorflow_triton.so.1 libtensorflow_triton.so \
-# libtriton_tensorflow1.so LICENSE.tensorflow tritonserver/backends/tensorflow1/
-
-WORKDIR /opt/baserpms
-
-#re2
-RUN rpm -i re2-20190801-1.el8.x86_64.rpm
+RUN tar -zxvhf ./${TARBALL1} && rm -fv ./${TARBALL1} && tar -xvhf ./opt/nvidia.rpms.tar -C ./opt && rm -fv ./opt/nvidia.rpms.tar \
+  && rpm -i /opt/baserpms/re2-20190801-1.el8.x86_64.rpm && rpm --nodeps -i /opt/nvidia.rpms/*.rpm \
+  && pip3 install -r opt/basewhls/requirements.txt --no-index --find-links /opt/basewhls && rm -r /opt/nvidia.rpms \
+  && rm -r opt/basewhls && rm -r /opt/baserpms && mkdir /models
 
 ENV NCCL_VERSION 2.8.4
 ENV LIBRARY_PATH /usr/local/cuda/lib64/stubs
-
 ENV CUDNN_VERSION 8.1.0.77
 
-WORKDIR /opt/nvidia.rpms
-RUN rpm --nodeps -i *.rpm
-
-WORKDIR /
-
-#RUN rm -r usr/local/cuda-11.2/libnvvp
-
-RUN mkdir /models
-
-#RUN ln -s /usr/local/cuda-11.2/targets/x86_64-linux/lib/stubs/libnvidia-ml.so \
-# /usr/local/cuda-11.2/targets/x86_64-linux/lib/stubs/libnvidia-ml.so.1
-
 USER triton
 
 EXPOSE 8000

hardening_manifest.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 name: "opensource/triton-inference-server/server"
 
 tags:
-  - "20.03"
+  - "20.12"
   - "latest"
 
 args:
@@ -24,7 +24,7 @@ labels:
   # Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "NVIDIA"
   # Authoritative version of the software
-  org.opencontainers.image.version: "20.03"
+  org.opencontainers.image.version: "20.12"
   # Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "triton, inference"
   # This value can be "opensource" or "commercial"
@@ -33,61 +33,16 @@ labels:
   mil.dso.ironbank.product.name: "triton-inference-server"
 
 resources:
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/baserpms.tar.gz"
-    filename: "rpms.tar.gz"
-    validation:
-      type: "sha256"
-      value: "f89e7923559a92b63480c428c9189f41f5910921bbb96fe77d28fc43a77466e0"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtensorflow_cc.so.1.tar.gz"
-    filename: "libtensorflow_cc.so.1.tar.gz"
-    validation:
-      type: "sha256"
-      value: "05e0b0815183009b51096c4e3547f8cb8eb18af84d3ae3de7f3885b263e4ec92"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtensorflow_cc.so.tar.gz"
-    filename: "libtensorflow_cc.so.tar.gz"
-    validation:
-      type: "sha256"
-      value: "7c9b47a9e50c9ade04d82aa835a0e7399e63c895145da94ebb15021b2388accb"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtensorflow_framework.so.1.tar.gz"
-    filename: "libtensorflow_framework.so.1.tar.gz"
-    validation:
-      type: "sha256"
-      value: "71f615ea586ef406cb35ba1b8231f15bcf5ad5245fab4230965964567ef0b882"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtensorflow_framework.so.tar.gz"
-    filename: "libtensorflow_framework.so.tar.gz"
-    validation:
-      type: "sha256"
-      value: "20b02f7e2f21523c56c0a0955c0f1acab1d951d5629aa795e7a74975e96075ca"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtensorflow_triton.so.1.tar.gz"
-    filename: "libtensorflow_triton.so.1.tar.gz"
-    validation:
-      type: "sha256"
-      value: "3a61ac78b5cea7835981b3ff0dbdb437aba2a9a01330d13005cb6d4e7f8ae91c"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtensorflow_triton.so.tar.gz"
-    filename: "libtensorflow_triton.so.tar.gz"
-    validation:
-      type: "sha256"
-      value: "511334f58cfd7185943a204c5fe5817833175fb44fe16cf890bb0f4088d1c918"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtriton_tensorflow1.so.tar.gz"
-    filename: "libtriton_tensorflow1.so.tar.gz"
-    validation:
-      type: "sha256"
-      value: "436e06f34d7aa0e59278abda0e0018bd91975b535789d8674c2ee555e1fc5d76"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/tritonserverwobe.tar.gz"
-    filename: "tritonserverwobe.tar.gz"
-    validation:
-      type: "sha256"
-      value: "a14c2b8ff2495299f99ccce9f58f53b75e06a54496e298dba7960d0646598851"
   - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/nvidia.rpms.tar"
     filename: "nvidia.rpms.tar"
     validation:
       type: "sha256"
       value: "66801d2eef84fe087bc9fcc4d25d17785352572365b3f9ec969729ba3027b777"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/OCV.tar"
-    filename: "OCV.tar"
+  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/structure.tar.gz"
+    filename: "structure.tar.gz"
     validation:
       type: "sha256"
-      value: "02a342f9eb90f09338f0cffa19378befd09e9e0ed24da93b239c65d40ad87cf6"
+      value: "229416ebf2c8b7f4a534b2ee70d38c878a66cc80554d022d8a0a38b872f870fa"
 
 maintainers:
   - name: "Daniel Mumpton"