VS Integration Files: Auto

Should be automatically installed for VS2022: https://docs.nvidia.com/cuda/cuda-installation-guide-microsoft-windows/#sample-projects
AMReX-Codes · Apr 11, 2024 · d94d725 · d94d725
1 parent c8237d9
commit d94d725
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/dependencies/windows_install_cuda.ps1 b/.github/workflows/dependencies/windows_install_cuda.ps1
@@ -5,6 +5,9 @@
 # License: BSD-3-Clause-LBNL
 # Authors: Axel Huebl
 
+# fail on first error
+$ErrorActionPreference = "Stop"
+
 # skip if already installed
 if (Test-Path "C:\Program Files\NVIDIA GPU Computing Toolkit\") { exit }
 
@@ -47,18 +50,15 @@ $CudaFeatures = " nvcc_${cuda_version_short} " + `
 " nvrtc_dev_${cuda_version_short} " + `
 " nvtx_${cuda_version_short} " + `
 " sanitizer_${cuda_version_short} " + `
-" thrust_${cuda_version_short} "
+" thrust_${cuda_version_short} " + `
+" visual_studio_integration_${cuda_version_short} "
 
 $SilentFlag = '-s '
 Start-Process -FilePath '.\cuda_install.exe' -ArgumentList @($SilentFlag + $CudaFeatures) -Wait -NoNewWindow
 
 # cleanup
 Remove-Item cuda_install.exe
 
-# VisualStudio integration
-Copy-item -Force -Recurse -Verbose "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${cuda_version_short}\extras\visual_studio_integration\MSBuildExtensions" -Destination "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Microsoft\VC\v170\BuildCustomizations"
-Copy-item -Force -Recurse -Verbose "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${cuda_version_short}\extras\visual_studio_integration\MSBuildExtensions" -Destination "C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\BuildCustomizations"
-
 # GitHub actions env updates
 if (Test-Path "env:GITHUB_ACTIONS") {
     echo "Adding CUDA to CUDA_PATH and PATH"

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -163,7 +163,7 @@ jobs:
 
         cmake -S . -B build ^
               -A x64        ^
-              -DCMAKE_VS_PLATFORM_TOOLSET_CUDA="cuda=12.4"  ^
+              -DCMAKE_GENERATOR_TOOLSET="cuda=12.4"  ^
               -DCUDA_TOOLKIT_ROOT_DIR="%CUDA_PATH%"  ^
               -DCUDAToolkit_ROOT="%CUDA_PATH%"  ^
               -DCMAKE_BUILD_TYPE=Release ^