Merge pull request #364 from sourceryinstitute/bugfix-#359

Ensure the correct MPIEXEC is used

 - Fixes #359 
 - Closes #360 (supersedes outdated PR)

Author: zbeekman

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.2)
 
 # Set the type/configuration of build to perform
 set ( CMAKE_CONFIGURATION_TYPES "Debug" "Release" "MinSizeRel" "RelWithDebInfo" "CodeCoverage" )
@@ -90,7 +90,7 @@ the C compiler if it matches the Fortran compiler ID." )
   endif()
   set( CMAKE_Fortran_COMPILER_VERSION "${DETECTED_VER}" )
 endif()
-  
+
   # We have populated CMAKE_Fortran_COMPILER_VERSION if it was missing
   if(gfortran_compiler AND (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER 5.0.0))
     set(opencoarrays_aware_compiler true)
@@ -155,7 +155,7 @@ endif()
 
 find_package( MPI )
 
-if ( (NOT MPI_C_FOUND) OR (NOT MPI_Fortran_FOUND) )
+if ( (NOT MPI_C_FOUND) OR (NOT MPI_Fortran_FOUND) OR (NOT MPIEXEC))
   find_program (MY_MPI_EXEC NAMES mpirun mpiexec lamexec srun
     PATHS "${CMAKE_SOURCE_DIR/prerequisites/installations/mpich/3.1.4}" "${CMAKE_SOURCE_DIR}/prerequisites/installations/mpich/*" ENV PATH
     HINTS "${FTN_COMPILER_DIR}" "${C_COMPILER_DIR}"
@@ -164,6 +164,46 @@ if ( (NOT MPI_C_FOUND) OR (NOT MPI_Fortran_FOUND) )
   find_package( MPI REQUIRED )
 endif()
 
+# Test for consistent MPI environment
+if (NOT MPIEXEC)
+  message ( ERROR "CMake failed to find `mpiexec` or similar. If building with `./install.sh` please
+report this bug to the OpenCoarrays developers at
+https://github.com/sourceryinstitute/opencoarrays/issues, otherwise use point CMake
+to the desired MPI runtime.")
+endif()
+
+get_filename_component(MPIEXEC_RELATIVE_LOC "${MPIEXEC}"
+  PROGRAM)
+get_filename_component(MPIEXEC_ABS_LOC "${MPIEXEC_RELATIVE_LOC}"
+  REALPATH)
+get_filename_component(MPIEXEC_DIR "${MPIEXEC_ABS_LOC}"
+  DIRECTORY)
+
+get_filename_component(MPICC_RELATIVE_LOC "${MPI_C_COMPILER}"
+  PROGRAM)
+get_filename_component(MPICC_ABS_LOC "${MPICC_RELATIVE_LOC}"
+  REALPATH)
+get_filename_component(MPICC_DIR "${MPICC_ABS_LOC}"
+  DIRECTORY)
+
+get_filename_component(MPIFC_RELATIVE_LOC "${MPI_Fortran_COMPILER}"
+  PROGRAM)
+get_filename_component(MPIFC_ABS_LOC "${MPIFC_RELATIVE_LOC}"
+  REALPATH)
+get_filename_component(MPIFC_DIR "${MPIFC_ABS_LOC}"
+  DIRECTORY)
+
+if ((MPIEXEC_DIR STREQUAL MPICC_DIR) AND (MPIEXEC_DIR STREQUAL MPIFC_DIR))
+  message ( STATUS "MPI runtime and compile time environments appear to be consistent")
+else()
+  message ( WARNING "MPIEXEC is in \"${MPIEXEC_DIR},\"
+which differs from the location of MPICC and/or MPIFC which are in
+\"${MPICC_DIR}\" and \"${MPIFC_DIR},\" respectively.
+This is likely indicative of a problem. If building with `./install.sh` please report
+this to the OpenCoarrays developers by filing a new issue at:
+https://github.com/sourceryinstitute/OpenCoarrays/issues/new")
+endif()
+
 #--------------------------------------------------------
 # Make sure a simple "hello world" C mpi program compiles
 #--------------------------------------------------------

prerequisites/install-functions/build_opencoarrays.sh

@@ -22,9 +22,16 @@ build_opencoarrays()
   FC="${MPIFC_show[0]}"
   # Set CC to the MPI implementation's gcc command...
   CC="${MPICC_show[0]}"
+  # try to find mpiexec
+  MPIEXEC_CANDIDATES=($(find "${MPICC%/*}" -name 'mpiexec' -o -name 'mpirun' -o -name 'lamexec' -o -name 'srun'))
+  if ! ((${#MPIEXEC_CANDIDATES[@]} >= 1)); then
+    emergency "Could not find a suitable \`mpiexec\` in directory containing mpi wrappers (${MPICC%/*})"
+  else
+    MPIEXEC="${MPIEXEC_CANDIDATES[0]}"
+  fi
   info "Configuring OpenCoarrays in ${PWD} with the command:"
-  info "CC=\"${CC}\" FC=\"${FC}\" $CMAKE \"${opencoarrays_src_dir}\" -DCMAKE_INSTALL_PREFIX=\"${install_path}\" -DMPI_C_COMPILER=\"${MPICC}\" -DMPI_Fortran_COMPILER=\"${MPIFC}\""
-  CC="${CC}" FC="${FC}" $CMAKE "${opencoarrays_src_dir}" -DCMAKE_INSTALL_PREFIX="${install_path}" -DMPI_C_COMPILER="${MPICC}" -DMPI_Fortran_COMPILER="${MPIFC}"
+  info "CC=\"${CC}\" FC=\"${FC}\" $CMAKE \"${opencoarrays_src_dir}\" -DCMAKE_INSTALL_PREFIX=\"${install_path}\" -DMPIEXEC=\"${MPIEXEC}\" -DMPI_C_COMPILER=\"${MPICC}\" -DMPI_Fortran_COMPILER=\"${MPIFC}\""
+  CC="${CC}" FC="${FC}" $CMAKE "${opencoarrays_src_dir}" -DCMAKE_INSTALL_PREFIX="${install_path}" -DMPIEXEC="${MPIEXEC}" -DMPI_C_COMPILER="${MPICC}" -DMPI_Fortran_COMPILER="${MPIFC}"
   info "Building OpenCoarrays in ${PWD} with the command make -j${num_threads}"
   make "-j${num_threads}"
   if [[ ! -z ${SUDO:-} ]]; then
@@ -33,4 +40,3 @@ build_opencoarrays()
   info "Installing OpenCoarrays in ${install_path} with the command ${SUDO:-} make install"
   ${SUDO:-} make install
 }
-