Merge branch 'branch-23.12' of github.com:rapidsai/devcontainers into…

… branch-24.02
rapidsai · Nov 16, 2023 · 35596fe · 35596fe
2 parents 9634d71 + 30f3287
commit 35596fe
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/matrix.yml b/matrix.yml
@@ -104,9 +104,9 @@ include:
   - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.27" }]} # MSVC 2019
   - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.28" }]} # MSVC 2019
   - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.29" }]} # MSVC 2019
-  - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.34" }]} # MSVC 2022
   - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.35" }]} # MSVC 2022
   - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.36" }]} # MSVC 2022
+  - {features: [{<<: *cuda_curr_max, <<: *cccl_cuda_opts}, { name: "cl", version: "14.37" }]} # MSVC 2022
 
 # RAPIDS devcontainers
 

diff --git a/windows/image/installers/build-env.psm1 b/windows/image/installers/build-env.psm1
@@ -32,6 +32,7 @@ $MSBuildPathMap = @{
     "14.34"="$MSBuildPath\17\VC\Auxiliary\Build"
     "14.35"="$MSBuildPath\17\VC\Auxiliary\Build"
     "14.36"="$MSBuildPath\17\VC\Auxiliary\Build"
+    "14.37"="$MSBuildPath\17\VC\Auxiliary\Build"
     "latest"="$MSBuildPath\$ENV:INSTALLED_MSVC_VERSION\VC\Auxiliary\Build"
 }
 

diff --git a/windows/image/installers/install-lit.ps1 b/windows/image/installers/install-lit.ps1
@@ -6,6 +6,7 @@ $ENV:PATH = "C:\Python\Scripts;$ENV:PATH"
 
 python -m pip install --upgrade pip
 python -m pip install wheel
+python -m pip install psutil
 python -m pip install lit
 
 Remove-Item .\python_installer.exe
diff --git a/windows/image/installers/install-vs.ps1 b/windows/image/installers/install-vs.ps1
@@ -23,6 +23,7 @@ $vsComponentsMap = @{
     "14.34"  = "Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64"
     "14.35"  = "Microsoft.VisualStudio.Component.VC.14.35.17.5.x86.x64"
     "14.36"  = "Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64"
+    "14.37"  = "Microsoft.VisualStudio.Component.VC.14.37.17.7.x86.x64"
     "latest" = "Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
 }
 

diff --git a/windows/vs-version-matrix.ps1 b/windows/vs-version-matrix.ps1
@@ -1,7 +1,7 @@
 $global:vsVerToCompilers = @{
     "2017"=("14.14", "14.15", "14.16");
     "2019"=("14.27", "14.28", "14.29");
-    "2022"=("14.34", "14.35", "14.36");
+    "2022"=("14.35", "14.36", "14.37");
 }
 
 $global:vsCompilersToYear = @{
@@ -14,6 +14,7 @@ $global:vsCompilersToYear = @{
     "14.34"="2022"
     "14.35"="2022"
     "14.36"="2022"
+    "14.37"="2022"
     "latest"="2022"
 }