Removed ENABLE_OPENMP cmake option.

corbett5 · corbett5 · commit 929fe1a61d52 · 2020-10-12T20:52:11.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,14 +25,12 @@ if( NOT is_submodule )
     option( ENABLE_BENCHMARKS "Builds benchmarks" ON )
     option( ENABLE_DOCS "Builds documentation" ON )
 
-    option( ENABLE_UMPIRE "Build with UMPIRE" ON )
-    option( ENABLE_CHAI "Build with CHAI" ON )
-    option( ENABLE_MPI "Build with MPI" ON )
-    option( ENABLE_CUDA "Build with CUDA" OFF )
-    option( ENABLE_OPENMP "Build with OpenMP" ON )
-    option( ENABLE_CALIPER "Build with Caliper" ON )
-
     option( ENABLE_ADDR2LINE "Enable addr2line usage in stacktraces" ON )
+    option( ENABLE_CUDA "Build with CUDA" OFF )
+    option( ENABLE_UMPIRE "Build with UMPIRE" OFF )
+    option( ENABLE_CHAI "Build with CHAI" OFF )
+    option( ENABLE_MPI "Build with MPI" OFF )
+    option( ENABLE_CALIPER "Build with Caliper" OFF )
 
     include( cmake/blt/SetupBLT.cmake )
     include( cmake/CMakeBasics.cmake )
@@ -58,10 +56,6 @@ if( ENABLE_CUDA )
     set( lvarray_dependencies ${lvarray_dependencies} cuda )
 endif()
 
-if( ENABLE_OPENMP )
-    set( lvarray_dependencies ${lvarray_dependencies} openmp )
-endif()
-
 if( ENABLE_RAJA )
     set( lvarray_dependencies ${lvarray_dependencies} RAJA )
 endif()
diff --git a/benchmarks/benchmarkArray1DR2TensorMultiplication.cpp b/benchmarks/benchmarkArray1DR2TensorMultiplication.cpp
@@ -218,7 +218,7 @@ void pointerRAJA( benchmark::State & state )
 
 INDEX_TYPE const SERIAL_SIZE = (2 << 18) - 87;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 INDEX_TYPE const OMP_SIZE = (2 << 22) - 87;
 #endif
 
@@ -271,7 +271,7 @@ void registerBenchmarks()
   },
                                 std::make_tuple( SERIAL_SIZE, RAJA::PERM_IJK {}, serialPolicy {} )
                                 , std::make_tuple( SERIAL_SIZE, RAJA::PERM_KJI {}, serialPolicy {} )
-  #if defined(LVARRAY_USE_OPENMP)
+  #if defined(RAJA_ENABLE_OPENMP)
                                 , std::make_tuple( OMP_SIZE, RAJA::PERM_IJK {}, parallelHostPolicy {} )
                                 , std::make_tuple( OMP_SIZE, RAJA::PERM_KJI {}, parallelHostPolicy {} )
   #endif
@@ -295,7 +295,7 @@ int main( int argc, char * * argv )
   LVARRAY_LOG( "VALUE_TYPE = " << LvArray::system::demangleType< LvArray::benchmarking::VALUE_TYPE >() );
   LVARRAY_LOG( "Serial problems of size ( " << LvArray::benchmarking::SERIAL_SIZE << ", 3, 3 )." );
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
   LVARRAY_LOG( "OMP problems of size ( " << LvArray::benchmarking::OMP_SIZE << ", 3, 3 )." );
 #endif
 
diff --git a/benchmarks/benchmarkArray1DR2TensorMultiplicationKernels.cpp b/benchmarks/benchmarkArray1DR2TensorMultiplicationKernels.cpp
@@ -290,7 +290,7 @@ template class ArrayOfR2TensorsNative< RAJA::PERM_KJI >;
 template class ArrayOfR2TensorsRAJA< RAJA::PERM_IJK, serialPolicy >;
 template class ArrayOfR2TensorsRAJA< RAJA::PERM_KJI, serialPolicy >;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 template class ArrayOfR2TensorsRAJA< RAJA::PERM_IJK, parallelHostPolicy >;
 template class ArrayOfR2TensorsRAJA< RAJA::PERM_KJI, parallelHostPolicy >;
 #endif
diff --git a/benchmarks/benchmarkArrayOfArraysNodeToElementMapConstruction.cpp b/benchmarks/benchmarkArrayOfArraysNodeToElementMapConstruction.cpp
@@ -67,7 +67,7 @@ void registerBenchmarks()
     REGISTER_BENCHMARK_TEMPLATE( WRAP( { nx, ny, nz } ), overAllocation, POLICY );
     REGISTER_BENCHMARK_TEMPLATE( WRAP( { nx, ny, nz } ), resizeFromCapacities, POLICY );
   }, std::make_tuple( NX, NY, NZ, serialPolicy {} )
-  #if defined(LVARRAY_USE_OPENMP)
+  #if defined(RAJA_ENABLE_OPENMP)
                                 , std::make_tuple( NX, NY, NZ, parallelHostPolicy {} )
   #endif
                                 );
diff --git a/benchmarks/benchmarkArrayOfArraysNodeToElementMapConstructionKernels.cpp b/benchmarks/benchmarkArrayOfArraysNodeToElementMapConstructionKernels.cpp
@@ -127,7 +127,7 @@ resizeFromCapacities( ArrayView< INDEX_TYPE const, 2, 1, INDEX_TYPE, DEFAULT_BUF
 // Explicit instantiation of NodeToElemMapConstruction.
 template class NodeToElemMapConstruction< serialPolicy >;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 template class NodeToElemMapConstruction< parallelHostPolicy >;
 #endif
 
diff --git a/benchmarks/benchmarkArrayOfArraysNodeToElementMapConstructionKernels.hpp b/benchmarks/benchmarkArrayOfArraysNodeToElementMapConstructionKernels.hpp
@@ -49,7 +49,7 @@ class NaiveNodeToElemMapConstruction
   {
     CALI_CXX_MARK_SCOPE( "~NaiveNodeToElemMapConstruction" );
 
-    // #if defined(LVARRAY_USE_OPENMP)
+    // #if defined(RAJA_ENABLE_OPENMP)
     //   using EXEC_POLICY = parallelHostPolicy;
     // #else
     using EXEC_POLICY = serialPolicy;
diff --git a/benchmarks/benchmarkEigendecomposition.cpp b/benchmarks/benchmarkEigendecomposition.cpp
@@ -38,7 +38,7 @@ void eigenvectors( benchmark::State & state )
 INDEX_TYPE const SERIAL_SIZE_2x2 = (2 << 22) - 87;
 INDEX_TYPE const SERIAL_SIZE_3x3 = (2 << 19) - 87;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 INDEX_TYPE const OMP_SIZE_2x2 = (2 << 24) - 87;
 INDEX_TYPE const OMP_SIZE_3x3 = (2 << 23) - 87;
 #endif
@@ -67,7 +67,7 @@ void registerBenchmarks()
                                 , std::make_tuple( SERIAL_SIZE_2x2, std::integral_constant< int, 2 > {}, RAJA::PERM_JI {}, RAJA::PERM_KJI {}, serialPolicy {} )
                                 , std::make_tuple( SERIAL_SIZE_3x3, std::integral_constant< int, 3 > {}, RAJA::PERM_IJ {}, RAJA::PERM_IJK {}, serialPolicy {} )
                                 , std::make_tuple( SERIAL_SIZE_3x3, std::integral_constant< int, 3 > {}, RAJA::PERM_JI {}, RAJA::PERM_KJI {}, serialPolicy {} )
-  #if defined(LVARRAY_USE_OPENMP)
+  #if defined(RAJA_ENABLE_OPENMP)
                                 , std::make_tuple( OMP_SIZE_2x2, std::integral_constant< int, 2 > {}, RAJA::PERM_IJ {}, RAJA::PERM_IJK {}, parallelHostPolicy {} )
                                 , std::make_tuple( OMP_SIZE_2x2, std::integral_constant< int, 2 > {}, RAJA::PERM_JI {}, RAJA::PERM_KJI {}, parallelHostPolicy {} )
                                 , std::make_tuple( OMP_SIZE_3x3, std::integral_constant< int, 3 > {}, RAJA::PERM_IJ {}, RAJA::PERM_IJK {}, parallelHostPolicy {} )
@@ -97,7 +97,7 @@ int main( int argc, char * * argv )
   LVARRAY_LOG( "Serial number of 2x2 matrices = " << LvArray::benchmarking::SERIAL_SIZE_2x2 );
   LVARRAY_LOG( "Serial number of 3x3 matrices = " << LvArray::benchmarking::SERIAL_SIZE_3x3 );
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
   LVARRAY_LOG( "OMP number of 2x2 matrices = " << LvArray::benchmarking::OMP_SIZE_2x2 );
   LVARRAY_LOG( "OMP number of 3x3 matrices = " << LvArray::benchmarking::OMP_SIZE_3x3 );
 #endif
diff --git a/benchmarks/benchmarkEigendecompositionKernels.cpp b/benchmarks/benchmarkEigendecompositionKernels.cpp
@@ -41,7 +41,7 @@ template class Eigendecomposition< 2, RAJA::PERM_JI, RAJA::PERM_KJI, serialPolic
 template class Eigendecomposition< 3, RAJA::PERM_IJ, RAJA::PERM_IJK, serialPolicy >;
 template class Eigendecomposition< 3, RAJA::PERM_JI, RAJA::PERM_KJI, serialPolicy >;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 template class Eigendecomposition< 2, RAJA::PERM_IJ, RAJA::PERM_IJK, parallelHostPolicy >;
 template class Eigendecomposition< 2, RAJA::PERM_JI, RAJA::PERM_KJI, parallelHostPolicy >;
 template class Eigendecomposition< 3, RAJA::PERM_IJ, RAJA::PERM_IJK, parallelHostPolicy >;
diff --git a/benchmarks/benchmarkInnerProduct.cpp b/benchmarks/benchmarkInnerProduct.cpp
@@ -119,7 +119,7 @@ void pointerRAJA( benchmark::State & state )
 
 
 INDEX_TYPE const SERIAL_SIZE = (2 << 20) + 573;
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 INDEX_TYPE const OMP_SIZE = SERIAL_SIZE;
 #endif
 
@@ -153,7 +153,7 @@ void registerBenchmarks()
     REGISTER_BENCHMARK_TEMPLATE( { size }, pointerRAJA, POLICY );
   },
                                 std::make_tuple( SERIAL_SIZE, serialPolicy {} )
-  #if defined(LVARRAY_USE_OPENMP)
+  #if defined(RAJA_ENABLE_OPENMP)
                                 , std::make_tuple( OMP_SIZE, parallelHostPolicy {} )
   #endif
   #if defined(LVARRAY_USE_CUDA) && defined(LVARRAY_USE_CHAI)
@@ -178,7 +178,7 @@ int main( int argc, char * * argv )
 
   LVARRAY_LOG( "Serial problems of size ( " << LvArray::benchmarking::SERIAL_SIZE << " )." );
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
   LVARRAY_LOG( "OMP problems of size ( " << LvArray::benchmarking::OMP_SIZE << " )." );
 #endif
 
diff --git a/benchmarks/benchmarkInnerProductKernels.cpp b/benchmarks/benchmarkInnerProductKernels.cpp
@@ -109,7 +109,7 @@ pointerKernel( INDEX_TYPE const N,
 
 template class InnerProductRAJA< serialPolicy >;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 template class InnerProductRAJA< parallelHostPolicy >;
 #endif
 
diff --git a/benchmarks/benchmarkMatrixMatrix.cpp b/benchmarks/benchmarkMatrixMatrix.cpp
@@ -121,7 +121,7 @@ INDEX_TYPE const SERIAL_N = (2 << 8) + 73;
 INDEX_TYPE const SERIAL_L = (2 << 8) - 71;
 INDEX_TYPE const SERIAL_M = (2 << 8) - 3;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 INDEX_TYPE const OMP_N = 4 * SERIAL_N;
 INDEX_TYPE const OMP_L = 4 * SERIAL_L;
 INDEX_TYPE const OMP_M = 4 * SERIAL_M;
@@ -169,7 +169,7 @@ void registerBenchmarks()
   },
                                 std::make_tuple( SERIAL_N, SERIAL_L, SERIAL_M, RAJA::PERM_IJ {}, serialPolicy {} )
                                 , std::make_tuple( SERIAL_N, SERIAL_L, SERIAL_M, RAJA::PERM_JI {}, serialPolicy {} )
-  #if defined(LVARRAY_USE_OPENMP)
+  #if defined(RAJA_ENABLE_OPENMP)
                                 , std::make_tuple( OMP_N, OMP_L, OMP_M, RAJA::PERM_IJ {}, parallelHostPolicy {} )
                                 , std::make_tuple( OMP_N, OMP_L, OMP_M, RAJA::PERM_JI {}, parallelHostPolicy {} )
   #endif
@@ -196,7 +196,7 @@ int main( int argc, char * * argv )
   LVARRAY_LOG( "Serial problems of size ( " << LvArray::benchmarking::SERIAL_N << ", " <<
                LvArray::benchmarking::SERIAL_L << ", " << LvArray::benchmarking::SERIAL_M << " )." );
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
   LVARRAY_LOG( "OMP problems of size ( " << LvArray::benchmarking::OMP_N << ", " <<
                LvArray::benchmarking::OMP_L << ", " << LvArray::benchmarking::OMP_M << " )." );
 #endif
diff --git a/benchmarks/benchmarkMatrixMatrixKernels.cpp b/benchmarks/benchmarkMatrixMatrixKernels.cpp
@@ -204,7 +204,7 @@ template class MatrixMatrixNative< RAJA::PERM_JI >;
 template class MatrixMatrixRAJA< RAJA::PERM_IJ, serialPolicy >;
 template class MatrixMatrixRAJA< RAJA::PERM_JI, serialPolicy >;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 
 template class MatrixMatrixRAJA< RAJA::PERM_IJ, parallelHostPolicy >;
 template class MatrixMatrixRAJA< RAJA::PERM_JI, parallelHostPolicy >;
diff --git a/benchmarks/benchmarkMatrixVector.cpp b/benchmarks/benchmarkMatrixVector.cpp
@@ -161,7 +161,7 @@ void registerBenchmarks()
   },
                                 std::make_tuple( SERIAL_N, SERIAL_M, RAJA::PERM_IJ {}, serialPolicy {} )
                                 , std::make_tuple( SERIAL_N, SERIAL_M, RAJA::PERM_JI {}, serialPolicy {} )
-  #if defined(LVARRAY_USE_OPENMP)
+  #if defined(RAJA_ENABLE_OPENMP)
                                 , std::make_tuple( OMP_N, OMP_M, RAJA::PERM_IJ {}, parallelHostPolicy {} )
                                 , std::make_tuple( OMP_N, OMP_M, RAJA::PERM_JI {}, parallelHostPolicy {} )
   #endif
@@ -188,7 +188,7 @@ int main( int argc, char * * argv )
   LVARRAY_LOG( "Serial problems of size ( " << LvArray::benchmarking::SERIAL_N << ", " <<
                LvArray::benchmarking::SERIAL_M << " )." );
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
   LVARRAY_LOG( "OMP problems of size ( " << LvArray::benchmarking::OMP_N << ", " <<
                LvArray::benchmarking::OMP_M << " )." );
 #endif
diff --git a/benchmarks/benchmarkMatrixVectorKernels.cpp b/benchmarks/benchmarkMatrixVectorKernels.cpp
@@ -171,7 +171,7 @@ template class MatrixVectorNative< RAJA::PERM_JI >;
 template class MatrixVectorRAJA< RAJA::PERM_IJ, serialPolicy >;
 template class MatrixVectorRAJA< RAJA::PERM_JI, serialPolicy >;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 
 template class MatrixVectorRAJA< RAJA::PERM_IJ, parallelHostPolicy >;
 template class MatrixVectorRAJA< RAJA::PERM_JI, parallelHostPolicy >;
diff --git a/benchmarks/benchmarkOuterProduct.cpp b/benchmarks/benchmarkOuterProduct.cpp
@@ -120,7 +120,7 @@ void pointerRAJA( benchmark::State & state )
 INDEX_TYPE const SERIAL_N = (2 << 9) + 73;
 INDEX_TYPE const SERIAL_M = (2 << 9) - 71;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 INDEX_TYPE const OMP_N = (2 << 9) + 73;
 INDEX_TYPE const OMP_M = (2 << 9) - 71;
 #endif
@@ -165,7 +165,7 @@ void registerBenchmarks()
   },
                                 std::make_tuple( SERIAL_N, SERIAL_M, RAJA::PERM_IJ {}, serialPolicy {} )
                                 , std::make_tuple( SERIAL_N, SERIAL_M, RAJA::PERM_JI {}, serialPolicy {} )
-  #if defined(LVARRAY_USE_OPENMP)
+  #if defined(RAJA_ENABLE_OPENMP)
                                 , std::make_tuple( OMP_N, OMP_M, RAJA::PERM_IJ {}, parallelHostPolicy {} )
                                 , std::make_tuple( OMP_N, OMP_M, RAJA::PERM_JI {}, parallelHostPolicy {} )
   #endif
@@ -192,7 +192,7 @@ int main( int argc, char * * argv )
   LVARRAY_LOG( "Serial problems of size ( " << LvArray::benchmarking::SERIAL_N << ", " <<
                LvArray::benchmarking::SERIAL_M << " )." );
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
   LVARRAY_LOG( "OMP problems of size ( " << LvArray::benchmarking::OMP_N << ", " <<
                LvArray::benchmarking::OMP_M << " )." );
 #endif
diff --git a/benchmarks/benchmarkOuterProductKernels.cpp b/benchmarks/benchmarkOuterProductKernels.cpp
@@ -170,7 +170,7 @@ template class OuterProductNative< RAJA::PERM_JI >;
 template class OuterProductRAJA< RAJA::PERM_IJ, serialPolicy >;
 template class OuterProductRAJA< RAJA::PERM_JI, serialPolicy >;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 template class OuterProductRAJA< RAJA::PERM_IJ, parallelHostPolicy >;
 template class OuterProductRAJA< RAJA::PERM_JI, parallelHostPolicy >;
 #endif
diff --git a/benchmarks/benchmarkReduce.cpp b/benchmarks/benchmarkReduce.cpp
@@ -117,7 +117,7 @@ void pointerRAJA( benchmark::State & state )
 }
 
 INDEX_TYPE const SERIAL_SIZE = (2 << 20) + 573;
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 INDEX_TYPE const OMP_SIZE = SERIAL_SIZE;
 #endif
 #if defined(LVARRAY_USE_CUDA) && defined(LVARRAY_USE_CHAI)
@@ -149,7 +149,7 @@ void registerBenchmarks()
     REGISTER_BENCHMARK_TEMPLATE( { size }, pointerRAJA, POLICY );
   },
                                 std::make_tuple( SERIAL_SIZE, serialPolicy {} )
-  #if defined(LVARRAY_USE_OPENMP)
+  #if defined(RAJA_ENABLE_OPENMP)
                                 , std::make_tuple( OMP_SIZE, parallelHostPolicy {} )
   #endif
   #if defined(LVARRAY_USE_CUDA) && defined(LVARRAY_USE_CHAI)
@@ -175,7 +175,7 @@ int main( int argc, char * * argv )
 
   LVARRAY_LOG( "Serial problems of size ( " << LvArray::benchmarking::SERIAL_SIZE << " )." );
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
   LVARRAY_LOG( "OMP problems of size ( " << LvArray::benchmarking::OMP_SIZE << " )." );
 #endif
 
diff --git a/benchmarks/benchmarkReduceKernels.cpp b/benchmarks/benchmarkReduceKernels.cpp
@@ -81,7 +81,7 @@ VALUE_TYPE ReduceRAJA< POLICY >::pointerKernel( VALUE_TYPE const * const LVARRAY
 
 template class ReduceRAJA< serialPolicy >;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 template class ReduceRAJA< parallelHostPolicy >;
 #endif
 
diff --git a/benchmarks/benchmarkSparsityGeneration.cpp b/benchmarks/benchmarkSparsityGeneration.cpp
@@ -80,7 +80,7 @@ void addToRow( benchmark::State & state )
 
 int const SERIAL_SIZE = 100;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 int const OMP_SIZE = 100;
 #endif
 
@@ -105,7 +105,7 @@ void registerBenchmarks()
     REGISTER_BENCHMARK_TEMPLATE( WRAP( { size, size, size } ), nodeLoopPreallocatedRAJA, POLICY );
   },
                                 std::make_tuple( SERIAL_SIZE, serialPolicy {} )
-  #if defined(LVARRAY_USE_OPENMP)
+  #if defined(RAJA_ENABLE_OPENMP)
                                 , std::make_tuple( OMP_SIZE, parallelHostPolicy {} )
   #endif
   #if defined(LVARRAY_USE_CUDA) && defined(LVARRAY_USE_CHAI)
@@ -121,7 +121,7 @@ void registerBenchmarks()
     REGISTER_BENCHMARK_TEMPLATE( WRAP( { size, size, size } ), addToRow, POLICY );
   },
                                 std::make_tuple( SERIAL_SIZE, serialPolicy {} )
-  #if defined(LVARRAY_USE_OPENMP)
+  #if defined(RAJA_ENABLE_OPENMP)
                                 , std::make_tuple( OMP_SIZE, parallelHostPolicy {} )
   #endif
   #if defined(LVARRAY_USE_CUDA) && defined(LVARRAY_USE_CHAI)
@@ -146,7 +146,7 @@ int main( int argc, char * * argv )
   LvArray::benchmarking::INDEX_TYPE size = std::pow( LvArray::benchmarking::SERIAL_SIZE, 3 );
   LVARRAY_LOG( "Serial problems of size ( " << size << " )." );
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
   size = std::pow( LvArray::benchmarking::OMP_SIZE, 3 );
   LVARRAY_LOG( "OMP problems of size ( " << size << " )." );
 #endif
diff --git a/benchmarks/benchmarkSparsityGenerationKernels.cpp b/benchmarks/benchmarkSparsityGenerationKernels.cpp
@@ -140,7 +140,7 @@ resizeExact()
   CALI_CXX_MARK_SCOPE( "resizeExact" );
   std::vector< INDEX_TYPE > nnzPerRow( 3 * m_numNodes );
 
-  #if defined(LVARRAY_USE_OPENMP)
+  #if defined(RAJA_ENABLE_OPENMP)
   using RESIZE_POLICY = std::conditional_t< std::is_same< serialPolicy, POLICY >::value, serialPolicy, parallelHostPolicy >;
   #else
   using RESIZE_POLICY = serialPolicy;
@@ -235,7 +235,7 @@ addKernel( CRSMatrixViewConstSizesT const & matrix,
 template class SparsityGenerationRAJA< serialPolicy >;
 template class CRSMatrixAddToRow< serialPolicy >;
 
-#if defined(LVARRAY_USE_OPENMP)
+#if defined(RAJA_ENABLE_OPENMP)
 template class SparsityGenerationRAJA< parallelHostPolicy >;
 template class CRSMatrixAddToRow< parallelHostPolicy >;
 #endif
diff --git a/benchmarks/benchmarkSparsityGenerationKernels.hpp b/benchmarks/benchmarkSparsityGenerationKernels.hpp
@@ -117,7 +117,7 @@ class SparsityGenerationNative
     /// Iterate over all the nodes.
     m_sparsity.move( MemorySpace::CPU );
 
-    #if defined(LVARRAY_USE_OPENMP)
+    #if defined(RAJA_ENABLE_OPENMP)
     using EXEC_POLICY = parallelHostPolicy;
     #else
     using EXEC_POLICY = serialPolicy;
@@ -233,7 +233,7 @@ class CRSMatrixAddToRow : public SparsityGenerationRAJA< POLICY >
   {
     this->resizeExact();
 
-    #if defined(LVARRAY_USE_OPENMP)
+    #if defined(RAJA_ENABLE_OPENMP)
     using EXEC_POLICY = parallelHostPolicy;
     #else
     using EXEC_POLICY = serialPolicy;
@@ -258,7 +258,7 @@ class CRSMatrixAddToRow : public SparsityGenerationRAJA< POLICY >
     m_matrix.move( MemorySpace::CPU, false );
     this->m_nodeToElemMap.move( MemorySpace::CPU, false );
 
-    #if defined(LVARRAY_USE_OPENMP)
+    #if defined(RAJA_ENABLE_OPENMP)
     using EXEC_POLICY = parallelHostPolicy;
     #else
     using EXEC_POLICY = serialPolicy;
diff --git a/cmake/Config.cmake b/cmake/Config.cmake
@@ -3,7 +3,6 @@ set( PREPROCESSOR_DEFINES CHAI
                           CUDA
                           MPI
                           TOTALVIEW_OUTPUT
-                          OPENMP
                           CALIPER )
 
 set( USE_CONFIGFILE ON CACHE BOOL "" )
@@ -25,7 +24,7 @@ if( USE_ADDR2LINE )
     set( LVARRAY_ADDR2LINE_EXEC ${ADDR2LINE_EXEC} )
 endif()
 
-if( DEFINED LVARRAY_BOUNDS_CHECK )
+if( LVARRAY_BOUNDS_CHECK )
     message( STATUS "LvArray bounds checking enabled." )
 else()
     message( STATUS "LvArray bounds checking disabled." )
diff --git a/examples/exampleArrayOfArrays.cpp b/examples/exampleArrayOfArrays.cpp
diff --git a/examples/exampleSparsityPatternAndCRSMatrix.cpp b/examples/exampleSparsityPatternAndCRSMatrix.cpp
diff --git a/src/LvArrayConfig.hpp.in b/src/LvArrayConfig.hpp.in
diff --git a/unitTests/testArrayOfArrays.cpp b/unitTests/testArrayOfArrays.cpp
diff --git a/unitTests/testArrayOfSets.cpp b/unitTests/testArrayOfSets.cpp
diff --git a/unitTests/testCRSMatrix.cpp b/unitTests/testCRSMatrix.cpp
diff --git a/unitTests/testSparsityPattern.cpp b/unitTests/testSparsityPattern.cpp
diff --git a/unitTests/testStackTrace.cpp b/unitTests/testStackTrace.cpp
diff --git a/unitTests/testUtils.hpp b/unitTests/testUtils.hpp

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class NaiveNodeToElemMapConstruction`
`49`	`49`	`{`
`50`	`50`	`CALI_CXX_MARK_SCOPE( "~NaiveNodeToElemMapConstruction" );`
`51`	`51`
`52`		`- // #if defined(LVARRAY_USE_OPENMP)`
	`52`	`+ // #if defined(RAJA_ENABLE_OPENMP)`
`53`	`53`	`// using EXEC_POLICY = parallelHostPolicy;`
`54`	`54`	`// #else`
`55`	`55`	`using EXEC_POLICY = serialPolicy;`