More uses of EKAT_ENABLE_GPU and a BFB flag guard.

Author: ambrad

tests/CMakeLists.txt

@@ -7,7 +7,7 @@
 ###    THREADING    ###
 #######################
 
-if (Kokkos_ENABLE_CUDA)
+if (EKAT_ENABLE_GPU)
   set (DEFAULT_MAX_THREADS 1)
 else ()
   set (DEFAULT_MAX_THREADS 16)

tests/algorithm/tridiag_tests_correctness.cpp

@@ -570,7 +570,9 @@ TEST_CASE("property", "tridiag") {
 }
 
 TEST_CASE("bfb", "tridiag") {
+#ifdef EKAT_DEFAULT_BFB
   ekat::test::correct::run_bfb_test<1,1>();
   if (EKAT_TEST_PACK_SIZE > 1)
     ekat::test::correct::run_bfb_test<EKAT_TEST_PACK_SIZE, EKAT_TEST_PACK_SIZE>();
+#endif
 }

tests/kokkos/kokkos_utils_tests.cpp

@@ -290,7 +290,7 @@ void test_view_reduction(const Scalar a=Scalar(0.0), const int begin=0, const in
   const auto results_h = Kokkos::create_mirror_view(results);
 
   int team_size = ExeSpace::concurrency();
-#ifdef KOKKOS_ENABLE_CUDA
+#ifdef EKAT_ENABLE_GPU
   ExeSpace temp_space;
   auto num_sm = temp_space.impl_internal_space_instance()->m_multiProcCount;
   team_size /= (ekat::is_single_precision<Real>::value ? num_sm*64 : num_sm*32);

tests/kokkos/workspace_tests.cpp

@@ -492,8 +492,8 @@ TEST_CASE("workspace_manager", "[utils]") {
   unit_test::UnitWrap::UnitTest<ekat::DefaultDevice>::unittest_workspace();
 }
 
-#ifdef KOKKOS_ENABLE_CUDA
-// Force host testing on CUDA
+#ifdef EKAT_ENABLE_GPU
+// Force host testing when the exe space is a GPU space.
 TEST_CASE("workspace_manager_host", "[utils]") {
   unit_test::UnitWrap::UnitTest<ekat::HostDevice>::unittest_workspace();
 }