Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Require Kokkos 4.0 #895

Merged
merged 5 commits into from
Jul 5, 2023
Merged

Require Kokkos 4.0 #895

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12eb1ef
Require Kokkos 4.0
aprokop Jun 11, 2023
fdf80ba
Switch 3.7 builds to 4.0
aprokop Jun 11, 2023
4c1b604
Remove pre Kokkos 4.0 workarounds
aprokop Jun 11, 2023
3a13d06
Move HIP out of experimental
aprokop Jun 11, 2023
7194c85
Use shorter version of Kokkos in CMake (4.0.00 -> 4.0)
aprokop Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Require Kokkos 4.0
  • Loading branch information
@aprokop
aprokop committed Jun 11, 2023
commit 12eb1ef12b081724ab0a0b2d44de3a091a092404
8 changes: 1 addition & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
cmake_minimum_required(VERSION 3.16)
project(ArborX CXX)

# Workaround to compile against Trilinos 14.0. That version
# of Trilinos does not set the compatibility mode for Kokkos correctly.
# FIXME: remove once we require Kokkos 4.0.1 or later.
find_package(Kokkos QUIET 3.7.01 CONFIG)
if (NOT Kokkos_FOUND)
find_package(Kokkos 4.0.00 REQUIRED CONFIG)
endif()
find_package(Kokkos 4.0.00 REQUIRED CONFIG)
aprokop marked this conversation as resolved.
Show resolved Hide resolved
message(STATUS "Found Kokkos: ${Kokkos_DIR} (version \"${Kokkos_VERSION}\")")
if(Kokkos_ENABLE_CUDA AND Kokkos_VERSION VERSION_LESS 4.1)
# CUDA_LAMBDA is deprecated starting 4.1
Expand Down