Undid hack for missing Thrust in CUDA_full v11.3

JuliaPackaging · Sep 12, 2022 · 931edf6 · 931edf6
1 parent 32ee7c7
commit 931edf6
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/T/Torch/build_tarballs.jl b/T/Torch/build_tarballs.jl
@@ -10,8 +10,7 @@ sources = [
     GitSource("https://github.com/pytorch/pytorch.git", "71f889c7d265b9636b93ede9d651c0a9c4bee191"),
     FileSource("https://micromamba.snakepit.net/api/micromamba/linux-64/0.21.1", "c907423887b43bec4e8b24f17471262c8087b7095683f41dcef4a4e24e9a3bbd"; filename = "micromamba.tar.bz2"),
     ArchiveSource("https://github.com/JuliaBinaryWrappers/CUDA_full_jll.jl/releases/download/CUDA_full-v10.2.89%2B5/CUDA_full.v10.2.89.x86_64-linux-gnu.tar.gz", "60e6f614db3b66d955b7e6aa02406765e874ff475c69e2b4a04eb95ba65e4f3b"; unpack_target = "CUDA_full.v10.2"),
-    ArchiveSource("https://github.com/JuliaBinaryWrappers/CUDA_full_jll.jl/releases/download/CUDA_full-v11.3.1%2B0/CUDA_full.v11.3.1.x86_64-linux-gnu.tar.gz", "4094b8f1a3667166c1281faa7958cc46dbdc86ac86979e86d462a3c58f2a4b54"; unpack_target = "CUDA_full.v11.3"),
-    GitSource("https://github.com/NVIDIA/thrust.git", "bdedc53ec19488704ba1461a79f6cd8d785fcc3e"), # Thrust v1.11.0 matches CUDA 11.3
+    ArchiveSource("https://github.com/JuliaBinaryWrappers/CUDA_full_jll.jl/releases/download/CUDA_full-v11.3.1%2B1/CUDA_full.v11.3.1.x86_64-linux-gnu.tar.gz", "9ae00d36d39b04e8e99ace63641254c93a931dcf4ac24c8eddcdfd4625ab57d6"; unpack_target = "CUDA_full.v11.3"),
     DirectorySource("./bundled"),
 ]
 
@@ -119,23 +118,13 @@ if [[ $bb_full_target == *cuda* ]]; then
         -DCUDA_cufft_LIBRARY=$cuda_full_path/lib64/libcufft.$dlext \
         -DCUDA_curand_LIBRARY=$cuda_full_path/lib64/libcurand.$dlext \
         -DCUDA_cusolver_LIBRARY=$cuda_full_path/lib64/libcusolver.$dlext \
-        -DCUDA_cusparse_LIBRARY=$cuda_full_path/lib64/libcusparse.$dlext "
+        -DCUDA_cusparse_LIBRARY=$cuda_full_path/lib64/libcusparse.$dlext \
+        -DCUDA_TOOLKIT_INCLUDE=$includedir;$cuda_full_path/include \
+        -DCUB_INCLUDE_DIR=$WORKSPACE/srcdir/pytorch/third_party/cub "
     include_paths+=":$cuda_full_path/include"
-    if [[ $bb_full_target == *cuda+11.3* ]]; then # HACK Workaround for missing thrust in CUDA_full 11.3
-        cd $WORKSPACE/srcdir/thrust && git config --file=.gitmodules submodule.cub.url https://github.com/NVIDIA/cub.git && git submodule update --init --recursive && cd $WORKSPACE/srcdir/pytorch
-        cmake_extra_args+="\
-            -DCUDA_TOOLKIT_INCLUDE=$includedir;$cuda_full_path/include;$WORKSPACE/srcdir/thrust;$WORKSPACE/srcdir/thrust/dependencies/cub \
-            -DCUB_INCLUDE_DIR=$WORKSPACE/srcdir/thrust/dependencies/cub "
-        include_paths+=":$WORKSPACE/srcdir/thrust"
-        include_paths+=":$WORKSPACE/srcdir/thrust/dependencies/cub"
-    else
-        git submodule update --init third_party/cub
-        cmake_extra_args+="\
-            -DCUDA_TOOLKIT_INCLUDE=$includedir;$cuda_full_path/include \
-            -DCUB_INCLUDE_DIR=$WORKSPACE/srcdir/pytorch/third_party/cub "
-    fi
     micromamba install -y magma-cuda${cuda_version_major}${cuda_version_minor} -c pytorch
     git submodule update --init \
+        third_party/cub \
         third_party/cudnn_frontend
 else
     cmake_extra_args+="-DUSE_CUDA=OFF -DUSE_MAGMA=OFF "