From 740fa077bb25dfce80826d63f7eb51d45f173b50 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 7 Apr 2022 11:59:54 -0700
Subject: [PATCH 1/3] Manywheel and conda builds for CUDA 11.6

---
 conda/pytorch-nightly/build.sh |  7 ++++++
 manywheel/build_cuda.sh        | 39 ++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/conda/pytorch-nightly/build.sh b/conda/pytorch-nightly/build.sh
index cdb533689..93a45e93c 100755
--- a/conda/pytorch-nightly/build.sh
+++ b/conda/pytorch-nightly/build.sh
@@ -71,6 +71,13 @@ if [[ -n "$build_with_cuda" ]]; then
         export USE_STATIC_CUDNN=0
         #for cuda 11.5 include all dynamic loading libraries
         DEPS_LIST=(/usr/local/cuda/lib64/libcudnn*.so.8 /usr/local/cuda-11.5/extras/CUPTI/lib64/libcupti.so.11.5)
+    elif [[ $CUDA_VERSION == 11.6* ]]; then
+        export TORCH_CUDA_ARCH_LIST="$TORCH_CUDA_ARCH_LIST;6.0;6.1;7.0;7.5;8.0;8.6"
+        #for cuda 11.5 we use cudnn 8.3.2.44 https://docs.nvidia.com/deeplearning/cudnn/release-notes/rel_8.html
+        #which does not have single static libcudnn_static.a deliverable to link with
+        export USE_STATIC_CUDNN=0
+        #for cuda 11.5 include all dynamic loading libraries
+        DEPS_LIST=(/usr/local/cuda/lib64/libcudnn*.so.8 /usr/local/cuda-11.6/extras/CUPTI/lib64/libcupti.so.11.6)
     fi
     export NCCL_ROOT_DIR=/usr/local/cuda
     export USE_STATIC_NCCL=1  # links nccl statically (driven by tools/setup_helpers/nccl.py, some of the NCCL cmake files such as FindNCCL.cmake and gloo/FindNCCL.cmake)
diff --git a/manywheel/build_cuda.sh b/manywheel/build_cuda.sh
index 1a6c3bd2c..7bcccb3f2 100644
--- a/manywheel/build_cuda.sh
+++ b/manywheel/build_cuda.sh
@@ -138,6 +138,8 @@ DEPS_LIST=(
     "/usr/local/cuda/lib64/libcudnn_ops_infer.so.8"
     "/usr/local/cuda/lib64/libcudnn_ops_train.so.8"
     "/usr/local/cuda/lib64/libcudnn.so.8"
+    "/usr/local/cuda/lib64/libcublas.so.11"
+    "/usr/local/cuda/lib64/libcublasLt.so.11"
     "$LIBGOMP_PATH"
 )
 
@@ -153,6 +155,8 @@ DEPS_SONAME=(
     "libcudnn_ops_infer.so.8"
     "libcudnn_ops_train.so.8"
     "libcudnn.so.8"
+    "libcublas.so.11"
+    "libcublasLt.so.11"
     "libgomp.so.1"
 )
 elif [[ $CUDA_VERSION == "11.5" ]]; then
@@ -189,6 +193,41 @@ DEPS_SONAME=(
     "libcublasLt.so.11"
     "libgomp.so.1"
 )
+elif [[ $CUDA_VERSION == "11.6" ]]; then
+export USE_STATIC_CUDNN=0
+DEPS_LIST=(
+    "/usr/local/cuda/lib64/libcudart.so.11.0"
+    "/usr/local/cuda/lib64/libnvToolsExt.so.1"
+    "/usr/local/cuda/lib64/libnvrtc.so.11.2"    # this is not a mistake for 11.5, it links to 11.5.50
+    "/usr/local/cuda/lib64/libnvrtc-builtins.so.11.6"
+    "/usr/local/cuda/lib64/libcudnn_adv_infer.so.8"
+    "/usr/local/cuda/lib64/libcudnn_adv_train.so.8"
+    "/usr/local/cuda/lib64/libcudnn_cnn_infer.so.8"
+    "/usr/local/cuda/lib64/libcudnn_cnn_train.so.8"
+    "/usr/local/cuda/lib64/libcudnn_ops_infer.so.8"
+    "/usr/local/cuda/lib64/libcudnn_ops_train.so.8"
+    "/usr/local/cuda/lib64/libcudnn.so.8"
+    "/usr/local/cuda/lib64/libcublas.so.11"
+    "/usr/local/cuda/lib64/libcublasLt.so.11"
+    "$LIBGOMP_PATH"
+)
+DEPS_SONAME=(
+    "libcudart.so.11.0"
+    "libnvToolsExt.so.1"
+    "libnvrtc.so.11.2"
+    "libnvrtc-builtins.so.11.5"
+    "libcudnn_adv_infer.so.8"
+    "libcudnn_adv_train.so.8"
+    "libcudnn_cnn_infer.so.8"
+    "libcudnn_cnn_train.so.8"
+    "libcudnn_ops_infer.so.8"
+    "libcudnn_ops_train.so.8"
+    "libcudnn.so.8"
+    "libcublas.so.11"
+    "libcublasLt.so.11"
+    "libgomp.so.1"
+)
+
 
 # Try parallelizing nvcc as well
 export TORCH_NVCC_FLAGS="-Xfatbin -compress-all --threads 2"

From e48deb4d5568ae485eb44f40305ba7b36fa69049 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 7 Apr 2022 12:05:09 -0700
Subject: [PATCH 2/3] Fix typo

---
 manywheel/build_cuda.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manywheel/build_cuda.sh b/manywheel/build_cuda.sh
index 7bcccb3f2..331dde41a 100644
--- a/manywheel/build_cuda.sh
+++ b/manywheel/build_cuda.sh
@@ -215,7 +215,7 @@ DEPS_SONAME=(
     "libcudart.so.11.0"
     "libnvToolsExt.so.1"
     "libnvrtc.so.11.2"
-    "libnvrtc-builtins.so.11.5"
+    "libnvrtc-builtins.so.11.6"
     "libcudnn_adv_infer.so.8"
     "libcudnn_adv_train.so.8"
     "libcudnn_cnn_infer.so.8"

From 5992999bffa099cbe16a3482f019433950198505 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Thu, 7 Apr 2022 12:08:49 -0700
Subject: [PATCH 3/3] Correct comment

---
 manywheel/build_cuda.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manywheel/build_cuda.sh b/manywheel/build_cuda.sh
index 331dde41a..8d2780a91 100644
--- a/manywheel/build_cuda.sh
+++ b/manywheel/build_cuda.sh
@@ -198,7 +198,7 @@ export USE_STATIC_CUDNN=0
 DEPS_LIST=(
     "/usr/local/cuda/lib64/libcudart.so.11.0"
     "/usr/local/cuda/lib64/libnvToolsExt.so.1"
-    "/usr/local/cuda/lib64/libnvrtc.so.11.2"    # this is not a mistake for 11.5, it links to 11.5.50
+    "/usr/local/cuda/lib64/libnvrtc.so.11.2"    # this is not a mistake for 11.6
     "/usr/local/cuda/lib64/libnvrtc-builtins.so.11.6"
     "/usr/local/cuda/lib64/libcudnn_adv_infer.so.8"
     "/usr/local/cuda/lib64/libcudnn_adv_train.so.8"