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

Avoid constexpr cuda #37

Merged
merged 3 commits into from
Jan 27, 2024
Merged

Avoid constexpr cuda #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f22a23a
Use Kokkos Array inside parallel for
Jan 27, 2024
5f16dee
add [[maybe_unused]] to suppress warnings from nvcc
Jan 27, 2024
7266906
formatting
Jan 27, 2024
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
6 changes: 3 additions & 3 deletions common/src/KokkosFFT_layouts.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ auto get_extents(InViewType& in, OutViewType& out, axis_type<DIM> _axes) {
auto [map, map_inv] = KokkosFFT::Impl::get_map_axes(in, _axes);

constexpr std::size_t rank = InViewType::rank;
int inner_most_axis =
[[maybe_unused]] int inner_most_axis =
std::is_same_v<array_layout_type, typename Kokkos::LayoutLeft> ? 0
: rank - 1;

Expand Down Expand Up @@ -95,7 +95,7 @@ auto get_extents_batched(InViewType& in, OutViewType& out,
"or equal to 1.");

constexpr std::size_t rank = InViewType::rank;
int inner_most_axis =
[[maybe_unused]] int inner_most_axis =
std::is_same_v<array_layout_type, typename Kokkos::LayoutLeft>
? 0
: (rank - 1);
Expand Down Expand Up @@ -155,7 +155,7 @@ auto get_extents_batched(InViewType& in, OutViewType& out,
1, std::multiplies<>());
int fft_size = std::accumulate(fft_extents.begin(), fft_extents.end(), 1,
std::multiplies<>());
int howmany = total_fft_size / fft_size;
[[maybe_unused]] int howmany = total_fft_size / fft_size;

return std::tuple<std::vector<int>, std::vector<int>, std::vector<int>, int>(
{in_extents, out_extents, fft_extents, howmany});
Expand Down
4 changes: 2 additions & 2 deletions common/src/KokkosFFT_normalization.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ auto _coefficients(const ViewType& inout, Direction direction,
Normalization normalization, std::size_t fft_size) {
using value_type =
KokkosFFT::Impl::real_type_t<typename ViewType::non_const_value_type>;
value_type coef = 1;
bool to_normalize = false;
value_type coef = 1;
[[maybe_unused]] bool to_normalize = false;

switch (normalization) {
case Normalization::FORWARD:
Expand Down
12 changes: 7 additions & 5 deletions common/src/KokkosFFT_transpose.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,23 +165,25 @@ void _transpose(const ExecutionSpace& exec_space, InViewType& in,
auto [_n0, _n1, _n2] = out_extents;
out = OutViewType("out", _n0, _n1, _n2);
}

Kokkos::Array<int, 3> map = {_map[0], _map[1], _map[2]};
Kokkos::parallel_for(
range, KOKKOS_LAMBDA(int i0, int i1, int i2) {
int _i0 = i0, _i1 = i1, _i2 = i2;
if (_map[0] == 0 && _map[1] == 2 && _map[2] == 1) {
if (map[0] == 0 && map[1] == 2 && map[2] == 1) {
_i1 = i2;
_i2 = i1;
} else if (_map[0] == 1 && _map[1] == 0 && _map[2] == 2) {
} else if (map[0] == 1 && map[1] == 0 && map[2] == 2) {
_i0 = i1;
_i1 = i0;
} else if (_map[0] == 1 && _map[1] == 2 && _map[2] == 0) {
} else if (map[0] == 1 && map[1] == 2 && map[2] == 0) {
_i0 = i1;
_i1 = i2;
_i2 = i0;
} else if (_map[0] == 2 && _map[1] == 1 && _map[2] == 0) {
} else if (map[0] == 2 && map[1] == 1 && map[2] == 0) {
_i0 = i2;
_i2 = i0;
} else if (_map[0] == 2 && _map[1] == 0 && _map[2] == 1) {
} else if (map[0] == 2 && map[1] == 0 && map[2] == 1) {
_i0 = i2;
_i1 = i0;
_i2 = i1;
Expand Down
6 changes: 3 additions & 3 deletions common/src/KokkosFFT_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ template <typename ViewType>
auto convert_negative_shift(const ViewType& view, int _shift, int _axis) {
static_assert(Kokkos::is_view<ViewType>::value,
"convert_negative_shift: ViewType is not a Kokkos::View.");
int axis = convert_negative_axis(view, _axis);
int extent = view.extent(axis);
int shift0 = 0, shift1 = 0, shift2 = extent / 2;
int axis = convert_negative_axis(view, _axis);
int extent = view.extent(axis);
[[maybe_unused]] int shift0 = 0, shift1 = 0, shift2 = extent / 2;

if (_shift < 0) {
shift0 = -_shift + extent % 2; // add 1 for odd case
Expand Down
4 changes: 2 additions & 2 deletions fft/src/KokkosFFT_Helpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ void _roll(const ExecutionSpace& exec_space, ViewType& inout,
int n0 = inout.extent(0), n1 = inout.extent(1);

ViewType tmp("tmp", n0, n1);
int len0 = (n0 - 1) / 2 + 1;
int len1 = (n1 - 1) / 2 + 1;
[[maybe_unused]] int len0 = (n0 - 1) / 2 + 1;
[[maybe_unused]] int len1 = (n1 - 1) / 2 + 1;

using range_type = Kokkos::MDRangePolicy<
ExecutionSpace,
Expand Down
Loading