Skip to content

Remove implication that we can turn off mpi #1530

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

Merged
white238 merged 2 commits into from
Feb 3, 2026
Merged

Remove implication that we can turn off mpi #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec4c42f
remove implication that we can turn off mpi
white238 Jan 28, 2026
3f560fa
Merge branch 'develop' into white238/remove_mpi_option
white238 Feb 2, 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
1 change: 0 additions & 1 deletion cmake/SmithBasics.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ if (NOT SMITH_BASICS_SETUP)
cmake_dependent_option(SMITH_ENABLE_TESTS "Enables Smith Tests" ON "ENABLE_TESTS" OFF)
cmake_dependent_option(SMITH_ENABLE_CUDA "Enables Smith with CUDA support" ON "ENABLE_CUDA" OFF)
cmake_dependent_option(SMITH_ENABLE_HIP "Enables Smith with HIP support" ON "ENABLE_HIP" OFF)
cmake_dependent_option(SMITH_ENABLE_MPI "Enables Smith with MPI support" ON "ENABLE_MPI" OFF)
cmake_dependent_option(SMITH_ENABLE_OPENMP "Enables Smith with OPENMP support" ON "ENABLE_OPENMP" OFF)

# Options for builtin TPLs
Expand Down
1 change: 0 additions & 1 deletion cmake/smith-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ if(NOT SMITH_FOUND)
set(SMITH_ENABLE_CODEVELOP @SMITH_ENABLE_CODEVELOP@)
set(SMITH_ENABLE_CUDA @SMITH_ENABLE_CUDA@)
set(SMITH_ENABLE_HIP @SMITH_ENABLE_HIP@)
set(SMITH_ENABLE_MPI @SMITH_ENABLE_MPI@)
set(SMITH_ENABLE_OPENMP @SMITH_ENABLE_OPENMP@)

set(SMITH_USE_ADIAK @SMITH_USE_ADIAK@)
Expand Down
22 changes: 11 additions & 11 deletions cmake/thirdparty/SetupSmithThirdParty.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,19 +267,19 @@ if (NOT SMITH_THIRD_PARTY_LIBRARIES_FOUND)
set(MFEM_USE_HIP ${SMITH_ENABLE_HIP} CACHE BOOL "")
set(MFEM_USE_LAPACK ON CACHE BOOL "")
# mfem+mpi requires metis
set(MFEM_USE_METIS ${SMITH_ENABLE_MPI} CACHE BOOL "")
set(MFEM_USE_METIS_5 ${SMITH_ENABLE_MPI} CACHE BOOL "")
set(MFEM_USE_MPI ${SMITH_ENABLE_MPI} CACHE BOOL "")
set(MFEM_USE_METIS ON CACHE BOOL "")
set(MFEM_USE_METIS_5 ON CACHE BOOL "")
set(MFEM_USE_MPI ON CACHE BOOL "")
if(NETCDF_DIR)
smith_assert_is_directory(DIR_VARIABLE NETCDF_DIR)
set(MFEM_USE_NETCDF ON CACHE BOOL "")
endif()

# mfem+mpi also needs parmetis
if(SMITH_ENABLE_MPI)
smith_assert_is_directory(DIR_VARIABLE PARMETIS_DIR)
# Slightly different naming convention
set(ParMETIS_DIR ${PARMETIS_DIR} CACHE PATH "")
endif()
smith_assert_is_directory(DIR_VARIABLE PARMETIS_DIR)
# Slightly different naming convention
set(ParMETIS_DIR ${PARMETIS_DIR} CACHE PATH "")

set(MFEM_USE_OPENMP ${SMITH_ENABLE_OPENMP} CACHE BOOL "")
if(PETSC_DIR)
set(MFEM_USE_PETSC ON CACHE BOOL "")
Expand All @@ -299,7 +299,7 @@ if (NOT SMITH_THIRD_PARTY_LIBRARIES_FOUND)
smith_assert_is_directory(DIR_VARIABLE SUPERLUDIST_DIR)
# MFEM uses a slightly different naming convention
set(SuperLUDist_DIR ${SUPERLUDIST_DIR} CACHE PATH "")
set(MFEM_USE_SUPERLU ${SMITH_ENABLE_MPI} CACHE BOOL "")
set(MFEM_USE_SUPERLU ON CACHE BOOL "")
endif()
if(STRUMPACK_DIR)
smith_assert_is_directory(DIR_VARIABLE STRUMPACK_DIR)
Expand Down Expand Up @@ -601,8 +601,8 @@ if (NOT SMITH_THIRD_PARTY_LIBRARIES_FOUND)
set(ENABLE_FORTRAN OFF CACHE BOOL "" FORCE)
# Otherwise we use the submodule
message(STATUS "Using Tribol submodule")
set(BUILD_REDECOMP ${SMITH_ENABLE_MPI} CACHE BOOL "")
set(TRIBOL_USE_MPI ${SMITH_ENABLE_MPI} CACHE BOOL "")
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 "")
Expand Down
5 changes: 1 addition & 4 deletions src/smith/physics/contact/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ set(contact_sources
)

set(contact_depends smith_infrastructure smith_state)
blt_list_append(TO contact_depends ELEMENTS tribol IF TRIBOL_FOUND)
if (TRIBOL_FOUND AND SMITH_ENABLE_MPI)
list(APPEND contact_depends redecomp)
endif()
blt_list_append(TO contact_depends ELEMENTS tribol redecomp IF TRIBOL_FOUND)

smith_add_library(
NAME smith_contact
Expand Down