From b9d0069de8ec939b4280338183be296cb62fb6a1 Mon Sep 17 00:00:00 2001 From: Nathan Ellingwood Date: Wed, 7 Aug 2024 17:10:54 -0600 Subject: [PATCH 1/2] Update version to 4.4.99 Update min kokkos version to 4.3.01 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8cdd203f2..92dd323bb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ SET(KOKKOSKERNELS_TOP_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}) SET(KOKKOSKERNELS_TOP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) SET(KokkosKernels_VERSION_MAJOR 4) -SET(KokkosKernels_VERSION_MINOR 3) +SET(KokkosKernels_VERSION_MINOR 4) SET(KokkosKernels_VERSION_PATCH 99) SET(KokkosKernels_VERSION "${KokkosKernels_VERSION_MAJOR}.${KokkosKernels_VERSION_MINOR}.${KokkosKernels_VERSION_PATCH}") @@ -136,13 +136,13 @@ ELSE() SET(CMAKE_HIP_ARCHITECTURES ${Kokkos_HIP_ARCHITECTURES}) ENDIF() ENDIF() - IF(${Kokkos_VERSION} VERSION_GREATER_EQUAL "4.2.00") + IF(${Kokkos_VERSION} VERSION_GREATER_EQUAL "4.3.01") MESSAGE(STATUS "Found Kokkos version ${Kokkos_VERSION} at ${Kokkos_DIR}") - IF((${Kokkos_VERSION} VERSION_GREATER "4.3.99")) + IF((${Kokkos_VERSION} VERSION_GREATER "4.4.99")) MESSAGE(WARNING "Configuring with Kokkos ${Kokkos_VERSION} which is newer than the expected develop branch - version check may need update") ENDIF() ELSE() - MESSAGE(FATAL_ERROR "Kokkos Kernels ${KokkosKernels_VERSION} requires Kokkos 4.2.00 or greater (found ${Kokkos_VERSION})") + MESSAGE(FATAL_ERROR "Kokkos Kernels ${KokkosKernels_VERSION} requires Kokkos 4.3.01 or greater (found ${Kokkos_VERSION})") ENDIF() ENDIF() From 418cf56c4757b0a2a45b05eef9662097220e9b84 Mon Sep 17 00:00:00 2001 From: Nathan Ellingwood Date: Wed, 7 Aug 2024 19:29:30 -0600 Subject: [PATCH 2/2] update workflows yaml files to test with kokkos@4.3.01 --- .github/workflows/codeql.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/osx.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1052366eff..c3ad5be106 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -56,7 +56,7 @@ jobs: with: repository: 'kokkos/kokkos' path: 'kokkos' - ref: '4.3.00' + ref: '4.3.01' - name: configure_kokkos run: | diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9690446a4f..a89f4480d9 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -33,7 +33,7 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: repository: kokkos/kokkos - ref: 4.3.00 + ref: 4.3.01 path: kokkos - name: configure_kokkos diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index fa23b5dd72..b2227d0394 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -58,7 +58,7 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: repository: kokkos/kokkos - ref: 4.3.00 + ref: 4.3.01 path: kokkos - name: configure_kokkos