Skip to content

Commit

Permalink
Update axom. conduit, mfem, and raja. (#1)
Browse files Browse the repository at this point in the history
  • Loading branch information
liyangrock committed Oct 17, 2024
1 parent 9af927b commit 17c8809
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 4 deletions.
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1199,7 +1199,7 @@ list(APPEND build_list fmt)
# 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 )
Expand Down Expand Up @@ -1282,7 +1282,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 )
Expand All @@ -1300,14 +1300,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}
Expand Down
11 changes: 11 additions & 0 deletions tplMirror/Axom-v0.9.0.patch
Original file line number Diff line number Diff line change
@@ -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)
{
3 changes: 3 additions & 0 deletions tplMirror/Axom-v0.9.0.tar.gz
Git LFS file not shown
3 changes: 3 additions & 0 deletions tplMirror/mfem-4.7.tar.gz
Git LFS file not shown

0 comments on commit 17c8809

Please sign in to comment.