Merge branch 'master' into opencoarrays-teams

Author: zbeekman

.travis.yml

@@ -9,23 +9,17 @@ env:
     - MPICH_VER="3.2"
     - MPICH_URL_HEAD="https://www.mpich.org/static/downloads/${MPICH_VER}"
     - MPICH_URL_TAIL="mpich-${MPICH_VER}.tar.gz"
-    - MPICH_DIR="${HOME}/.local/usr/mpich"
     - MPICH_GCC6_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/979804/"
     - MPICH_GCC7_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/976779/"
     - MPICH_BOT_URL_TAIL="mpich-3.2_3.yosemite.bottle.1.tar.gz"
     - BUILD_TYPES="Release Debug RelWithDebInfo CodeCoverage"
-  matrix: # shellcheck installed manually below for macOS
-    - GCC=6 OSX_PACKAGES="gcc@6 cmake"
-    - GCC=7 OSX_PACKAGES="gcc cmake"
+  matrix:
+    - GCC=6 OSX_PACKAGES="gcc@6 shellcheck" BUILD_TYPE="InstallScript"
+    - GCC="6 7" OSX_PACKAGES="gcc gcc@6 cmake shellcheck" BUILD_TYPE="cmake"
 
 matrix:
   fast_finish: true
   include:
-    - os: osx
-      env:
-        - BUILD_TYPE="InstallScript"
-          OSX_PACKAGES="gcc@6"
-          GCC=6
     - &ubuntu
       os: linux
       sudo: false
@@ -45,8 +39,6 @@ matrix:
             - gcc-6
             - gfortran-6
             - g++-6
-            - binutils
-            - cmake-data
             - cmake
     -
       <<: *ubuntu
@@ -59,8 +51,6 @@ matrix:
             - gcc-7
             - gfortran-7
             - g++-7
-            - binutils
-            - cmake-data
             - cmake
     -
       <<: *ubuntu
@@ -88,113 +78,20 @@ matrix:
     - *linux_allowed_failure
 
 before_install:
-  - export FC=gfortran-${GCC}
-  - export CC=gcc-${GCC}
-  - export CXX=g++-${GCC}
-  - export MPICH_BOT_URL_HEAD=MPICH_GCC${GCC}_BOT_URL_HEAD
-  - |
-    if [[ (-n ${TRAVIS_TAG}) && (${TRAVIS_OS_NAME} == osx) ]] && ${TRAVIS_SECURE_ENV_VARS} ; then
-      brew update > /dev/null
-      brew ls --versions gpg2 >/dev/null || brew install gpg2
-      brew outdated gpg2 || brew upgrade gpg2
-      type -P openssl || brew install openssl
-    fi
-    if ! [[ "${TRAVIS_TAG}" ]] || ! ${TRAVIS_SECURE_ENV_VARS} ; then
-      unset encrypted_ef4535c39461_key || true
-      unset encrypted_ef4535c39461_iv || true
-      rm subkey-328B3A0E-secret.asc{,.enc} || true
-
-    fi
-    if [[ "${TRAVIS_TAG}" ]] ; then
-      curl https://izaakbeekman.com/izaak.pubkey.txt | gpg --import
-      git tag -v ${TRAVIS_TAG}
-    fi
-  - |
-    if [[ (-n ${TRAVIS}) && (${TRAVIS_OS_NAME} == osx) ]]; then
-      export PATH="${PATH}:${HOME}/Library/Python/2.7/bin"
-    else
-      [[ -d "${CACHE}/bin" ]] || mkdir -p "${CACHE}/bin"
-      [[ -d "${MPICH_DIR}" ]] || mkdir -p "${MPICH_DIR}"
-      export PATH="${CACHE}/bin:${PATH}"
-      ${FC} --version
-      ${CC} --version
-      ${CXX} --version
-    fi
+  - source developer-scripts/travis/before_install.all.sh
+  - developer-scripts/travis/before_install.${TRAVIS_OS_NAME}.sh
 
 install:
-  - |
-    if [[ (-n ${TRAVIS}) && (${TRAVIS_OS_NAME} == osx) ]]; then
-      brew update > /dev/null
-
-      brew ls --versions shellcheck >/dev/null || brew install --force-bottle shellcheck
-      brew outdated shellcheck || brew upgrade --force-bottle shellcheck
-      for pkg in ${OSX_PACKAGES}; do
-        brew ls --versions ${pkg} >/dev/null || brew install ${pkg} || brew link --overwrite ${pkg}
-        brew outdated ${pkg} || brew upgrade ${pkg}
-      done
-      if [[ ${BUILD_TYPE} == InstallScript ]]; then # uninstall some stuff if present
-        brew uninstall --force --ignore-dependencies cmake || true
-        brew uninstall --force --ignore-dependencies mpich || true
-        brew uninstall --force --ignore-dependencies openmpi || true
-      else
-        wget "${!MPICH_BOT_URL_HEAD}${MPICH_BOT_URL_TAIL}"
-        brew install --force-bottle ${MPICH_BOT_URL_TAIL}
-        brew ls --versions mpich >/dev/null || brew install --force-bottle mpich
-      fi
-      mpif90 --version || mpif90 -show || true
-      mpicc --version || mpicc -show || true
-      cmake --version || true
-
-    elif [[ ${BUILD_TYPE} != InstallScript ]]; then # Ubuntu on Travis-CI, NOT testing install.sh
-      if ! [[ -x "${HOME}/.local/bin/mpif90" && -x "${HOME}/.local/bin/mpicc" ]]; then
-        # mpich install not cached
-        # could use prerequisites/build instead...
-        wget "${MPICH_URL_HEAD}/${MPICH_URL_TAIL}"
-        mv "${MPICH_URL_TAIL}" "${MPICH_DIR}/.."
-        pushd "${MPICH_DIR}/.."
-        tar -xzvf "${MPICH_URL_TAIL}"
-        cd "${MPICH_URL_TAIL%.tar.gz}"
-        ./configure --prefix="${MPICH_DIR}"
-        make -j 4
-        make install
-        popd
-        for f in "${MPICH_DIR}/bin/"*; do
-          if [[ -x "${f}" ]]; then
-            ln -fs "${f}" "${HOME}/.local/bin/${f##*/}"
-          fi
-        done
-      fi
-      mpif90 --version
-      mpicc --version
-      cmake --version
-    fi
+  - pwd
+  - developer-scripts/travis/install.${TRAVIS_OS_NAME}.sh
 
 script:
-  - echo "In Travis-CI 'script' section."
-  - |
-    if [[ ${BUILD_TYPE} == InstallScript ]]; then
-      ./install.sh --yes-to-all -i "${HOME}/opencoarrays" -j 4 -f "$(type -P "${FC}")" -c "$(type -P "${CC}")" -C "$(type -P "${CXX}")"
-      cd prerequisites/builds/opencoarrays/*
-      ../../../installations/cmake/*/bin/ctest --output-on-failure --schedule-random --repeat-until-fail ${NREPEAT:-5}
-      cd -
-    else
-      mkdir cmake-build || echo "Cannot mkdir cmake-build"
-      for BUILD_TYPE in ${BUILD_TYPES}; do
-        rm -rf cmake-build/* || true
-        cd cmake-build || echo 'cannot cd to cmake-build/'
-        cmake -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" .. || echo "running cmake failed"
-        make -j 4 || echo "running make failed"
-        ctest --output-on-failure --schedule-random --repeat-until-fail ${NREPEAT:-5} --timeout ${TEST_TIMEOUT:-200}
-        make install
-        make uninstall
-        cd ..
-      done
-    fi
+  - pwd
+  - developer-scripts/travis/test-script.${BUILD_TYPE:-cmake}.sh
 
 after_script:
   - find . -name '*.gcno' -print
-  - gcov-${GCC} --version
-  - bash <(curl -s https://codecov.io/bash) -x $(type -P gcov-${GCC})
+  - for version in ${GCC}; do bash <(curl -s https://codecov.io/bash) -x $(type -P gcov-${GCC}) ; done
   - |
     if [[ "${TRAVIS_TAG}" ]]; then
       if [[ "v${TRAVIS_TAG}" != "v$(sed -n '/[0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}/{s/^\([^.]*\)\([0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}\)\(.*\)/\2/p;q;}' .VERSION)" ]]; then
@@ -254,3 +151,7 @@ notifications:
     on_success: change  # options: [always|never|change]
     on_failure: always
     on_start: always
+  email:
+    on_success: change
+    on_failure: always
+    on_start: never

CMakeLists.txt

@@ -586,15 +586,16 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
 #---------------------------------------------------------------------------------------
 
 # Determine if we're using Open MPI
+cmake_host_system_information(RESULT N_CPU QUERY NUMBER_OF_LOGICAL_CORES)
+cmake_host_system_information(RESULT HOST_NAME QUERY HOSTNAME)
 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 )
+  # Write out a host file because OMPI's mpiexec is dumb
+  file(APPEND ${CMAKE_BINARY_DIR}/hostfile "${HOST_NAME} slots=${N_CPU}\n")
 endif ()
-
-include( ProcessorCount )
-ProcessorCount(N_CPU)
 function(add_caf_test name num_caf_img test_target)
   # Function to add MPI tests.
   if(TARGET ${test_target})
@@ -607,6 +608,10 @@ function(add_caf_test name num_caf_img test_target)
       message( FATAL_ERROR "Test ${name} requires ${min_test_imgs} but was only given ${num_caf_images}" )
     endif()
   endif()
+  # Add a host file for OMPI
+  if ( openmpi )
+    set(test_parameters --hostfile ${CMAKE_BINARY_DIR}/hostfile)
+  endif()
   if ( ((N_CPU LESS num_caf_img) OR (N_CPU EQUAL 0)) )
     message(STATUS "Test ${name} is oversubscribed: ${num_caf_img} CAF images requested with ${N_CPU} system processor available.")
     if ( openmpi )
@@ -615,7 +620,7 @@ function(add_caf_test name num_caf_img test_target)
       elseif ( N_CPU LESS 2 )
         set( num_caf_img 2 )
       endif()
-      set (test_parameters --oversubscribe)
+      set (test_parameters ${test_parameters} --oversubscribe)
       message( STATUS "Open-MPI back end detected, passing --oversubscribe for oversubscribed test, ${name}, with ${num_caf_img} ranks/images." )
     endif()
   endif()
@@ -652,6 +657,7 @@ if(opencoarrays_aware_compiler)
     add_caf_test(async_comp_alloc_2 2 async_comp_alloc_2)
     add_caf_test(comp_allocated_1 2 comp_allocated_1)
     add_caf_test(comp_allocated_2 2 comp_allocated_2)
+    add_caf_test(alloc_comp_get_convert_nums 2 alloc_comp_get_convert_nums)
     if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8)
       add_caf_test(team_number 2 ${tests_root}/unit/teams/team_number)
       add_caf_test(get_communicator 3 ${tests_root}/unit/teams/get_communicator)
@@ -672,9 +678,18 @@ if(opencoarrays_aware_compiler)
     endif()
     if((NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
       add_caf_test(send_convert_char_array 2 send_convert_char_array)
-    else()#if((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
+      add_caf_test(alloc_comp_send_convert_nums 2 alloc_comp_send_convert_nums)
+    elseif((NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.4.0) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
+      add_caf_test(send-strided-self 2 send-strided-self)
+    endif()
+    if((CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0) AND (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
       message( AUTHOR_WARNING "Skipping the following tests to GFortran < 7.3.0 lack of compatibility:
-        send_convert_char_array.f90")
+        send_convert_char_array.f90
+        alloc_comp_send_convert_nums.f90")
+    endif()
+    if((CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.4.0) AND (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
+      message( AUTHOR_WARNING "Skipping the following test to GFortran < 7.4.0 lack of compatibility:
+        send-strided-self.f90")
     endif()
   endif()
 
@@ -759,8 +774,8 @@ if(opencoarrays_aware_compiler)
 
   # IMAGE FAIL tests
   if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
-    add_caf_test(image_status_test_1 4 image_status_test_1)
     if(CAF_ENABLE_FAILED_IMAGES)
+      add_caf_test(image_status_test_1 4 image_status_test_1)
       if ((NOT DEFINED ENV{TRAVIS}) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
 	add_caf_test(image_fail_test_1 4 image_fail_test_1)
 	set_property(TEST image_fail_test_1 PROPERTY FAIL_REGULAR_EXPRESSION "Test failed.")
@@ -795,3 +810,13 @@ endif()
 
 include(cmake/AddInstallationScriptTest.cmake )
 add_installation_script_test(installation-scripts.sh src/tests/installation/)
+
+# Lint the Travis-CI scripts
+set(TRAVIS_SCRIPTS
+  install.linux.sh
+  install.osx.sh
+  test-script.InstallScript.sh
+  test-script.cmake.sh)
+foreach(SCRIPT ${TRAVIS_SCRIPTS})
+  lint_script("${CMAKE_SOURCE_DIR}/developer-scripts/travis" ${SCRIPT})
+endforeach()