Merge pull request #30 from LLNL/tpl/bramwell/update_axom

Updating axom to 0.8.1
LLNL · Nov 3, 2023 · 892d27d · 892d27d
2 parents 07a71df + 9363ca9
commit 892d27d
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 282 deletions.
diff --git a/.gitlab/build_quartz.yml b/.gitlab/build_quartz.yml
@@ -20,9 +20,6 @@
     - when: on_success
   before_script:
     - module load python/3.9.12
-    # We could also extract the CMake executable location from the hostconfig in common_build_functions
-    # like we do in config-build
-    - module load cmake/3.19.2
 
 
 ####

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -4,9 +4,8 @@
 # SPDX-License-Identifier: (MIT)
 
 variables:
-  Clang_10_ImageName: 'seracllnl/tpls:clang-10_05-03-23_16h-04m'
-  GCC_9_ImageName: 'seracllnl/tpls:gcc-9_05-03-23_16h-04m'
-  GCC_11_ImageName: 'seracllnl/tpls:gcc-11_05-03-23_16h-04m'
+  Clang_10_ImageName: 'seracllnl/tpls:clang-10_09-15-23_19h-06m'
+  GCC_11_ImageName: 'seracllnl/tpls:gcc-11_09-15-23_19h-06m'
   HOME_DIR: '/home/serac'
   BASE_CMAKE_OPTS: '-UUMPIRE_DIR'
 
@@ -35,20 +34,6 @@ jobs:
           HOST_CONFIG: '[email protected]'
           BUILD_TYPE: 'Release'
           BUILD_REDECOMP: 'On'
-      linux_gcc9_debug:
-          VM_ImageName: 'ubuntu-20.04'
-          Compiler_ImageName: $(GCC_9_ImageName)
-          TEST_TARGET: 'linux_gcc9'
-          HOST_CONFIG: '[email protected]'
-          BUILD_TYPE: 'Debug'
-          BUILD_REDECOMP: 'On'
-      linux_gcc9_release:
-          VM_ImageName: 'ubuntu-20.04'
-          Compiler_ImageName: $(GCC_9_ImageName)
-          TEST_TARGET: 'linux_gcc9'
-          HOST_CONFIG: '[email protected]'
-          BUILD_TYPE: 'Release'
-          BUILD_REDECOMP: 'On'
       linux_clang10_debug:
           VM_ImageName: 'ubuntu-20.04'
           Compiler_ImageName: $(Clang_10_ImageName)

diff --git a/cmake/SetupThirdParty.cmake b/cmake/SetupThirdParty.cmake
@@ -79,6 +79,39 @@ else()
     message(STATUS "Shroud support is OFF")
 endif()
 
+#---------------------------------------------------------------------------
+# Remove non-existant INTERFACE_INCLUDE_DIRECTORIES from imported targets
+# to work around CMake error
+#---------------------------------------------------------------------------
+set(_imported_targets
+    axom
+    axom::mfem
+    conduit
+    conduit::conduit_mpi
+    conduit::conduit
+    conduit_relay_mpi
+    conduit_relay_mpi_io
+    conduit_blueprint
+    conduit_blueprint_mpi)
+
+foreach(_target ${_imported_targets})
+    if(TARGET ${_target})
+        message(STATUS "Removing non-existant include directories from target[${_target}]")
+
+        get_target_property(_dirs ${_target} INTERFACE_INCLUDE_DIRECTORIES)
+        set(_existing_dirs)
+        foreach(_dir ${_dirs})
+            if (EXISTS "${_dir}")
+                list(APPEND _existing_dirs "${_dir}")
+            endif()
+        endforeach()
+        if (_existing_dirs)
+            set_target_properties(${_target} PROPERTIES
+                                  INTERFACE_INCLUDE_DIRECTORIES "${_existing_dirs}" )
+        endif()
+    endif()
+endforeach()
+
 # export tribol-targets
 foreach(dep ${TPL_DEPS})
   # If the target is EXPORTABLE, add it to the export set

diff --git a/cmake/thirdparty/SetupMFEM.cmake b/cmake/thirdparty/SetupMFEM.cmake
@@ -116,19 +116,23 @@ else()
         list(APPEND MFEM_LIBRARIES ${CUDA_cusolver_LIBRARY})
     endif()
 
-    # Tribol edit
-    if(TRIBOL_USE_MPI)
-        list(APPEND MFEM_LIBRARIES mpi)
-    endif()
-    # End Tribol edit
-
     blt_import_library(
         NAME          mfem
         INCLUDES      ${MFEM_INCLUDE_DIRS}
         LIBRARIES     ${MFEM_LIBRARIES}
         TREAT_INCLUDES_AS_SYSTEM ON
         EXPORTABLE    ON)
 
+    # Tribol edit
+    if(TRIBOL_USE_MPI)
+        # Note: -lmpifort is being added to MFEM's link line w/o a -L<mpi lib dir>
+        list(GET MPI_C_LIBRARIES 0 _first_mpi_lib)
+        get_filename_component(_mpi_lib_dir ${_first_mpi_lib} DIRECTORY)
+        target_link_directories(mfem INTERFACE ${_mpi_lib_dir})
+        target_link_libraries(mfem INTERFACE mpi)
+    endif()
+    # End Tribol edit
+
 endif()
 
 include(FindPackageHandleStandardArgs)

diff --git a/host-configs/docker/[email protected] b/host-configs/docker/[email protected]
@@ -7,7 +7,7 @@
 #------------------------------------------------------------------------------
 # Compilers
 #------------------------------------------------------------------------------
-# Compiler Spec: [email protected]
+# Compiler Spec: clang@=10.0.0
 #------------------------------------------------------------------------------
 if(DEFINED ENV{SPACK_CC})
 
@@ -57,43 +57,13 @@ set(ENABLE_OPENMP ON CACHE BOOL "")
 # TPLs
 #------------------------------------------------------------------------------
 
-set(TPL_ROOT "/home/serac/serac_tpls/spack/opt/spack/linux-ubuntu20.04-x86_64/clang-10.0.0" CACHE PATH "")
+set(TPL_ROOT "/home/serac/serac_tpls/clang-10.0.0" CACHE PATH "")
 
-set(AXOM_DIR "${TPL_ROOT}/axom-0.7.0.4-hqaa4pjjxgb2zdgvl2qbxwu3hpsc7nj3" CACHE PATH "")
+set(AXOM_DIR "${TPL_ROOT}/axom-0.8.1.0-pfm6pcjjjjur4ys74nfrkiin5qjz7gxa" CACHE PATH "")
 
-set(CAMP_DIR "${TPL_ROOT}/camp-2022.03.2-b6xee5bpmcsz4hsol5jlyno3flpkz6dl" CACHE PATH "")
+set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.3.2-wvzqfklkvfkh4faebcahrfptplavpmm4" CACHE PATH "")
 
-set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.4-zv6xy6cbwx5a5kihp5nke4sf2timhx5v" CACHE PATH "")
-
-set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-yeupc2nzcvymqyhsk2golb62xmifrngf" CACHE PATH "")
-
-set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.3.1-dortdprcnkw2xlrqfzdwftmtv2w4en6r" CACHE PATH "")
-
-set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.21-vcmtagoc73loxfo7v5yx3s5valxs25a7" CACHE PATH "")
-
-set(HYPRE_DIR "${TPL_ROOT}/hypre-2.26.0-kjw2n2isumk2oy6x3ijqesyeo6owonoc" CACHE PATH "")
-
-set(METIS_DIR "${TPL_ROOT}/metis-5.1.0-3y32pg5dmreczdq66bcbamfcnp3ww5hv" CACHE PATH "")
-
-set(PARMETIS_DIR "${TPL_ROOT}/parmetis-4.0.3-xtbolsa5oxhwgytczn65znrurp3ruq37" CACHE PATH "")
-
-set(NETCDF_DIR "${TPL_ROOT}/netcdf-c-4.7.4-cfipo6y3k4j5ch3nujmtgwxdjipvhabj" CACHE PATH "")
-
-set(SUPERLUDIST_DIR "${TPL_ROOT}/superlu-dist-6.1.1-ns7ssxwxmuva2cm4fnq5rhtylo6jrydt" CACHE PATH "")
-
-# ADIAK not built
-
-# AMGX not built
-
-# CALIPER not built
-
-# PETSC not built
-
-set(RAJA_DIR "${TPL_ROOT}/raja-2022.03.0-gvquqeduwans5kcq5ngysvjwrx3q7jrq" CACHE PATH "")
-
-set(SUNDIALS_DIR "${TPL_ROOT}/sundials-6.4.1-gzb3udgkn74t62ropfu5kuwz275ezkh2" CACHE PATH "")
-
-set(UMPIRE_DIR "${TPL_ROOT}/umpire-2022.03.1-5u3fkkj6euykttrc5usvncfcnhbhofud" CACHE PATH "")
+set(UMPIRE_DIR "${TPL_ROOT}/umpire-2022.10.0-gxgf2myilijp7pjcuqg5s7pw5xjlgffo" CACHE PATH "")
 
 #------------------------------------------------------------------------------
 # Devtools

diff --git a/host-configs/docker/[email protected] b/host-configs/docker/[email protected]
@@ -7,7 +7,7 @@
 #------------------------------------------------------------------------------
 # Compilers
 #------------------------------------------------------------------------------
-# Compiler Spec: [email protected]
+# Compiler Spec: gcc@=11.1.0
 #------------------------------------------------------------------------------
 if(DEFINED ENV{SPACK_CC})
 
@@ -57,43 +57,13 @@ set(ENABLE_OPENMP ON CACHE BOOL "")
 # TPLs
 #------------------------------------------------------------------------------
 
-set(TPL_ROOT "/home/serac/serac_tpls/spack/opt/spack/linux-ubuntu20.04-x86_64/gcc-11.1.0" CACHE PATH "")
+set(TPL_ROOT "/home/serac/serac_tpls/gcc-11.1.0" CACHE PATH "")
 
-set(AXOM_DIR "${TPL_ROOT}/axom-0.7.0.4-33xg6frnn45dotxii4dp4yrf4biwszj6" CACHE PATH "")
+set(AXOM_DIR "${TPL_ROOT}/axom-0.8.1.0-3jpnrqhyzdlyoif3ule5e2mwmnhity3a" CACHE PATH "")
 
-set(CAMP_DIR "${TPL_ROOT}/camp-2022.03.2-ohurb75ad54wfzq3l5lmf65ffkhnznl5" CACHE PATH "")
+set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.3.2-hfxy63gysonhbmjk6hxkccm53pb5seoi" CACHE PATH "")
 
-set(CONDUIT_DIR "${TPL_ROOT}/conduit-0.8.4-j3bceitn6x3sog5cc3jk6goqf4hhlgre" CACHE PATH "")
-
-set(LUA_DIR "${TPL_ROOT}/lua-5.4.4-q5dw7ka7j6u2kpfi3x3ozcwzzxqhnaal" CACHE PATH "")
-
-set(MFEM_DIR "${TPL_ROOT}/mfem-4.5.3.1-skfy5vyem23ypequsahwxcnp4oot6ik7" CACHE PATH "")
-
-set(HDF5_DIR "${TPL_ROOT}/hdf5-1.8.21-d3camibwwxhdwxrtxtpctsg5ca7we2lt" CACHE PATH "")
-
-set(HYPRE_DIR "${TPL_ROOT}/hypre-2.26.0-mxuoe2zcgowngj5zwgc2p357fhv5w2ip" CACHE PATH "")
-
-set(METIS_DIR "${TPL_ROOT}/metis-5.1.0-dbsfmadsyxh2wyuxcjfw2ayl6wkjyqys" CACHE PATH "")
-
-set(PARMETIS_DIR "${TPL_ROOT}/parmetis-4.0.3-5v6nhjdlcgw77r4b47dihkorudhkvifz" CACHE PATH "")
-
-set(NETCDF_DIR "${TPL_ROOT}/netcdf-c-4.7.4-3cxpbpolyem33vxxaigyyrfib43xeizq" CACHE PATH "")
-
-set(SUPERLUDIST_DIR "${TPL_ROOT}/superlu-dist-6.1.1-ee7vk6tgqs3bz2vi7ltnt4v23wxl7hxd" CACHE PATH "")
-
-# ADIAK not built
-
-# AMGX not built
-
-# CALIPER not built
-
-# PETSC not built
-
-set(RAJA_DIR "${TPL_ROOT}/raja-2022.03.0-2yhqffl4bfzmjxf32fctkufqlypcwp6i" CACHE PATH "")
-
-set(SUNDIALS_DIR "${TPL_ROOT}/sundials-6.4.1-o37lx2uvocyaylvkssrxlxougfjj45qd" CACHE PATH "")
-
-set(UMPIRE_DIR "${TPL_ROOT}/umpire-2022.03.1-ag7belgtp5n3dqka6njiq2xjhydu3h6a" CACHE PATH "")
+set(UMPIRE_DIR "${TPL_ROOT}/umpire-2022.10.0-epwggxb4tgwrfhzjpwpkxdcyg4y6cf7v" CACHE PATH "")
 
 #------------------------------------------------------------------------------
 # Devtools

diff --git a/host-configs/docker/[email protected] b/host-configs/docker/[email protected]
diff --git a/host-configs/[email protected] b/host-configs/[email protected]
diff --git a/host-configs/[email protected] b/host-configs/[email protected]
diff --git a/host-configs/[email protected] b/host-configs/[email protected]