Sidestep lacking CTAD support msvc/cuda

japlews · Dec 9, 2023 · 249f8b4 · 249f8b4
1 parent 7dcf1de
commit 249f8b4
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/algorithms/unit_tests/TestStdAlgorithmsTeamCopyIf.cpp b/algorithms/unit_tests/TestStdAlgorithmsTeamCopyIf.cpp
@@ -139,7 +139,7 @@ void test_A(std::size_t numTeams, std::size_t numCols, int apiId) {
   auto intraTeamSentinelView_h = create_host_space_copy(intraTeamSentinelView);
   Kokkos::View<ValueType**, Kokkos::HostSpace> stdDestView("stdDestView",
                                                            numTeams, numCols);
-  GreaterThanValueFunctor predicate(threshold);
+  GreaterThanValueFunctor<ValueType> predicate(threshold);
   for (std::size_t i = 0; i < sourceView.extent(0); ++i) {
     auto rowFrom = Kokkos::subview(sourceViewBeforeOp_h, i, Kokkos::ALL());
     auto rowDest = Kokkos::subview(stdDestView, i, Kokkos::ALL());

diff --git a/algorithms/unit_tests/TestStdAlgorithmsTeamIsPartitioned.cpp b/algorithms/unit_tests/TestStdAlgorithmsTeamIsPartitioned.cpp
@@ -191,7 +191,7 @@ void test_A(std::size_t numTeams, std::size_t numCols, int apiId,
   // -----------------------------------------------
   auto returnView_h            = create_host_space_copy(returnView);
   auto intraTeamSentinelView_h = create_host_space_copy(intraTeamSentinelView);
-  GreaterThanValueFunctor predicate(threshold);
+  GreaterThanValueFunctor<ValueType> predicate(threshold);
 
   for (std::size_t i = 0; i < dataView_dc_h.extent(0); ++i) {
     auto myRow = Kokkos::subview(dataView_dc_h, i, Kokkos::ALL());

diff --git a/algorithms/unit_tests/TestStdAlgorithmsTeamPartitionCopy.cpp b/algorithms/unit_tests/TestStdAlgorithmsTeamPartitionCopy.cpp
@@ -240,7 +240,7 @@ void test_A(std::size_t numTeams, std::size_t numCols, int apiId,
       "stdDestTrueView", numTeams, numCols);
   Kokkos::View<ValueType**, Kokkos::HostSpace> stdDestFalseView(
       "stdDestFalseView", numTeams, numCols);
-  GreaterThanValueFunctor predicate(threshold);
+  GreaterThanValueFunctor<ValueType> predicate(threshold);
 
   for (std::size_t i = 0; i < sourceView_dc_h.extent(0); ++i) {
     auto myRowSource    = Kokkos::subview(sourceView_dc_h, i, Kokkos::ALL());

diff --git a/algorithms/unit_tests/TestStdAlgorithmsTeamPartitionPoint.cpp b/algorithms/unit_tests/TestStdAlgorithmsTeamPartitionPoint.cpp
@@ -197,7 +197,7 @@ void test_A(std::size_t numTeams, std::size_t numCols, int apiId,
   auto distancesView_h         = create_host_space_copy(distancesView);
   auto dataViewAfterOp_h       = create_host_space_copy(dataView);
   auto intraTeamSentinelView_h = create_host_space_copy(intraTeamSentinelView);
-  GreaterThanValueFunctor predicate(threshold);
+  GreaterThanValueFunctor<ValueType> predicate(threshold);
 
   for (std::size_t i = 0; i < dataView_dc_h.extent(0); ++i) {
     auto myRow = Kokkos::subview(dataView_dc_h, i, Kokkos::ALL());

diff --git a/algorithms/unit_tests/TestStdAlgorithmsTeamRemoveCopyIf.cpp b/algorithms/unit_tests/TestStdAlgorithmsTeamRemoveCopyIf.cpp
@@ -138,7 +138,7 @@ void test_A(std::size_t numTeams, std::size_t numCols, int apiId) {
   auto intraTeamSentinelView_h = create_host_space_copy(intraTeamSentinelView);
   Kokkos::View<ValueType**, Kokkos::HostSpace> stdDestView("stdDestView",
                                                            numTeams, numCols);
-  GreaterThanValueFunctor predicate(threshold);
+  GreaterThanValueFunctor<ValueType> predicate(threshold);
   for (std::size_t i = 0; i < destViewAfterOp_h.extent(0); ++i) {
     auto rowFrom =
         Kokkos::subview(cloneOfSourceViewBeforeOp_h, i, Kokkos::ALL());

diff --git a/algorithms/unit_tests/TestStdAlgorithmsTeamRemoveIf.cpp b/algorithms/unit_tests/TestStdAlgorithmsTeamRemoveIf.cpp
@@ -127,7 +127,7 @@ void test_A(std::size_t numTeams, std::size_t numCols, int apiId) {
   // -----------------------------------------------
   // check against std
   // -----------------------------------------------
-  GreaterThanValueFunctor predicate(threshold);
+  GreaterThanValueFunctor<ValueType> predicate(threshold);
   auto dataViewAfterOp_h       = create_host_space_copy(dataView);
   auto distancesView_h         = create_host_space_copy(distancesView);
   auto intraTeamSentinelView_h = create_host_space_copy(intraTeamSentinelView);

diff --git a/algorithms/unit_tests/TestStdAlgorithmsTeamReplaceCopyIf.cpp b/algorithms/unit_tests/TestStdAlgorithmsTeamReplaceCopyIf.cpp
@@ -145,7 +145,7 @@ void test_A(std::size_t numTeams, std::size_t numCols, int apiId) {
   auto intraTeamSentinelView_h = create_host_space_copy(intraTeamSentinelView);
   Kokkos::View<ValueType**, Kokkos::HostSpace> stdDestView("stdDestView",
                                                            numTeams, numCols);
-  GreaterThanValueFunctor predicate(threshold);
+  GreaterThanValueFunctor<ValueType> predicate(threshold);
   for (std::size_t i = 0; i < sourceView.extent(0); ++i) {
     auto rowFrom =
         Kokkos::subview(cloneOfSourceViewBeforeOp_h, i, Kokkos::ALL());

diff --git a/algorithms/unit_tests/TestStdAlgorithmsTeamReplaceIf.cpp b/algorithms/unit_tests/TestStdAlgorithmsTeamReplaceIf.cpp
@@ -103,7 +103,7 @@ void test_A(std::size_t numTeams, std::size_t numCols, int apiId) {
       stdDataView(i, j) = cloneOfDataViewBeforeOp_h(i, j);
     }
   }
-  GreaterThanValueFunctor predicate(threshold);
+  GreaterThanValueFunctor<ValueType> predicate(threshold);
   for (std::size_t i = 0; i < dataView.extent(0); ++i) {
     auto thisRow = Kokkos::subview(stdDataView, i, Kokkos::ALL());
     std::replace_if(KE::begin(thisRow), KE::end(thisRow), predicate, newVal);