Made test require cabana

Author: Kloepfer

CMakeLists.txt

@@ -162,19 +162,19 @@ meshfields_add_exe(ElementTests test/testElement.cpp)
 meshfields_add_exe(OmegahElementTests test/testOmegahElement.cpp)
 meshfields_add_exe(OmegahCoordFieldTest test/testOmegahCoordField.cpp)
 meshfields_add_exe(ExceptionTest test/testExceptions.cpp)
-meshfields_add_exe(ControllerPerformance test/testControllerPerformance.cpp)
 
 if(MeshFields_USE_Cabana)
+  meshfields_add_exe(ControllerPerformance test/testControllerPerformance.cpp)
   meshfields_add_exe(CabanaTests test/testCabana.cpp)
   test_func(CabanaTests ./CabanaTests)
+  test_func(ControllerPerformance ./ControllerPerformance)
 endif()
 
 test_func(KokkosTests ./KokkosTests)
 test_func(SerializationTests ./SerializationTests)
 test_func(ElementTests ./ElementTests)
 test_func(OmegahElementTests ./OmegahElementTests)
 test_func(OmegahCoordFieldTest ./OmegahCoordFieldTest)
-test_func(ControllerPerformance ./ControllerPerformance)
 if(MeshFields_USE_EXCEPTIONS)
   # exception caught - no error
   test_func(ExceptionTest ./ExceptionTest)

test/testControllerPerformance.cpp

@@ -1,10 +1,8 @@
+#include "CabanaController.hpp"
 #include "KokkosController.hpp"
 #include "MeshField.hpp"
 #include "MeshField_For.hpp"
-#ifdef MESHFIELDS_ENABLE_CABANA
-#include "CabanaController.hpp"
 #include "MeshField_SimdFor.hpp"
-#endif
 #include <Kokkos_Core.hpp>
 #include <chrono>
 #include <iomanip>
@@ -27,7 +25,6 @@ int main(int argc, char **argv) {
     which = atoi(argv[3]);
   }
   Kokkos::initialize(argc, argv);
-#ifdef MESHFIELDS_ENABLE_CABANA
   if (which) {
     double avg = 0;
     using cab = MeshField::CabanaController<ExecutionSpace, MemorySpace,
@@ -67,7 +64,6 @@ int main(int argc, char **argv) {
     avg = avg / runs;
     std::cout << std::fixed << std::setprecision(1) << avg << std::endl;
   }
-#endif
   Kokkos::finalize();
   return 0;
 }