-
Notifications
You must be signed in to change notification settings - Fork 117
KokkosBatched_Util: allow DynRankView in rank checks #3034
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
Closed
japlews
wants to merge
1
commit into
kokkos:develop
from
japlews:japlews/allow-dynrankview-kokkos-batched-util
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -23,6 +23,7 @@ | |||||
|
|
||||||
| #include "Kokkos_Complex.hpp" | ||||||
|
|
||||||
| #include "Kokkos_DynRankView.hpp" | ||||||
| #include "KokkosKernels_config.h" | ||||||
| #include "KokkosKernels_Macros.hpp" | ||||||
| #include "KokkosKernels_SimpleUtils.hpp" | ||||||
|
|
@@ -677,9 +678,14 @@ KOKKOS_INLINE_FUNCTION void fma_bounds_check(ViewType v, SizeType m, SizeType n, | |||||
| namespace Impl { | ||||||
| template <typename ViewType> | ||||||
| KOKKOS_INLINE_FUNCTION int get_extent_int(const ViewType &v, const int r) { | ||||||
| static_assert(Kokkos::is_view_v<ViewType>, "KokkosBatched: ViewType is not a Kokkos::View."); | ||||||
| constexpr std::size_t V_rank = ViewType::rank(); | ||||||
| static_assert(V_rank <= 2, "KokkosBatched: ViewType must have rank 0, 1 or 2."); | ||||||
| // Only allow View and DynRankView objects | ||||||
| if constexpr (Kokkos::is_view_v<ViewType>) { | ||||||
| static_assert(ViewType::rank() == 2, "KokkosBatched: ViewType must be rank 0, 1, or 2"); | ||||||
| } else { | ||||||
| static_assert(Kokkos::is_dyn_rank_view_v<ViewType>, "KokkosBatched: ViewType must be a DynRankView or a View"); | ||||||
| } | ||||||
|
|
||||||
| const std::size_t V_rank = v.rank(); | ||||||
|
lucbv marked this conversation as resolved.
|
||||||
|
|
||||||
| if (r == 0) { | ||||||
| int V_extent_0 = V_rank < 1 ? 1 : v.extent_int(0); | ||||||
|
|
@@ -694,9 +700,14 @@ KOKKOS_INLINE_FUNCTION int get_extent_int(const ViewType &v, const int r) { | |||||
|
|
||||||
| template <typename ViewType> | ||||||
| KOKKOS_INLINE_FUNCTION std::size_t get_stride(const ViewType &v, const int r) { | ||||||
| static_assert(Kokkos::is_view_v<ViewType>, "KokkosBatched: ViewType is not a Kokkos::View."); | ||||||
| constexpr std::size_t V_rank = ViewType::rank(); | ||||||
| static_assert(V_rank <= 2, "KokkosBatched: ViewType must have rank 0, 1 or 2."); | ||||||
| // Only allow View and DynRankView objects | ||||||
| if constexpr (Kokkos::is_view_v<ViewType>) { | ||||||
| static_assert(ViewType::rank() == 2, "KokkosBatched: ViewType must be rank 0, 1, or 2"); | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| } else { | ||||||
| static_assert(Kokkos::is_dyn_rank_view_v<ViewType>, "KokkosBatched: ViewType must be a DynRankView or a View"); | ||||||
| } | ||||||
|
|
||||||
| const std::size_t V_rank = v.rank(); | ||||||
|
lucbv marked this conversation as resolved.
|
||||||
|
|
||||||
| if (r == 0) { | ||||||
| std::size_t V_stride_0 = V_rank < 1 ? 1 : v.stride(0); | ||||||
|
|
@@ -708,6 +719,7 @@ KOKKOS_INLINE_FUNCTION std::size_t get_stride(const ViewType &v, const int r) { | |||||
| return 1; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| } // namespace Impl | ||||||
|
|
||||||
| } // namespace KokkosBatched | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.