From 89fbb3e262079c1cda3b7289ed756213436233c7 Mon Sep 17 00:00:00 2001 From: gs-olive <113141689+gs-olive@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:29:32 -0700 Subject: [PATCH] Roll back to cuDNN 8.8 --- .circleci/config.yml | 20 ++++++++++---------- README.md | 2 +- WORKSPACE | 6 +++--- docker/README.md | 4 ++-- py/versions.py | 2 +- toolchains/ci_workspaces/WORKSPACE.x86_64 | 16 ++++++---------- 6 files changed, 23 insertions(+), 27 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 24e39f1336..0332d25e4e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -94,7 +94,7 @@ commands: - << parameters.install-dir >> install-cudnn: - description: "Install CUDNN 8.9.1" + description: "Install CUDNN 8.8.1" parameters: os: type: string @@ -104,10 +104,10 @@ commands: default: "x86_64" cudnn-version: type: string - default: "8.9.1.23" + default: "8.8.1.3" cuda-version: type: string - default: "cuda12.1" + default: "cuda12.0" steps: - run: name: Install CUDNN @@ -183,7 +183,7 @@ commands: default: "cuda12.0" cudnn-version: type: string - default: "8.9.1.23" + default: "8.8.1.3" trt-version-short: type: string default: "8.6.1" @@ -235,7 +235,7 @@ commands: default: "8.6.1" cudnn-version-long: type: string - default: "8.9.1.23" + default: "8.8.1.3" steps: - run: name: Set up python environment @@ -252,13 +252,13 @@ commands: parameters: torch-build: type: string - default: "2.1.0.dev20230619+cu121.with.pypi.cudnn" + default: "2.1.0.dev20230619+cu121" torchvision-build: type: string default: "0.16.0.dev20230619+cu121" torch-build-index: type: string - default: "https://download.pytorch.org/whl/nightly/cu121_pypi_cudnn" + default: "https://download.pytorch.org/whl/nightly/cu121" torchvision-build-index: type: string default: "https://download.pytorch.org/whl/nightly/cu121" @@ -1338,13 +1338,13 @@ parameters: # Nightly platform config torch-build: type: string - default: "2.1.0.dev20230619+cu121.with.pypi.cudnn" + default: "2.1.0.dev20230619+cu121" torchvision-build: type: string default: "0.16.0.dev20230619+cu121" torch-build-index: type: string - default: "https://download.pytorch.org/whl/nightly/cu121_pypi_cudnn" + default: "https://download.pytorch.org/whl/nightly/cu121" torch-build-legacy: type: string default: "1.13.1+cu117" @@ -1359,7 +1359,7 @@ parameters: default: true cudnn-version: type: string - default: "8.9.1.23" + default: "8.8.1.3" trt-version-short: type: string default: "8.6.1" diff --git a/README.md b/README.md index f7172e8e2e..c43fd0d08e 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ These are the following dependencies used to verify the testcases. Torch-TensorR - Bazel 5.2.0 - Libtorch 2.1.0.dev20230619 (built with CUDA 12.1) - CUDA 12.1 -- cuDNN 8.9.1 +- cuDNN 8.8.1 - TensorRT 8.6.1 ## Prebuilt Binaries and Wheel files diff --git a/WORKSPACE b/WORKSPACE index 54344ba74a..8bc298f72a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -71,10 +71,10 @@ http_archive( http_archive( name = "cudnn", build_file = "@//third_party/cudnn/archive:BUILD", - sha256 = "35163c5c542be0c511738b27e25235193cbeedc5e0e006e44b1cdeaf1922e83e", - strip_prefix = "cudnn-linux-x86_64-8.9.1.23_cuda12-archive", + sha256 = "79d77a769c7e7175abc7b5c2ed5c494148c0618a864138722c887f95c623777c", + strip_prefix = "cudnn-linux-x86_64-8.8.1.3_cuda12-archive", urls = [ - "https://developer.nvidia.com/downloads/compute/cudnn/secure/8.9.1/local_installers/12.x/cudnn-linux-x86_64-8.9.1.23_cuda12-archive.tar.xz", + "https://developer.nvidia.com/downloads/compute/cudnn/secure/8.8.1/local_installers/12.0/cudnn-linux-x86_64-8.8.1.3_cuda12-archive.tar.xz", ], ) diff --git a/docker/README.md b/docker/README.md index 9f83f25134..527b7ae2b2 100644 --- a/docker/README.md +++ b/docker/README.md @@ -17,14 +17,14 @@ Note: By default the container uses the `pre-cxx11-abi` version of Torch + Torch ### Instructions -- The example below uses CUDNN 8.9 and TensorRT 8.6 +- The example below uses CUDNN 8.8 and TensorRT 8.6 - See dependencies for a list of current default dependencies. > From root of Torch-TensorRT repo Build: ``` -DOCKER_BUILDKIT=1 docker build --build-arg TENSORRT_VERSION=8.6 --build-arg CUDNN_VERSION=8.9 -f docker/Dockerfile -t torch_tensorrt:latest . +DOCKER_BUILDKIT=1 docker build --build-arg TENSORRT_VERSION=8.6 --build-arg CUDNN_VERSION=8.8 -f docker/Dockerfile -t torch_tensorrt:latest . ``` Run: diff --git a/py/versions.py b/py/versions.py index 0decc34b28..14f59ce4a0 100644 --- a/py/versions.py +++ b/py/versions.py @@ -1,4 +1,4 @@ __version__ = "1.5.0.dev0" __cuda_version__ = "12.1" -__cudnn_version__ = "8.9" +__cudnn_version__ = "8.8" __tensorrt_version__ = "8.6" diff --git a/toolchains/ci_workspaces/WORKSPACE.x86_64 b/toolchains/ci_workspaces/WORKSPACE.x86_64 index 2587c1fa71..ff95a22b2f 100644 --- a/toolchains/ci_workspaces/WORKSPACE.x86_64 +++ b/toolchains/ci_workspaces/WORKSPACE.x86_64 @@ -61,20 +61,16 @@ new_local_repository( # x86_64 python distribution. If using NVIDIA's version just point to the root of the package # for both versions here and do not use --config=pre-cxx11-abi -http_archive( +new_local_repository( name = "libtorch", - build_file = "@//third_party/libtorch:BUILD", - sha256 = "5ba55259b65e071346a2b547b8d1378595f1467a39aaa923fecb09f134f1bcba", - strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-cxx11-abi-shared-with-deps-2.1.0.dev20230619%2Bcu121.zip"], + path = "/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/torch", + build_file = "third_party/libtorch/BUILD" ) -http_archive( +new_local_repository( name = "libtorch_pre_cxx11_abi", - build_file = "@//third_party/libtorch:BUILD", - sha256 = "8f6661bfc11597e77400e9e36cc8dd8e5e385ba82361d630d9ccede8518d7c7e", - strip_prefix = "libtorch", - urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-shared-with-deps-2.1.0.dev20230619%2Bcu121.zip"], + path = "/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/torch", + build_file = "third_party/libtorch/BUILD" ) new_local_repository(