Merge pull request #180 from sourceryinstitute/bump-default-gcc-to-6.1

Damian Rouson · Damian Rouson · commit 2997200a1eda · 2016-05-09T10:15:09.000-07:00
Bump default gcc to 6.1
diff --git a/INSTALL.md b/INSTALL.md
@@ -117,7 +117,7 @@ The prerequisites below and their dependencies are recommended for the broadest
 opencoarrays
 ├── cmake-3.4.0
 └── mpich-3.1.4
-    └── gcc-5.3.0
+    └── gcc-6.1.0
         ├── flex-2.6.0
         │   └── bison-3.0.4
         │       └── m4-1.4.17
diff --git a/STATUS.md b/STATUS.md
@@ -134,14 +134,13 @@ Known Issues
         access as in `coarray(:,:)[i]%comp`.
      * An internal compiler error (ICE) occurs with non-allocatable, polymorphic coarrays
        in `associate` or `select type` statements.
-     * `co_reduce` with GCC 5 and 6 requires patches committed on 17 July 2015 and will
-       work with the GCC 5.3.0 and 6.1.0 releases.
+     * `co_reduce` requires GCC 5.4.0 or later.
      * `co_reduce` only supports arguments of intrinsic type.
+     * Proper execution of `stop` when `this_image()>1` requires GCC 5.4.0 or later.
      * No support for type finalization or allocatable components of derived-type coarrays
        passed to the collective subroutines (e.g., `co_sum`, `co_reduce`, etc.).
-	 * Optimization levels other than `-O0` introduce correctness errors
-	   in the compiled binaries. A patch has been submitted by @afanfa
-	   to the GFortran team. See #28 for some more context.
+     * Optimization levels other than `-O0` require GCC 5.3.0 or later. 
+     * Using `stop` to halt an individual image without halting all images requires GCC 5.4.0 or later. 
 <a name="compiler-issues-intel">
 * **Intel** (ifort)</a>
      * Supported via the [opencoarrays module]  only.
diff --git a/doc/dependency_tree/opencoarrays-tree.txt b/doc/dependency_tree/opencoarrays-tree.txt
@@ -1,7 +1,7 @@
 opencoarrays
 ├── cmake-3.4.0
 └── mpich-3.1.4
-    └── gcc-5.3.0
+    └── gcc-6.1.0
         ├── flex-2.6.0
         │   └── bison-3.0.4
         │       └── m4-1.4.17
diff --git a/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-5.1.0/flex-2.6.0/bison-3.0.4/m4-1.4.17/.gitkeep b/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-5.1.0/flex-2.6.0/bison-3.0.4/m4-1.4.17/.gitkeep
diff --git a/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-5.1.0/gmp/.gitkeep b/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-5.1.0/gmp/.gitkeep
diff --git a/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-5.1.0/mpc/.gitkeep b/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-5.1.0/mpc/.gitkeep
diff --git a/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-5.1.0/mpfr/.gitkeep b/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-5.1.0/mpfr/.gitkeep
diff --git a/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-6.1.0/flex-2.6.0/bison-3.0.4/m4-1.4.17/.gitkeep b/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-6.1.0/flex-2.6.0/bison-3.0.4/m4-1.4.17/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-6.1.0/gmp/.gitkeep b/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-6.1.0/gmp/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-6.1.0/mpc/.gitkeep b/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-6.1.0/mpc/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-6.1.0/mpfr/.gitkeep b/doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-6.1.0/mpfr/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/install.sh b/install.sh
@@ -188,8 +188,8 @@ info  "-V (--print-version):    ${arg_V}"
 this_script="$(basename "$0")"
 export this_script
 
-export install_path="${arg_i}/${arg_p}"
-info "install_path=${arg_i}/${arg_p}"
+export install_path="${arg_i}"
+info "install_path=${arg_i}"
 
 export num_threads="${arg_j}"
 info "num_threads=${arg_j}"
@@ -284,7 +284,7 @@ elif [[ "${arg_p:-}" == "ofp" ]]; then
 
 elif [[ ! -z "${arg_p:-}" ]]; then
 
-  "${opencoarrays_src_dir}"/prerequisites/build.sh -p "${arg_p}"
+  "${opencoarrays_src_dir}"/prerequisites/build.sh ${@:-}
 
 fi
 # ____________________________________ End of Main Body ____________________________________________
diff --git a/install.sh-usage b/install.sh-usage
@@ -1,9 +1,9 @@
-  -c --with-c [arg]           Use specified C compiler. Default="gcc"
-  -C --with-cxx [arg]         Use specified C++ compiler. Default="g++"
+  -c --with-c [arg]           Use specified C compiler. 
+  -C --with-cxx [arg]         Use specified C++ compiler. 
   -d --debug                  Enable debug mode.
   -D --print-downloader [arg] Print download program for package specified in argument.
   -e --verbose                Enable verbose mode, print script as it is executed.
-  -f --with-fortran [arg]     Use specified Fortran compiler. Default="gfortran"
+  -f --with-fortran [arg]     Use specified Fortran compiler. 
   -h --help                   Print this page.
   -i --install-dir [arg]      Install package in specified path. Default="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/"
   -I --install-version [arg]  Install package version.
diff --git a/prerequisites/acceptable_compiler.f90 b/prerequisites/acceptable_compiler.f90
@@ -35,5 +35,5 @@
 program main
   use iso_fortran_env, only : compiler_version
   implicit none
-  print *,compiler_version() >= "GCC version 5.3.0 "
+  print *,compiler_version() >= "GCC version 6.1.0 "
 end program
diff --git a/prerequisites/build-functions/build_and_install.sh b/prerequisites/build-functions/build_and_install.sh
@@ -19,7 +19,7 @@ build_and_install()
     "${PWD}"/contrib/download_prerequisites
     info "popd"
     popd
-    info "Configuring with the following command:"
+    info "Configuring gcc/g++/gfortran builds with the following command:"
     info "${download_path}/${package_source_directory}/configure --prefix=${install_path} --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror"
     "${download_path}/${package_source_directory}/configure" --prefix="${install_path}" --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror
     info "Building with the following command: 'make -j${num_threads} bootstrap'"
@@ -32,11 +32,11 @@ build_and_install()
     ${SUDO:-} make install
   else
     info "Configuring ${package_to_build} ${version_to_build} with the following command:"
-    info "CC=\"${CC:-'gcc'}\" CXX=\"${CXX:-'g++'}\" \"${download_path}/${package_source_directory}\"/configure --prefix=\"${install_path}\""
-    CC="${CC:-'gcc'}" CXX="${CXX:-'g++'}" "${download_path}/${package_source_directory}"/configure --prefix="${install_path}"
+    info "FC=\"${FC:-'gfortran'}\" CC=\"${CC:-'gcc'}\" CXX=\"${CXX:-'g++'}\" \"${download_path}/${package_source_directory}\"/configure --prefix=\"${install_path}\""
+    FC="${FC:-'gfortran'}" CC="${CC:-'gcc'}" CXX="${CXX:-'g++'}" "${download_path}/${package_source_directory}"/configure --prefix="${install_path}"
     info "Building with the following command:"
-    info "CC=\"${CC:-'gcc'}\" CXX=\"${CXX:-'g++'}\" make -j\"${num_threads}\""
-    CC="${CC:-'gcc'}" CXX="${CXX:-'g++'}" make "-j${num_threads}"
+    info "FC=\"${FC:-'gfortran'}\" CC=\"${CC:-'gcc'}\" CXX=\"${CXX:-'g++'}\" make -j\"${num_threads}\""
+    FC="${FC:-'gfortran'}" CC="${CC:-'gcc'}" CXX="${CXX:-'g++'}" make "-j${num_threads}"
     info "Installing ${package_to_build} in ${install_path}"
     if [[ ! -z "${SUDO:-}" ]]; then
       info "You do not have write permissions to the installation path ${install_path}"
diff --git a/prerequisites/build-functions/download_if_necessary.sh b/prerequisites/build-functions/download_if_necessary.sh
@@ -1,16 +1,16 @@
 # shellcheck source=./ftp-url.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/ftp-url.sh"
+source "${OPENCOARRAYS_SRC_DIR}/prerequisites/build-functions/ftp-url.sh"
 # shellcheck source=./set_SUDO_if_needed_to_write_to_directory.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh"
+source "${OPENCOARRAYS_SRC_DIR}/prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh"
 
-# Download pkg-config if the tar ball is not already in the present working directory
+# Download package if the tar ball is not already in the present working directory
 # shellcheck disable=SC2154
 download_if_necessary()
 {
-  download_path="${PWD}/downloads"
+  download_path="${OPENCOARRAYS_SRC_DIR}/prerequisites/downloads"
   set_SUDO_if_needed_to_write_to_directory "${download_path}"
-  if [ -f "$url_tail" ] || [ -d "$url_tail" ]; then
-    info "Found '${url_tail}' in ${PWD}."
+  if  [[ -f "${download_path}/${url_tail}" || -d "${download_path}/${url_tail}" ]] ; then
+    info "Found '${url_tail}' in ${download_path}."
     info "If it resulted from an incomplete download, building ${package_name} could fail."
     info "Would you like to proceed anyway? (Y/n)"
     read -r proceed
@@ -27,13 +27,7 @@ download_if_necessary()
     info "Please either ensure that ${fetch} is installed and in your PATH"
     info "or download the ${package_name} source from "
     info "${package_url}"
-   #called_by_install_sh=`echo "$(ps -p $PPID -o args=)" | grep install.sh`
     info "Place the downloaded file in ${download_path} and restart this script."
-   #if [[ ! -z $called_by_install_sh ]]; then
-   #  caller="install.sh"
-   #else
-   #  caller="build"
-   #fi
     emergency "Aborting [exit 90]"
   else
     # The download mechanism is in the path.
diff --git a/prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh b/prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh
@@ -9,7 +9,7 @@ set_SUDO_if_needed_to_write_to_directory()
   if [[ -z "${LD_LIBRARY_PATH:-}" ]]; then
      info "\${LD_LIBRARY_PATH} is empty. Try setting it if the compiler encounters linking problems."
   fi
-  SUDO_COMMAND="sudo env LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-""}"
+  SUDO_COMMAND="sudo env LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-} PATH=${PATH:-}"
   info "Checking whether the directory ${directory_to_create} exists... "
   if [[ -d "${directory_to_create}" ]]; then
     info "yes"
diff --git a/prerequisites/build-functions/set_or_print_default_version.sh b/prerequisites/build-functions/set_or_print_default_version.sh
@@ -18,7 +18,7 @@ set_or_print_default_version()
   # See http://stackoverflow.com/questions/1494178/how-to-define-hash-tables-in-bash
   package_version=(
     "cmake:3.4.0"
-    "gcc:5.3.0"
+    "gcc:6.1.0"
     "mpich:3.1.4"
     "wget:1.16.3"
     "flex:2.6.0"
diff --git a/prerequisites/install-functions/find_or_install.sh b/prerequisites/install-functions/find_or_install.sh
@@ -28,9 +28,9 @@ find_or_install()
   done
 
   if [[ "$package" == "$executable" ]]; then
-    echo -e "$this_script: Checking whether $executable is in the PATH..."
+    printf "$this_script: Checking whether $executable is in the PATH..."
   else
-    echo -e "$this_script: Checking whether $package executable $executable is in the PATH..."
+    printf "$this_script: Checking whether $package executable $executable is in the PATH..."
   fi
   if type "$executable" > /dev/null; then
     printf "yes.\n"
@@ -43,8 +43,7 @@ find_or_install()
 
   package_install_path=$(./build.sh -P "$package")
 
-  echo -e "$this_script: Checking whether $executable is in the directory in which $this_script\n"
-  printf "            installs it by default and whether the user has executable permission for it..."
+  printf "Checking whether $executable is in the prerequisites/instalations directory.."
   if [[ -x "$package_install_path/bin/$executable" ]]; then
     printf "yes.\n"
     script_installed_package=true
@@ -111,8 +110,30 @@ find_or_install()
     # Every branch that discovers an acceptable pre-existing installation must set the
     # MPIFC, MPICC, and MPICXX environment variables. Every branch must also manage the
     # dependency stack.
+   
+    if [[ ! -z "${arg_f}" ]]; then
+
+      # -f or --with-fortran argument specifies a compiler, which we use if mpif90
+      # invokes the specified compiler.  Otherwise, we halt and print an error message.
+
+      mpif90_wraps=$(mpif90 --version)
+      compiler=$(${arg_f} --version)
+      if [[ "${mpif90_wraps}" != "${compiler}"   ]]; then
+        emergency "The specified compiler ${arg_f} differs from the compiler that mpif90 invokes."
+      else
+        info "mpif90 invokes the specified compiler ${arg_f}"
+      fi
+      export MPIFC=mpif90
+      export MPICC=mpicc
+      export MPICXX=mpicxx
+
+      # Halt the recursion
+      stack_push dependency_pkg "none"
+      stack_push dependency_exe "none"
+      stack_push dependency_path "none"
+
+    elif [[ "$script_installed_package" == true ]]; then
 
-    if [[ "$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 MPICC=$package_install_path/bin/mpicc
@@ -123,9 +144,10 @@ find_or_install()
       stack_push dependency_path "none"
 
     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)
+      mpif90_version_header=$(mpif90 --version | head -1)
+      first_three_characters=$(echo "$mpif90_version_header" | cut -c1-3)
       if [[ "$first_three_characters" != "GNU" ]]; then
         printf "no.\n"
         # Trigger 'find_or_install gcc' and subsequent build of $package
@@ -134,16 +156,16 @@ find_or_install()
         stack_push dependency_path "none" "$(./build.sh -P "$package")" "$(./build.sh -P gcc)"
       else
         printf "yes.\n"
-        echo -e "$this_script: Checking whether $executable in PATH wraps gfortran version 5.3.0 or later... "
+
+        echo -e "$this_script: Checking whether $executable in PATH wraps gfortran version `./build.sh -V gcc` or later... "
         $executable acceptable_compiler.f90 -o acceptable_compiler
         $executable print_true.f90 -o print_true
         acceptable=$(./acceptable_compiler)
         is_true=$(./print_true)
         rm acceptable_compiler print_true
-
-        if [[ "$acceptable" == "$is_true"  ]]; then
-          printf "yes.\n"
-          echo -e "$this_script: Using the $executable found in the PATH.\n"
+       
+        if [[ "$acceptable" == "$is_true" ]]; then
+          printf "yes.\n $this_script: Using the $executable found in the PATH.\n"
           export MPIFC=mpif90
           export MPICC=mpicc
           export MPICXX=mpicxx
@@ -170,7 +192,7 @@ find_or_install()
 
   elif [[ $package == "gcc" ]]; then
 
-    # We arrive when the 'elif [[ $package == "gcc" ]]' block pushes "gcc" onto the
+    # We arrive here when the 'elif [[ $package == "mpich" ]]' block pushes "gcc" onto the
     # the dependency_pkg stack, resulting in the recursive call 'find_or_install gcc'
 
     # Every branch that discovers an acceptable pre-existing installation must set the
@@ -203,7 +225,7 @@ find_or_install()
       stack_push dependency_path "none"
 
     elif [[ "$package_in_path" == "true" ]]; then
-      echo -e "$this_script: Checking whether $executable in PATH is version 5.3.0 or later..."
+      echo -e "$this_script: Checking whether $executable in PATH is version `./build.sh -V gcc` or later..."
       $executable -o acceptable_compiler acceptable_compiler.f90
       $executable -o print_true print_true.f90
       is_true=$(./print_true)
diff --git a/prerequisites/install-functions/print_header.sh b/prerequisites/install-functions/print_header.sh
@@ -3,15 +3,14 @@ print_header()
 {
   clear
   echo ""
-  echo "*** A default build of OpenCoarrays requires CMake 3.4.0 or later     ***"
-  echo "*** and MPICH 3.1.4 wrapping GCC Fortran (gfortran) 5.3.0 or later.   ***"
-  echo "*** Additionally, CMake, MPICH, and GCC have their own prerequisites. ***"
-  echo "*** This script will check for most known requirements in your PATH   ***"
-  echo "*** environment variable and in the default installation directory    ***"
-  echo "*** to which this script installs each missing prerequisite.  The     ***"
-  echo "*** script will recursively traverse the following dependency tree    ***"
-  echo "*** and ask permission to download, build, and install any missing    ***"
-  echo "*** prerequisites:                                                    ***"
+  echo "*** By default, building OpenCoarrays requires CMake 3.4.0 or later,      ***"
+  echo "*** MPICH 3.1.4, and GCC Fortran (gfortran) 6.1.0 or later.  To see       ***"
+  echo "*** options for forcing the use of older or alternative packages, execute ***"
+  echo "*** this script with the -h flag.  This script will recursively traverse  ***"
+  echo "*** the following dependency tree, asking permission to download, build,  ***"
+  echo "*** and install any packages that are required for building another       ***"
+  echo "*** package and are neither in your PATH nor in                           ***"
+  echo "*** opencoarrays/prerequisites/installations:                             ***"
   echo ""
   # Move to a directory tree whose structure mirrors the dependency tree
   pushd "$opencoarrays_src_dir/doc/dependency_tree/" > /dev/null
@@ -24,9 +23,8 @@ print_header()
   fi
   popd > /dev/null
   echo ""
-  printf "*** OpenCoarrays and all prerequisites will be downloaded, built, and installed in ***\n"
-  echo -e "${build_path}\n"
-  echo -e "${install_path}\n"
+  printf "${arg_p} will be installed in ${install_path}\n"
+  echo ""
   printf "Ready to rock and roll? (Y/n)"
   read -r install_now
   echo -e " $install_now\n"
