diff --git a/.github/actions/test-windows-image/image-test.ps1 b/.github/actions/test-windows-image/image-test.ps1 index 0e098fd05..83111b2ed 100644 --- a/.github/actions/test-windows-image/image-test.ps1 +++ b/.github/actions/test-windows-image/image-test.ps1 @@ -9,6 +9,9 @@ $mismatch_nvcc_cl_flags = @( '--allow-unsupported-compiler', # Tell MSVC that new nvcc is okay '-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH' + # Since MSVC 19.51, there is a static assertion triggered when compiling with nvcc < 13.0 regarding + # std::aligned_storage conformance. By defining _ENABLE_EXTENDED_ALIGNED_STORAGE, we select the conforming behaviour + '-D_ENABLE_EXTENDED_ALIGNED_STORAGE' ) $ErrorActionPreference = "Stop" diff --git a/matrix.yml b/matrix.yml index 18a4b950b..ecc4e5729 100644 --- a/matrix.yml +++ b/matrix.yml @@ -203,11 +203,11 @@ include: - { features: [{ <<: *cuda_curr_min, <<: *cccl_cuda_opts }, { name: "cl", version: "14.44" }] } # MSVC 2022 - { features: [{ <<: *cuda_curr_max, <<: *cccl_cuda_opts }, { name: "cl", version: "14.44" }] } # MSVC 2022 - # Still, we build a 12.0 + 14.50 image for python testing infra: - - { features: [{ <<: *cuda_prev_min, <<: *cccl_cuda_opts }, { name: "cl", version: "14.50" }] } # MSVC 2026 - - { features: [{ <<: *cuda_prev_max, <<: *cccl_cuda_opts }, { name: "cl", version: "14.50" }] } # MSVC 2026 - - { features: [{ <<: *cuda_curr_min, <<: *cccl_cuda_opts }, { name: "cl", version: "14.50" }] } # MSVC 2026 - - { features: [{ <<: *cuda_curr_max, <<: *cccl_cuda_opts }, { name: "cl", version: "14.50" }] } # MSVC 2026 + # Still, we build a 12.0 + 14.51 image for python testing infra: + - { features: [{ <<: *cuda_prev_min, <<: *cccl_cuda_opts }, { name: "cl", version: "14.51" }] } # MSVC 2026 + - { features: [{ <<: *cuda_prev_max, <<: *cccl_cuda_opts }, { name: "cl", version: "14.51" }] } # MSVC 2026 + - { features: [{ <<: *cuda_curr_min, <<: *cccl_cuda_opts }, { name: "cl", version: "14.51" }] } # MSVC 2026 + - { features: [{ <<: *cuda_curr_max, <<: *cccl_cuda_opts }, { name: "cl", version: "14.51" }] } # MSVC 2026 # RAPIDS devcontainers diff --git a/windows/image/installers/build-env.ps1 b/windows/image/installers/build-env.ps1 index 6284103d7..e7efaa652 100644 --- a/windows/image/installers/build-env.ps1 +++ b/windows/image/installers/build-env.ps1 @@ -44,6 +44,7 @@ $MSBuildPathMap = @{ "14.43"="$MSBuildPath\17\VC\Auxiliary\Build" "14.44"="$MSBuildPath\17\VC\Auxiliary\Build" "14.50"="$MSBuildPath\18\VC\Auxiliary\Build" + "14.51"="$MSBuildPath\18\VC\Auxiliary\Build" "latest"="$MSBuildPath\$ENV:INSTALLED_MSVC_VERSION\VC\Auxiliary\Build" } diff --git a/windows/image/installers/install-vs.ps1 b/windows/image/installers/install-vs.ps1 index 4a3c87dda..4a7e344e0 100644 --- a/windows/image/installers/install-vs.ps1 +++ b/windows/image/installers/install-vs.ps1 @@ -26,7 +26,8 @@ $vsComponentVersion = @{ "14.43" = "14.43.17.13" "14.44" = "14.44.17.14" "14.50" = "14.50.18.0" - "latest" = "14.50.18.0" + "14.51" = "14.51.18.6" + "latest" = "14.51.18.6" }[$clVersion] $sdkComponent = @{ diff --git a/windows/vs-version-matrix.ps1 b/windows/vs-version-matrix.ps1 index f2060824f..88c89e828 100644 --- a/windows/vs-version-matrix.ps1 +++ b/windows/vs-version-matrix.ps1 @@ -2,7 +2,7 @@ $global:vsVerToCompilers = @{ "2017"=("14.14", "14.15", "14.16"); "2019"=("14.27", "14.28", "14.29"); "2022"=("14.35", "14.36", "14.37", "14.38", "14.39", "14.40", "14.41", "14.42", "14.43", "14.44"); - "2026"=("14.50") + "2026"=("14.50", "14.51") } $global:vsCompilersToYear = @{ @@ -24,6 +24,7 @@ $global:vsCompilersToYear = @{ "14.43"="2022" "14.44"="2022" "14.50"="2026" + "14.51"="2026" "latest"="2026" }