From f3bef7995ef2c80c65b6e58e86fe99180d3cf04f Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 24 Jan 2025 21:29:11 +0100 Subject: [PATCH 1/3] Update ci-gpu.yml --- .github/workflows/ci-gpu.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-gpu.yml b/.github/workflows/ci-gpu.yml index 95a7e5489..8226c8a71 100644 --- a/.github/workflows/ci-gpu.yml +++ b/.github/workflows/ci-gpu.yml @@ -22,16 +22,16 @@ jobs: strategy: fail-fast: false matrix: - optix: [ optix-7.5.0, optix-7.7.0, optix-8.0.0 ] - cuda: [ '11.7.0', '12.1.0', '12.2.2', '12.3.2' ] - os: [ ubuntu-20.04, windows-latest ] + optix: [ optix-7.5.0, optix-7.7.0, optix-8.1.0 ] + cuda: [ '11.7.0', '12.2.2', '12.6.3', '12.8.0' ] + os: [ ubuntu-24.04, ubuntu-20.04, windows-latest ] name: GPU Build Only (${{ matrix.os }}, CUDA ${{ matrix.cuda }}, ${{ matrix.optix }}) runs-on: ${{ matrix.os }} steps: - - uses: jimver/cuda-toolkit@v0.2.19 + - uses: jimver/cuda-toolkit@v0.2.20 id: cuda-toolkit with: cuda: ${{ matrix.cuda }} @@ -76,7 +76,7 @@ jobs: vcpkg install zlib:x64-windows-static - name: Install OpenGL - if: ${{ matrix.os == 'ubuntu-20.04' }} + if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-24.04' }} run: sudo apt-get install -y --no-install-recommends libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libxfixes-dev libgl1-mesa-dev libwayland-bin libwayland-dev wayland-protocols libxkbcommon-dev libxkbcommon-x11-0 - name: Configure (Windows) @@ -86,7 +86,7 @@ jobs: cmake .. -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT"/scripts/buildsystems/vcpkg.cmake -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX7_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80 - name: Configure (Linux) - if: ${{ matrix.os == 'ubuntu-20.04' }} + if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-24.04' }} run: | cd build cmake .. -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX7_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80 @@ -97,7 +97,7 @@ jobs: - name: Save Windows executable if: ${{ matrix.os == 'windows-latest' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: pbrt.exe path: pbrt.exe From 6c5b32a0424a3e20a086f0dec72b7cbdd11585b0 Mon Sep 17 00:00:00 2001 From: Johnny Date: Sun, 26 Jan 2025 16:34:13 +0100 Subject: [PATCH 2/3] Update ci-gpu.yml --- .github/workflows/ci-gpu.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-gpu.yml b/.github/workflows/ci-gpu.yml index 8226c8a71..e60f90d94 100644 --- a/.github/workflows/ci-gpu.yml +++ b/.github/workflows/ci-gpu.yml @@ -24,14 +24,14 @@ jobs: matrix: optix: [ optix-7.5.0, optix-7.7.0, optix-8.1.0 ] cuda: [ '11.7.0', '12.2.2', '12.6.3', '12.8.0' ] - os: [ ubuntu-24.04, ubuntu-20.04, windows-latest ] + os: [ ubuntu-latest, ubuntu-20.04, windows-latest ] name: GPU Build Only (${{ matrix.os }}, CUDA ${{ matrix.cuda }}, ${{ matrix.optix }}) runs-on: ${{ matrix.os }} steps: - - uses: jimver/cuda-toolkit@v0.2.20 + - uses: jimver/cuda-toolkit@v0.2.21 id: cuda-toolkit with: cuda: ${{ matrix.cuda }} From 857cc99cdead9734f510ff6d977e6d728878d4cb Mon Sep 17 00:00:00 2001 From: Johnny Date: Sun, 26 Jan 2025 16:34:41 +0100 Subject: [PATCH 3/3] Update ci-gpu.yml --- .github/workflows/ci-gpu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-gpu.yml b/.github/workflows/ci-gpu.yml index e60f90d94..37cee0243 100644 --- a/.github/workflows/ci-gpu.yml +++ b/.github/workflows/ci-gpu.yml @@ -24,7 +24,7 @@ jobs: matrix: optix: [ optix-7.5.0, optix-7.7.0, optix-8.1.0 ] cuda: [ '11.7.0', '12.2.2', '12.6.3', '12.8.0' ] - os: [ ubuntu-latest, ubuntu-20.04, windows-latest ] + os: [ ubuntu-24.04, ubuntu-20.04, windows-latest ] name: GPU Build Only (${{ matrix.os }}, CUDA ${{ matrix.cuda }}, ${{ matrix.optix }})