Skip to content

Commit 8d33636

Browse files
committed
CI Windows: Use CUDA >= 12.4 for python builds, and add an extra 12.0 job without python building
1 parent b18fe43 commit 8d33636

3 files changed

Lines changed: 26 additions & 9 deletions

File tree

.github/workflows/Draft-Release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ defaults:
2828
# + Wheel producing manylinux builds
2929
# + CUDA 12.0 and 13.0, py 3.8-3.12, vis on/off, py only.
3030
# + Wheel producing Windows builds
31-
# + CUDA 12.0 and 13.0, py 3.8-3.12, vis on/off, py only.
31+
# + CUDA 12.4 and 13.0, py 3.8-3.12, vis on/off, py only.
3232
# + Draft github release workflow.
3333

3434
jobs:
@@ -194,12 +194,12 @@ jobs:
194194
cuda_arch: "75"
195195
hostcxx: "Visual Studio 17 2022"
196196
os: windows-2025
197-
# Newest and oldest CUDA 12.x we support. 12.4 is the oldest officially supported by MSVC >= 1940, but we have a workaround in place
197+
# Newest and oldest CUDA 12.x we support. 12.4 is the oldest officially supported by MSVC >= 1940, and although we have a workaround in place 12.4+ is required for pyflamegpu in c++20.
198198
- cuda: "12.9.1"
199199
cuda_arch: "50"
200200
hostcxx: "Visual Studio 17 2022"
201201
os: windows-2025
202-
- cuda: "12.0.0"
202+
- cuda: "12.4.0"
203203
cuda_arch: "50"
204204
hostcxx: "Visual Studio 17 2022"
205205
os: windows-2022
@@ -494,8 +494,8 @@ jobs:
494494
cuda_arch: "75-real;80-real;90-real;100-real;110-real;120-real;120-virtual"
495495
hostcxx: "Visual Studio 17 2022"
496496
os: windows-2025
497-
# Oldest CUDA 12.x we support. 12.4 is the oldest officially supported by MSVC >= 1940, but we have a workaround in place
498-
- cuda: "12.0.0"
497+
# Oldest CUDA 12.x we support. 12.4 is the oldest officially supported by MSVC >= 1940, and is required for pyflamegpu as c++20 due to compiler/stdlib errors
498+
- cuda: "12.4.0"
499499
cuda_arch: "50-real;60-real;70-real;80-real;90-real;90-virtual"
500500
hostcxx: "Visual Studio 17 2022"
501501
os: windows-2022

.github/workflows/Windows-Tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,16 @@ jobs:
2828
cuda_arch: "75"
2929
hostcxx: "Visual Studio 17 2022"
3030
os: windows-2025
31-
# Newest and oldest CUDA 12.x we support. 12.4 is the oldest officially supported by MSVC >= 1940, but we have a workaround in place
31+
# Newest and oldest CUDA 12.x we support. 12.4 is the oldest officially supported by MSVC >= 1940, and although we have a workaround in place 12.4+ is required for pyflamegpu in c++20.
3232
- cuda: "12.9.1"
3333
cuda_arch: "50"
3434
hostcxx: "Visual Studio 17 2022"
3535
os: windows-2025
36+
- cuda: "12.4.0"
37+
cuda_arch: "50"
38+
hostcxx: "Visual Studio 17 2022"
39+
os: windows-2022
40+
# No python in this workflow, so can just include 12.0 in the matrix.
3641
- cuda: "12.0.0"
3742
cuda_arch: "50"
3843
hostcxx: "Visual Studio 17 2022"

.github/workflows/Windows.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ jobs:
3434
cuda_arch: "75"
3535
hostcxx: "Visual Studio 17 2022"
3636
os: windows-2025
37-
# Newest and oldest CUDA 12.x we support. 12.4 is the oldest officially supported by MSVC >= 1940, but we have a workaround in place
37+
# Newest and oldest CUDA 12.x we support. 12.4 is the oldest officially supported by MSVC >= 1940, and although we have a workaround in place 12.4+ is required for pyflamegpu in c++20.
3838
- cuda: "12.9.1"
3939
cuda_arch: "50"
4040
hostcxx: "Visual Studio 17 2022"
4141
os: windows-2025
42-
- cuda: "12.0.0"
42+
- cuda: "12.4.0"
4343
cuda_arch: "50"
4444
hostcxx: "Visual Studio 17 2022"
4545
os: windows-2022
@@ -73,7 +73,19 @@ jobs:
7373
- config:
7474
name: "Beltsoff"
7575
VISUALISATION: "ON"
76-
76+
include:
77+
# Add an explicit CUDA 12.0 build for windows without Python
78+
- cudacxx:
79+
cuda: "12.0.0"
80+
cuda_arch: "50"
81+
hostcxx: "Visual Studio 17 2022"
82+
os: windows-2022
83+
python: ""
84+
config:
85+
- name: "Release"
86+
config: "Release"
87+
SEATBELTS: "ON"
88+
VISUALISATION: "ON"
7789
# Name the job based on matrix/env options
7890
name: "build (${{ matrix.cudacxx.cuda }}, ${{matrix.python}}, ${{ matrix.VISUALISATION }}, ${{ matrix.config.name }}, ${{ matrix.cudacxx.os }})"
7991

0 commit comments

Comments
 (0)