Attempt to fix missing OpenMPI C on travis macOS

 - Modernized some usage of FindMPI.cmake

Author: zbeekman

.travis.yml

@@ -1,5 +1,5 @@
 ---
-language: generic
+language: c
 
 os: osx
 
@@ -97,11 +97,11 @@ before_install:
 
 install:
   - pwd
-  - travis_wait 40 developer-scripts/travis/install.${TRAVIS_OS_NAME}.sh
+  - ./developer-scripts/travis/install.${TRAVIS_OS_NAME}.sh
 
 script:
   - pwd
-  - developer-scripts/travis/test-script.${BUILD_TYPE:-cmake}.sh
+  - ./developer-scripts/travis/test-script.${BUILD_TYPE:-cmake}.sh
 
 after_script:
   - find . -name '*.gcno' -print

CMakeLists.txt

@@ -244,8 +244,14 @@ endif()
 
 find_package( MPI )
 
-if ( (NOT MPI_C_FOUND) OR (NOT MPI_Fortran_FOUND) OR (NOT MPIEXEC))
+if ( (NOT MPI_C_FOUND) OR (NOT MPI_Fortran_FOUND) OR (NOT MPIEXEC_EXECUTABLE))
   # Get default install location of MPICH from install.sh
+  message(WARNING "Could not find all MPI components!")
+  message(WARNING "
+MPI_C_FOUND        = ${MPI_C_FOUND}
+MPI_Fortran_FOUND  = ${MPI_Fortran_FOUND}
+MPIEXEC_EXECUTABLE = ${MPIEXEC_EXECUTABLE}
+")
   execute_process( COMMAND "./install.sh" -P mpich
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     OUTPUT_VARIABLE DEFAULT_MPICH_INSTALL_LOC
@@ -262,7 +268,7 @@ endif()
 list(REMOVE_DUPLICATES MPI_Fortran_INCLUDE_PATH)
 
 # Test for consistent MPI environment
-if (NOT MPIEXEC)
+if (NOT MPIEXEC_EXECUTABLE)
   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 point CMake
@@ -271,7 +277,7 @@ else()
   add_definitions(-DHAVE_MPI)
 endif()
 
-get_filename_component(MPIEXEC_RELATIVE_LOC "${MPIEXEC}"
+get_filename_component(MPIEXEC_RELATIVE_LOC "${MPIEXEC_EXECUTABLE}"
   PROGRAM)
 get_filename_component(MPIEXEC_ABS_LOC "${MPIEXEC_RELATIVE_LOC}"
   REALPATH)

developer-scripts/travis/install.osx.sh

@@ -24,9 +24,12 @@ echo "Performing Travis-CI installation phase on macOS..."
 # Update and install via Homebrew on macOS
 brew update > /dev/null
 
+brew install gcc
+brew link --overwrite gcc
+
 for pkg in ${OSX_PACKAGES}; do
-    brew ls --versions "${pkg}" >/dev/null || brew install --force-bottle "${pkg}" || brew link --overwrite "${pkg}"
-    brew outdated "${pkg}" || brew upgrade --force-bottle "${pkg}"
+    brew ls --versions "${pkg}" >/dev/null || brew install "${pkg}" || brew link --overwrite "${pkg}"
+    brew outdated "${pkg}" || brew upgrade "${pkg}"
 done
 
 # Uninstall mpich and openmpi so that we can install our own version

developer-scripts/travis/test-script.cmake.sh

@@ -37,7 +37,11 @@ for version in ${GCC}; do
 	    brew outdated "${mpi}" || brew upgrade "${mpi}"
 	    brew unlink "${mpi}" || true
 	done
-	brew link open-mpi
+	brew link --overwrite open-mpi
+	otool -L "$(brew --prefix open-mpi)/lib/libmpi.dylib"
+	otool -L "$(brew --prefix libevent)/lib/libevent.dylib"
+	OMPI_CC="$(prew --prefix gcc)/bin/gcc-${version}"
+	export OMPI_CC
     fi
     ${FC} --version
     ${CC} --version
@@ -50,7 +54,12 @@ for version in ${GCC}; do
 	[[ -d "${BLD_DIR}" ]] && rm -rf "${BLD_DIR:?}"/* || true
 	(
 	    cd "${BLD_DIR}"
-	    cmake -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" ..
+	    cmake -Wdev \
+		  -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" \
+		  -DCMAKE_BUILD_TYPE:STRING="${BUILD_TYPE}" \
+		  -DMPI_CXX_SKIP_MPICXX:BOOL=ON \
+		  -DMPI_ASSUME_NO_BUILTIN_MPI:BOOL=ON \
+		  -DMPI_SKIP_GUESSING ..
 	    make -j 4
 	    CTEST_FLAGS=(--output-on-failure --schedule-random --repeat-until-fail "${NREPEAT:-5}" --timeout "${TEST_TIMEOUT:-200}")
 	    if [[ "${BUILD_TYPE}" =~ Deb ]]; then

prerequisites/install-functions/build_opencoarrays.sh

@@ -37,15 +37,15 @@ build_opencoarrays()
   if ! ((${#MPIEXEC_CANDIDATES[@]} >= 1)); then
     emergency "Could not find a suitable \`mpiexec\` in directory containing mpi wrappers (${MPICC%/*})"
   else
-    MPIEXEC="${MPIEXEC_CANDIDATES[0]}"
+    MPIEXEC_EXECUTABLE="${MPIEXEC_CANDIDATES[0]}"
   fi
 
   source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_installation_path.sh"
   set_or_print_installation_path
 
   info "Configuring OpenCoarrays in ${PWD} with the command:"
-  info "CC=\"${CC}\" FC=\"${FC}\" $CMAKE \"${opencoarrays_src_dir}\" \"${WDEVFLAG}\" -DCMAKE_INSTALL_PREFIX=\"${install_path}\" -DMPIEXEC=\"${MPIEXEC}\" -DMPI_C_COMPILER=\"${MPICC}\" -DMPI_Fortran_COMPILER=\"${MPIFC}\""
-  CC="${CC}" FC="${FC}" $CMAKE "${opencoarrays_src_dir}" "${WDEVFLAG}" -DCMAKE_INSTALL_PREFIX="${install_path}" -DMPIEXEC="${MPIEXEC}" -DMPI_C_COMPILER="${MPICC}" -DMPI_Fortran_COMPILER="${MPIFC}"
+  info "CC=\"${CC}\" FC=\"${FC}\" $CMAKE \"${opencoarrays_src_dir}\" \"${WDEVFLAG}\" -DCMAKE_INSTALL_PREFIX=\"${install_path}\" -DMPIEXEC_EXECUTABLE=\"${MPIEXEC_EXECUTABLE}\" -DMPI_C_COMPILER=\"${MPICC}\" -DMPI_Fortran_COMPILER=\"${MPIFC}\""
+  CC="${CC}" FC="${FC}" $CMAKE "${opencoarrays_src_dir}" "${WDEVFLAG}" -DCMAKE_INSTALL_PREFIX="${install_path}" -DMPIEXEC_EXECUTABLE="${MPIEXEC_EXECUTABLE}" -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

src/extensions/cafrun.in

@@ -50,12 +50,12 @@ set -o pipefail
 # Configured variables
 #---------------------
 #
-# CAF_VERSION, MPIEXEC, MPIEXEC_NUMPROC_FLAG, MPIEXEC_PREFLAGS, MPIEXEC_POSTFLAGS,
+# CAF_VERSION, MPIEXEC_EXECUTABLE, MPIEXEC_NUMPROC_FLAG, MPIEXEC_PREFLAGS, MPIEXEC_POSTFLAGS,
 # HAVE_FAILED_IMG
 #
 
 caf_version='@CAF_VERSION@'
-CAFRUN="@MPIEXEC@"
+CAFRUN="@MPIEXEC_EXECUTABLE@"
 if [[ "${CAFRUN}" == @*@ ]]; then
   CAFRUN=mpiexec
 fi

src/mpi/CMakeLists.txt

@@ -15,7 +15,7 @@ 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
+execute_process(COMMAND ${MPIEXEC_EXECUTABLE} --version
   OUTPUT_VARIABLE mpi_version_out)
 if (mpi_version_out MATCHES "[Oo]pen[ -][Mm][Pp][Ii]")
   message( STATUS "OpenMPI detected")
@@ -249,7 +249,7 @@ configure_file("${CMAKE_SOURCE_DIR}/src/extensions/caf.in" "${CMAKE_BINARY_DIR}/
 
 # List of carrun.in variables needing configuration:
 #
-# @CAF_VERSION@ @MPIEXEC@ @MPIEXEC_NUMPROC_FLAG@ @MPIEXEC_PREFLAGS@ @MPIEXEC_POSTFLAGS@
+# @CAF_VERSION@ @MPIEXEC_EXECUTABLE@ @MPIEXEC_NUMPROC_FLAG@ @MPIEXEC_PREFLAGS@ @MPIEXEC_POSTFLAGS@
 # @HAVE_FAILED_IMG@
 #