From f87de65a063ee7f725f83f481932d84080729e9e Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Thu, 21 Oct 2021 20:59:41 -0700 Subject: [PATCH 1/3] fix cuda installation failure in packaging --- packaging/windows/internal/cuda_install.bat | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/packaging/windows/internal/cuda_install.bat b/packaging/windows/internal/cuda_install.bat index db0e19320fb..bed10f35cbf 100644 --- a/packaging/windows/internal/cuda_install.bat +++ b/packaging/windows/internal/cuda_install.bat @@ -194,7 +194,14 @@ if not exist "%SRC_DIR%\temp_build\NvToolsExt.7z" ( echo Installing CUDA toolkit... 7z x %CUDA_SETUP_FILE% -o"%SRC_DIR%\temp_build\cuda" pushd "%SRC_DIR%\temp_build\cuda" -start /wait setup.exe -s %ARGS% + +sc config wuauserv start= disabled +sc stop wuauserv +sc query wuauserv + +start /wait setup.exe -s %ARGS% -loglevel:6 -log:"%cd%/cuda_install_logs" +echo %errorlevel% + popd echo Installing VS integration... @@ -221,10 +228,16 @@ set "CUDA_PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_S set "CUDA_PATH_V%CUDA_VER_MAJOR%_%CUDA_VER_MINOR%=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_STR%" set "NVTOOLSEXT_PATH=%ProgramFiles%\NVIDIA Corporation\NvToolsExt\bin\x64" +if not exist "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_STR%\bin\nvcc.exe" ( if not exist "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_STR%\bin\nvcc.exe" ( echo CUDA %CUDA_VERSION_STR% installed failed. + echo --------- RunDll32.exe.log + type "%SRC_DIR%\temp_build\cuda\cuda_install_logs\LOG.RunDll32.exe.log" + echo --------- setup.exe.log ------- + type "%SRC_DIR%\temp_build\cuda\cuda_install_logs\LOG.setup.exe.log" exit /b 1 ) +) echo Installing cuDNN... 7z x %CUDNN_SETUP_FILE% -o"%SRC_DIR%\temp_build\cudnn" From c9d4dcb4aae1ed7824afc0009bd164fa4a6c96b4 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Fri, 22 Oct 2021 19:06:47 +0800 Subject: [PATCH 2/3] rm stop windows upgrade --- packaging/windows/internal/cuda_install.bat | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packaging/windows/internal/cuda_install.bat b/packaging/windows/internal/cuda_install.bat index bed10f35cbf..297753f22d6 100644 --- a/packaging/windows/internal/cuda_install.bat +++ b/packaging/windows/internal/cuda_install.bat @@ -194,11 +194,6 @@ if not exist "%SRC_DIR%\temp_build\NvToolsExt.7z" ( echo Installing CUDA toolkit... 7z x %CUDA_SETUP_FILE% -o"%SRC_DIR%\temp_build\cuda" pushd "%SRC_DIR%\temp_build\cuda" - -sc config wuauserv start= disabled -sc stop wuauserv -sc query wuauserv - start /wait setup.exe -s %ARGS% -loglevel:6 -log:"%cd%/cuda_install_logs" echo %errorlevel% From 7eaedb013ce0eb55511db6768ec022bd7dad7b80 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Fri, 22 Oct 2021 19:10:03 +0800 Subject: [PATCH 3/3] Update cuda_install.bat --- packaging/windows/internal/cuda_install.bat | 2 -- 1 file changed, 2 deletions(-) diff --git a/packaging/windows/internal/cuda_install.bat b/packaging/windows/internal/cuda_install.bat index 297753f22d6..631769747d4 100644 --- a/packaging/windows/internal/cuda_install.bat +++ b/packaging/windows/internal/cuda_install.bat @@ -223,7 +223,6 @@ set "CUDA_PATH=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_S set "CUDA_PATH_V%CUDA_VER_MAJOR%_%CUDA_VER_MINOR%=%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_STR%" set "NVTOOLSEXT_PATH=%ProgramFiles%\NVIDIA Corporation\NvToolsExt\bin\x64" -if not exist "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_STR%\bin\nvcc.exe" ( if not exist "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_STR%\bin\nvcc.exe" ( echo CUDA %CUDA_VERSION_STR% installed failed. echo --------- RunDll32.exe.log @@ -232,7 +231,6 @@ if not exist "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_ST type "%SRC_DIR%\temp_build\cuda\cuda_install_logs\LOG.setup.exe.log" exit /b 1 ) -) echo Installing cuDNN... 7z x %CUDNN_SETUP_FILE% -o"%SRC_DIR%\temp_build\cudnn"