Fix naming of windows cudnn package (#3861)

triton-inference-server · Jan 28, 2022 · ed86133 · ed86133
1 parent 4f925a7
commit ed86133
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/Dockerfile.win10.min b/Dockerfile.win10.min
@@ -100,7 +100,8 @@ ARG TENSORRT_VERSION=8.2.2.1
 ARG TENSORRT_ZIP=TensorRT-${TENSORRT_VERSION}.Windows10.x86_64.cuda-11.4.cudnn8.2.zip
 
 ARG CUDNN_VERSION=8.3.2.44
-ARG CUDNN_ZIP=cudnn-11.5-windows-x64-v${CUDNN_VERSION}.zip
+ARG CUDNN_DIR=cudnn-windows-x86_64-${CUDNN_VERSION}_cuda11.5-archive
+ARG CUDNN_ZIP=${CUDNN_DIR}.zip
 
 WORKDIR /tmp
 ADD https://developer.download.nvidia.com/compute/cuda/${CUDA_VERSION}/network_installers/cuda_${CUDA_VERSION}_win10_network.exe cuda_${CUDA_VERSION}_win10_network.exe
@@ -115,9 +116,9 @@ ENV TRT_VERSION ${TENSORRT_VERSION}
 WORKDIR /tmp
 RUN cuda_%CUDA_VERSION%_win10_network.exe -s %CUDA_PACKAGES%
 RUN unzip %CUDNN_ZIP%
-RUN copy libcudnn\bin\cudnn*.dll "%CUDA_INSTALL_ROOT_WP%\bin\."
-RUN copy libcudnn_dev\lib\x64\cudnn*.lib "%CUDA_INSTALL_ROOT_WP%\lib\x64\."
-RUN copy libcudnn_dev\include\cudnn*.h "%CUDA_INSTALL_ROOT_WP%\include\."
+RUN copy %CUDNN_DIR%\bin\cudnn*.dll "%CUDA_INSTALL_ROOT_WP%\bin\."
+RUN copy %CUDNN_DIR%\lib\cudnn*.lib "%CUDA_INSTALL_ROOT_WP%\lib\x64\."
+RUN copy %CUDNN_DIR%\include\cudnn*.h "%CUDA_INSTALL_ROOT_WP%\include\."
 
 # Copy the CUDA visualstudio integration from where is was installed
 # into the appropriate place in BuildTools

diff --git a/docs/build.md b/docs/build.md
@@ -247,14 +247,16 @@ the Windows build. The Windows min container is
 [Dockerfile.win10.min](../Dockerfile.win10.min).
 
 Before building the min container you must download the appropriate
-cuDNN and TensorRT versions and place them in the local directory.
+cuDNN and TensorRT versions and place them in the same directory as
+Dockerfile.win10.min.
 
-* For cuDNN the CUDNN_VERSION and CUDNN_ZIP arguments indicate the
-  version of cuDNN that your should download from
-  https://developer.nvidia.com/rdp/cudnn-download.
+* For cuDNN the CUDNN_VERSION and CUDNN_ZIP arguments defined in
+  Dockerfile.win10.min indicate the version of cuDNN that your should
+  download from https://developer.nvidia.com/rdp/cudnn-download.
 
-* For TensorRT the TENSORRT_VERSION and TENSORRT_ZIP arguments
-  indicate the version of TensorRT that your should download from
+* For TensorRT the TENSORRT_VERSION and TENSORRT_ZIP arguments defined
+  in Dockerfile.win10.min indicate the version of TensorRT that your
+  should download from
   https://developer.nvidia.com/nvidia-tensorrt-download.
 
 After downloading the zip files for cuDNN and TensorRT, you build the
@@ -274,7 +276,7 @@ and so you must enable them explicitly. The following build.py
 invocation builds all features and backends available on windows.
 
 ```bash
-python build.py --cmake-dir=<path/to/repo>/build --build-dir=/tmp/citritonbuild --no-container-pull --image=base,win10-py3-min --enable-logging --enable-stats --enable-tracing --enable-gpu --endpoint=grpc --endpoint=http --repo-tag=common:<container tag> --repo-tag=core:<container tag> --repo-tag=backend:<container tag> --repo-tag=thirdparty:<container tag> --backend=ensemble --backend=tensorrt:<container tag> --backend=onnxruntime:<container tag>
+python build.py --cmake-dir=<path/to/repo>/build --build-dir=/tmp/citritonbuild --no-container-pull --image=base,win10-py3-min --enable-logging --enable-stats --enable-tracing --enable-gpu --endpoint=grpc --endpoint=http --repo-tag=common:<container tag> --repo-tag=core:<container tag> --repo-tag=backend:<container tag> --repo-tag=thirdparty:<container tag> --backend=ensemble --backend=tensorrt:<container tag> --backend=onnxruntime:<container tag> --backend=openvino:<container tag>
 ```
 
 If you are building on *main* branch then '<container tag>' will