Skip to content

WIP: Submodule Tribol included in default build #1633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
white238 wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

WIP: Submodule Tribol included in default build #1633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f9921f
temporarily quiet warning
white238 Jul 15, 2026
9cbe8c2
reorder builtin thirdparty libraries and have Tribol build included b…
white238 Jul 15, 2026
9914603
turn off external tribol
white238 Jul 15, 2026
24913bf
update building skills to not reference tribol in the codevelop build
white238 Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cmake/SmithCompilerFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,7 @@ blt_append_custom_compiler_flag(FLAGS_VAR CMAKE_CXX_FLAGS DEFAULT ${_extra_flags
# Clang specific warnings
# Note: pedantic is a gcc flag but throws a false positive in src/smith/numerics/petsc_solvers.cpp
blt_append_custom_compiler_flag(FLAGS_VAR CMAKE_CXX_FLAGS CLANG "-Wpedantic -Wunused-private-field")

# Temporarily quiet warnings produced by Tribol
# TODO: remove this
blt_append_custom_compiler_flag(FLAGS_VAR CMAKE_CXX_FLAGS CLANG "-Wno-shorten-64-to-32")
167 changes: 76 additions & 91 deletions cmake/thirdparty/SetupSmithThirdParty.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,11 @@ if (NOT SMITH_THIRD_PARTY_LIBRARIES_FOUND)
# Prefix the "check" targets
set(MFEM_CUSTOM_TARGET_PREFIX "mfem_" CACHE STRING "")

# Add MUMPS direct solver to MFEM codevelop (we have to do this before Smith's MFEM library is added)
if(SMITH_ENABLE_CONTINUATION AND MUMPS_DIR)
set(MFEM_USE_MUMPS ON CACHE BOOL "")
endif()

# Tweaks needed after Spack converted to the HDF5 CMake build system
# NOTE: we check if an hdf5 target is namespaced or not, since some versions
# of hdf5 do not namespace their targets and others do
Expand Down Expand Up @@ -417,42 +422,6 @@ if (NOT SMITH_THIRD_PARTY_LIBRARIES_FOUND)
set(MFEM_BUILT_WITH_CMAKE TRUE)
endif()

#------------------------------------------------------------------------------
# ContinuationSolvers
#------------------------------------------------------------------------------
message(STATUS "Smith Enable Continuation: ${SMITH_ENABLE_CONTINUATION}")

if(SMITH_ENABLE_CONTINUATION)
# Allow homotopy solver as a non-submodule
if (DEFINED CONTINUATION_SOURCE_DIR)
if(NOT EXISTS "${CONTINUATION_SOURCE_DIR}/CMakeLists.txt")
message(FATAL_ERROR "Given CONTINUATION_SOURCE_DIR does not contain CMakeLists.txt")
endif()
else()
if(EXISTS "${PROJECT_SOURCE_DIR}/smith/ContinuationSolvers")
set(CONTINUATION_SOURCE_DIR "${PROJECT_SOURCE_DIR}/smith/ContinuationSolvers" CACHE PATH "")
else()
set(CONTINUATION_SOURCE_DIR "${PROJECT_SOURCE_DIR}/ContinuationSolvers" CACHE PATH "")
endif()

if (NOT EXISTS "${CONTINUATION_SOURCE_DIR}/CMakeLists.txt")
message(FATAL_ERROR
"The continuationsolver repo is not present. "
"Either run the following command in your git repository: \n"
" git submodule update --init --recursive\n"
"Or add -DCONTINUATION_SOURCE_DIR=/path/to/ContinuationSolvers to your CMake command." )
endif()
endif()

# Add MUMPS direct solver to MFEM codevelop (we have to do this before Smith's MFEM library is added)
if (SMITH_ENABLE_CODEVELOP AND MUMPS_DIR)
set(MFEM_USE_MUMPS ON CACHE BOOL "")
endif()

set(CONTINUATION_FOUND TRUE)
add_subdirectory("${CONTINUATION_SOURCE_DIR}" ${CMAKE_BINARY_DIR}/ContinuationSolvers)
endif()

#------------------------------------------------------------------------------
# Axom
#------------------------------------------------------------------------------
Expand Down Expand Up @@ -555,11 +524,52 @@ if (NOT SMITH_THIRD_PARTY_LIBRARIES_FOUND)
set(ENABLE_FORTRAN ON CACHE BOOL "" FORCE)
endif()


#------------------------------------------------------------------------------
# Gretl
# Submodule Third Party Libraries
#
# These are included in the regular build of Smith due to the close and
# tied development cycles.
#------------------------------------------------------------------------------
message(STATUS "Smith Enable Gretl: ${SMITH_ENABLE_GRETL}")


#---------------------------
# ContinuationSolvers
#---------------------------
message(STATUS "Smith Enable Continuation: ${SMITH_ENABLE_CONTINUATION}")

if(SMITH_ENABLE_CONTINUATION)
# Allow homotopy solver as a non-submodule
if (DEFINED CONTINUATION_SOURCE_DIR)
if(NOT EXISTS "${CONTINUATION_SOURCE_DIR}/CMakeLists.txt")
message(FATAL_ERROR "Given CONTINUATION_SOURCE_DIR does not contain CMakeLists.txt")
endif()
else()
if(EXISTS "${PROJECT_SOURCE_DIR}/smith/ContinuationSolvers")
set(CONTINUATION_SOURCE_DIR "${PROJECT_SOURCE_DIR}/smith/ContinuationSolvers" CACHE PATH "")
else()
set(CONTINUATION_SOURCE_DIR "${PROJECT_SOURCE_DIR}/ContinuationSolvers" CACHE PATH "")
endif()

if (NOT EXISTS "${CONTINUATION_SOURCE_DIR}/CMakeLists.txt")
message(FATAL_ERROR
"The continuationsolver repo is not present. "
"Either run the following command in your git repository: \n"
" git submodule update --init --recursive\n"
"Or add -DCONTINUATION_SOURCE_DIR=/path/to/ContinuationSolvers to your CMake command." )
endif()
endif()

add_subdirectory("${CONTINUATION_SOURCE_DIR}" ${CMAKE_BINARY_DIR}/ContinuationSolvers)
set(CONTINUATION_FOUND TRUE)
endif()


#---------------------------
# Gretl
#---------------------------
message(STATUS "Smith Enable Gretl: ${SMITH_ENABLE_GRETL}")

if(SMITH_ENABLE_GRETL)
if (NOT DEFINED GRETL_SOURCE_DIR)
set(GRETL_SOURCE_DIR "${PROJECT_SOURCE_DIR}/gretl" CACHE PATH "")
Expand All @@ -583,73 +593,48 @@ if (NOT SMITH_THIRD_PARTY_LIBRARIES_FOUND)
endif()


#------------------------------------------------------------------------------
#---------------------------
# Tribol
#------------------------------------------------------------------------------
if (NOT SMITH_ENABLE_CODEVELOP)
if(TRIBOL_DIR)
smith_assert_is_directory(DIR_VARIABLE TRIBOL_DIR)
#---------------------------
if(TRIBOL_DIR)
message(STATUS "Enabling pre-built Tribol in '${TRIBOL_DIR}'" )
smith_assert_is_directory(DIR_VARIABLE TRIBOL_DIR)

find_dependency(tribol REQUIRED PATHS "${TRIBOL_DIR}/lib/cmake")
find_dependency(tribol REQUIRED PATHS "${TRIBOL_DIR}/lib/cmake")

smith_assert_find_succeeded(PROJECT_NAME Tribol
TARGET tribol
DIR_VARIABLE TRIBOL_DIR)
blt_convert_to_system_includes(TARGET tribol)
set(TRIBOL_FOUND ON)
else()
set(TRIBOL_FOUND OFF)
endif()

message(STATUS "Tribol support is " ${TRIBOL_FOUND})
smith_assert_find_succeeded(PROJECT_NAME Tribol
TARGET tribol
DIR_VARIABLE TRIBOL_DIR)
blt_convert_to_system_includes(TARGET tribol)
else()
set(ENABLE_FORTRAN OFF CACHE BOOL "" FORCE)
# Otherwise we use the submodule
message(STATUS "Using Tribol submodule")
set(BUILD_REDECOMP ON CACHE BOOL "")
set(TRIBOL_USE_MPI ON CACHE BOOL "")
set(TRIBOL_ENABLE_TESTS OFF CACHE BOOL "")
set(TRIBOL_ENABLE_EXAMPLES OFF CACHE BOOL "")
set(TRIBOL_ENABLE_DOCS OFF CACHE BOOL "")
set(TRIBOL_USE_MPI ON CACHE BOOL "")

if(EXISTS "${PROJECT_SOURCE_DIR}/smith/tribol")
set(tribol_repo_dir "${PROJECT_SOURCE_DIR}/smith/tribol")
else()
set(tribol_repo_dir "${PROJECT_SOURCE_DIR}/tribol")
if (NOT DEFINED TRIBOL_SOURCE_DIR)
set(TRIBOL_SOURCE_DIR "${PROJECT_SOURCE_DIR}/tribol" CACHE PATH "")
endif()

# User enabled tribol profiling, briefly restore CALIPER_DIR
if(TRIBOL_ENABLE_PROFILING)
set(CALIPER_DIR ${_caliper_dir} CACHE STRING "" FORCE)
# check if Tribol exists in the TRIBOL_SOURCE_DIR, if not, try looking through the smith submodule
if (NOT EXISTS "${TRIBOL_SOURCE_DIR}/CMakeLists.txt")
set(TRIBOL_SOURCE_DIR "${PROJECT_SOURCE_DIR}/smith/tribol" CACHE PATH "" FORCE)
endif()

add_subdirectory(${tribol_repo_dir} ${CMAKE_BINARY_DIR}/tribol)

# Suppresses Tribol compiler warnings during build
blt_convert_to_system_includes(TARGET tribol)

if(TRIBOL_ENABLE_PROFILING)
unset(CALIPER_DIR CACHE)
if (NOT EXISTS "${TRIBOL_SOURCE_DIR}/CMakeLists.txt")
message(FATAL_ERROR
"The Tribol repo is not present. "
"Either run the following command in your git repository: \n"
" git submodule update --init --recursive\n"
"Or add -DTRIBOL_SOURCE_DIR=/path/to/tribol to your CMake command." )
endif()

target_include_directories(redecomp PUBLIC
$<BUILD_INTERFACE:${tribol_repo_dir}/src>
)
target_include_directories(tribol PUBLIC
$<BUILD_INTERFACE:${tribol_repo_dir}/src>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/tribol/include>
$<INSTALL_INTERFACE:include>
)
target_include_directories(tribol_shared PUBLIC
$<BUILD_INTERFACE:${tribol_repo_dir}/src>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/tribol/include>
$<INSTALL_INTERFACE:include>
)

set(TRIBOL_FOUND TRUE CACHE BOOL "" FORCE)
set(ENABLE_FORTRAN ON CACHE BOOL "" FORCE)
message(STATUS "Enabling source Tribol in '${TRIBOL_SOURCE_DIR}'" )
add_subdirectory("${TRIBOL_SOURCE_DIR}" ${CMAKE_BINARY_DIR}/tribol)
set(TRIBOL_FOUND ON)
endif()

message(STATUS "Tribol support is " ${TRIBOL_FOUND})


#---------------------------------------------------------------------------
# Remove non-existant INTERFACE_INCLUDE_DIRECTORIES from imported targets
# to work around CMake error
Expand Down
3 changes: 2 additions & 1 deletion host-configs/rzwhippet-toss_4_x86_64_ib-llvm@19.1.3.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ set(SUNDIALS_DIR "${TPL_ROOT}/sundials-7.7.0-flzbomo7uf644rao5ryd3et72sjlhy4n" C

set(UMPIRE_DIR "${TPL_ROOT}/umpire-2025.12.0-hrf4ogx6dmslytu7go5jz5wfct3bonjy" CACHE PATH "")

set(TRIBOL_DIR "${TPL_ROOT}/tribol-0.1.0.27-t5aay3tn2bnmnr3b3ewz5tii6qxjkf3n" CACHE PATH "")
# Uncomment to use external Tribol
#set(TRIBOL_DIR "${TPL_ROOT}/tribol-0.1.0.27-t5aay3tn2bnmnr3b3ewz5tii6qxjkf3n" CACHE PATH "")

#------------------------------------------------------------------------------
# Devtools
Expand Down
2 changes: 1 addition & 1 deletion skills/building/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ cmake --build build -j
ctest --test-dir build
```

## Co-develop Smith (MFEM + Axom + Tribol)
## Co-develop Smith (MFEM + Axom)

Use this only when you intend to modify/build Smith against the submodules.

Expand Down
Loading