Merge branch 'develop' into release/2.0.0

LLNL · Dec 10, 2019 · d360273 · d360273
2 parents 9b0ee0e + 8f09d3d
commit d360273
Show file tree

Hide file tree

Showing 10 changed files with 4,158 additions and 46 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,6 +18,7 @@ option(DISABLE_RM "Make ManagedArray a thin wrapper" Off)
 mark_as_advanced(DISABLE_RM)
 option(ENABLE_UM "Use CUDA unified (managed) memory" Off)
 option(ENABLE_RAJA_PLUGIN "Build plugin to set RAJA execution spaces" Off)
+option(CHAI_ENABLE_GPU_ERROR_CHECKING "Enable GPU error checking" On)
 
 set(ENABLE_TESTS On CACHE BOOL "")
 set(ENABLE_EXAMPLES On CACHE BOOL "")

diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
@@ -36,3 +36,13 @@ blt_add_executable(
 blt_add_benchmark(
   NAME managedarray_benchmarks
   COMMAND managedarray_benchmarks)
+
+blt_add_executable(
+  NAME managed_ptr_benchmarks
+  SOURCES chai_managed_ptr_benchmarks.cpp
+  DEPENDS_ON ${chai_benchmark_depends})
+
+blt_add_benchmark(
+  NAME managed_ptr_benchmarks
+  COMMAND managed_ptr_benchmarks)
+