From 761d46d48ee5e70fe7e8758643c04800b0fed0d8 Mon Sep 17 00:00:00 2001 From: Nathan Ellingwood Date: Mon, 25 Nov 2024 16:14:05 -0700 Subject: [PATCH 1/2] Update develop version to 4.5.99 Signed-off-by: Nathan Ellingwood --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92dd323bb3..fc367f6dcc 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 4) +SET(KokkosKernels_VERSION_MINOR 5) 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.3.01") + IF(${Kokkos_VERSION} VERSION_GREATER_EQUAL "4.4.01") MESSAGE(STATUS "Found Kokkos version ${Kokkos_VERSION} at ${Kokkos_DIR}") - IF((${Kokkos_VERSION} VERSION_GREATER "4.4.99")) + IF((${Kokkos_VERSION} VERSION_GREATER "4.5.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.3.01 or greater (found ${Kokkos_VERSION})") + MESSAGE(FATAL_ERROR "Kokkos Kernels ${KokkosKernels_VERSION} requires Kokkos 4.4.01 or greater (found ${Kokkos_VERSION})") ENDIF() ENDIF() From 70672fc9f9fcad554829f7c7372b419e7cefe191 Mon Sep 17 00:00:00 2001 From: Nathan Ellingwood Date: Mon, 25 Nov 2024 16:16:59 -0700 Subject: [PATCH 2/2] Update kokkos version for codequl and docs checks Signed-off-by: Nathan Ellingwood --- .github/workflows/codeql.yml | 2 +- .github/workflows/docs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 14b7e1c7ab..831c69890c 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.01' + ref: '4.5.00' - name: configure_kokkos run: | diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 02883a3013..f313a4ee9a 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: repository: kokkos/kokkos - ref: 4.3.01 + ref: 4.5.00 path: kokkos - name: configure_kokkos