Unverified Commit 463cdeab authored by Radek Bartoň's avatar Radek Bartoň Committed by GitHub
Browse files

CMake build using VS2022 (#7694)


Co-authored-by: default avatarAndrey Talman <atalman@fb.com>
parent f81d68aa
...@@ -54,7 +54,11 @@ echo '::endgroup::' ...@@ -54,7 +54,11 @@ echo '::endgroup::'
if [[ "${OS_TYPE}" == windows && "${GPU_ARCH_TYPE}" == cuda ]]; then if [[ "${OS_TYPE}" == windows && "${GPU_ARCH_TYPE}" == cuda ]]; then
echo '::group::Install VisualStudio CUDA extensions on Windows' echo '::group::Install VisualStudio CUDA extensions on Windows'
TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/MSBuild/Microsoft/VC/v160/BuildCustomizations" if [[ "${VC_YEAR:-}" == "2022" ]]; then
TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Microsoft/VC/v170/BuildCustomizations"
else
TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/MSBuild/Microsoft/VC/v160/BuildCustomizations"
fi
mkdir -p "${TARGET_DIR}" mkdir -p "${TARGET_DIR}"
cp -r "${CUDA_HOME}/MSBuildExtensions/"* "${TARGET_DIR}" cp -r "${CUDA_HOME}/MSBuildExtensions/"* "${TARGET_DIR}"
echo '::endgroup::' echo '::endgroup::'
......
...@@ -74,9 +74,9 @@ jobs: ...@@ -74,9 +74,9 @@ jobs:
script: | script: |
set -euo pipefail set -euo pipefail
source packaging/windows/internal/vc_install_helper.sh
export PYTHON_VERSION=3.8 export PYTHON_VERSION=3.8
export VC_YEAR=2022
export VSDEVCMD_ARGS=""
export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }} export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }} export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
......
...@@ -98,6 +98,8 @@ jobs: ...@@ -98,6 +98,8 @@ jobs:
set -euxo pipefail set -euxo pipefail
export PYTHON_VERSION=${{ matrix.python-version }} export PYTHON_VERSION=${{ matrix.python-version }}
export VC_YEAR=2019
export VSDEVCMD_ARGS=""
export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }} export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }} export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
......
@echo on @echo on
set VC_VERSION_LOWER=16 set VC_VERSION_LOWER=17
set VC_VERSION_UPPER=17 set VC_VERSION_UPPER=18
if "%VC_YEAR%" == "2019" (
set VC_VERSION_LOWER=16
set VC_VERSION_UPPER=17
)
if "%VC_YEAR%" == "2017" ( if "%VC_YEAR%" == "2017" (
set VC_VERSION_LOWER=15 set VC_VERSION_LOWER=15
set VC_VERSION_UPPER=16 set VC_VERSION_UPPER=16
......
#!/bin/bash
set -ex
export VC_YEAR=2019
export VSDEVCMD_ARGS=""
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment