Skip to content

Commit 85982ac

Browse files
authored
FIX CMAKE_WINDOWS_GPU workflow (#4419)
* add cuda envs * packaging doesn't need cuda env now * fix cmake_windows_gpu * minor fix * rename suffix * minor change * update vs integration
1 parent 1140ecf commit 85982ac

File tree

3 files changed

+46
-1
lines changed

3 files changed

+46
-1
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/usr/bin/env bash
2+
3+
if [ "${CU_VERSION:-}" == "cpu" ] ; then
4+
exit 0
5+
fi
6+
7+
if [[ ${#CU_VERSION} -eq 5 ]]; then
8+
CUDA_VERSION="${CU_VERSION:2:2}.${CU_VERSION:4:1}"
9+
fi
10+
11+
# It's a log to see if CU_VERSION exists, if not, we use environment CUDA_VERSION directly
12+
# in unittest_windows_gpu, there's no CU_VERSION, but CUDA_VERSION.
13+
echo "Using CUDA $CUDA_VERSION, CU_VERSION is $CU_VERSION now"
14+
15+
version=$CUDA_VERSION
16+
17+
# set cuda envs
18+
export PATH="/c/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v${version}/bin:/c/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v${version}/libnvvp:$PATH"
19+
export CUDA_PATH_V${version/./_}="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${version}"
20+
export CUDA_PATH="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${version}"
21+
22+
if [ ! -d "$CUDA_PATH" ]
23+
then
24+
echo "$CUDA_PATH" does not exist
25+
exit 1
26+
fi
27+
28+
# check cuda driver version
29+
for path in '/c/Program Files/NVIDIA Corporation/NVSMI/nvidia-smi.exe' /c/Windows/System32/nvidia-smi.exe; do
30+
if [[ -x "$path" ]]; then
31+
"$path" || echo "true";
32+
break
33+
fi
34+
done
35+
which nvcc

packaging/build_cmake.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ else
4545
yum install -y libpng-devel libjpeg-turbo-devel
4646
fi
4747

48+
if [[ "$OSTYPE" == "msys" ]]; then
49+
source .circleci/unittest/windows/scripts/set_cuda_envs.sh
50+
fi
51+
4852
mkdir cpp_build
4953
pushd cpp_build
5054

packaging/windows/internal/cuda_install.bat

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,13 @@ start /wait setup.exe -s %ARGS%
187187
popd
188188

189189
echo Installing VS integration...
190-
xcopy /Y "%SRC_DIR%\temp_build\cuda\CUDAVisualStudioIntegration\extras\visual_studio_integration\MSBuildExtensions\*.*" "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\VCTargets\BuildCustomizations"
190+
rem It's for VS 2019
191+
if "%CUDA_VER_MAJOR%" == "10" (
192+
xcopy /Y "%SRC_DIR%\temp_build\cuda\CUDAVisualStudioIntegration\extras\visual_studio_integration\MSBuildExtensions\*.*" "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\BuildCustomizations"
193+
)
194+
if "%CUDA_VER_MAJOR%" == "11" (
195+
xcopy /Y "%SRC_DIR%\temp_build\cuda\visual_studio_integration\CUDAVisualStudioIntegration\extras\visual_studio_integration\MSBuildExtensions\*.*" "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\BuildCustomizations"
196+
)
191197

192198
echo Installing NvToolsExt...
193199
7z x %SRC_DIR%\temp_build\NvToolsExt.7z -o"%SRC_DIR%\temp_build\NvToolsExt"

0 commit comments

Comments
 (0)