Update axom. conduit, mfem, and raja. (#1)

liyangrock · Jun 6, 2024 · 58cfad7 · 58cfad7
1 parent c7e95a1
commit 58cfad7
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -235,7 +235,7 @@ list(APPEND build_list hdf5 )
 # Conduit
 ################################
 set(CONDUIT_DIR "${CMAKE_INSTALL_PREFIX}/conduit")
-set(CONDUIT_URL "${TPL_MIRROR_DIR}/conduit-0.8.2.tar.gz")
+set(CONDUIT_URL "${TPL_MIRROR_DIR}/conduit-v0.9.2.tar.gz")
 message(STATUS "Building Conduit found at ${CONDUIT_URL}")
 
 if( ${ENABLE_MPI} )
@@ -282,7 +282,7 @@ ExternalProject_Add( conduit
                                 -D CMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
                                 -D BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
                                 -D CMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
-                                -D BLT_CXX_STD:STRING=c++11
+                                -D BLT_CXX_STD:STRING=c++14
                                 )
 
 list(APPEND build_list conduit )
@@ -334,7 +334,7 @@ list(APPEND build_list silo )
 
 
 set(RAJA_DIR "${CMAKE_INSTALL_PREFIX}/raja")
-set(RAJA_URL "${TPL_MIRROR_DIR}/RAJA-v2023.06.1.tar.gz")
+set(RAJA_URL "${TPL_MIRROR_DIR}/RAJA-v2024.02.1.tar.gz")
 
 
 message(STATUS "Building RAJA found at ${RAJA_URL}")
@@ -1304,7 +1304,7 @@ endif()
 # MFEM
 ################################
 set(MFEM_DIR "${CMAKE_INSTALL_PREFIX}/mfem")
-set(MFEM_URL "${TPL_MIRROR_DIR}/mfem-4.5.tar.gz")
+set(MFEM_URL "${TPL_MIRROR_DIR}/mfem-4.7.tar.gz")
 message(STATUS "Building MFEM found at ${MFEM_URL}")
 
 if( ENABLE_MPI )
@@ -1387,7 +1387,7 @@ list(APPEND build_list lua )
 # AXOM
 ################################
 set(AXOM_DIR "${CMAKE_INSTALL_PREFIX}/axom")
-set(AXOM_URL "${TPL_MIRROR_DIR}/Axom-v0.8.0.zip")
+set(AXOM_URL "${TPL_MIRROR_DIR}/Axom-v0.9.0.tar.gz")
 message(STATUS "Building AXOM found at ${AXOM_URL}")
 
 if( ENABLE_MPI )
@@ -1405,14 +1405,15 @@ if( ENABLE_CUDA )
 endif( ENABLE_CUDA )
 
 if( CMAKE_BUILD_TYPE MATCHES Release )
-    set(AXOM_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-cast-function-type -Wno-cast-qual -Wno-shadow")
+    set(AXOM_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-cast-function-type -Wno-cast-qual -Wno-shadow -Wno-maybe-uninitialized -Wno-array-bounds -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-alloc-size-larger-than")
 endif()
 
 ExternalProject_Add( axom
                      PREFIX ${PROJECT_BINARY_DIR}/axom
                      URL ${AXOM_URL}
                      SOURCE_SUBDIR "src"
-                     INSTALL_DIR ${AXOM_DIR}
+                     INSTALL_DIR ${AXOM_DIR}                     
+                     PATCH_COMMAND patch -p0 < ${TPL_MIRROR_DIR}/Axom-v0.9.0.patch
                      DEPENDS ${AXOM_DEPENDS}
                      BUILD_COMMAND ${TPL_BUILD_COMMAND}
                      INSTALL_COMMAND ${TPL_INSTALL_COMMAND}

diff --git a/tplMirror/Axom-v0.9.0.patch b/tplMirror/Axom-v0.9.0.patch
@@ -0,0 +1,11 @@
+--- src/axom/spin/policy/UniformGridStorage.hpp	2024-03-21 04:56:04.000000000 +0800
++++ src/axom/spin/policy/UniformGridStorage1.hpp	2024-06-05 14:40:48.893407600 +0800
+@@ -73,7 +73,7 @@
+     {
+       m_bins.emplace_back(binSizes[i], binSizes[i], m_allocatorID);
+     }
+-  };
++  }
+
+   void insert(IndexType gridIdx, const T& elem)
+   {
diff --git a/tplMirror/Axom-v0.9.0.tar.gz b/tplMirror/Axom-v0.9.0.tar.gz
diff --git a/tplMirror/RAJA-v2024.02.1.tar.gz b/tplMirror/RAJA-v2024.02.1.tar.gz
diff --git a/tplMirror/conduit-v0.9.2.tar.gz b/tplMirror/conduit-v0.9.2.tar.gz
diff --git a/tplMirror/mfem-4.7.tar.gz b/tplMirror/mfem-4.7.tar.gz