Skip to content

Commit 93ea533

Browse files
committed
Drop support for MSVC.
1 parent 1d0daa5 commit 93ea533

23 files changed

+27
-571
lines changed

.github/workflows/build-and-test-windows.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/dispatch-build-and-test.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
project_name: {type: string, required: true}
77
per_cuda_compiler_matrix: {type: string, required: true}
88
devcontainer_version: {type: string, required: true}
9-
is_windows: {type: boolean, required: true}
109

1110
permissions:
1211
contents: read
@@ -20,7 +19,6 @@ jobs:
2019
permissions:
2120
id-token: write
2221
contents: read
23-
if: ${{ !inputs.is_windows }}
2422
uses: ./.github/workflows/build-and-test-linux.yml
2523
strategy:
2624
fail-fast: false
@@ -34,20 +32,3 @@ jobs:
3432
build_script: "./ci/build_${{ inputs.project_name }}.sh -cxx ${{matrix.compiler.exe}} ${{matrix.extra_build_args}}"
3533
test_script: "./ci/test_${{ inputs.project_name }}.sh -cxx ${{matrix.compiler.exe}} ${{matrix.extra_build_args}}"
3634
container_image: rapidsai/devcontainers:${{inputs.devcontainer_version}}-cpp-${{matrix.compiler.name}}${{matrix.compiler.version}}-cuda${{matrix.cuda}}-${{matrix.os}}
37-
38-
build_and_test_windows:
39-
name: build and test windows
40-
permissions:
41-
id-token: write
42-
contents: read
43-
if: ${{ inputs.is_windows }}
44-
uses: ./.github/workflows/build-and-test-windows.yml
45-
strategy:
46-
fail-fast: false
47-
matrix:
48-
include: ${{ fromJSON(inputs.per_cuda_compiler_matrix) }}
49-
with:
50-
test_name: ${{matrix.cpu}}/${{matrix.compiler.name}}${{matrix.compiler.version}}
51-
build_script: "./ci/windows/build_${{ inputs.project_name }}.ps1 ${{matrix.extra_build_args}}"
52-
test_script: "./ci/windows/test_${{ inputs.project_name }}.ps1 ${{matrix.extra_build_args}}"
53-
container_image: rapidsai/devcontainers:${{inputs.devcontainer_version}}-cuda${{matrix.cuda}}-${{matrix.compiler.name}}${{matrix.compiler.version}}-${{matrix.os}}

.github/workflows/pr.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565
project_name: "nvbench"
6666
per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ matrix.cuda_host_combination ]) }}
6767
devcontainer_version: ${{ needs.compute-matrix.outputs.DEVCONTAINER_VERSION }}
68-
is_windows: ${{ contains(matrix.cuda_host_combination, 'cl') }}
6968

7069
verify-devcontainers:
7170
name: Verify Dev Containers

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ include(cmake/NVBenchUtilities.cmake) # Must be first
5151
include(cmake/NVBenchClangdCompileInfo.cmake) # Must be before any targets are created
5252

5353
include(cmake/NVBenchConfigTarget.cmake)
54-
include(cmake/NVBenchDependentDlls.cmake)
5554
include(cmake/NVBenchExports.cmake)
5655
include(cmake/NVBenchWriteConfigHeader.cmake)
5756
include(cmake/NVBenchDependencies.cmake)

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ features:
2828

2929
# Supported Compilers and Tools
3030

31-
- CMake > 2.23.1
31+
- CMake > 3.30.4
3232
- CUDA Toolkit + nvcc: 11.8 and above
3333
- g++: 7 -> 14
3434
- clang++: 14 -> 19
35-
- cl.exe: 2019 -> 2022 (19.29, 29.39)
3635
- Headers are tested with C++17 -> C++20.
3736

3837
# Getting Started

ci/matrix.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ llvm17: &llvm17 { name: 'llvm', version: '17', exe: 'clang++' }
2525
llvm18: &llvm18 { name: 'llvm', version: '18', exe: 'clang++' }
2626
llvm19: &llvm19 { name: 'llvm', version: '19', exe: 'clang++' }
2727

28-
# MSVC configs
29-
msvc2019: &msvc2019 { name: 'cl', version: '14.29', exe: 'cl++' }
30-
msvc2022: &msvc2022 { name: 'cl', version: '14.39', exe: 'cl++' }
31-
3228
# Each environment below will generate a unique build/test job
3329
# See the "compute-matrix" job in the workflow for how this is parsed and used
3430
# cuda: The CUDA Toolkit version
@@ -64,5 +60,3 @@ pull_request:
6460
- {cuda: *cuda_curr_max, os: 'ubuntu22.04', cpu: 'amd64', compiler: *llvm17 }
6561
- {cuda: *cuda_curr_max, os: 'ubuntu22.04', cpu: 'amd64', compiler: *llvm18 }
6662
- {cuda: *cuda_curr_max, os: 'ubuntu22.04', cpu: 'amd64', compiler: *llvm19 }
67-
- {cuda: *cuda_curr_max, os: 'windows2022', cpu: 'amd64', compiler: *msvc2019 }
68-
- {cuda: *cuda_curr_max, os: 'windows2022', cpu: 'amd64', compiler: *msvc2022 }

ci/windows/build_common.psm1

Lines changed: 0 additions & 207 deletions
This file was deleted.

ci/windows/build_nvbench.ps1

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)