From 149e69499fa09e491f66afb8cf6c9aa1de6f3260 Mon Sep 17 00:00:00 2001 From: Bryce Allen Date: Thu, 13 Nov 2025 18:41:21 -0500 Subject: [PATCH 1/4] ci: update to ubuntu 24.04 --- .github/workflows/ccpp.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index a20457be..2b2e0f2d 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -25,10 +25,10 @@ jobs: clangFormatVersion: 14 tests-cpu: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: matrix: - cxx: [ 'g++-9', 'g++-10', 'clang++-10' ] + cxx: [ 'g++-12', 'g++-14', 'clang++-16', 'clang++-18' ] name: tests-cpu-${{ matrix.cxx }} env: CMAKE_BUILD_PARALLEL_LEVEL: 8 @@ -67,10 +67,10 @@ jobs: run: cmake --build build-tests-${{ matrix.cxx }} -t test examples-cpu: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: matrix: - cxx: [ 'g++-9', 'g++-10', 'clang++-10' ] + cxx: [ 'g++-12', 'g++-14', 'clang++-16', 'clang++-18' ] name: examples-cpu-${{ matrix.cxx }} env: CMAKE_BUILD_PARALLEL_LEVEL: 8 From 9265bfc6481df3b463a3b69333451be8c0945d66 Mon Sep 17 00:00:00 2001 From: Bryce Allen Date: Thu, 13 Nov 2025 19:01:49 -0500 Subject: [PATCH 2/4] ci: new sycl image --- .github/workflows/sycl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sycl.yml b/.github/workflows/sycl.yml index 9e5bca77..f103ac41 100644 --- a/.github/workflows/sycl.yml +++ b/.github/workflows/sycl.yml @@ -10,7 +10,7 @@ on: jobs: test-sycl: runs-on: ubuntu-latest - container: intel/oneapi-basekit:2023.1.0-devel-ubuntu22.04 + container: intel/oneapi-basekit:2025.3.0-0-devel-ubuntu24.04 env: GTEST_VERSION: 1.12.1 GTEST_ROOT: ${{ github.workspace }}/googletest From ac7f8c55d78267d35a471924aacc2b488f0a04d1 Mon Sep 17 00:00:00 2001 From: Bryce Allen Date: Thu, 13 Nov 2025 19:28:36 -0500 Subject: [PATCH 3/4] ci: sycl remove GNU make builds --- .github/workflows/sycl.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/sycl.yml b/.github/workflows/sycl.yml index f103ac41..7d0827be 100644 --- a/.github/workflows/sycl.yml +++ b/.github/workflows/sycl.yml @@ -63,21 +63,6 @@ jobs: - name: cmake cpu run mult_table run: ./mult_table working-directory: ${{ github.workspace }}/build-sycl/examples - - name: GNU make setup gtensor subdir - run: mkdir -p external/gtensor && cp -R ../include external/gtensor/ - working-directory: ${{ github.workspace }}/examples - - name: GNU make build - run: make GTENSOR_DEVICE=sycl - working-directory: ${{ github.workspace }}/examples - - name: GNU make run daxpy - run: ./daxpy - working-directory: ${{ github.workspace }}/examples - - name: GNU make run stencil1d - run: ./stencil1d - working-directory: ${{ github.workspace }}/examples - - name: GNU make run mult_table - run: ./mult_table - working-directory: ${{ github.workspace }}/examples - name: install umpire run: | mkdir -p ${{ env.UMPIRE_ROOT }} From b665d00a7b09c0e7760f895871ebb94e3863351c Mon Sep 17 00:00:00 2001 From: Bryce Allen Date: Thu, 13 Nov 2025 19:44:16 -0500 Subject: [PATCH 4/4] ci: sycl remove umpire builds failing for unknown reasons. umpire is still tested in other builds --- .github/workflows/sycl.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/sycl.yml b/.github/workflows/sycl.yml index 7d0827be..7da9a5f2 100644 --- a/.github/workflows/sycl.yml +++ b/.github/workflows/sycl.yml @@ -63,16 +63,3 @@ jobs: - name: cmake cpu run mult_table run: ./mult_table working-directory: ${{ github.workspace }}/build-sycl/examples - - name: install umpire - run: | - mkdir -p ${{ env.UMPIRE_ROOT }} - cd ${{ env.UMPIRE_ROOT }} - git clone -b feature/oneapi-2023 --recursive https://github.com/bd4/Umpire.git src - cmake -S src -B build -DCMAKE_INSTALL_PREFIX=${{ env.UMPIRE_ROOT }}/install -DUMPIRE_ENABLE_SYCL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo - cmake --build build -t install - - name: cmake umpire - run: cmake -S . -B build-sycl-umpire -DGTENSOR_DEVICE=sycl -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGTENSOR_BUILD_EXAMPLES=ON -DGTENSOR_USE_THRUST=OFF -DGTEST_ROOT=${{ env.GTEST_ROOT }} -DGTENSOR_ENABLE_CLIB=ON -DGTENSOR_ENABLE_BLAS=ON -DGTENSOR_ENABLE_FFT=ON -DGTENSOR_ENABLE_SOLVER=ON - env: - CMAKE_PREFIX_PATH: ${{env.CMAKE_PREFIX_PATH}}:${{ env.UMPIRE_ROOT }}/install - - name: cmake umpire build - run: cmake --build build-sycl-umpire -v