Skip to content

Commit

Permalink
Merge branch 'develop' into task/rhornung67/split-azure-ghactions
Browse files Browse the repository at this point in the history
  • Loading branch information
rhornung67 authored Aug 3, 2024
2 parents cc0f070 + 378199a commit e8db114
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ void ForallReduceBitAndBasicTestImpl(const SEG_TYPE& seg,

ASSERT_EQ(static_cast<DATA_TYPE>(simpand.get()), 5);

//

//
// And now a randomized test that pushes zeros around
//
//

const int modval = 100;

Expand All @@ -72,6 +72,7 @@ void ForallReduceBitAndBasicTestImpl(const SEG_TYPE& seg,
RAJA::forall<EXEC_POLICY>(seg,
RAJA::expt::Reduce<RAJA::operators::bit_and>(&redand),
RAJA::expt::Reduce<RAJA::operators::bit_and>(&redand2),
RAJA::expt::KernelName("RAJA Reduce BitAnd"),
[=] RAJA_HOST_DEVICE(IDX_TYPE idx, DATA_TYPE &r1, DATA_TYPE &r2) {
r1 &= working_array[idx];
r2 &= working_array[idx];
Expand All @@ -92,7 +93,7 @@ void ForallReduceBitAndBasicTestImpl(const SEG_TYPE& seg,
}

ASSERT_EQ(static_cast<DATA_TYPE>(redand), ref_and);


deallocateForallTestData<DATA_TYPE>(working_res,
working_array,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ void ForallReduceBitOrBasicTestImpl(const SEG_TYPE& seg,
RAJA::forall<EXEC_POLICY>(seg,
RAJA::expt::Reduce<RAJA::operators::bit_or>(&redor),
RAJA::expt::Reduce<RAJA::operators::bit_or>(&redor2),
RAJA::expt::KernelName("RAJA Reduce BitOr"),
[=] RAJA_HOST_DEVICE(IDX_TYPE idx, DATA_TYPE &r1, DATA_TYPE &r2) {
r1 |= working_array[idx];
r2 |= working_array[idx];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ void ForallReduceMaxBasicTestImpl(const SEG_TYPE& seg,
RAJA::forall<EXEC_POLICY>(seg,
RAJA::expt::Reduce<RAJA::operators::maximum>(&maxinit),
RAJA::expt::Reduce<RAJA::operators::maximum>(&max),
RAJA::expt::KernelName("RAJA Reduce Max"),
[=] RAJA_HOST_DEVICE(IDX_TYPE idx, DATA_TYPE &mi, DATA_TYPE &m) {
mi = RAJA_MAX(working_array[idx], mi);
m = RAJA_MAX(working_array[idx], m);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ void ForallReduceMaxLocBasicTestImpl(const SEG_TYPE& seg,
RAJA::forall<EXEC_POLICY>(seg,
RAJA::expt::Reduce<RAJA::operators::maximum>(&maxinit),
RAJA::expt::Reduce<RAJA::operators::maximum>(&max),
RAJA::expt::KernelName("RAJA Reduce MaxLoc"),
[=] RAJA_HOST_DEVICE(IDX_TYPE idx, VL_TYPE &mi, VL_TYPE &m) {
mi.max( working_array[idx], idx );
m.max( working_array[idx], idx );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ void ForallReduceMinBasicTestImpl(const SEG_TYPE& seg,
RAJA::forall<EXEC_POLICY>(seg,
RAJA::expt::Reduce<RAJA::operators::minimum>(&mininit),
RAJA::expt::Reduce<RAJA::operators::minimum>(&min),
RAJA::expt::KernelName("RAJA Reduce Min"),
[=] RAJA_HOST_DEVICE(IDX_TYPE idx, DATA_TYPE &mi, DATA_TYPE &m) {
mi = RAJA_MIN(working_array[idx], mi);
m = RAJA_MIN(working_array[idx], m);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ void ForallReduceMinLocBasicTestImpl(const SEG_TYPE& seg,
RAJA::forall<EXEC_POLICY>(seg,
RAJA::expt::Reduce<RAJA::operators::minimum>(&mininit),
RAJA::expt::Reduce<RAJA::operators::minimum>(&min),
RAJA::expt::KernelName("RAJA Reduce MinLoc"),
[=] RAJA_HOST_DEVICE(IDX_TYPE idx, VL_TYPE &mi, VL_TYPE &m) {
mi.min( working_array[idx], idx );
m.min( working_array[idx], idx );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ void ForallReduceSumBasicTestImpl(const SEG_TYPE& seg,
RAJA::forall<EXEC_POLICY>(seg,
RAJA::expt::Reduce<RAJA::operators::plus>(&sum),
RAJA::expt::Reduce<RAJA::operators::plus>(&sum2),
RAJA::expt::KernelName("RAJA Reduce Sum"),
[=] RAJA_HOST_DEVICE(IDX_TYPE idx, DATA_TYPE &s1, DATA_TYPE &s2) {
s1 += working_array[idx];
s2 += working_array[idx];
Expand Down

0 comments on commit e8db114

Please sign in to comment.