Skip to content

Commit

Permalink
Update version, changelog, checks for 4.5 (#2441)
Browse files Browse the repository at this point in the history
* Update develop version to 4.5.99

Signed-off-by: Nathan Ellingwood <[email protected]>

* Update kokkos version for codequl and docs checks

Signed-off-by: Nathan Ellingwood <[email protected]>

---------

Signed-off-by: Nathan Ellingwood <[email protected]>
  • Loading branch information
ndellingwood authored Nov 26, 2024
1 parent 60a6a67 commit 392e117
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
with:
repository: 'kokkos/kokkos'
path: 'kokkos'
ref: '4.3.01'
ref: '4.5.00'

- name: configure_kokkos
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

Expand Down Expand Up @@ -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()

Expand Down

0 comments on commit 392e117

Please sign in to comment.