From cbf344819f2632bf32785df09ec3f65f6d2155dc Mon Sep 17 00:00:00 2001 From: James Foucar Date: Mon, 22 Jul 2024 15:54:15 -0600 Subject: [PATCH 01/10] A couple platforms do not correctly handle static complexes --- sparse/unit_test/Test_Sparse_sptrsv.hpp | 41 ++++++++++++------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/sparse/unit_test/Test_Sparse_sptrsv.hpp b/sparse/unit_test/Test_Sparse_sptrsv.hpp index 42afd04054..663f9d83ef 100644 --- a/sparse/unit_test/Test_Sparse_sptrsv.hpp +++ b/sparse/unit_test/Test_Sparse_sptrsv.hpp @@ -61,9 +61,6 @@ struct SptrsvTest { using range_policy_t = Kokkos::RangePolicy; - static inline const scalar_t ZERO = scalar_t(0); - static inline const scalar_t ONE = scalar_t(1); - static std::vector> get_5x5_ut_ones_fixture() { std::vector> A = {{1.00, 0.00, 1.00, 0.00, 0.00}, {0.00, 1.00, 0.00, 0.00, 1.00}, @@ -133,7 +130,7 @@ struct SptrsvTest { // known_lhs ValuesType known_lhs("known_lhs", nrows); // Create known solution lhs set to all 1's - Kokkos::deep_copy(known_lhs, ONE); + Kokkos::deep_copy(known_lhs, scalar_t(1)); // Solution to find ValuesType lhs("lhs", nrows); @@ -142,7 +139,7 @@ struct SptrsvTest { ValuesType rhs("rhs", nrows); Crs triMtx("triMtx", nrows, nrows, nnz, values, row_map, entries); - KokkosSparse::spmv("N", ONE, triMtx, known_lhs, ZERO, rhs); + KokkosSparse::spmv("N", scalar_t(1), triMtx, known_lhs, scalar_t(0), rhs); return std::make_tuple(triMtx, lhs, rhs); } @@ -185,7 +182,7 @@ struct SptrsvTest { Kokkos::parallel_reduce(range_policy_t(0, lhs.extent(0)), ReductionCheck(lhs), sum); EXPECT_EQ(sum, lhs.extent(0)); - Kokkos::deep_copy(lhs, ZERO); + Kokkos::deep_copy(lhs, scalar_t(0)); kh.destroy_sptrsv_handle(); } @@ -259,8 +256,8 @@ struct SptrsvTest { Kokkos::deep_copy(Uvalues, hUvalues); Crs mtxU("mtxU", nrows, nrows, nnz_sp, Uvalues, Urowptr, Ucolind); - Kokkos::deep_copy(B, ONE); - KokkosSparse::spmv("N", ONE, mtxU, B, ZERO, X); + Kokkos::deep_copy(B, scalar_t(1)); + KokkosSparse::spmv("N", scalar_t(1), mtxU, B, scalar_t(0), X); } } @@ -304,23 +301,23 @@ struct SptrsvTest { // values // first column (first supernode) hUvalues(0) = FIVE; - hUvalues(1) = ZERO; + hUvalues(1) = scalar_t(0); // second column (first supernode) - hUvalues(2) = ONE; + hUvalues(2) = scalar_t(1); hUvalues(3) = FIVE; // third column (second supernode) hUvalues(4) = FIVE; - hUvalues(5) = ONE; - hUvalues(6) = ZERO; + hUvalues(5) = scalar_t(1); + hUvalues(6) = scalar_t(0); // fourth column (third supernode) hUvalues(7) = FIVE; - hUvalues(8) = ONE; + hUvalues(8) = scalar_t(1); // fifth column (fourth supernode) hUvalues(9) = FIVE; - hUvalues(10) = ZERO; - hUvalues(11) = ONE; - hUvalues(12) = ONE; - hUvalues(13) = ONE; + hUvalues(10) = scalar_t(0); + hUvalues(11) = scalar_t(1); + hUvalues(12) = scalar_t(1); + hUvalues(13) = scalar_t(1); // store Ut in crsmat host_graph_t static_graph(hUrowind, hUcolptr); @@ -372,7 +369,7 @@ struct SptrsvTest { Kokkos::deep_copy(Lvalues, hLvalues); Crs mtxL("mtxL", nrows, nrows, nnz_sp, Lvalues, Lcolptr, Lrowind); - KokkosSparse::spmv("T", ONE, mtxL, X, ZERO, B); + KokkosSparse::spmv("T", scalar_t(1), mtxL, X, scalar_t(0), B); } } @@ -403,7 +400,7 @@ struct SptrsvTest { // > solve ValuesType b("b", nrows); Kokkos::deep_copy(b, B); - Kokkos::deep_copy(X, ZERO); + Kokkos::deep_copy(X, scalar_t(0)); sptrsv_solve(&khL, &khU, X, b); Kokkos::fence(); @@ -459,7 +456,7 @@ struct SptrsvTest { // > solve ValuesType b("b", nrows); Kokkos::deep_copy(b, B); - Kokkos::deep_copy(X, ZERO); + Kokkos::deep_copy(X, scalar_t(0)); sptrsv_solve(&khLd, &khUd, X, b); Kokkos::fence(); @@ -525,7 +522,7 @@ struct SptrsvTest { // known_lhs ValuesType known_lhs("known_lhs", nrows); // Create known solution lhs set to all 1's - Kokkos::deep_copy(known_lhs, ONE); + Kokkos::deep_copy(known_lhs, scalar_t(1)); // Solution to find lhs_v[i] = ValuesType("lhs", nrows); @@ -533,7 +530,7 @@ struct SptrsvTest { // A*known_lhs generates rhs: rhs is dense, use spmv rhs_v[i] = ValuesType("rhs", nrows); - KokkosSparse::spmv("N", ONE, triMtx, known_lhs, ZERO, rhs_v[i]); + KokkosSparse::spmv("N", scalar_t(1), triMtx, known_lhs, scalar_t(0), rhs_v[i]); Kokkos::fence(); // Create handle From 3842de4779ca45f4996bb0a635ce0874e5435eff Mon Sep 17 00:00:00 2001 From: Evan Harvey <57234914+e10harvey@users.noreply.github.com> Date: Fri, 26 Jul 2024 21:08:38 -0600 Subject: [PATCH 02/10] .github/workflows: Auto trigger AT2 ci upon review (#2243) --- .github/workflows/bdw.yml | 3 +++ .github/workflows/h100.yml | 3 +++ .github/workflows/mi210.yml | 3 +++ .github/workflows/spr.yml | 3 +++ 4 files changed, 12 insertions(+) diff --git a/.github/workflows/bdw.yml b/.github/workflows/bdw.yml index 450a0975ab..e4036d68b9 100644 --- a/.github/workflows/bdw.yml +++ b/.github/workflows/bdw.yml @@ -9,6 +9,9 @@ on: - '**/*.py' - 'docs/**' types: [ opened, reopened, synchronize ] + pull_request_review: + types: + - submitted permissions: contents: none diff --git a/.github/workflows/h100.yml b/.github/workflows/h100.yml index 0d20177b96..3473f8edd7 100644 --- a/.github/workflows/h100.yml +++ b/.github/workflows/h100.yml @@ -10,6 +10,9 @@ on: - '**/*.py' - 'docs/**' types: [ opened, reopened, synchronize ] + pull_request_review: + types: + - submitted permissions: contents: none diff --git a/.github/workflows/mi210.yml b/.github/workflows/mi210.yml index 9735e405f1..70b91a908c 100644 --- a/.github/workflows/mi210.yml +++ b/.github/workflows/mi210.yml @@ -9,6 +9,9 @@ on: - '**/*.py' - 'docs/**' types: [ opened, reopened, synchronize ] + pull_request_review: + types: + - submitted permissions: contents: none diff --git a/.github/workflows/spr.yml b/.github/workflows/spr.yml index c38d04ac8d..8b2d504926 100644 --- a/.github/workflows/spr.yml +++ b/.github/workflows/spr.yml @@ -10,6 +10,9 @@ on: workflow_dispatch # - '**/*.py' # - 'docs/**' # types: [ opened, reopened, synchronize ] + #pull_request_review: + # types: + # - submitted permissions: contents: none From 5d6b9e1edcb0250b84aba8be3827b6c594cb821b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 21:10:54 -0600 Subject: [PATCH 03/10] Bump github/codeql-action from 3.25.12 to 3.25.13 (#2284) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.12 to 3.25.13. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/4fa2a7953630fd2f3fb380f21be14ede0169dd4f...2d790406f505036ef40ecba973cc774a50395aac) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 49ce377c26..801ea454ad 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -44,7 +44,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 + uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13 with: languages: c-cpp # If you wish to specify custom queries, you can do so here or in a config file. @@ -100,6 +100,6 @@ jobs: run: make -j2 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 + uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13 with: category: "/language:c-cpp" diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index d81ed0e1bc..25818eec3e 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -73,6 +73,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12 + uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13 with: sarif_file: results.sarif From 9b6dfaae152b34c527e4c4e98624baa89bf9615c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 21:11:18 -0600 Subject: [PATCH 04/10] Bump step-security/harden-runner from 2.8.1 to 2.9.0 (#2283) Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.8.1 to 2.9.0. - [Release notes](https://github.com/step-security/harden-runner/releases) - [Commits](https://github.com/step-security/harden-runner/compare/17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6...0d381219ddf674d61a7572ddd19d7941e271515c) --- updated-dependencies: - dependency-name: step-security/harden-runner dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/scorecards.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 801ea454ad..2c310e8cc8 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -33,7 +33,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0 with: egress-policy: audit diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 56d5770ba5..f072eabac8 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0 with: egress-policy: audit diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 25818eec3e..a23db20023 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -33,7 +33,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1 + uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0 with: egress-policy: audit From c5a583238bb9f4b95a269f2c67ecb2c17c271823 Mon Sep 17 00:00:00 2001 From: James Foucar Date: Sat, 27 Jul 2024 00:07:59 -0600 Subject: [PATCH 05/10] Add big reformat commits to ignore revs for blame (#2286) --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 07973335d9..74670a3b7d 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -15,3 +15,5 @@ # git blame --ignore-revs-file=.git-blame-ignore-revs $file # # List skips here: +985c3a9e7343c2f612560024cae4d968f800c8ac +0ffb820881335beb0e78463c19988a0c61044705 From 07db1848c5aadb0c0b59de95f3d443c1dfed7680 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 07:16:25 -0600 Subject: [PATCH 06/10] Bump github/codeql-action from 3.25.13 to 3.25.15 (#2288) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.13 to 3.25.15. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2d790406f505036ef40ecba973cc774a50395aac...afb54ba388a7dca6ecae48f608c4ff05ff4cc77a) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2c310e8cc8..1052366eff 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -44,7 +44,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13 + uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 with: languages: c-cpp # If you wish to specify custom queries, you can do so here or in a config file. @@ -100,6 +100,6 @@ jobs: run: make -j2 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13 + uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 with: category: "/language:c-cpp" diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index a23db20023..a1269d02db 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -73,6 +73,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13 + uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 with: sarif_file: results.sarif From 99cbb4a2d3683abc9aa3c8affb818df51fdb863b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 07:16:33 -0600 Subject: [PATCH 07/10] Bump ossf/scorecard-action from 2.3.3 to 2.4.0 (#2287) Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.3 to 2.4.0. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/dc50aa9510b46c811795eb24b2f1ba02a914e534...62b2cac7ed8198b15735ed49ab1e5cf35480ba46) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index a1269d02db..a48b1e6f89 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -43,7 +43,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3 + uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0 with: results_file: results.sarif results_format: sarif From a2318759133861d49eec77b263ae25e7a77c261e Mon Sep 17 00:00:00 2001 From: Luc Berger Date: Wed, 31 Jul 2024 07:49:39 -0600 Subject: [PATCH 08/10] Sparse - coo2csr: deactivating test on PVC (#2290) * Sparse - coo2csr: deactivating test on PVC With this test deactivated everything in Kokkos Kernels passes. Let us confirm that with a nightly build and potentially create of SYCL CI-build. * Protecting SYCL check with preprocessor guard --- sparse/unit_test/Test_Sparse_coo2crs.hpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sparse/unit_test/Test_Sparse_coo2crs.hpp b/sparse/unit_test/Test_Sparse_coo2crs.hpp index 7e20c76f21..d8dc44a4be 100644 --- a/sparse/unit_test/Test_Sparse_coo2crs.hpp +++ b/sparse/unit_test/Test_Sparse_coo2crs.hpp @@ -214,6 +214,13 @@ void doAllCoo2Crs(size_t m, size_t n) { } TEST_F(TestCategory, sparse_coo2crs) { +#if defined(KOKKOS_ENABLE_SYCL) + if constexpr (std::is_same_v) { + std::cout << "Not running coo2csr on SYCL execution space" << std::endl; + return; + } +#endif + uint64_t ticks = std::chrono::high_resolution_clock::now().time_since_epoch().count() % UINT32_MAX; std::srand(ticks); @@ -241,6 +248,13 @@ TEST_F(TestCategory, sparse_coo2crs) { } TEST_F(TestCategory, sparse_coo2crs_staticMatrix_edgeCases) { +#if defined(KOKKOS_ENABLE_SYCL) + if constexpr (std::is_same_v) { + std::cout << "Not running coo2csr on SYCL execution space" << std::endl; + return; + } +#endif + int m = 4; int n = 4; long long staticRow[16]{0, 1, 3, 2, 3, 2, 2, 2, 0, 0, 0, 1, 2, 0, 3, 0}; From 3d5e57af0b27363b45bf493c3bffdbe0ca3e62b2 Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Thu, 1 Aug 2024 15:13:19 -0600 Subject: [PATCH 09/10] cmake: add CMake language support for CUDA/HIP (#2173) * cmake: add CMake language support for CUDA/HIP * Apply suggestions of @brian-kelley --- CMakeLists.txt | 9 +++++++++ cmake/kokkoskernels_tribits.cmake | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c02d71c49..d8cdd203f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,6 +127,15 @@ ELSE() IF (NOT KOKKOSKERNELS_HAS_TRILINOS AND NOT KOKKOSKERNELS_HAS_PARENT) # This is a standalone build FIND_PACKAGE(Kokkos REQUIRED) + IF(Kokkos_COMPILE_LANGUAGE) + ENABLE_LANGUAGE(${Kokkos_COMPILE_LANGUAGE}) + IF(Kokkos_COMPILE_LANGUAGE STREQUAL CUDA) + SET(CMAKE_CUDA_ARCHITECTURES ${Kokkos_CUDA_ARCHITECTURES}) + ENDIF() + IF(Kokkos_COMPILE_LANGUAGE STREQUAL HIP) + SET(CMAKE_HIP_ARCHITECTURES ${Kokkos_HIP_ARCHITECTURES}) + ENDIF() + ENDIF() IF(${Kokkos_VERSION} VERSION_GREATER_EQUAL "4.2.00") MESSAGE(STATUS "Found Kokkos version ${Kokkos_VERSION} at ${Kokkos_DIR}") IF((${Kokkos_VERSION} VERSION_GREATER "4.3.99")) diff --git a/cmake/kokkoskernels_tribits.cmake b/cmake/kokkoskernels_tribits.cmake index 2d70f656ad..f7d11c9ef1 100644 --- a/cmake/kokkoskernels_tribits.cmake +++ b/cmake/kokkoskernels_tribits.cmake @@ -85,6 +85,11 @@ ENDIF() IF(PARSE_SOURCES) LIST(REMOVE_DUPLICATES PARSE_SOURCES) ENDIF() +IF(Kokkos_COMPILE_LANGUAGE) + FOREACH(source ${PARSE_SOURCES}) + SET_SOURCE_FILES_PROPERTIES(${source} PROPERTIES LANGUAGE ${Kokkos_COMPILE_LANGUAGE}) + ENDFOREACH() +ENDIF() ADD_LIBRARY( ${LIBRARY_NAME} @@ -151,6 +156,12 @@ IF (IS_ENABLED) SOURCES ${PARSE_SOURCES} TESTONLYLIBS ${PARSE_TESTONLYLIBS}) ELSE() + # Set the correct CMake language on all source files for this exe + IF(Kokkos_COMPILE_LANGUAGE) + FOREACH(source ${PARSE_SOURCES}) + SET_SOURCE_FILES_PROPERTIES(${source} PROPERTIES LANGUAGE ${Kokkos_COMPILE_LANGUAGE}) + ENDFOREACH() + ENDIF() ADD_EXECUTABLE(${EXE_NAME} ${PARSE_SOURCES}) #AJP, BMK altered: IF(KOKKOSKERNELS_ENABLE_TESTS_AND_PERFSUITE) From f437879bc406a9f5c4ad7cdd46e4c1c0bee3acce Mon Sep 17 00:00:00 2001 From: James Foucar Date: Thu, 1 Aug 2024 15:59:17 -0600 Subject: [PATCH 10/10] Make sure clang is using a newer GCC on weaver (#2289) It's clear from the name of the AT job GCC930_Light_Tpls_GCC930_Tpls_CLANG13CUDA10 that the intent was to use gcc-9.3 but gcc-7.4.0 was the one actually being used because the clang-13 module loads that gcc. --- scripts/cm_test_all_sandia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cm_test_all_sandia b/scripts/cm_test_all_sandia index 1bc7692e08..55749a67bb 100755 --- a/scripts/cm_test_all_sandia +++ b/scripts/cm_test_all_sandia @@ -593,7 +593,7 @@ elif [ "$MACHINE" = "weaver" ]; then SKIP_HWLOC=True GCC93_MODULE_TPL_LIST="cmake/3.23.1,/,openblas/0.3.20/gcc/9.3.0,gcc/9.3.0" - CLANG13_MODULE_TPL_LIST="cmake/3.23.1,/,openblas/0.3.20/gcc/9.3.0,cuda/10.1.243" + CLANG13_MODULE_TPL_LIST="cmake/3.23.1,/,openblas/0.3.20/gcc/9.3.0,cuda/10.1.243,gcc/9.3.0" BASE_MODULE_LIST="cmake/3.23.1,/" # Cuda/11 modules available rhel8 queue (rhel8 OS); gcc/8.3.1 load by default