From 65a44578e11edfe2d4de4562f4ff3e0dc06a75f4 Mon Sep 17 00:00:00 2001 From: atalman Date: Mon, 3 Oct 2022 13:54:23 -0700 Subject: [PATCH 1/3] Fix for invluding nvtx dll and cudart --- conda/pytorch-nightly/bld.bat | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/conda/pytorch-nightly/bld.bat b/conda/pytorch-nightly/bld.bat index 09dc1a816..ae80b3166 100644 --- a/conda/pytorch-nightly/bld.bat +++ b/conda/pytorch-nightly/bld.bat @@ -21,11 +21,6 @@ set CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v%desired_cuda% set CUDA_BIN_PATH=%CUDA_PATH%\bin set TORCH_NVCC_FLAGS=-Xfatbin -compress-all set TORCH_CUDA_ARCH_LIST=3.7+PTX;5.0 -if "%desired_cuda%" == "10.2" set TORCH_CUDA_ARCH_LIST=%TORCH_CUDA_ARCH_LIST%;6.0;6.1;7.0;7.5 -if "%desired_cuda%" == "11.3" ( - set TORCH_CUDA_ARCH_LIST=%TORCH_CUDA_ARCH_LIST%;6.0;6.1;7.0;7.5;8.0;8.6 - set TORCH_NVCC_FLAGS=-Xfatbin -compress-all --threads 2 -) if "%desired_cuda%" == "11.5" ( set TORCH_CUDA_ARCH_LIST=%TORCH_CUDA_ARCH_LIST%;6.0;6.1;7.0;7.5;8.0;8.6 set TORCH_NVCC_FLAGS=-Xfatbin -compress-all --threads 2 @@ -112,6 +107,8 @@ IF "%USE_SCCACHE%" == "1" ( if NOT "%build_with_cuda%" == "" ( copy "%CUDA_BIN_PATH%\cudnn*64_*.dll*" %SP_DIR%\torch\lib + copy "%CUDA_BIN_PATH%\cudart*64_*.dll*" %SP_DIR%\torch\lib + copy "%NVTOOLSEXT_PATH%\bin\x64\nvToolsExt64_1.dll*" %SP_DIR%\torch\lib :: cupti library file name changes aggressively, bundle it to avoid :: potential file name mismatch. copy "%CUDA_PATH%\extras\CUPTI\lib64\cupti64_*.dll*" %SP_DIR%\torch\lib @@ -120,6 +117,8 @@ if NOT "%build_with_cuda%" == "" ( if exist "C:\Windows\System32\zlibwapi.dll" ( copy "C:\Windows\System32\zlibwapi.dll" %SP_DIR%\torch\lib ) + + ) exit /b 0 From 224bb9b5b7ad2edda11ea849a350cf01c545336c Mon Sep 17 00:00:00 2001 From: atalman Date: Mon, 3 Oct 2022 14:00:58 -0700 Subject: [PATCH 2/3] Fix for include nvtx --- conda/pytorch-nightly/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/pytorch-nightly/bld.bat b/conda/pytorch-nightly/bld.bat index ae80b3166..2f975bc03 100644 --- a/conda/pytorch-nightly/bld.bat +++ b/conda/pytorch-nightly/bld.bat @@ -108,7 +108,7 @@ IF "%USE_SCCACHE%" == "1" ( if NOT "%build_with_cuda%" == "" ( copy "%CUDA_BIN_PATH%\cudnn*64_*.dll*" %SP_DIR%\torch\lib copy "%CUDA_BIN_PATH%\cudart*64_*.dll*" %SP_DIR%\torch\lib - copy "%NVTOOLSEXT_PATH%\bin\x64\nvToolsExt64_1.dll*" %SP_DIR%\torch\lib + copy "%NVTOOLSEXT_PATH%\bin\x64\nvToolsExt64_*.dll*" %SP_DIR%\torch\lib :: cupti library file name changes aggressively, bundle it to avoid :: potential file name mismatch. copy "%CUDA_PATH%\extras\CUPTI\lib64\cupti64_*.dll*" %SP_DIR%\torch\lib From aa73de465fe01cb387d0b79e5a9d65ba6808c575 Mon Sep 17 00:00:00 2001 From: atalman Date: Mon, 3 Oct 2022 18:41:59 -0700 Subject: [PATCH 3/3] Fix spaces --- conda/pytorch-nightly/bld.bat | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda/pytorch-nightly/bld.bat b/conda/pytorch-nightly/bld.bat index 2f975bc03..8f9575f85 100644 --- a/conda/pytorch-nightly/bld.bat +++ b/conda/pytorch-nightly/bld.bat @@ -117,8 +117,6 @@ if NOT "%build_with_cuda%" == "" ( if exist "C:\Windows\System32\zlibwapi.dll" ( copy "C:\Windows\System32\zlibwapi.dll" %SP_DIR%\torch\lib ) - - ) exit /b 0