revert files

masterleinad · Aug 8, 2023 · 69389fc · 69389fc
1 parent a3a00a6
commit 69389fc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/algorithms/unit_tests/TestStdAlgorithmsExclusiveScan.cpp b/algorithms/unit_tests/TestStdAlgorithmsExclusiveScan.cpp
@@ -348,9 +348,8 @@ TEST(std_algorithms_numeric_ops_test, exclusive_scan_functor) {
   int dummy       = 0;
   using view_type = Kokkos::View<int*, exespace>;
   view_type dummy_view("dummy_view", 0);
-  using functor_type =
-      Kokkos::Experimental::Impl::ExclusiveScanDefaultFunctorWithValueWrapper<
-          exespace, int, int, view_type, view_type>;
+  using functor_type = Kokkos::Experimental::Impl::ExclusiveScanDefaultFunctor<
+      exespace, int, int, view_type, view_type>;
   functor_type functor(dummy, dummy_view, dummy_view);
   using value_type = functor_type::value_type;
 

diff --git a/algorithms/unit_tests/TestStdAlgorithmsTransformExclusiveScan.cpp b/algorithms/unit_tests/TestStdAlgorithmsTransformExclusiveScan.cpp
@@ -295,7 +295,7 @@ TEST(std_algorithms_numeric_ops_test, transform_exclusive_scan_functor) {
       Kokkos::Experimental::Impl::StdNumericScanIdentityReferenceUnaryFunctor<
           int>;
   using functor_type =
-      Kokkos::Experimental::Impl::TransformExclusiveScanFunctorWithValueWrapper<
+      Kokkos::Experimental::Impl::TransformExclusiveScanFunctor<
           exespace, int, int, view_type, view_type, MultiplyFunctor<int>,
           unary_op_type>;
   functor_type functor(dummy, dummy_view, dummy_view, {}, {});

diff --git a/algorithms/unit_tests/TestStdAlgorithmsTransformInclusiveScan.cpp b/algorithms/unit_tests/TestStdAlgorithmsTransformInclusiveScan.cpp
@@ -355,20 +355,18 @@ TEST(std_algorithms_numeric_ops_test, transform_inclusive_scan_functor) {
   using unary_op_type =
       KE::Impl::StdNumericScanIdentityReferenceUnaryFunctor<int>;
   {
-    using functor_type =
-        KE::Impl::ExeSpaceTransformInclusiveScanNoInitValueFunctor<
-            exespace, int, int, view_type, view_type, MultiplyFunctor<int>,
-            unary_op_type>;
+    using functor_type = KE::Impl::TransformInclusiveScanNoInitValueFunctor<
+        exespace, int, int, view_type, view_type, MultiplyFunctor<int>,
+        unary_op_type>;
     functor_type functor(dummy_view, dummy_view, {}, {});
 
     test_lambda(functor);
   }
 
   {
-    using functor_type =
-        KE::Impl::ExeSpaceTransformInclusiveScanWithInitValueFunctor<
-            exespace, int, int, view_type, view_type, MultiplyFunctor<int>,
-            unary_op_type>;
+    using functor_type = KE::Impl::TransformInclusiveScanWithInitValueFunctor<
+        exespace, int, int, view_type, view_type, MultiplyFunctor<int>,
+        unary_op_type>;
     functor_type functor(dummy_view, dummy_view, {}, {}, dummy);
 
     test_lambda(functor);