Skip to content

Commit f27884e

Browse files
committed
CI: make the (legacy) build require CC >= 3.0
build for CC 3.0 instead of previously used CC 3.5 Although the Keplers are no longer supported by NVIDIA, it won't hurt to still build for all Keplers (not only CC>=3.5) since the GPUJPEG codebase allows that. Also the compiler in ubuntu-20.04 and windows-2019 images support CUDA 10.x (last supporting CC 3.0), so it doesn't require much of special attention.
1 parent e4e8efd commit f27884e

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

.github/workflows/ccpp.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,14 @@ jobs:
4040
runs-on: ubuntu-20.04
4141
strategy:
4242
matrix:
43-
cuda_arch: [35, all]
43+
conf: [legacy, all]
4444
include:
45-
- cuda_arch: 35
45+
- conf: legacy
46+
cuda_arch: 30
4647
tar_name: GPUJPEG-Linux.tar.xz
4748
name: Linux build
48-
- cuda_arch: all
49+
- conf: all
50+
cuda_arch: all
4951
tar_name: GPUJPEG-Linux-all.tar.xz
5052
name: Linux build (all CUDA architetures)
5153

@@ -56,7 +58,7 @@ jobs:
5658
sudo apt update
5759
sudo apt install cmake jq
5860
- name: Install disro CUDA
59-
if: matrix.cuda_arch == 35
61+
if: matrix.conf == 'legacy'
6062
run: |
6163
sudo apt install nvidia-cuda-toolkit
6264
id: install-distro-cuda
@@ -95,13 +97,13 @@ jobs:
9597
Windows:
9698
name: run Windows
9799
needs: retag-continuous
98-
runs-on: windows-latest
100+
runs-on: windows-2019
99101

100102
steps:
101103
- uses: actions/checkout@main
102104
- name: install CUDA
103105
run: |
104-
choco install cuda -y --no-progress --version=11.8.0.52206
106+
choco install cuda -y --no-progress --version=10.1.243
105107
#$url="https://developer.download.nvidia.com/compute/cuda/12.1.0/network_installers/cuda_12.1.0_windows_network.exe"
106108
#$url -match 'cuda/(?<version>[0-9]+.[0-9]+)'
107109
#$version=$Matches.version
@@ -130,7 +132,7 @@ jobs:
130132
cmake.exe -DCMAKE_SYSTEM_VERSION=10.0.18362 -DCMAKE_BUILD_TYPE=Release `
131133
-DBUILD_OPENGL=ON -DGLFW_ROOT_DIR='C:\glfw' -DGLFW_USE_STATIC_LIBS=ON `
132134
-DGLEW_ROOT='C:\glew' -DGLEW_USE_STATIC_LIBS=ON `
133-
-DCMAKE_CUDA_ARCHITECTURES=35 -Bbuild .
135+
-DCMAKE_CUDA_ARCHITECTURES=30 -Bbuild .
134136
cmake.exe --build build --config Release --parallel (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors
135137
cmake.exe --install build --prefix GPUJPEG
136138
cpack.exe --config build/CPackConfig.cmake -GNSIS64

0 commit comments

Comments
 (0)