Enable all tests for HPX bacend

laristra · Sep 28, 2020 · 0d0f74f · 0d0f74f
1 parent 6fc5781
commit 0d0f74f
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 46 deletions.
diff --git a/cinch b/cinch
diff --git a/flecsi/coloring/CMakeLists.txt b/flecsi/coloring/CMakeLists.txt
@@ -37,19 +37,21 @@ set(coloring_HEADERS
 # runtime specific and can be configured for whichever runtime is active.
 #------------------------------------------------------------------------------#
 
+set(UNIT_POLICY MPI)
+
 if(FLECSI_RUNTIME_MODEL STREQUAL "serial")
 
-  set(UNIT_POLICY SERIAL)
+#  set(UNIT_POLICY SERIAL)
   set(RUNTIME_DRIVER ../execution/serial/runtime_driver.cc)
 
 elseif(FLECSI_RUNTIME_MODEL STREQUAL "legion")
 
-  set(UNIT_POLICY LEGION)
+#  set(UNIT_POLICY LEGION)
   set(RUNTIME_DRIVER ../execution/legion/runtime_driver.cc)
 
 elseif(FLECSI_RUNTIME_MODEL STREQUAL "mpi")
 
-  set(UNIT_POLICY MPI)
+#  set(UNIT_POLICY MPI)
   set(RUNTIME_DRIVER ../execution/mpi/runtime_driver.cc)
 
 elseif(FLECSI_RUNTIME_MODEL STREQUAL "hpx")
@@ -108,7 +110,7 @@ cinch_add_unit(dcrs
   LIBRARIES
     ${CINCH_RUNTIME_LIBRARIES}
     ${COLORING_LIBRARIES}
-  POLICY MPI
+  POLICY ${UNIT_POLICY}
   THREADS 5
 )
 
@@ -120,7 +122,7 @@ cinch_add_devel_target(devel-dcrs
   LIBRARIES
     ${CINCH_RUNTIME_LIBRARIES}
     ${COLORING_LIBRARIES}
-  POLICY MPI
+  POLICY ${UNIT_POLICY}
   THREADS 5
   FOLDER "Tests/Coloring/Devel"
 )
@@ -129,33 +131,33 @@ cinch_add_unit(boxcolor2d
   SOURCES test/test_simple_box_colorer_2d.cc
   INPUTS
   LIBRARIES ${COLORING_LIBRARIES}
-  POLICY MPI
+  POLICY ${UNIT_POLICY}
   THREADS 4
 )
 cinch_add_unit(boxcolor3d
   SOURCES test/test_simple_box_colorer_3d.cc
   INPUTS
   LIBRARIES ${COLORING_LIBRARIES}
-  POLICY MPI
+  POLICY ${UNIT_POLICY}
   THREADS 4
 )
 # Both of these tests depend on ParMETIS.
 # This could change if we add more colorer types.
 if(ENABLE_PARMETIS)
 
-cinch_add_devel_target(coloring
-  SOURCES test/coloring.cc
-  INPUTS
-    test/simple2d-8x8.msh
-    test/simple2d-16x16.msh
-    test/simple2d-32x32.msh
-    test/simple2d-48x48.msh
-  LIBRARIES
-    ${CINCH_RUNTIME_LIBRARIES}
-    ${COLORING_LIBRARIES}
-  POLICY MPI
-  THREADS 5
-  FOLDER "Tests/Coloring/Devel"
-)
+  cinch_add_devel_target(coloring
+    SOURCES test/coloring.cc
+    INPUTS
+      test/simple2d-8x8.msh
+      test/simple2d-16x16.msh
+      test/simple2d-32x32.msh
+      test/simple2d-48x48.msh
+    LIBRARIES
+      ${CINCH_RUNTIME_LIBRARIES}
+      ${COLORING_LIBRARIES}
+    POLICY ${UNIT_POLICY}
+    THREADS 5
+    FOLDER "Tests/Coloring/Devel"
+  )
 
-endif()
+endif(ENABLE_PARMETIS)
diff --git a/flecsi/io/CMakeLists.txt b/flecsi/io/CMakeLists.txt
@@ -140,21 +140,21 @@ endif()
 
 if(FLECSI_RUNTIME_MODEL STREQUAL "legion" AND ENABLE_HDF5)
 
-cinch_add_unit(io_hdf5
-  SOURCES
-    test/legion/io_hdf5.cc
-    ${DRIVER_INITIALIZATION}
-    ${RUNTIME_DRIVER}
-  DEFINES
-    -DCINCH_OVERRIDE_DEFAULT_INITIALIZATION_DRIVER
-  POLICY
-    ${UNIT_POLICY}
-  LIBRARIES
-    FleCSI
-    ${CINCH_RUNTIME_LIBRARIES}
-    ${HDF5_LIBRARIES}
-  THREADS 4
-)
+  cinch_add_unit(io_hdf5
+    SOURCES
+      test/legion/io_hdf5.cc
+      ${DRIVER_INITIALIZATION}
+      ${RUNTIME_DRIVER}
+    DEFINES
+      -DCINCH_OVERRIDE_DEFAULT_INITIALIZATION_DRIVER
+    POLICY
+      ${UNIT_POLICY}
+    LIBRARIES
+      FleCSI
+      ${CINCH_RUNTIME_LIBRARIES}
+      ${HDF5_LIBRARIES}
+    THREADS 4
+  )
 endif()
 
 cinch_add_unit(simple_definition

diff --git a/flecsi/topology/test/pseudo_random.h b/flecsi/topology/test/pseudo_random.h
@@ -23,7 +23,7 @@ class pseudo_random
   //! \brief Generate a new random number with a uniform distribution between
   //!        [0, 1).
   double uniform() {
-    return double(rng_()) / rng_.max();
+    return double(rng_()) / (rng_.max)();
   }
 
   //! \brief Generate a new random number with a uniform distribution between

diff --git a/flecsi/utils/CMakeLists.txt b/flecsi/utils/CMakeLists.txt
@@ -133,11 +133,12 @@ endif()
 
 cinch_add_unit(factory
   SOURCES
-    demangle.cc
     test/factory.cc
   INPUTS
     test/factory.blessed
     ${factory_blessed_input}
+  LIBRARIES
+    FleCSI
 )
 
 cinch_add_unit(fixed_vector
@@ -190,10 +191,11 @@ cinch_add_unit(static_verify
 
 cinch_add_unit(test_utility
   SOURCES
-    demangle.cc
     test/utility.cc
   INPUTS
     test/utility.blessed.gnug
+  LIBRARIES
+    FleCSI
 )
 
 set(tuple_type_converter_blessed_input test/tuple_type_converter.blessed.gnug)
@@ -204,16 +206,18 @@ endif()
 
 cinch_add_unit(tuple_type_converter
   SOURCES
-    demangle.cc
     test/tuple_type_converter.cc
   INPUTS
     ${tuple_type_converter_blessed_input}
+  LIBRARIES
+    FleCSI
 )
 
 cinch_add_unit(tuple_wrapper
   SOURCES
-    demangle.cc
     test/tuple_wrapper.cc
+  LIBRARIES
+    FleCSI
 )
 
 set(array_ref_blessed_input test/array_ref.blessed.gnug)
@@ -224,10 +228,11 @@ endif()
 
 cinch_add_unit(array_ref
   SOURCES
-    demangle.cc
     test/array_ref.cc
   INPUTS
     test/array_ref.blessed ${array_ref_blessed_input}
+  LIBRARIES
+    FleCSI
 )
 
 set(common_blessed_input test/common.blessed.gnug)
@@ -238,10 +243,11 @@ endif()
 
 cinch_add_unit(common
   SOURCES
-    demangle.cc
     test/common.cc
   INPUTS
     test/common.blessed.ppc test/common.blessed ${common_blessed_input}
+  LIBRARIES
+    FleCSI
 )
 
 set(id_blessed_input test/id.blessed.gnug)
@@ -252,10 +258,11 @@ endif()
 
 cinch_add_unit(id
   SOURCES
-    demangle.cc
     test/id.cc
   INPUTS
     test/id.blessed ${id_blessed_input}
+  LIBRARIES
+    FleCSI
 )
 
 if(ENABLE_OPENSSL)