Fix warnings, move to c++17, consistent include guards, clean up (some) includes

CMakeLists.txt

@@ -45,7 +45,7 @@ if ("${PROJECT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
     # Set some default BLT options before loading BLT only if not included in
     # another project
     if (NOT BLT_CXX_STD)
-        set(BLT_CXX_STD "c++14" CACHE STRING "")
+        set(BLT_CXX_STD "c++17" CACHE STRING "")
     endif()
 
     # These BLT tools are not used in Tribol, turn them off
@@ -160,7 +160,7 @@ endif()
 
 set(TRIBOL_DEBUG_DEFINE_STRING "${TRIBOL_DEBUG_DEFINE_STRING}" CACHE STRING "" FORCE)
 # Define AXOM_DEBUG for SLIC macros
-string(REPLACE "TRIBOL" "AXOM" AXOM_DEBUG_DEFINE_STRING TRIBOL_DEBUG_DEFINE_STRING)
+string(REPLACE "TRIBOL" "AXOM" AXOM_DEBUG_DEFINE_STRING "${TRIBOL_DEBUG_DEFINE_STRING}")
 set(AXOM_DEBUG_DEFINE_STRING "${AXOM_DEBUG_DEFINE_STRING}" CACHE STRING "" FORCE)
 
 #------------------------------------------------------------------------------

README.md

@@ -69,7 +69,7 @@ to build Tribol.
 
 The Tribol contact physics library requires:
 - CMake 3.14 or higher
-- C++14 compiler
+- C++17 compiler
 - MPI
 - mfem
 - axom

scripts/spack/packages/tribol/package.py

@@ -203,7 +203,7 @@ def initconfig_compiler_entries(self):
         else:
             entries.append(cmake_cache_option("ENABLE_FORTRAN", False))
 
-        entries.append(cmake_cache_string("BLT_CXX_STD", "c++14", ""))
+        entries.append(cmake_cache_string("BLT_CXX_STD", "c++17", ""))
 
         # Add optimization flag workaround for Debug builds with
         # cray compiler or newer HIP

src/examples/CMakeLists.txt

@@ -151,3 +151,27 @@ if ( BUILD_REDECOMP )
   endforeach()
 
 endif()
+
+if (ENABLE_BENCHMARKS)
+  blt_add_executable(
+      NAME       array_benchmarks_ex
+      SOURCES    array_benchmarks.cpp
+      OUTPUT_DIR ${EXAMPLE_OUTPUT_DIRECTORY}
+      DEPENDS_ON tribol gbenchmark ${tribol_device_depends} 
+      )
+
+  if (ENABLE_CUDA)
+    set_target_properties(array_benchmarks_ex PROPERTIES CUDA_SEPARABLE_COMPILATION On)
+  endif()
+
+  if (ENABLE_HIP)
+    target_compile_options(array_benchmarks_ex PRIVATE -fgpu-rdc)
+    target_compile_options(array_benchmarks_ex PRIVATE
+        $<$<CONFIG:Debug>:
+            -ggdb
+        >
+    )
+    target_link_options(array_benchmarks_ex PRIVATE -fgpu-rdc)
+    target_link_options(array_benchmarks_ex PRIVATE --hip-link)
+  endif()
+endif()