Skip to content

BUG: Fixing compiler warning with MPI types #157

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

Open
jacob-moore22 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

BUG: Fixing compiler warning with MPI types #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 37 additions & 2 deletions src/include/macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,6 @@


// the REDUCE Product loop


#define \
RPROD1D(i, x0, x1, var, fcn, result) \
Kokkos::parallel_reduce( \
Expand All @@ -230,6 +228,41 @@
EXPAND(GET_MACRO(__VA_ARGS__, _13, RPROD3D, _11, _10, RPROD2D, _8, _7, RPROD1D)(__VA_ARGS__))




// the REDUCE Product loop for a class
#define \
RPRODCLASS1D(i, x0, x1, var, fcn, result) \
Kokkos::parallel_reduce( \
Kokkos::RangePolicy<> ( (x0), (x1) ), \
KOKKOS_CLASS_LAMBDA(const int (i), decltype(var) &(var)){fcn}, \
Kokkos::Prod< decltype(result) > ( (result) ) )

#define \
RPRODCLASS2D(i, x0, x1, j, y0, y1, var, fcn, result) \
Kokkos::parallel_reduce( \
Kokkos::MDRangePolicy< Kokkos::Rank<2,LOOP_ORDER,LOOP_ORDER> > ( {(x0), (y0)}, {(x1), (y1)} ), \
KOKKOS_CLASS_LAMBDA( const int (i),const int (j), decltype(var) &(var) ){fcn}, \
Kokkos::Prod< decltype(result) > ( (result) ) )

#define \
RPRODCLASS3D(i, x0, x1, j, y0, y1, k, z0, z1, var, fcn, result) \
Kokkos::parallel_reduce( \
Kokkos::MDRangePolicy< Kokkos::Rank<3,LOOP_ORDER,LOOP_ORDER> > ( {(x0), (y0), (z0)}, {(x1), (y1), (z1)} ), \
KOKKOS_CLASS_LAMBDA( const int (i), const int (j), const int (k), decltype(var) &(var) ){fcn}, \
Kokkos::Prod< decltype(result) > ( (result) ) )

#define \
FOR_REDUCE_PRODUCT_CLASS(...) \
EXPAND(GET_MACRO(__VA_ARGS__, _13, RPRODCLASS3D, _11, _10, RPRODCLASS2D, _8, _7, RPRODCLASS1D)(__VA_ARGS__))








// the DO_REDUCE_SUM loop
#define \
DO_RSUM1D(i, x0, x1, var, fcn, result) \
Expand All @@ -255,6 +288,8 @@
EXPAND(GET_MACRO(__VA_ARGS__, _13, DO_RSUM3D, _11, _10, DO_RSUM2D, _8, _7, DO_RSUM1D)(__VA_ARGS__))




// the REDUCE MAX loop
#define \
RMAX1D(i, x0, x1, var, fcn, result) \
Expand Down
32 changes: 16 additions & 16 deletions src/include/mpi_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ T MPICArrayKokkos<T, Layout, ExecSpace, MemoryTraits>::all_reduce(operation op)
case operation::sum: {
local = 0;
T loc_sum = 0;
FOR_REDUCE_SUM(i, 0, owned_len,
FOR_REDUCE_SUM_CLASS(i, 0, owned_len,
loc_sum, {
loc_sum += this_array_(i);
}, local);
Expand All @@ -681,7 +681,7 @@ T MPICArrayKokkos<T, Layout, ExecSpace, MemoryTraits>::all_reduce(operation op)
case operation::product: {
local = T(1);
T loc_prod = 1;
FOR_REDUCE_PRODUCT(i, 0, owned_len,
FOR_REDUCE_PRODUCT_CLASS(i, 0, owned_len,
loc_prod, {
loc_prod *= this_array_(i);
}, local);
Expand All @@ -690,7 +690,7 @@ T MPICArrayKokkos<T, Layout, ExecSpace, MemoryTraits>::all_reduce(operation op)
case operation::max: {
local = this_array_(0);
T loc_max = this_array_(0);
FOR_REDUCE_MAX(i, 0, owned_len,
FOR_REDUCE_MAX_CLASS(i, 0, owned_len,
loc_max, {
loc_max = (this_array_(i) > loc_max) ? this_array_(i) : loc_max;
}, local);
Expand All @@ -699,7 +699,7 @@ T MPICArrayKokkos<T, Layout, ExecSpace, MemoryTraits>::all_reduce(operation op)
case operation::min: {
local = this_array_(0);
T loc_min = this_array_(0);
FOR_REDUCE_MIN(i, 0, owned_len,
FOR_REDUCE_MIN_CLASS(i, 0, owned_len,
loc_min, {
loc_min = (this_array_(i) < loc_min) ? this_array_(i) : loc_min;
}, local);
Expand Down Expand Up @@ -740,23 +740,23 @@ T MPICArrayKokkos<T, Layout, ExecSpace, MemoryTraits>::all_reduce(operation op,
case operation::sum: {
local = 0;
T loc_sum = 0;
FOR_REDUCE_SUM(e, 0, owned_len, loc_sum, {
FOR_REDUCE_SUM_CLASS(e, 0, owned_len, loc_sum, {
loc_sum += this_array_(e, j);
}, local);
break;
}
case operation::product: {
local = T(1);
T loc_prod = 1;
FOR_REDUCE_PRODUCT(e, 0, owned_len, loc_prod, {
FOR_REDUCE_PRODUCT_CLASS(e, 0, owned_len, loc_prod, {
loc_prod *= this_array_(e, j);
}, local);
break;
}
case operation::max: {
local = this_array_(0, j);
T loc_max = local;
FOR_REDUCE_MAX(e, 0, owned_len, loc_max, {
FOR_REDUCE_MAX_CLASS(e, 0, owned_len, loc_max, {
const T v = this_array_(e, j);
loc_max = (v > loc_max) ? v : loc_max;
}, local);
Expand All @@ -765,7 +765,7 @@ T MPICArrayKokkos<T, Layout, ExecSpace, MemoryTraits>::all_reduce(operation op,
case operation::min: {
local = this_array_(0, j);
T loc_min = local;
FOR_REDUCE_MIN(e, 0, owned_len, loc_min, {
FOR_REDUCE_MIN_CLASS(e, 0, owned_len, loc_min, {
const T v = this_array_(e, j);
loc_min = (v < loc_min) ? v : loc_min;
}, local);
Expand Down Expand Up @@ -806,23 +806,23 @@ T MPICArrayKokkos<T, Layout, ExecSpace, MemoryTraits>::all_reduce(operation op,
case operation::sum: {
local = 0;
T loc_sum = 0;
FOR_REDUCE_SUM(e, 0, owned_len, loc_sum, {
FOR_REDUCE_SUM_CLASS(e, 0, owned_len, loc_sum, {
loc_sum += this_array_(e, j, k);
}, local);
break;
}
case operation::product: {
local = T(1);
T loc_prod = 1;
FOR_REDUCE_PRODUCT(e, 0, owned_len, loc_prod, {
FOR_REDUCE_PRODUCT_CLASS(e, 0, owned_len, loc_prod, {
loc_prod *= this_array_(e, j, k);
}, local);
break;
}
case operation::max: {
local = this_array_(0, j, k);
T loc_max = local;
FOR_REDUCE_MAX(e, 0, owned_len, loc_max, {
FOR_REDUCE_MAX_CLASS(e, 0, owned_len, loc_max, {
const T v = this_array_(e, j, k);
loc_max = (v > loc_max) ? v : loc_max;
}, local);
Expand All @@ -831,7 +831,7 @@ T MPICArrayKokkos<T, Layout, ExecSpace, MemoryTraits>::all_reduce(operation op,
case operation::min: {
local = this_array_(0, j, k);
T loc_min = local;
FOR_REDUCE_MIN(e, 0, owned_len, loc_min, {
FOR_REDUCE_MIN_CLASS(e, 0, owned_len, loc_min, {
const T v = this_array_(e, j, k);
loc_min = (v < loc_min) ? v : loc_min;
}, local);
Expand Down Expand Up @@ -874,23 +874,23 @@ T MPICArrayKokkos<T, Layout, ExecSpace, MemoryTraits>::all_reduce(operation op,
case operation::sum: {
local = 0;
T loc_sum = 0;
FOR_REDUCE_SUM(e, 0, owned_len, loc_sum, {
FOR_REDUCE_SUM_CLASS(e, 0, owned_len, loc_sum, {
loc_sum += this_array_(e, g, ti, tj);
}, local);
break;
}
case operation::product: {
local = T(1);
T loc_prod = 1;
FOR_REDUCE_PRODUCT(e, 0, owned_len, loc_prod, {
FOR_REDUCE_PRODUCT_CLASS(e, 0, owned_len, loc_prod, {
loc_prod *= this_array_(e, g, ti, tj);
}, local);
break;
}
case operation::max: {
local = this_array_(0, g, ti, tj);
T loc_max = local;
FOR_REDUCE_MAX(e, 0, owned_len, loc_max, {
FOR_REDUCE_MAX_CLASS(e, 0, owned_len, loc_max, {
const T v = this_array_(e, g, ti, tj);
loc_max = (v > loc_max) ? v : loc_max;
}, local);
Expand All @@ -899,7 +899,7 @@ T MPICArrayKokkos<T, Layout, ExecSpace, MemoryTraits>::all_reduce(operation op,
case operation::min: {
local = this_array_(0, g, ti, tj);
T loc_min = local;
FOR_REDUCE_MIN(e, 0, owned_len, loc_min, {
FOR_REDUCE_MIN_CLASS(e, 0, owned_len, loc_min, {
const T v = this_array_(e, g, ti, tj);
loc_min = (v < loc_min) ? v : loc_min;
}, local);
Expand Down
Loading