Merge branch 'andrew.simonetta-development-branch-031820' into 'development'

Andrew.simonetta development branch 031820

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

Dockerfile

@@ -6,79 +6,103 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 ARG VERSION=23.03
 
-#Non-root user
 RUN useradd -u 1818 triton
 
-#ubi 8 rpms
-RUN dnf upgrade && dnf clean all
+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 && \
+    echo "/usr/local/nvidia/lib64" >> /etc/ld.so.conf.d/nvidia.conf
+
+#ENV
+ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
+ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64:/opt/tritonserver/lib
+
+#Link
+RUN ln -s cuda-11.2 /usr/local/cuda
+
+# nvidia-container-runtime
+ENV NVIDIA_VISIBLE_DEVICES all
+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=whls.tar.gz
+ARG TARBALL1=OCV.tar
 ARG TARBALL2=rpms.tar.gz
-ARG TARBALL6=libtensorflow_cc.so.1.tar
-ARG TARBALL7=libtensorflow_cc.so.tar
-ARG TARBALL8=libtensorflow_framework.so.1.tar
-ARG TARBALL9=libtensorflow_framework.so.tar
-ARG TARBALL10=libtensorflow_triton.so.1.tar
-ARG TARBALL11=libtensorflow_triton.so.tar
-ARG TARBALL12=libtriton_tensorflow1.so.tar
+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 TARBALLC0=cuda-parts0.tar
-ARG TARBALLC1=cuda-parts1.tar
-ARG TARBALLC2=cuda-parts2.tar
 
-#"${TARBALL1}",
-COPY ["${TARBALL2}", "/opt/"]
+ARG TARBALLN1=nvidia.rpms.tar
 
-COPY ["${TARBALL6}", "${TARBALL7}", "${TARBALL8}", "${TARBALL9}", \
-       "${TARBALL10}", "${TARBALL11}", "${TARBALL12}", "${TARBALL13}", \
-       "/opt/"]
+COPY ["${TARBALL1}", "/"]
+
+COPY ["${TARBALLN1}", "${TARBALL13}", "${TARBALL2}","/opt/"]
 
-COPY ["${TARBALLC0}", "${TARBALLC1}", "${TARBALLC2}", "/"]
+WORKDIR /
+RUN tar -xvf ./${TARBALL1} && rm -fv ./${TARBALL1}
 
 WORKDIR /opt
 
 #Untar
-#RUN tar -zxf ./${TARBALL1} && rm -fv ./${TARBALL1}
+RUN tar -xvf ./${TARBALLN1} && rm -fv ./${TARBALLN1}
 RUN tar -zxf ./${TARBALL2} && rm -fv ./${TARBALL2}
-RUN tar -xvf ./${TARBALL6} && rm -fv ./${TARBALL6}
-RUN tar -xvf ./${TARBALL7} && rm -fv ./${TARBALL7}
-RUN tar -xvf ./${TARBALL8} && rm -fv ./${TARBALL8}
-RUN tar -xvf ./${TARBALL9} && rm -fv ./${TARBALL9}
-RUN tar -xvf ./${TARBALL10} && rm -fv ./${TARBALL10}
-RUN tar -xvf ./${TARBALL11} && rm -fv ./${TARBALL11}
-RUN tar -xvf ./${TARBALL12} && rm -fv ./${TARBALL12}
-RUN tar -xvf ./${TARBALL13} && rm -fv ./${TARBALL13}
+RUN tar -zxf ./${TARBALL13} && rm -fv ./${TARBALL13}
 
-#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/
+COPY ["${TARBALL6}", "${TARBALL7}", "${TARBALL8}", "${TARBALL9}", \
+       "${TARBALL10}", "${TARBALL11}", "${TARBALL12}", "/opt/tritonserver/backends/tensorflow1/"]
 
-WORKDIR /
+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}
 
-#split cuda folder
-RUN tar -xvf ./${TARBALLC0} && rm -fv ./${TARBALLC0}
-RUN tar -xvf ./${TARBALLC1} && rm -fv ./${TARBALLC1}
-RUN tar -xvf ./${TARBALLC2} && rm -fv ./${TARBALLC2}
+
+#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
 
+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 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
 EXPOSE 8001
 EXPOSE 8002
-
+#
 ENTRYPOINT ["/opt/tritonserver/bin/tritonserver", "--strict-model-config=false", "--model-repository", "/models"]
 
 HEALTHCHECK --timeout=30s CMD curl -fs http://localhost:8000/v2 || exit 1
\ No newline at end of file

hardening_manifest.yaml

@@ -32,68 +32,62 @@ labels:
   # Product the image belongs to for grouping multiple images
   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"
-    filename: "libtensorflow_cc.so.1.tar"
+  - 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: "4e7d16a36df54b6c0e2f4d1531f672302783bb080b202d08b44ce65cefe1d961"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtensorflow_cc.so.tar"
-    filename: "libtensorflow_cc.so.tar"
+      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: "1d1e7760a88d9318d07468ef67b88e9898fed60bc784abe634c688225255fe3d"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtensorflow_framework.so.1.tar"
-    filename: "libtensorflow_framework.so.1.tar"
+      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: "9aed19572a562d9ddb0311d2f41b9e4e2941a1a0e320ecb46b2e04d329058812"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtensorflow_framework.so.tar"
-    filename: "libtensorflow_framework.so.tar"
+      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: "de1978125cd4fda7a30ce97ed5373de876af6bc1160e310e2e51f23857cfa4b4"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtensorflow_triton.so.1.tar"
-    filename: "libtensorflow_triton.so.1.tar"
+      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: "876ca87902a9dfb914c3a1af33cf3eb235573346dfccf18b0d1222d23df36d1c"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtensorflow_triton.so.tar"
-    filename: "libtensorflow_triton.so.tar"
+      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: "169590403b9b64ee0e9e12ed2af3bb4fceb2cdc731ee3b753b5a5008f66612e3"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/libtriton_tensorflow1.so.tar"
-    filename: "libtriton_tensorflow1.so.tar"
+      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: "291d3d93c6be6a4ce2af991c48a000694af2c3445335bb94b780e35c8f6daeef"
+      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/cuda-parts0.tar"
-    filename: "cuda-parts0.tar"
-    validation:
-      type: "sha256"
-      value: "6f46d963e08f7a151c8a420a2b75c49a1bbd67fc00e77dad6967b910f4c52ed6"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/cuda-parts1.tar"
-    filename: "cuda-parts1.tar"
+  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/nvidia.rpms.tar"
+    filename: "nvidia.rpms.tar"
     validation:
       type: "sha256"
-      value: "d5a11547d71ad6c735ab3ead231f4d39f0e53dd20cd4b14f931301908e8e374c"
-  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/cuda-parts2.tar"
-    filename: "cuda-parts2.tar"
+      value: "66801d2eef84fe087bc9fcc4d25d17785352572365b3f9ec969729ba3027b777"
+  - url: "https://iron-bank-tars.s3-us-gov-west-1.amazonaws.com/OCV.tar"
+    filename: "OCV.tar"
     validation:
       type: "sha256"
-      value: "51d4a76ac59a76e4bee1cab5632d1a452276520153d8098d179a55b729d278f7"
+      value: "02a342f9eb90f09338f0cffa19378befd09e9e0ed24da93b239c65d40ad87cf6"
 
 maintainers:
   - name: "Daniel Mumpton"