Merge pull request #418 from sourceryinstitute/issue-378-mpi-names

Fixes #378 - mpi names

Author: zbeekman

CMakeLists.txt

@@ -81,7 +81,7 @@ if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
     "in a manner such as\n"
     "  $ mkdir build-opencarrays\n"
     "  $ cd build-opencoarrays\n"
-    "  $ CC=mpicc FC=mpif90 cmake <path-to-opencoarrays-source-directory> -DCMAKE_INSTALL_PREFIX=<path-to-install-directory>\n"
+    "  $ CC=gcc FC=gfortran cmake -DBUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/path/to/install/dir /path/to/opencoarrays/src/dir \n"
     "\nsubstituting the appropriate syntax for your shell (the above line assumes the bash shell)."
     )
 endif()
@@ -188,7 +188,7 @@ endif()
 # Find MPI and set some flags so that FC and CC can point to gfortran and gcc
 #----------------------------------------------------------------------------
 
-# If the user passes FC=mpif90 etc. check and prefer that location
+# If the user passes FC=mpifort etc. check and prefer that location
 get_filename_component( FTN_COMPILER_NAME "${CMAKE_Fortran_COMPILER}"
   NAME )
 get_filename_component( C_COMPILER_NAME "${CMAKE_C_COMPILER}"

GETTING_STARTED.md

@@ -107,13 +107,13 @@ If the `caf` compiler wrapper cannot process the source code in question, invoke
 the underlying communication library directly:
 
 ```bash
-mpif90 -fcoarray=lib -L/opt/opencoarrays/ tally.f90 \ -lcaf_mpi -o htally -I<OpenCoarrays-install-path>/mod
+mpifort -fcoarray=lib -L/opt/opencoarrays/ tally.f90 \ -lcaf_mpi -o htally -I<OpenCoarrays-install-path>/mod
 ```
 
 and also run the program with the lower-level communication library:
 
 ```bash
-mpirun -np <number-of-images> ./tally
+mpiexec -np <number-of-images> ./tally
 ```
 
 ---

README.md

@@ -46,14 +46,14 @@ OpenCoarrays provides a compiler wrapper (named `caf`), a runtime
 library (named `libcaf_mpi.a` by default), and an executable file
 launcher (named `cafrun`).  With OpenCoarrays-aware compilers, the
 compiler wrapper passes the provided source code to the chosen
-compiler (`mpif90` by default).  For non-OpenCoarrays-aware compilers,
+compiler (`mpifort` by default).  For non-OpenCoarrays-aware compilers,
 the wrapper transforms CAF syntax into OpenCoarrays procedure calls
 before invoking the chosen compiler on the transformed code.  The
 runtime library supports compiler communication and synchronization
 requests by invoking a lower-level communication library--the Message
 Passing Interface ([MPI]) by default.  The launcher passes execution
 to the chosen communication library's parallel program launcher
-(`mpirun` by default).
+(`mpiexec` by default).
 
 OpenCoarrays defines an application binary interface ([ABI]) that
 translates high-level communication and synchronization requests into

developer-scripts/hpclinux-install.sh

@@ -2,37 +2,37 @@
 
 # BSD 3-Clause License
 #
-# -- hpclinux-install.sh 
-#   
+# -- hpclinux-install.sh
+#
 #  Install OpenCoarrays inside the HPCLinux distribution from hpclinux.org.
 #
 #  Usage: cd opencoarrays && ./prerequisites/hpclinux-install.sh"
 #
 #  Motivation:
 #
-#    On Fedora-based distributions, the OpenCoarrays installer fails during the stack-based 
-#    system interrogation (presumably due to problems with the prerequisites/stack.sh script).  
-#    At least in the case of HPCLinux, system interrogation is unnecessary because HPCLinux is 
-#    uber-stable and it's  safe bet that all prerequisites need to be installed so this script 
+#    On Fedora-based distributions, the OpenCoarrays installer fails during the stack-based
+#    system interrogation (presumably due to problems with the prerequisites/stack.sh script).
+#    At least in the case of HPCLinux, system interrogation is unnecessary because HPCLinux is
+#    uber-stable and it's  safe bet that all prerequisites need to be installed so this script
 #    omits the interrogation and invokes prerequisites/build.sh to build all prerequisites.
-# 
+#
 # Copyright (c) 2016, Sourcery Institute
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice, this
 #   list of conditions and the following disclaimer.
-# 
+#
 # * Redistributions in binary form must reproduce the above copyright notice,
 #   this list of conditions and the following disclaimer in the documentation
 #   and/or other materials provided with the distribution.
-# 
+#
 # * Neither the name of the copyright holder nor the names of its
 #   contributors may be used to endorse or promote products derived from
 #   this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,57 +45,58 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 if [[ ! -d prerequisites ]]; then
-   echo "Please execute this script with your present working directory"
-   echo "set to the top level of the OpenCoarrays source tree."
-   exit 1
+  printf "Please execute this script with your present working directory"
+  printf "set to the top level of the OpenCoarrays source tree."
+  exit 1
 fi
 
 pushd prerequisites
 
-  # Build CMake using the system GCC (4.8.1) and prepend its bin subdirectory to the PATH
-  export cmake_install_path="${PWD}"/installations/cmake/cmake
-  ./build.sh --package cmake --install-prefix "${cmake_install_path}"
-  if [[ -z "${PATH}" ]]; then
-    export PATH="${cmake_install_path}"/bin
-  else
-    export PATH="${cmake_install_path}"/bin:$PATH
-  fi
+# Build CMake using the system GCC (4.8.1) and prepend its bin subdirectory to the PATH
+export cmake_install_path="${PWD}/installations/cmake/cmake"
+./build.sh --package cmake --install-prefix "${cmake_install_path}"
+if [[ -z "${PATH}" ]]; then
+  export PATH="${cmake_install_path}/bin"
+else
+  export PATH="${cmake_install_path}/bin:${PATH}"
+fi
 
-  # Build GCC 6.3.0 and prepend its bin subdirectory to the PATH
-  export gcc_version=6.3.0
-  export gcc_install_path="${PWD}"/installations/gnu/$gcc_version
-  ./build.sh --package gcc --install-version $gcc_version --install-prefix "${gcc_install_path}"
-  export PATH="${gcc_install_path}"/bin:$PATH
-  export LD_LIBRARY_PATH="${gcc_install_path}"/lib64:"${gcc_install_path}"/lib:$LD_LIBRARY_PATH
+# Build GCC 6.3.0 and prepend its bin subdirectory to the PATH
+export gcc_version=6.3.0
+export gcc_install_path="${PWD}/installations/gnu/${gcc_version}"
+./build.sh --package gcc --install-version "${gcc_version}" --install-prefix "${gcc_install_path}"
+export PATH="${gcc_install_path}/bin:${PATH}"
+export LD_LIBRARY_PATH="${gcc_install_path}/lib64:${gcc_install_path}/lib:${LD_LIBRARY_PATH}"
 
-  # Build MPICH 3.2 and prepend its bin subdirectory to the PATH
-  export mpich_install_path="${PWD}"/installations/mpich
-  ./build.sh --package mpich --install-prefix "${mpich_install_path}" --num-threads 4
-  export PATH="${mpich_install_path}"/bin:$PATH
+# Build MPICH 3.2 and prepend its bin subdirectory to the PATH
+export mpich_install_path="${PWD}/installations/mpich"
+./build.sh --package mpich --install-prefix "${mpich_install_path}" --num-threads 4
+export PATH="${mpich_install_path}/bin:${PATH}"
 
 popd # return to top level of OpenCoarrays source tree
 
 # Build OpenCoarrays
 if [[ -d build ]]; then
-  echo -e 'Old build subdirectory found. Ok to delete the "build" subdirectory? (Y/n) '
+  printf 'Old build subdirectory found. Ok to delete the "build" subdirectory? (Y/n)'
   read -r delete_build
 
-  if [[ "$delete_build" == "n" || "$delete_build" == "no" ]]; then
+  if [[ "${delete_build}" == "n" || "${delete_build}" == "no" ]]; then
     printf "n\n"
-    echo -e "Please rename or delete the build subdirectory and restart this script. Aborting. [exit 10]\n"
+    printf "Please rename or delete the build subdirectory and restart this script. Aborting. [exit 10]\n"
     exit 10
   else # permission granted to delete build subdirectory
     printf "Y\n"
-  fi  
+  fi
   rm -rf build
 fi
 mkdir build
 pushd build
 
-  export opencoarrays_install_path="${PWD}"/prerequisites/installations/opencoarrays
-  FC=gfortran CC=gcc cmake .. -DCMAKE_INSTALL_PREFIX="{opencoarrays_install_path}"
-  make
-  make install
-  export PATH="${opencoarrays_install_path}"/bin:$PATH
+export opencoarrays_install_path="${PWD}/prerequisites/installations/opencoarrays"
+FC=gfortran CC=gcc cmake .. -DCMAKE_INSTALL_PREFIX="${opencoarrays_install_path}"
+make
+ctest --output-on-failure --schedule-random
+make install
+export PATH="${opencoarrays_install_path}/bin:${PATH}"
 
 popd # return to top level of OpenCoarrays source tree

developer-scripts/patched-trunk-install.sh

@@ -179,7 +179,7 @@ echo "Building MPICH with the patched compilers."
 
 # Verify that MPICH installed where expected
 mpich_install_path=$(./install.sh -P mpich)
-if ! type "${mpich_install_path}"/bin/mpif90; then
+if ! type "${mpich_install_path}"/bin/mpifort; then
   echo "MPICH is not installed in the expected location ${mpich_install_path}."
   exit 1
 fi

prerequisites/install-functions/find_or_install.sh

@@ -8,7 +8,7 @@ find_or_install()
   package_executable_array=(
     "gcc:gfortran"
     "cmake:cmake"
-    "mpich:mpif90"
+    "mpich:mpifort"
     "flex:flex"
     "bison:yacc"
     "m4:m4"
@@ -121,11 +121,11 @@ find_or_install()
     # MPIFC, MPICC, and MPICXX environment variables. Every branch must also manage the
     # dependency stack.
 
-    # If the user specified a Fortran compiler, verify that mpif90 wraps the specified compiler
+    # If the user specified a Fortran compiler, verify that mpifort wraps the specified compiler
     if [[ ! -z "${arg_M:-}" ]]; then
 
       echo -e "$this_script: Using the $package specified by -M or --with-mpi: ${arg_M}\n"
-      export MPIFC="${arg_M}"/bin/mpif90
+      export MPIFC="${arg_M}"/bin/mpifort
       export MPICC="${arg_M}"/bin/mpicc
       export MPICXX="${arg_M}"/bin/mpicxx
       # Halt the recursion
@@ -136,7 +136,7 @@ find_or_install()
     elif [[ "$script_installed_package" == true ]]; then
 
       echo -e "$this_script: Using the $package installed by $this_script\n"
-      export MPIFC=$package_install_path/bin/mpif90
+      export MPIFC=$package_install_path/bin/mpifort
       export MPICC=$package_install_path/bin/mpicc
       export MPICXX=$package_install_path/bin/mpicxx
       # Halt the recursion
@@ -147,8 +147,8 @@ find_or_install()
     elif [[ "$package_in_path" == "true" ]]; then
 
       echo -e "$this_script: Checking whether $executable in PATH wraps gfortran... "
-      mpif90_version_header=$(mpif90 --version | head -1)
-      first_three_characters=$(echo "$mpif90_version_header" | cut -c1-3)
+      mpifort_version_header=$(mpifort --version | head -1)
+      first_three_characters=$(echo "$mpifort_version_header" | cut -c1-3)
       if [[ "$first_three_characters" != "GNU" ]]; then
         printf "no.\n"
         # Trigger 'find_or_install gcc' and subsequent build of $package
@@ -162,7 +162,7 @@ find_or_install()
 
           info "-f (or --with-fortran) argument detected with value ${arg_f}"
           printf "yes.\n %s: Using the specified %s.\n" "$this_script" "$executable"
-          export MPIFC=mpif90
+          export MPIFC=mpifort
           export MPICC=mpicc
           export MPICXX=mpicxx
 
@@ -185,7 +185,7 @@ find_or_install()
           fi
           if [[ "$acceptable" == "${is_true:-}" ]]; then
             printf "yes.\n %s: Using the $executable found in the PATH.\n" "$this_script"
-            export MPIFC=mpif90
+            export MPIFC=mpifort
             export MPICC=mpicc
             export MPICXX=mpicxx
 
@@ -637,8 +637,8 @@ find_or_install()
             export LD_LIBRARY_PATH="$gfortran_lib_paths:$LD_LIBRARY_PATH"
           fi
         elif [[ $package == "mpich" ]]; then
-          echo "$this_script: export MPIFC=$package_install_path/bin/mpif90"
-                              export MPIFC="$package_install_path/bin/mpif90"
+          echo "$this_script: export MPIFC=$package_install_path/bin/mpifort"
+                              export MPIFC="$package_install_path/bin/mpifort"
           echo "$this_script: export MPICC= $package_install_path/bin/mpicc"
                               export MPICC="$package_install_path/bin/mpicc"
           echo "$this_script: export MPICXX=$package_install_path/bin/mpicxx"

src/extensions/caf-foot

@@ -29,7 +29,7 @@ usage()
     echo "      * be the only Fortran source file in the argument list,"
     echo "      * have a name of the form *.f90, *.F90, *.f, or *.F. "
     echo "   c. The environment variable 'CAFC' must be empty or point to a Fortran compiler/linker. "
-    echo "   d. If 'CAFC' is empty, a default value of 'mpif90' is used. "
+    echo "   d. If 'CAFC' is empty, a default value of 'mpifort' is used. "
     echo ""
     echo " 2. With non-OCA CAF compilers (Intel or Cray),"
     echo "   a. Observe restrictions 1a-d above."
@@ -60,8 +60,8 @@ if [ $# == 0 ]; then
   exit 1
 fi
 
-# Default to "mpif90" Fortran compiler if environment variable CAFC is empty or unset:
-CAFC=${CAFC:-mpif90}
+# Default to "mpifort" Fortran compiler if environment variable CAFC is empty or unset:
+CAFC=${CAFC:-mpifort}
 
 # TODO -- refactor this script to use the bash3boilerplate use case
 max_arguments=100

src/extensions/cafrun-head

@@ -26,10 +26,3 @@
 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# This script invokes the chosen Fortran compiler with the received command-line
-# arguments.  Current assumptions:
-#    1. The only argument is either an informational flag or a CAF executable
-#       file.
-#    2. The environment variable "FC" is used to determine the identity fo the Fortran compiler/linker.
-#    3. If "FC" is empty, a default value of "mpif90" is used.

src/make.inc

@@ -38,11 +38,11 @@ compiler=gnu
 ifeq ($(compiler),gnu)
   FC=gfortran
   CC=gcc
-  MPFC = mpif90
+  MPFC = mpifort
   MPICC = mpicc
   FFLAGS_EXTRA = -fcoarray=lib
   MPI_EXTRA_FLAGS = -Wall -Wextra -Wno-error=cpp -Wno-error=unused-parameter -DSTRIDED#-DNONBLOCKING_PUT -DCAF_MPI_LOCK_UNLOCK
-  MPI_RUN = mpirun -np 2
+  MPI_RUN = mpiexec -np 2
 else
   ifeq ($(compiler),cray)
     FC=ftn
@@ -71,4 +71,4 @@ GASNET_CFLAGS += # -DSTRIDED
 GASNET_PATH =
 GASNET_MAK = $(GASNET_PATH)/GASNet-1.22.4/smp-conduit/smp-par.mak
 GASNET_LDFLAGS +=$(GASNET_LIBS)
-GASNET_RUN = mpirun -np 2
+GASNET_RUN = mpiexec -np 2

src/make.inc.Cray-XE

@@ -32,4 +32,4 @@ GASNET_CFLAGS += -I/opt/chapel/1.8.0/cray-xk/third-party/gasnet/install/cray-xk-
                  -Wno-all
 GASNET_MAK = /opt/chapel/1.8.0/cray-xk/third-party/gasnet/install/cray-xk-cray-prgenv-gnu/seg-fast/nodbg/include/gemini-conduit/gemini-par.mak
 GASNET_CC = cc
-GASNET_RUN = mpirun -np 2
+GASNET_RUN = mpiexec -np 2

src/tests/integration/coarrayHelloWorld/Makefile

@@ -2,7 +2,7 @@
 opencoarrays=/opt/opencoarrays
 executable=hello_multiverse
 opt=-L $(opencoarrays)/lib
-compile=mpif90 -fcoarray=lib
+compile=mpifort -fcoarray=lib
 lib=-lcaf_mpi
 
 $(executable): hello_multiverse.o  Makefile

src/tests/integration/pde_solvers/coarrayBurgers/Makefile.inst

@@ -10,7 +10,7 @@ include_path=./include-files
 
 ifeq ($(compiler),gnu)
   lib=-lcaf_mpi
-  compile=mpif90 -fcoarray=lib
+  compile=mpifort -fcoarray=lib
   ifeq ($(machine),virtual)
     libpath=-L /opt/opencoarrays/lib
   else

src/tests/integration/pde_solvers/coarrayBurgers/run.sh

@@ -13,7 +13,7 @@ export TAU_CALLPATH_DEPTH=100
 for i in 1 2 4
 do
   echo "Running the code:"
-  mpirun -np ${i} ./burgers
+  mpiexec -np ${i} ./burgers
   paraprof --pack ${i}p.ppk
   taudb_loadtrial -a fireworks -x experiment -n ${i} ${i}p.ppk
 done

src/tests/integration/pde_solvers/coarrayBurgers/scripts/run.sh

@@ -11,7 +11,7 @@ export TAU_CALLPATH_DEPTH=100
 #export TAU_SAMPLING=1
 
 echo "Running the code:"
-mpirun -np 4 ./burgers
+mpiexec -np 4 ./burgers
 
 echo "Running the pprof command:"
 pprof

src/tests/integration/pde_solvers/coarrayBurgers/scripts/run_troubleshooting.sh

@@ -9,5 +9,5 @@ module load java
 export PATH=/usr/local/packages/intel/14.0/mpirt/bin/intel64/:$PATH
 #export FOR_COARRAY_NUM_IMAGES=1
 echo "Using FOR_COARRAY_NUM_IMAGES = " $FOR_COARRAY_NUM_IMAGES
-mpirun --mca btl_tcp_if_include eth2 -np 16 ./burgers_caf
+mpiexec --mca btl_tcp_if_include eth2 -np 16 ./burgers_caf
 #./burgers_caf

src/tests/integration/pde_solvers/coarrayHeatSimplified/Makefile

@@ -5,7 +5,7 @@ executable=co_heat
 ifeq ($(compiler),gnu)
   opencoarrays_dir=/opt/opencoarrays
   opt=-L $(opencoarrays_dir)/lib
-  compile=mpif90 -fcoarray=lib
+  compile=mpifort -fcoarray=lib
   lib=-lcaf_mpi
 else
   ifeq ($(compiler),intel)

src/tests/integration/pde_solvers/navier-stokes/Makefile

@@ -6,7 +6,7 @@ opencoarrays_dir=/opt/opencoarrays/lib
 ifeq ($(compiler),gnu)
   opt=-L $(opencoarrays_dir) -fcoarray=lib -Ofast
   libcaf_dir = $(opencoarrays_dir)
-  compile=mpif90
+  compile=mpifort
   lib=-lcaf_mpi
 else
   ifeq ($(compiler),intel)

src/tests/performance/BurgersMPI/Makefile

@@ -15,7 +15,7 @@ executable=burgers_mpi
 #Cray compiler command
 cray=ftn -ew -h caf
 #GNU compiler command
-gnu=mpif90 -fcoarray=lib -ffree-form -ffree-line-length-none
+gnu=mpifort -fcoarray=lib -ffree-form -ffree-line-length-none
 
 #Intel compiler command
 intel= tau_f90.sh -DTAU=1 -Bdynamic -standard-semantics -O3 -g -optCompInst