kokkos#5635: Move some tests for parallel_scan to TestTeamScan

core/unit_test/TestTeamScan.hpp

@@ -133,8 +133,7 @@ TEST(TEST_CATEGORY, team_scan) {
 // Temporary: This condition will progressively be reduced when parallel_scan
 // with return value will be implemented for more backends.
 #if !defined(KOKKOS_ENABLE_OPENACC) && !defined(KOKKOS_ENABLE_SYCL) &&         \
-    !defined(KOKKOS_ENABLE_THREADS) && !defined(KOKKOS_ENABLE_OPENMPTARGET) && \
-    !defined(KOKKOS_ENABLE_HPX)
+    !defined(KOKKOS_ENABLE_OPENMPTARGET) && !defined(KOKKOS_ENABLE_HPX)
 template <class ExecutionSpace, class DataType>
 struct TestTeamScanRetVal {
   using execution_space = ExecutionSpace;
@@ -186,10 +185,16 @@ struct TestTeamScanRetVal {
     a_r = view_2d_type("a_r", M, N);
     a_s = view_1d_type("a_s", M);
 
-    // Execute calculations
-    Kokkos::parallel_for(policy_type(M, Kokkos::AUTO), *this);
-
+    // Set team size explicitly to check whether non-power-of-two team sizes can
+    // be used.
+    if (ExecutionSpace().concurrency() > 10000)
+      Kokkos::parallel_for(policy_type(M, 127), *this);
+    else if (ExecutionSpace().concurrency() > 2)
+      Kokkos::parallel_for(policy_type(M, 3), *this);
+    else
+      Kokkos::parallel_for(policy_type(M, 1), *this);
     Kokkos::fence();
+
     auto a_i  = Kokkos::create_mirror_view(a_d);
     auto a_o  = Kokkos::create_mirror_view(a_r);
     auto a_os = Kokkos::create_mirror_view(a_s);