Merge pull request #78 from LLNL/feature/zagaris2/fix-openmp-detection

Fix openmp detection + minor build improvements

RELEASE-NOTES.md

@@ -16,6 +16,10 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
 ### Deprecated
 
 ### Changed
+- AXOM_USE_OPENMP is now being set at configure time accordingly instead of
+  auto-detected based on whether "_OPENMP" is passed by the compiler. This
+  fixes issues where a host code would compile Axom w/out OpenMP, but, use
+  Axom in parts of the code where OpenMP is enabled. 
 
 ### Fixed
 

src/axom/config.hpp.in

@@ -47,7 +47,6 @@
  */
 #cmakedefine USE_C_LOC_WITH_ASSUMED_SHAPE
 
-
 /*
  * Compiler defines for libraries (built-in and third party)
  */
@@ -58,22 +57,12 @@
 #cmakedefine AXOM_USE_MFEM
 #cmakedefine AXOM_USE_MPI
 #cmakedefine AXOM_USE_MPIF_HEADER
+#cmakedefine AXOM_USE_OPENMP
 #cmakedefine AXOM_USE_RAJA
 #cmakedefine AXOM_USE_SCR
 #cmakedefine AXOM_USE_SPARSEHASH
 #cmakedefine AXOM_USE_UMPIRE
 
-/*
- * OpenMP is a special case since it varies by target and the compiler
- * provides its own definition. For consistency, the project exposes
- * and uses this through its own AXOM_USE define.
- */
-#ifdef _OPENMP
-#define AXOM_USE_OPENMP
-#else
-#undef AXOM_USE_OPENMP
-#endif
-
 
 /*
  * We need to explicitly add some definitions on Windows

src/axom/core/tests/CMakeLists.txt

@@ -11,7 +11,7 @@ set(gtest_utils_tests
    core_array.cpp
    core_memory_management.cpp
    core_stack_array.cpp
-   
+
    utils_TaskTimer.cpp
    utils_endianness.cpp
    utils_fileUtilities.cpp
@@ -62,27 +62,27 @@ endforeach()
 # Add MPI tests if MPI is enabled
 #
 if ( ENABLE_MPI )
-  
+
   set( core_mpi_tests
        core_types.cpp
        )
-       
+
   foreach( mpitest ${core_mpi_tests} )
-    
+
     get_filename_component( mpitest_name ${mpitest} NAME_WE )
-    
+
     blt_add_executable( NAME ${mpitest_name}_test
-                        SOURCES ${mpitest} 
+                        SOURCES ${mpitest}
                         OUTPUT_DIR ${TEST_OUTPUT_DIRECTORY}
-                        DEPENDS_ON ${utils_tests_depends} mpi 
+                        DEPENDS_ON ${utils_tests_depends} mpi
                         FOLDER axom/core/tests )
-                        
-    blt_add_test( NAME ${mpitest_name} 
-                  COMMAND ${mpitest_name}_test 
+
+    blt_add_test( NAME ${mpitest_name}
+                  COMMAND ${mpitest_name}_test
                   NUM_MPI_TASKS 1 )
-                  
+
   endforeach()
-   
+
 endif()
 
 #
@@ -91,6 +91,7 @@ endif()
 set(utils_config_test_depends ${utils_tests_depends})
 
 blt_list_append( TO utils_config_test_depends ELEMENTS mfem IF ${MFEM_FOUND} )
+blt_list_append( TO utils_config_test_depends ELEMENTS openmp IF ${ENABLE_OPENMP} )
 
 blt_add_executable( NAME utils_config_test
                     SOURCES utils_config.cpp
@@ -111,24 +112,3 @@ if(MFEM_FOUND)
         APPEND_STRING PROPERTY COMPILE_FLAGS "${AXOM_DISABLE_UNUSED_PARAMETER_WARNINGS}")
 endif()
 
-
-if(ENABLE_OPENMP)
-    # Add a config test that uses OpenMP
-    blt_add_executable( NAME utils_config_openmp_test
-                        SOURCES utils_config.cpp
-                        OUTPUT_DIR ${TEST_OUTPUT_DIRECTORY}
-                        DEPENDS_ON ${utils_config_test_depends} openmp
-                        FOLDER axom/core/tests )
-
-    blt_add_test( NAME utils_config_openmp
-                  COMMAND utils_config_openmp_test )
-
-    if(MFEM_FOUND)
-        set_property(TARGET utils_config_openmp_test
-            APPEND_STRING PROPERTY COMPILE_FLAGS "${AXOM_DISABLE_UNUSED_PARAMETER_WARNINGS}")
-    endif()
-
-endif()
-
-
-

src/cmake/AxomConfig.cmake

@@ -14,7 +14,7 @@ message(STATUS "Configuring Axom version ${AXOM_VERSION_FULL}")
 ## Add a definition to the generated config file for each library dependency
 ## (optional and built-in) that we might need to know about in the code. We
 ## check for vars of the form <DEP>_FOUND or ENABLE_<DEP>
-set(TPL_DEPS CONDUIT CUDA FMT HDF5 MFEM MPI RAJA SCR SPARSEHASH UMPIRE )
+set(TPL_DEPS CONDUIT CUDA FMT HDF5 MFEM MPI RAJA SCR SPARSEHASH UMPIRE OPENMP )
 foreach(dep ${TPL_DEPS})
     if( ${dep}_FOUND OR ENABLE_${dep} )
         set(AXOM_USE_${dep} TRUE  )

src/cmake/AxomMacros.cmake

@@ -67,8 +67,8 @@ endmacro(axom_add_code_checks)
 ## (ON/OFF). This macro also adds an "option" so that the user can control,
 ## which components to build.
 ##------------------------------------------------------------------------------
-set(AXOM_COMPONENTS_FULL    CACHE LIST "List of all components in Axom" FORCE)
-set(AXOM_COMPONENTS_ENABLED CACHE LIST "List of all enabled components in Axom" FORCE)
+set(AXOM_COMPONENTS_FULL    CACHE STRING "List of all components in Axom" FORCE)
+set(AXOM_COMPONENTS_ENABLED CACHE STRING "List of all enabled components in Axom" FORCE)
 macro(axom_add_component)
 
     set(options)
@@ -90,11 +90,11 @@ macro(axom_add_component)
             ${arg_DEFAULT_STATE})
 
     set(AXOM_COMPONENTS_FULL ${AXOM_COMPONENTS_FULL} ${COMPONENT_NAME_LOWERED}
-        CACHE LIST "List of all components in Axom" FORCE)
+        CACHE STRING "List of all components in Axom" FORCE)
 
     if ( AXOM_ENABLE_${COMPONENT_NAME_CAPITALIZED} )
         set(AXOM_COMPONENTS_ENABLED ${AXOM_COMPONENTS_ENABLED} ${COMPONENT_NAME_LOWERED}
-            CACHE LIST "List of all enabled components in Axom" FORCE)
+            CACHE STRING "List of all enabled components in Axom" FORCE)
         add_subdirectory( ${arg_COMPONENT_NAME} )
     endif()
 
@@ -118,13 +118,13 @@ endmacro()
 
 ##------------------------------------------------------------------------------
 ## axom_check_code_compiles
-## 
+##
 ## This macro checks if a snippet of C++ code compiles.
 ##
-## SOURCE_STRING The source snippet to compile. 
+## SOURCE_STRING The source snippet to compile.
 ## Must be a valid C++ program with a main() function.
-## Note: This parameter should be passed in as a quoted string variable. Otherwise, 
-## cmake will convert the string into a list and lose the semicolons.  
+## Note: This parameter should be passed in as a quoted string variable. Otherwise,
+## cmake will convert the string into a list and lose the semicolons.
 ## E.g. axom_check_code_compiles(SOURCE_STRING "${str_var}" ...)
 ##
 ## CODE_COMPILES A boolean variable the contains the compilation result.
@@ -147,11 +147,11 @@ macro(axom_check_code_compiles)
     endif()
     if(NOT DEFINED arg_CODE_COMPILES)
         message(FATAL_ERROR "[axom_check_code_compiles] 'CODE_COMPILES' is a required parameter")
-    endif()    
+    endif()
 
     if(NOT DEFINED arg_VERBOSE_OUTPUT)
         set(arg_VERBOSE_OUTPUT FALSE)
-    endif()    
+    endif()
 
     if(${arg_VERBOSE_OUTPUT})
         message(STATUS "[axom_check_code_compiles] Attempting to compile source string: \n${arg_SOURCE_STRING}")
@@ -162,7 +162,7 @@ macro(axom_check_code_compiles)
     set(_fname ${CMAKE_CURRENT_BINARY_DIR}/_axomCheckCompiles${_rand}.cpp)
     file(WRITE ${_fname} "${arg_SOURCE_STRING}")
     try_compile(${arg_CODE_COMPILES}
-                ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp      
+                ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp
                 SOURCES ${_fname}
                 CXX_STANDARD ${CMAKE_CXX_STANDARD}
                 OUTPUT_VARIABLE _res)
@@ -171,11 +171,11 @@ macro(axom_check_code_compiles)
     if(${arg_VERBOSE_OUTPUT})
         message(STATUS "[axom_check_code_compiles] Compiler output: \n${_res}\n")
 
-        if(${arg_CODE_COMPILES})        
+        if(${arg_CODE_COMPILES})
             message(STATUS "[axom_check_code_compiles] The code snippet successfully compiled")
         else()
             message(STATUS "[axom_check_code_compiles] The code snippet failed to compile")
-        endif()        
+        endif()
     endif()
 
     # clear the variables set within the macro
@@ -187,7 +187,7 @@ endmacro(axom_check_code_compiles)
 
 ##------------------------------------------------------------------------------
 ## axom_component_requires
-## 
+##
 ## This macro checks for the required dependencies of the given component
 ##
 ## NAME - The name of the component that we are checking the dependencies of
@@ -224,7 +224,7 @@ endmacro(axom_component_requires)
 
 ##------------------------------------------------------------------------------
 ## axom_install_component
-## 
+##
 ## This macro installs libraries, fortran modules, headers, and exports the CMake
 ## target while preserving the directory stucture.  This macro assumes the following:
 ##
@@ -264,7 +264,7 @@ endmacro(axom_install_component)
 
 ##------------------------------------------------------------------------------
 ## axom_write_unified_header
-## 
+##
 ## This macro writes the unified header (axom/<lowered NAME>.hpp) to the build directory for the
 ## given component NAME with the given HEADERS included inside of it.
 ##
@@ -289,7 +289,7 @@ macro(axom_write_unified_header)
 
     file(WRITE ${_header} "\/\/ Copyright (c) 2017-2019, Lawrence Livermore National Security, LLC and
 \/\/ other Axom Project Developers. See the top-level COPYRIGHT file for details.
-\/\/ 
+\/\/
 \/\/ SPDX-License-Identifier: (BSD-3-Clause)
 \n
 ")
@@ -301,7 +301,7 @@ macro(axom_write_unified_header)
 
     foreach(_file ${arg_HEADERS})
         set(_headerPath "axom\/${_lcname}\/${_file}")
-        
+
         if(${_file} IN_LIST arg_EXCLUDE)
             continue()
         elseif(${_headerPath} MATCHES "(\/detail\/)|(\/internal\/)")