adding portable tests

core/unit_test/CMakeLists.txt

 SET(PASS_RE "No errors detected")
 SET(FAIL_RE "detected in the test module")
 
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+
+##--------------------------------------------------------------------------##
+## General tests.
 ##--------------------------------------------------------------------------##
 TRIBITS_ADD_EXECUTABLE_AND_TEST(
   Version_test
@@ -10,7 +15,6 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
   FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
   )
 
-##--------------------------------------------------------------------------##
 TRIBITS_ADD_EXECUTABLE_AND_TEST(
   Index_test
   SOURCES tstIndex.cpp unit_test_main.cpp
@@ -19,7 +23,6 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
   FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
   )
 
-##--------------------------------------------------------------------------##
 TRIBITS_ADD_EXECUTABLE_AND_TEST(
   SoA_test
   SOURCES tstSoA.cpp unit_test_main.cpp
@@ -29,30 +32,96 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
   )
 
 ##--------------------------------------------------------------------------##
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
-  AoSoA_test
-  SOURCES tstAoSoA.cpp unit_test_main.cpp
-  COMM serial mpi
-  PASS_REGULAR_EXPRESSION "${PASS_RE}"
-  FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
-  )
+## Serial tests.
+##--------------------------------------------------------------------------##
+IF(Cabana_ENABLE_Serial)
+
+  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+    AoSoA_test_Serial
+    SOURCES serial/tstAoSoA_Serial.cpp unit_test_main.cpp
+    COMM serial mpi
+    PASS_REGULAR_EXPRESSION "${PASS_RE}"
+    FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
+    )
+
+  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+    MemberSlice_test_Serial
+    SOURCES serial/tstMemberSlice_Serial.cpp unit_test_main.cpp
+    COMM serial mpi
+    PASS_REGULAR_EXPRESSION "${PASS_RE}"
+    FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
+    )
+
+  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+    Parallel_test_Serial
+    SOURCES serial/tstParallel_Serial.cpp unit_test_main.cpp
+    COMM serial mpi
+    PASS_REGULAR_EXPRESSION "${PASS_RE}"
+    FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
+    )
+
+ENDIF()
 
 ##--------------------------------------------------------------------------##
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
-  MemberSlice_test
-  SOURCES tstMemberSlice.cpp unit_test_main.cpp
-  COMM serial mpi
-  PASS_REGULAR_EXPRESSION "${PASS_RE}"
-  FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
-  )
+## OpenMP tests.
+##--------------------------------------------------------------------------##
+IF(Cabana_ENABLE_OpenMP)
+
+  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+    AoSoA_test_OpenMP
+    SOURCES openmp/tstAoSoA_OpenMP.cpp unit_test_main.cpp
+    COMM serial mpi
+    PASS_REGULAR_EXPRESSION "${PASS_RE}"
+    FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
+    )
+
+  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+    MemberSlice_test_OpenMP
+    SOURCES openmp/tstMemberSlice_OpenMP.cpp unit_test_main.cpp
+    COMM serial mpi
+    PASS_REGULAR_EXPRESSION "${PASS_RE}"
+    FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
+    )
+
+  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+    Parallel_test_OpenMP
+    SOURCES openmp/tstParallel_OpenMP.cpp unit_test_main.cpp
+    COMM serial mpi
+    PASS_REGULAR_EXPRESSION "${PASS_RE}"
+    FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
+    )
+
+ENDIF()
 
 ##--------------------------------------------------------------------------##
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
-  Parallel_test
-  SOURCES tstParallel.cpp unit_test_main.cpp
-  COMM serial mpi
-  PASS_REGULAR_EXPRESSION "${PASS_RE}"
-  FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
-  )
+## Cuda tests.
+##--------------------------------------------------------------------------##
+IF(Cabana_ENABLE_Cuda)
+
+  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+    AoSoA_test_CudaUVM
+    SOURCES cuda/tstAoSoA_CudaUVM.cpp unit_test_main.cpp
+    COMM serial mpi
+    PASS_REGULAR_EXPRESSION "${PASS_RE}"
+    FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
+    )
+
+  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+    MemberSlice_test_CudaUVM
+    SOURCES cuda/tstMemberSlice_CudaUVM.cpp unit_test_main.cpp
+    COMM serial mpi
+    PASS_REGULAR_EXPRESSION "${PASS_RE}"
+    FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
+    )
+
+  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+    Parallel_test_CudaUVM
+    SOURCES cuda/tstParallel_CudaUVM.cpp unit_test_main.cpp
+    COMM serial mpi
+    PASS_REGULAR_EXPRESSION "${PASS_RE}"
+    FAIL_REGULAR_EXPRESSION "${FAIL_RE}"
+    )
+
+ENDIF()
 
 ##--------------------------------------------------------------------------##
\ No newline at end of file

core/unit_test/cuda/TestCudaUVM_Category.hpp

+#ifndef CABANA_TEST_CUDAUVM_CATEGORY_HPP
+#define CABANA_TEST_CUDAUVM_CATEGORY_HPP
+
+#define TEST_EXECSPACE Kokkos::CudaUVM
+
+#endif // end CABANA_TEST_CUDAUVM_CATEGORY_HPP

core/unit_test/cuda/tstAoSoA_CudaUVM.cpp

+#include <cuda/TestCudaUVM_Category.hpp>
+#include <tstAoSoA.hpp>

core/unit_test/cuda/tstMemberSlice_CudaUVM.cpp

+#include <cuda/TestCudaUVM_Category.hpp>
+#include <tstMemberSlice.hpp>

core/unit_test/cuda/tstParallel_CudaUVM.cpp

+#include <cuda/TestCudaUVM_Category.hpp>
+#include <tstParallel.hpp>

core/unit_test/openmp/TestOpenMP_Category.hpp

+#ifndef CABANA_TEST_OPENMP_CATEGORY_HPP
+#define CABANA_TEST_OPENMP_CATEGORY_HPP
+
+#define TEST_EXECSPACE Kokkos::OpenMP
+
+#endif // end CABANA_TEST_OPENMP_CATEGORY_HPP

core/unit_test/openmp/tstAoSoA_OpenMP.cpp

+#include <openmp/TestOpenMP_Category.hpp>
+#include <tstAoSoA.hpp>

core/unit_test/openmp/tstMemberSlice_OpenMP.cpp

+#include <openmp/TestOpenMP_Category.hpp>
+#include <tstMemberSlice.hpp>

core/unit_test/openmp/tstParallel_OpenMP.cpp

+#include <openmp/TestOpenMP_Category.hpp>
+#include <tstParallel.hpp>

core/unit_test/serial/TestSerial_Category.hpp

+#ifndef CABANA_TEST_SERIAL_CATEGORY_HPP
+#define CABANA_TEST_SERIAL_CATEGORY_HPP
+
+#define TEST_EXECSPACE Kokkos::Serial
+
+#endif // end CABANA_TEST_SERIAL_CATEGORY_HPP

core/unit_test/serial/tstAoSoA_Serial.cpp

+#include <serial/TestSerial_Category.hpp>
+#include <tstAoSoA.hpp>

core/unit_test/serial/tstMemberSlice_Serial.cpp

+#include <serial/TestSerial_Category.hpp>
+#include <tstMemberSlice.hpp>

core/unit_test/serial/tstParallel_Serial.cpp

+#include <serial/TestSerial_Category.hpp>
+#include <tstParallel.hpp>

core/unit_test/tstAoSoA.cpp → core/unit_test/tstAoSoA.hpp

@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE( aosoa_serial_api_test )
                                 >;
 
     // Declare the AoSoA type.
-    using AoSoA_t = Cabana::AoSoA<DataTypes,inner_array_size,Kokkos::Serial>;
+    using AoSoA_t = Cabana::AoSoA<DataTypes,inner_array_size,TEST_EXECSPACE>;
 
     // Make sure that it is actually an AoSoA.
     BOOST_TEST( Cabana::is_aosoa<AoSoA_t>::value );
@@ -250,7 +250,7 @@ BOOST_AUTO_TEST_CASE( aosoa_raw_data_test )
                                 >;
 
     // Declare the AoSoA type.
-    using AoSoA_t = Cabana::AoSoA<DataTypes,inner_array_size,Kokkos::Serial>;
+    using AoSoA_t = Cabana::AoSoA<DataTypes,inner_array_size,TEST_EXECSPACE>;
 
     // Create an AoSoA using the default constructor.
     std::size_t num_data = 350;

core/unit_test/tstMemberSlice.cpp → core/unit_test/tstMemberSlice.hpp

@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE( slice_serial_api_test )
                                 >;
 
     // Declare the AoSoA type.
-    using AoSoA_t = Cabana::AoSoA<DataTypes,inner_array_size,Kokkos::Serial>;
+    using AoSoA_t = Cabana::AoSoA<DataTypes,inner_array_size,TEST_EXECSPACE>;
 
     // Make sure that it is actually an AoSoA.
     BOOST_TEST( Cabana::is_aosoa<AoSoA_t>::value );

core/unit_test/tstParallel.cpp → core/unit_test/tstParallel.hpp

@@ -68,14 +68,14 @@ BOOST_AUTO_TEST_CASE( parallel_for_test )
                                 >;
 
     // Declare the AoSoA type.
-    using AoSoA_t = Cabana::AoSoA<DataTypes,inner_array_size,Kokkos::Serial>;
+    using AoSoA_t = Cabana::AoSoA<DataTypes,inner_array_size,TEST_EXECSPACE>;
 
     // Create an AoSoA.
     std::size_t num_data = 155;
     AoSoA_t aosoa( num_data );
 
     // Create an execution policy.
-    Cabana::IndexRangePolicy<Kokkos::Serial>
+    Cabana::IndexRangePolicy<TEST_EXECSPACE>
         range_policy( aosoa.begin(), aosoa.end() );
 
     // Write a functor to operate on.