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.

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

#314: Kokkos: Update rank capitalization for Kokkos 4.1 #315

Merged
merged 1 commit into from
Jul 11, 2023

Conversation

lifflander
Copy link
Contributor

Fixes #314

Kokkos just released 4.1 and it was pushed into trilinos yesterday. EMPIRE sync of trilinos failed last night due to a deprecation warning (we are building with warnings as errors). I needed to make a minor change to vt to remove the deprecation warning. It is below. I will push this change to empire in a few minutes. Could you make the corresponding change to vt so that the next snapshot does not erase this change?

Thanks!
Roger

index eafc7b99..a753670e 100644
--- a/TPL/checkpoint/src/checkpoint/container/view_serialize.h
+++ b/TPL/checkpoint/src/checkpoint/container/view_serialize.h
@@ -328,7 +328,7 @@ inline void serialize_impl(SerializerT& s, Kokkos::View<T,Args...>& view) {
   using ViewType = Kokkos::View<T,Args...>;
   using ArrayLayoutType = typename ViewType::traits::array_layout;
 
-  static constexpr auto const rank_val = ViewType::Rank;
+  static constexpr auto const rank_val = ViewType::rank;
 
   checkpointAssert(
     ViewType::traits::is_managed,

@lifflander lifflander requested a review from nlslatt July 10, 2023 22:37
@lifflander lifflander linked an issue Jul 10, 2023 that may be closed by this pull request
@PhilMiller
Copy link
Member

@lifflander
Copy link
Contributor Author

I had addressed this in https://github.com/DARMA-tasking/magistrate/pull/290/files#diff-65b634eb7eef9fa2642e02f7c2da2b764f7e160b6e50da16b54e588237a8db43 but a separate PR is probably appropriate.

Oh I didn't realize that!

@lifflander lifflander merged commit 1c0a93a into develop Jul 11, 2023
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update for Kokkos 4.1 (Rank vs rank)
3 participants