Merge pull request #64 from streeve/unittest_neighbor

Add neighbor list unit test
ECP-copa · Jul 17, 2020 · d92e577 · d92e577
2 parents 6aff9b0 + dd70f51
commit d92e577
Show file tree

Hide file tree

Showing 9 changed files with 394 additions and 12 deletions.
diff --git a/cmake/FindCLANG_FORMAT.cmake b/cmake/FindCLANG_FORMAT.cmake
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (c) 2019 by the Cabana authors                                 #
+# Copyright (c) 2020 by the Cabana authors                                 #
 # All rights reserved.                                                     #
 #                                                                          #
 # This file is part of the Cabana library. Cabana is distributed under a   #

diff --git a/unit_test/CMakeLists.txt b/unit_test/CMakeLists.txt
@@ -5,12 +5,16 @@ set(gtest_args --gtest_color=yes)
 ##--------------------------------------------------------------------------##
 macro(CabanaMD_add_tests)
   cmake_parse_arguments(CABANAMD_UNIT_TEST "MPI" "" "NAMES" ${ARGN})
-  set(CABANAMD_UNIT_TEST_MPIEXEC_NUMPROCS 1 2)
-  if(MPIEXEC_MAX_NUMPROCS GREATER 2)
-    list(APPEND CABANAMD_UNIT_TEST_MPIEXEC_NUMPROCS ${MPIEXEC_MAX_NUMPROCS})
+  set(CABANAMD_UNIT_TEST_MPIEXEC_NUMPROCS 1)
+  if(CABANAMD_UNIT_TEST_MPI)
+    list(APPEND CABANAMD_UNIT_TEST_MPIEXEC_NUMPROCS 2)
+    if(MPIEXEC_MAX_NUMPROCS GREATER 1)
+      list(APPEND CABANAMD_UNIT_TEST_MPIEXEC_NUMPROCS ${MPIEXEC_MAX_NUMPROCS})
+    endif()
   endif()
   set(CABANAMD_UNIT_TEST_NUMTHREADS 1 2)
-  set(CABANAMD_UNIT_TEST_MAIN unit_test_main.cpp)
+
+  set(CABANAMD_UNIT_TEST_MAIN mpi_unit_test_main.cpp)
 
   foreach(_device SERIAL OPENMP CUDA HIP)
     if(Kokkos_ENABLE_${_device})
@@ -46,4 +50,7 @@ macro(CabanaMD_add_tests)
   endforeach()
 endmacro()
 
-CabanaMD_add_tests(MPI NAMES Integrator)
+CabanaMD_add_tests(NAMES Integrator Neighbor)
+
+# TODO:
+#CabanaMD_add_tests(MPI NAMES Comm)
diff --git a/unit_test/TestCUDA_Category.hpp b/unit_test/TestCUDA_Category.hpp
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2018-2019 by the Cabana authors                            *
+ * Copyright (c) 2018-2020 by the Cabana authors                            *
  * All rights reserved.                                                     *
  *                                                                          *
  * This file is part of the Cabana library. Cabana is distributed under a   *

diff --git a/unit_test/TestCUDA_UVM_Category.hpp b/unit_test/TestCUDA_UVM_Category.hpp
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2018-2019 by the Cabana authors                            *
+ * Copyright (c) 2018-2020 by the Cabana authors                            *
  * All rights reserved.                                                     *
  *                                                                          *
  * This file is part of the Cabana library. Cabana is distributed under a   *

diff --git a/unit_test/TestOPENMP_Category.hpp b/unit_test/TestOPENMP_Category.hpp
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2018-2019 by the Cabana authors                            *
+ * Copyright (c) 2018-2020 by the Cabana authors                            *
  * All rights reserved.                                                     *
  *                                                                          *
  * This file is part of the Cabana library. Cabana is distributed under a   *

diff --git a/unit_test/TestSERIAL_Category.hpp b/unit_test/TestSERIAL_Category.hpp
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2018-2019 by the Cabana authors                            *
+ * Copyright (c) 2018-2020 by the Cabana authors                            *
  * All rights reserved.                                                     *
  *                                                                          *
  * This file is part of the Cabana library. Cabana is distributed under a   *

diff --git a/unit_test/unit_test_main.cpp → unit_test/mpi_unit_test_main.cpp b/unit_test/unit_test_main.cpp → unit_test/mpi_unit_test_main.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2018-2019 by the Cabana authors                            *
+ * Copyright (c) 2018-2020 by the Cabana authors                            *
  * All rights reserved.                                                     *
  *                                                                          *
  * This file is part of the Cabana library. Cabana is distributed under a   *

diff --git a/unit_test/tstIntegrator.hpp b/unit_test/tstIntegrator.hpp
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2018-2019 by the Cabana authors                            *
+ * Copyright (c) 2018-2020 by the Cabana authors                            *
  * All rights reserved.                                                     *
  *                                                                          *
  * This file is part of the Cabana library. Cabana is distributed under a   *