From 3d03fe866f11be3639b0027db801e89d437effd0 Mon Sep 17 00:00:00 2001 From: intel12232289 Date: Tue, 14 Jan 2025 13:38:32 +0100 Subject: [PATCH 1/4] Update reusable_multi_numa.yml --- .github/workflows/reusable_multi_numa.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/reusable_multi_numa.yml b/.github/workflows/reusable_multi_numa.yml index f654789843..f62ad4ea12 100644 --- a/.github/workflows/reusable_multi_numa.yml +++ b/.github/workflows/reusable_multi_numa.yml @@ -15,11 +15,11 @@ jobs: multi_numa: name: "${{matrix.os}}, ${{matrix.build_type}}, shared=${{matrix.shared_library}}" # run only on upstream; forks will not have the HW - if: github.repository == 'oneapi-src/unified-memory-framework' + # if: github.repository == 'oneapi-src/unified-memory-framework' strategy: matrix: - os: [ubuntu-22.04, rhel-9.1] + os: [ubuntu-22.04, rhel-9.1, sles-15] build_type: [Debug, Release] shared_library: ['ON', 'OFF'] runs-on: ["DSS-MULTI-NUMA", "DSS-${{matrix.os}}"] @@ -53,15 +53,15 @@ jobs: run: cmake --build ${{github.workspace}}/build -j $(nproc) - name: Run tests - if: matrix.os != 'rhel-9.1' + if: (matrix.os != 'rhel-9.1') && (matrix.os != 'sles-15') working-directory: ${{github.workspace}}/build run: ctest --output-on-failure --test-dir test - # On RHEL, hwloc version is just a little too low. + # On RHEL/SLES, hwloc version is just a little too low. # Skip some tests until we upgrade hwloc and update CMake to properly handle local hwloc installation. # TODO: fix issue #560 - - name: Run tests (on RHEL) - if: matrix.os == 'rhel-9.1' + - name: Run tests (on RHEL/SLES15) + if: (matrix.os == 'rhel-9.1') || (matrix.os == 'sles-15') working-directory: ${{github.workspace}}/build run: | ctest --output-on-failure --test-dir test -E "umf-provider_os_memory_multiple_numa_nodes" From 580b9d3050e3e5c0bfdf31dad9fdc995e7de74bc Mon Sep 17 00:00:00 2001 From: intel12232289 Date: Tue, 14 Jan 2025 14:03:53 +0100 Subject: [PATCH 2/4] Update reusable_multi_numa.yml --- .github/workflows/reusable_multi_numa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable_multi_numa.yml b/.github/workflows/reusable_multi_numa.yml index f62ad4ea12..d7aca4da79 100644 --- a/.github/workflows/reusable_multi_numa.yml +++ b/.github/workflows/reusable_multi_numa.yml @@ -15,7 +15,7 @@ jobs: multi_numa: name: "${{matrix.os}}, ${{matrix.build_type}}, shared=${{matrix.shared_library}}" # run only on upstream; forks will not have the HW - # if: github.repository == 'oneapi-src/unified-memory-framework' + if: github.repository == 'oneapi-src/unified-memory-framework' strategy: matrix: From 2faf0dc0f267ff41e9aebe3a7f69a67d9aa304d0 Mon Sep 17 00:00:00 2001 From: intel12232289 Date: Tue, 14 Jan 2025 14:30:43 +0100 Subject: [PATCH 3/4] Update reusable_multi_numa.yml --- .github/workflows/reusable_multi_numa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable_multi_numa.yml b/.github/workflows/reusable_multi_numa.yml index d7aca4da79..8b30d9a4f3 100644 --- a/.github/workflows/reusable_multi_numa.yml +++ b/.github/workflows/reusable_multi_numa.yml @@ -1,4 +1,4 @@ -# Runs tests on multi-numa machine +# Runs tests on multi-numa machines name: MultiNuma on: [workflow_call] From a7a88fe375a38eb0b6ff5858da05ef547c155b72 Mon Sep 17 00:00:00 2001 From: intel12232289 Date: Tue, 14 Jan 2025 14:03:53 +0100 Subject: [PATCH 4/4] Update reusable_multi_numa.yml (+1 squashed commits) --- .github/workflows/reusable_multi_numa.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable_multi_numa.yml b/.github/workflows/reusable_multi_numa.yml index f62ad4ea12..8b30d9a4f3 100644 --- a/.github/workflows/reusable_multi_numa.yml +++ b/.github/workflows/reusable_multi_numa.yml @@ -1,4 +1,4 @@ -# Runs tests on multi-numa machine +# Runs tests on multi-numa machines name: MultiNuma on: [workflow_call] @@ -15,7 +15,7 @@ jobs: multi_numa: name: "${{matrix.os}}, ${{matrix.build_type}}, shared=${{matrix.shared_library}}" # run only on upstream; forks will not have the HW - # if: github.repository == 'oneapi-src/unified-memory-framework' + if: github.repository == 'oneapi-src/unified-memory-framework' strategy: matrix: