Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Daniel Arndt <[email protected]>
  • Loading branch information
ldh4 and masterleinad authored Sep 11, 2024
1 parent 299ce02 commit f332a8a
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 29 deletions.
10 changes: 5 additions & 5 deletions core/src/Cuda/Kokkos_Cuda_Team.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
ReducerType, value_type>;
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer); value_type value{};
wrapped_reducer_type wrapped_reducer(reducer); value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start + threadIdx.y;
Expand Down Expand Up @@ -604,7 +604,7 @@ parallel_reduce(const Impl::TeamVectorRangeBoundariesStruct<
ReducerType, value_type>;
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer); value_type value{};
wrapped_reducer_type wrapped_reducer(reducer); value_type value;
wrapped_reducer.init(&value);

for (iType i =
Expand Down Expand Up @@ -641,7 +641,7 @@ parallel_reduce(const Impl::TeamVectorRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(closure); value_type value{};
wrapped_reducer_type wrapped_reducer(closure); value_type value;
wrapped_reducer.init(&value);

for (iType i =
Expand Down Expand Up @@ -707,7 +707,7 @@ parallel_reduce(Impl::ThreadVectorRangeBoundariesStruct<
ReducerType, value_type>;
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer); value_type value{};
wrapped_reducer_type wrapped_reducer(reducer); value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start + threadIdx.x;
Expand Down Expand Up @@ -754,7 +754,7 @@ parallel_reduce(Impl::ThreadVectorRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(closure); value_type value{};
wrapped_reducer_type wrapped_reducer(closure); value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start + threadIdx.x;
Expand Down
12 changes: 6 additions & 6 deletions core/src/HIP/Kokkos_HIP_Team.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start + threadIdx.y; i < loop_boundaries.end;
Expand Down Expand Up @@ -559,7 +559,7 @@ parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(closure); value_type value{};
wrapped_reducer_type wrapped_reducer(closure); value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start + threadIdx.y;
Expand Down Expand Up @@ -671,7 +671,7 @@ parallel_reduce(const Impl::TeamVectorRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start + threadIdx.y * blockDim.x + threadIdx.x;
Expand Down Expand Up @@ -703,7 +703,7 @@ parallel_reduce(const Impl::TeamVectorRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(closure); value_type value{};
wrapped_reducer_type wrapped_reducer(closure); value_type value;
wrapped_reducer.init(&value);

for (iType i =
Expand Down Expand Up @@ -769,7 +769,7 @@ parallel_reduce(Impl::ThreadVectorRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start + threadIdx.x; i < loop_boundaries.end;
Expand Down Expand Up @@ -812,7 +812,7 @@ parallel_reduce(Impl::ThreadVectorRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(closure); value_type value{};
wrapped_reducer_type wrapped_reducer(closure); value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start + threadIdx.x;
Expand Down
8 changes: 4 additions & 4 deletions core/src/HPX/Kokkos_HPX.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1794,7 +1794,7 @@ KOKKOS_INLINE_FUNCTION void parallel_reduce(
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(lambda);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start; i < loop_boundaries.end;
Expand Down Expand Up @@ -1845,7 +1845,7 @@ KOKKOS_INLINE_FUNCTION void parallel_reduce(
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(lambda);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
Expand Down Expand Up @@ -1873,7 +1873,7 @@ KOKKOS_INLINE_FUNCTION void parallel_reduce(
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start; i < loop_boundaries.end;
Expand All @@ -1899,7 +1899,7 @@ KOKKOS_INLINE_FUNCTION void parallel_reduce(
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
Expand Down
12 changes: 6 additions & 6 deletions core/src/SYCL/Kokkos_SYCL_Team.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start +
Expand Down Expand Up @@ -599,7 +599,7 @@ parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(closure);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start +
Expand Down Expand Up @@ -707,7 +707,7 @@ parallel_reduce(const Impl::TeamVectorRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

const iType tidx0 = loop_boundaries.member.item().get_local_id(0);
Expand Down Expand Up @@ -740,7 +740,7 @@ parallel_reduce(const Impl::TeamVectorRangeBoundariesStruct<
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(closure);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

const iType tidx0 = loop_boundaries.member.item().get_local_id(0);
Expand Down Expand Up @@ -815,7 +815,7 @@ parallel_reduce(Impl::ThreadVectorRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

const iType tidx1 = loop_boundaries.member.item().get_local_id(1);
Expand Down Expand Up @@ -854,7 +854,7 @@ parallel_reduce(Impl::ThreadVectorRangeBoundariesStruct<
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(closure);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

const iType tidx1 = loop_boundaries.member.item().get_local_id(1);
Expand Down
8 changes: 4 additions & 4 deletions core/src/Threads/Kokkos_Threads_Team.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(lambda);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start; i < loop_boundaries.end;
Expand All @@ -934,7 +934,7 @@ parallel_reduce(const Impl::TeamThreadRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start; i < loop_boundaries.end;
Expand Down Expand Up @@ -987,7 +987,7 @@ parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(lambda);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start; i < loop_boundaries.end;
Expand All @@ -1012,7 +1012,7 @@ parallel_reduce(const Impl::ThreadVectorRangeBoundariesStruct<
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start; i < loop_boundaries.end;
Expand Down
8 changes: 4 additions & 4 deletions core/src/impl/Kokkos_HostThreadTeam.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ KOKKOS_INLINE_FUNCTION
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start; i < loop_boundaries.end;
Expand Down Expand Up @@ -832,7 +832,7 @@ KOKKOS_INLINE_FUNCTION
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(closure);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start; i < loop_boundaries.end;
Expand Down Expand Up @@ -893,7 +893,7 @@ KOKKOS_INLINE_FUNCTION
using value_type = typename wrapped_reducer_type::value_type;

wrapped_reducer_type wrapped_reducer(lambda);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start; i < loop_boundaries.end;
Expand All @@ -919,7 +919,7 @@ KOKKOS_INLINE_FUNCTION
using wrapped_reducer_type = typename functor_analysis_type::Reducer;

wrapped_reducer_type wrapped_reducer(reducer);
value_type value{};
value_type value;
wrapped_reducer.init(&value);

for (iType i = loop_boundaries.start; i < loop_boundaries.end;
Expand Down

0 comments on commit f332a8a

Please sign in to comment.