Skip to content

Default SIM_MPI to none #86

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
vikaskurapati merged 4 commits into from
Jan 28, 2025
Merged

Default SIM_MPI to none #86

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
2eae65b
Default `SIM_MPI` to none
davschneller Jan 27, 2025
cad0a28
Add warning for empty SIM_MPI
davschneller Jan 27, 2025
b0693c3
Fix typo
davschneller Jan 27, 2025
8834b8e
Merge remote-tracking branch 'origin/master' into davschneller/simmpi…
davschneller Jan 27, 2025
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointe

option(SIMMETRIX "Use simmetrix libraries" OFF)
set(SIMMETRIX_ROOT "" CACHE STRING "Root directory of simmetrix dev files")
set(SIM_MPI "mpich3" CACHE STRING "MPI version used by simmetrix")
set(SIM_MPI "" CACHE STRING "MPI version used by simmetrix")
option(NETCDF "Use netcdf" OFF)
option(PARASOLID "enable support for parasolid files" OFF)
option(SCOREC "Use PUMI/APF" OFF)
Expand Down
8 changes: 6 additions & 2 deletions cmake/FindSIMMETRIX.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ list(APPEND SIMMETRIX_INCLUDE_DIR

set(SIM_LIB_HINT ${SIMMETRIX_ROOT}/lib/x64_rhel7_gcc48)

if (SIM_MPI STREQUAL "")
message(FATAL_ERROR "No MPI implementation for Simmodeler given. Build will fail.")
endif()

find_library(SIM_DISCRETE_LIB SimDiscrete ${SIM_LIB_HINT})
find_library(SIM_MESHING_LIB SimMeshing ${SIM_LIB_HINT})
find_library(SIM_MESH_TOOLS_LIB SimMeshTools ${SIM_LIB_HINT})
Expand All @@ -30,7 +34,7 @@ find_library(SIM_PARASOLID_LIB NAMES SimParasolid310 SimParasolid320 SimParasoli
endif()
find_library(SIM_PARTITIONED_MESH_LIB SimPartitionedMesh ${SIM_LIB_HINT})
find_library(SIM_PARTITIONED_MESH_MPI_LIB SimPartitionedMesh-mpi ${SIM_LIB_HINT})
find_library(SIM_PARTITINED_WRAPPER_LIB SimPartitionWrapper-${SIM_MPI} ${SIM_LIB_HINT})
find_library(SIM_PARTITIONED_WRAPPER_LIB SimPartitionWrapper-${SIM_MPI} ${SIM_LIB_HINT})
find_library(SIM_PS_KRNL_LIB pskernel ${SIM_LIB_HINT}/psKrnl)

get_filename_component(SIM_PS_KRNL_LIB_DIR ${SIM_PS_KRNL_LIB} DIRECTORY)
Expand All @@ -41,7 +45,7 @@ list(APPEND SIMMETRIX_LIBRARIES
"${SIM_MESHING_LIB}"
"${SIM_MESH_TOOLS_LIB}"
"${SIM_PARTITIONED_MESH_MPI_LIB}"
"${SIM_PARTITINED_WRAPPER_LIB}"
"${SIM_PARTITIONED_WRAPPER_LIB}"
"${SIM_MODEL_LIB}"
"${SIM_PS_KRNL_LIB}"
)
Expand Down
Loading