5b9cbb518a
This commit adds a patch that prevents the package from hanging. The package would hang because CMakeLists would look for a system MPI. This patch changes the behavior.
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
diff --git a/src/mpi/CMakeLists.txt b/src/mpi/CMakeLists.txt
|
|
index 590d646..3f2bded 100644
|
|
--- a/src/mpi/CMakeLists.txt
|
|
+++ b/src/mpi/CMakeLists.txt
|
|
@@ -8,22 +8,6 @@ if (NOT MPI_C_FOUND)
|
|
include_directories(BEFORE ${MPI_C_INCLUDE_PATH} ${MPI_Fortran_INCLUDE_PATH})
|
|
endif()
|
|
|
|
-#----------------------------------
|
|
-# Determine if we're using Open MPI
|
|
-#----------------------------------
|
|
-cmake_host_system_information(RESULT N_CPU QUERY NUMBER_OF_LOGICAL_CORES)
|
|
-set(N_CPU ${N_CPU} PARENT_SCOPE)
|
|
-cmake_host_system_information(RESULT HOST_NAME QUERY HOSTNAME)
|
|
-set(HOSTNAME ${HOSTNAME} PARENT_SCOPE)
|
|
-execute_process(COMMAND ${MPIEXEC} --version
|
|
- OUTPUT_VARIABLE mpi_version_out)
|
|
-if (mpi_version_out MATCHES "[Oo]pen[ -][Mm][Pp][Ii]")
|
|
- message( STATUS "OpenMPI detected")
|
|
- set ( openmpi true PARENT_SCOPE)
|
|
- # Write out a host file because OMPI's mpiexec is dumb
|
|
- file(WRITE ${CMAKE_BINARY_DIR}/hostfile "${HOST_NAME} slots=${N_CPU}\n")
|
|
-endif ()
|
|
-
|
|
if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
|
|
set(gfortran_compiler true)
|
|
elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Cray")
|