From 17fc64b046e694efccb2c2cc4fb4a028734fee37 Mon Sep 17 00:00:00 2001 From: Atell Krasnopolski Date: Mon, 8 Apr 2024 20:57:23 +0200 Subject: [PATCH] Rename two of the definitions of `parallel_add` back to `parallel_sum` --- unittests/Kokkos/parallel_add.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/unittests/Kokkos/parallel_add.hpp b/unittests/Kokkos/parallel_add.hpp index 6e2c189be..7d62552b1 100644 --- a/unittests/Kokkos/parallel_add.hpp +++ b/unittests/Kokkos/parallel_add.hpp @@ -32,7 +32,7 @@ struct ViewSum { update += v(i0); }, sum ); - + result += sum; } }; @@ -65,7 +65,7 @@ struct ViewSum { update += v(i0, i1); }, sum ); - + result += sum; } }; @@ -99,7 +99,7 @@ struct ViewSum { update += v(i0, i1, i2); }, sum ); - + result += sum; } }; @@ -241,9 +241,9 @@ struct ViewAdd { template -void parallel_add(typename Kokkos::ViewTraits::value_type &sum, const Kokkos::View A) { +void parallel_sum(typename Kokkos::ViewTraits::value_type &sum, const Kokkos::View A) { using ViewtypeA = Kokkos::View; - Kokkos::fence("parallel_add: pre sum fence"); + Kokkos::fence("parallel_sum: pre sum fence"); if (A.span_is_contiguous()) { using ViewTypeFlat = Kokkos::View< @@ -260,13 +260,13 @@ void parallel_add(typename Kokkos::ViewTraits::value_type &sum, const else { ViewSum::template execute(sum, A); } - Kokkos::fence("parallel_add: post sum fence"); + Kokkos::fence("parallel_sum: post sum fence"); } template -void parallel_add(const ExecSpace& space, typename Kokkos::ViewTraits::value_type &sum, const Kokkos::View A) { +void parallel_sum(const ExecSpace& space, typename Kokkos::ViewTraits::value_type &sum, const Kokkos::View A) { using ViewtypeA = Kokkos::View; - space.fence("parallel_add: pre sum fence"); + space.fence("parallel_sum: pre sum fence"); if (A.span_is_contiguous()) { using ViewTypeFlat = Kokkos::View< @@ -283,7 +283,7 @@ void parallel_add(const ExecSpace& space, typename Kokkos::ViewTraits else { ViewSum::template execute(sum, A, space); } - space.fence("parallel_add: post sum fence"); + space.fence("parallel_sum: post sum fence"); } template