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

Jump to bottom

Require Kokkos 4.0 #895

Merged
merged 5 commits into from
Jul 5, 2023
Merged

Require Kokkos 4.0 #895

merged 5 commits into from
Jul 5, 2023

Conversation

aprokop
Copy link
Contributor

@aprokop aprokop commented Jun 13, 2023 •
edited
Loading

  • Require Kokkos 4.0
  • Switch 3.7 builds to 4.1
  • Remove pre Kokkos 4.0 workarounds

@aprokop aprokop added build Build and installation testing Anything to do with tests and CI labels Jun 13, 2023
@aprokop aprokop marked this pull request as ready for review June 28, 2023 18:05
dalg24
dalg24 reviewed Jun 29, 2023
View reviewed changes
CMakeLists.txt Outdated Show resolved Hide resolved
@aprokop @dalg24
Use shorter version of Kokkos in CMake (4.0.00 -> 4.0)
7194c85 
Co-authored-by: Damien L-G <dalg24+github@gmail.com>
@masterleinad
Copy link
Collaborator

We can also replace KOKKOS_VERSION comparisons with KOKKOS_VERSION_GREATER_EQUAL(MAJOR, MINOR, PATCH) from Kokkos 4.0.00 on, see kokkos/kokkos#5424.

@aprokop
Copy link
Contributor Author

aprokop commented Jun 29, 2023

We can also replace KOKKOS_VERSION comparisons with KOKKOS_VERSION_GREATER_EQUAL(MAJOR, MINOR, PATCH) from Kokkos 4.0.00 on, see kokkos/kokkos#5424.

Imho, this seems to be more complicated than KOKKOS_VERSION >= 40100.

@masterleinad
Copy link
Collaborator

Imho, this seems to be more complicated than KOKKOS_VERSION >= 40100.

The main motivation is that the new syntax clearly separates major, minor, and patch versions whereas that is not so clear for 40100.

@aprokop
Copy link
Contributor Author

aprokop commented Jun 29, 2023

The main motivation is that the new syntax clearly separates major, minor, and patch versions whereas that is not so clear for 40100.

I understand that. It's a tradeoff.

@Rombur Rombur mentioned this pull request Jul 5, 2023
Closed
@aprokop aprokop merged commit 0bb1a02 into arborx:master Jul 5, 2023
@aprokop aprokop deleted the kokkos-4.0 branch July 5, 2023 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dalg24 dalg24 dalg24 left review comments

@masterleinad masterleinad masterleinad approved these changes

Assignees
No one assigned
Labels
build Build and installation testing Anything to do with tests and CI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@aprokop @masterleinad @dalg24