Revert "with_pypi_cudnn_experiment"

This reverts commit c9145a6.
- Also upgrades to Jun 19 nightly and changes CI WORKSPACE

Author: gs-olive

.circleci/config.yml

@@ -252,13 +252,13 @@ commands:
     parameters:
       torch-build:
         type: string
-        default: "2.1.0.dev20230613+cu121"
+        default: "2.1.0.dev20230619+cu121.with.pypi.cudnn"
       torchvision-build:
         type: string
-        default: "0.16.0.dev20230613+cu121"
+        default: "0.16.0.dev20230619+cu121"
       torch-build-index:
         type: string
-        default: "https://download.pytorch.org/whl/nightly/cu121"
+        default: "https://download.pytorch.org/whl/nightly/cu121_pypi_cudnn"
       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.dev20230613+cu121"
+    default: "2.1.0.dev20230619+cu121.with.pypi.cudnn"
   torchvision-build:
     type: string
-    default: "0.16.0.dev20230613+cu121"
+    default: "0.16.0.dev20230619+cu121"
   torch-build-index:
     type: string
-    default: "https://download.pytorch.org/whl/nightly/cu121"
+    default: "https://download.pytorch.org/whl/nightly/cu121_pypi_cudnn"
   torch-build-legacy:
     type: string
     default: "1.13.1+cu117"

README.md

@@ -116,7 +116,7 @@ torch.jit.save(trt_ts_module, "trt_torchscript_module.ts") # save the TRT embedd
 These are the following dependencies used to verify the testcases. Torch-TensorRT can work with other versions, but the tests are not guaranteed to pass.
 
 - Bazel 5.2.0
-- Libtorch 2.1.0.dev20230613 (built with CUDA 12.1)
+- Libtorch 2.1.0.dev20230619 (built with CUDA 12.1)
 - CUDA 12.1
 - cuDNN 8.9.1
 - TensorRT 8.6.1

WORKSPACE

@@ -51,17 +51,17 @@ new_local_repository(
 http_archive(
     name = "libtorch",
     build_file = "@//third_party/libtorch:BUILD",
-    sha256 = "1c3712b3b1de34e9989549f53675b557f6f0ca0b800ccbbc80c941af68abcc65",
+    sha256 = "5ba55259b65e071346a2b547b8d1378595f1467a39aaa923fecb09f134f1bcba",
     strip_prefix = "libtorch",
-    urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-cxx11-abi-shared-with-deps-2.1.0.dev20230613%2Bcu121.zip"],
+    urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-cxx11-abi-shared-with-deps-2.1.0.dev20230619%2Bcu121.zip"],
 )
 
 http_archive(
     name = "libtorch_pre_cxx11_abi",
     build_file = "@//third_party/libtorch:BUILD",
-    sha256 = "6bbb53f2f9533804175a0d2eeae5093ee1907158a9ec75c7fb9d10e2103d5df5",
+    sha256 = "8f6661bfc11597e77400e9e36cc8dd8e5e385ba82361d630d9ccede8518d7c7e",
     strip_prefix = "libtorch",
-    urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-shared-with-deps-2.1.0.dev20230613%2Bcu121.zip"],
+    urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-shared-with-deps-2.1.0.dev20230619%2Bcu121.zip"],
 )
 
 # Download these tarballs manually from the NVIDIA website

py/requirements.txt

@@ -2,8 +2,8 @@ numpy
 packaging
 pybind11==2.6.2
 --extra-index-url https://download.pytorch.org/whl/nightly/cu121
-#--extra-index-url https://download.pytorch.org/whl/nightly/cu121_pypi_cudnn
-torch==2.1.0.dev20230613+cu121#.with.pypi.cudnn
-torchvision==0.16.0.dev20230613+cu121
+--extra-index-url https://download.pytorch.org/whl/nightly/cu121_pypi_cudnn
+torch==2.1.0.dev20230619+cu121.with.pypi.cudnn
+torchvision==0.16.0.dev20230619+cu121
 --extra-index-url https://pypi.ngc.nvidia.com
 tensorrt==8.6.1

py/torch_tensorrt/dynamo/backend/lowering/_decompositions.py

@@ -34,7 +34,6 @@ def inplace_op(*args, **kwargs):
 replace_inplace_op(aten.index_reduce_, aten.index_reduce)
 replace_inplace_op(aten.logit_, aten.logit)
 replace_inplace_op(aten.relu_, aten.relu)
-replace_inplace_op(aten.renorm_, aten.renorm)
 replace_inplace_op(aten.round_, aten.round)
 replace_inplace_op(aten.scatter_, aten.scatter)
 replace_inplace_op(aten.scatter_add_, aten.scatter_add)

toolchains/ci_workspaces/WORKSPACE.x86_64

@@ -61,16 +61,20 @@ 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
 
-new_local_repository(
+http_archive(
     name = "libtorch",
-    path = "/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/torch",
-    build_file = "third_party/libtorch/BUILD"
+    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"],
 )
 
-new_local_repository(
+http_archive(
     name = "libtorch_pre_cxx11_abi",
-    path = "/opt/circleci/.pyenv/versions/3.9.4/lib/python3.9/site-packages/torch",
-    build_file = "third_party/libtorch/BUILD"
+    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"],
 )
 
 new_local_repository(

toolchains/ci_workspaces/WORKSPACE.x86_64.release.rhel

@@ -56,17 +56,17 @@ new_local_repository(
 http_archive(
     name = "libtorch",
     build_file = "@//third_party/libtorch:BUILD",
-    sha256 = "1c3712b3b1de34e9989549f53675b557f6f0ca0b800ccbbc80c941af68abcc65",
+    sha256 = "5ba55259b65e071346a2b547b8d1378595f1467a39aaa923fecb09f134f1bcba",
     strip_prefix = "libtorch",
-    urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-cxx11-abi-shared-with-deps-2.1.0.dev20230613%2Bcu121.zip"],
+    urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-cxx11-abi-shared-with-deps-2.1.0.dev20230619%2Bcu121.zip"],
 )
 
 http_archive(
     name = "libtorch_pre_cxx11_abi",
     build_file = "@//third_party/libtorch:BUILD",
-    sha256 = "6bbb53f2f9533804175a0d2eeae5093ee1907158a9ec75c7fb9d10e2103d5df5",
+    sha256 = "8f6661bfc11597e77400e9e36cc8dd8e5e385ba82361d630d9ccede8518d7c7e",
     strip_prefix = "libtorch",
-    urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-shared-with-deps-2.1.0.dev20230613%2Bcu121.zip"],
+    urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-shared-with-deps-2.1.0.dev20230619%2Bcu121.zip"],
 )
 
 ####################################################################################

toolchains/ci_workspaces/WORKSPACE.x86_64.release.ubuntu

@@ -56,17 +56,17 @@ new_local_repository(
 http_archive(
     name = "libtorch",
     build_file = "@//third_party/libtorch:BUILD",
-    sha256 = "1c3712b3b1de34e9989549f53675b557f6f0ca0b800ccbbc80c941af68abcc65",
+    sha256 = "5ba55259b65e071346a2b547b8d1378595f1467a39aaa923fecb09f134f1bcba",
     strip_prefix = "libtorch",
-    urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-cxx11-abi-shared-with-deps-2.1.0.dev20230613%2Bcu121.zip"],
+    urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-cxx11-abi-shared-with-deps-2.1.0.dev20230619%2Bcu121.zip"],
 )
 
 http_archive(
     name = "libtorch_pre_cxx11_abi",
     build_file = "@//third_party/libtorch:BUILD",
-    sha256 = "6bbb53f2f9533804175a0d2eeae5093ee1907158a9ec75c7fb9d10e2103d5df5",
+    sha256 = "8f6661bfc11597e77400e9e36cc8dd8e5e385ba82361d630d9ccede8518d7c7e",
     strip_prefix = "libtorch",
-    urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-shared-with-deps-2.1.0.dev20230613%2Bcu121.zip"],
+    urls = ["https://download.pytorch.org/libtorch/nightly/cu121/libtorch-shared-with-deps-2.1.0.dev20230619%2Bcu121.zip"],
 )
 
 ####################################################################################