Skip to content

Commit fab1188

Browse files
authored
Clean up reference to VS2019 (#8901)
1 parent d4a1e3d commit fab1188

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

.github/scripts/setup-env.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ echo '::endgroup::'
4545

4646
if [[ "${OS_TYPE}" == windows && "${GPU_ARCH_TYPE}" == cuda ]]; then
4747
echo '::group::Install VisualStudio CUDA extensions on Windows'
48-
if [[ "${VC_YEAR:-}" == "2022" ]]; then
49-
TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Microsoft/VC/v170/BuildCustomizations"
50-
else
51-
TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/MSBuild/Microsoft/VC/v160/BuildCustomizations"
52-
fi
48+
TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Microsoft/VC/v170/BuildCustomizations"
5349
mkdir -p "${TARGET_DIR}"
5450
cp -r "${CUDA_HOME}/MSBuildExtensions/"* "${TARGET_DIR}"
5551
echo '::endgroup::'

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
set -euxo pipefail
103103
104104
export PYTHON_VERSION=${{ matrix.python-version }}
105-
export VC_YEAR=2019
105+
export VC_YEAR=2022
106106
export VSDEVCMD_ARGS=""
107107
export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
108108
export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}

packaging/windows/internal/vc_env_helper.bat

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22

33
set VC_VERSION_LOWER=17
44
set VC_VERSION_UPPER=18
5-
if "%VC_YEAR%" == "2019" (
6-
set VC_VERSION_LOWER=16
7-
set VC_VERSION_UPPER=17
8-
)
9-
if "%VC_YEAR%" == "2017" (
10-
set VC_VERSION_LOWER=15
11-
set VC_VERSION_UPPER=16
12-
)
135

146
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -legacy -products * -version [%VC_VERSION_LOWER%^,%VC_VERSION_UPPER%^) -property installationPath`) do (
157
if exist "%%i" if exist "%%i\VC\Auxiliary\Build\vcvarsall.bat" (

0 commit comments

Comments
 (0)