Merge branch 'master' into opencoarrays-teams

Author: Damian Rouson

.travis.yml

@@ -26,83 +26,76 @@ matrix:
         - BUILD_TYPE="InstallScript"
           OSX_PACKAGES="gcc@6"
           GCC=6
-    - os: osx
-      env:
-        - OSX_PACKAGES="gcc cmake"
-          GCC=7
-          OPENCOARRAYS_DEVELOPER=ON
     - &ubuntu
       os: linux
       sudo: false
       dist: trusty
       env:
         - GCC=6
       cache:
-        apt: false
+        apt: true
         directories:
           - "$CACHE"
       addons:
         apt:
-          sources:
+          sources: &linuxsrcs
             - ubuntu-toolchain-r-test
             - george-edison55-precise-backports
-          packages:
+          packages: &gcc6pkgs
             - gcc-6
             - gfortran-6
             - g++-6
             - binutils
             - cmake-data
             - cmake
-#            - shellcheck
     -
       <<: *ubuntu
       env:
         - GCC=7
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - george-edison55-precise-backports
-          packages:
+          sources: *linuxsrcs
+          packages: &gcc7pkgs
             - gcc-7
             - gfortran-7
             - g++-7
             - binutils
             - cmake-data
             - cmake
-#            - shellcheck
     -
       <<: *ubuntu
       env:
         - BUILD_TYPE="InstallScript"
           GCC=6
-      cache: false
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
+          sources: *linuxsrcs
           packages:
             - gcc-6
             - gfortran-6
             - g++-6
-#            - shellcheck
-  allow_failures:
-    - os: osx
+    - &linux_allowed_failure
+      <<: *ubuntu
       env:
-        - OSX_PACKAGES="gcc cmake"
-          GCC=7
+        - GCC=7
           OPENCOARRAYS_DEVELOPER=ON
+      addons:
+        apt:
+          sources: *linuxsrcs
+          packages: *gcc7pkgs
+
+  allow_failures:
+    - *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
   - |
-    set -o errexit
     if [[ (-n ${TRAVIS_TAG}) && (${TRAVIS_OS_NAME} == osx) ]] && ${TRAVIS_SECURE_ENV_VARS} ; then
       brew update > /dev/null
-      [[ "$(brew ls --versions gpg2)" ]] || brew install gpg2
+      brew ls --versions gpg2 >/dev/null || brew install gpg2
       brew outdated gpg2 || brew upgrade gpg2
       type -P openssl || brew install openssl
     fi
@@ -116,9 +109,7 @@ before_install:
       curl https://izaakbeekman.com/izaak.pubkey.txt | gpg --import
       git tag -v ${TRAVIS_TAG}
     fi
-    set +o errexit
   - |
-    set -o errexit
     if [[ (-n ${TRAVIS}) && (${TRAVIS_OS_NAME} == osx) ]]; then
       export PATH="${PATH}:${HOME}/Library/Python/2.7/bin"
     else
@@ -129,18 +120,16 @@ before_install:
       ${CC} --version
       ${CXX} --version
     fi
-    set +o errexit
 
 install:
   - |
-    set -o errexit
     if [[ (-n ${TRAVIS}) && (${TRAVIS_OS_NAME} == osx) ]]; then
       brew update > /dev/null
 
-      [[ "$(brew ls --versions shellcheck)" ]] || brew install --force-bottle shellcheck
+      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})" ]] || brew install ${pkg}
+        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
@@ -150,9 +139,7 @@ install:
       else
         wget "${!MPICH_BOT_URL_HEAD}${MPICH_BOT_URL_TAIL}"
         brew install --force-bottle ${MPICH_BOT_URL_TAIL}
-        if ! [[ "$(brew ls --versions mpich)" ]]; then
-          brew install --force-bottle mpich
-        fi
+        brew ls --versions mpich >/dev/null || brew install --force-bottle mpich
       fi
       mpif90 --version || mpif90 -show || true
       mpicc --version || mpicc -show || true
@@ -181,46 +168,40 @@ install:
       mpicc --version
       cmake --version
     fi
-    set +o errexit
 
 script:
+  - echo "In Travis-CI 'script' section."
   - |
-    set -o errexit
     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 7
+      ../../../installations/cmake/*/bin/ctest --output-on-failure --schedule-random --repeat-until-fail ${NREPEAT:-5}
       cd -
     else
-      mkdir cmake-build
+      mkdir cmake-build || echo "Cannot mkdir cmake-build"
       for BUILD_TYPE in ${BUILD_TYPES}; do
         rm -rf cmake-build/* || true
-        cd cmake-build
-        cmake -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" ..
-        make -j 4
-        ctest --output-on-failure --schedule-random --repeat-until-fail 7
+        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
-    set +o errexit
 
 after_script:
+  - find . -name '*.gcno' -print
+  - gcov-${GCC} --version
+  - bash <(curl -s https://codecov.io/bash) -x $(type -P gcov-${GCC})
   - |
-    set -o errexit
     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
         echo "ERROR: You are trying to tag a new release but have a version missmatch in \`.VERSION\`"
         false # throw an error
       fi
     fi
-    set +o errexit
-
-after_success:
-  - find . -name '*.gcno' -print
-  - gcov-${GCC} --version
-  - bash <(curl -s https://codecov.io/bash) -x $(type -P gcov-${GCC})
 
 # before_deploy:
 #   - git archive -v --prefix "OpenCoarrays-${TRAVIS_TAG}/" -o "OpenCoarrays-${TRAVIS_TAG}.tar.gz" ${TRAVIS_TAG}
@@ -233,7 +214,6 @@ after_success:
 #       sha256sum  "OpenCoarrays-${TRAVIS_TAG}.tar.gz" >> "opencoarrays-${TRAVIS_TAG}-SHA256.txt
 #     fi
 #   - |
-#     set -o errexit
 #     openssl aes-256-cbc -K ${encrypted_ef4535c39461_key} -iv ${encrypted_ef4535c39461_iv} -in subkey-328B3A0E-secret.asc.enc -out ./subkey-328B3A0E-secret.asc -d
 #     gpg --allow-secret-key-import --import ./subkey-328B3A0E-secret.asc && rm subkey-328B3A0E-secret.asc
 #     rm subkey-328B3A0E-secret.* || true
@@ -252,7 +232,6 @@ after_success:
 #       --comment 'verify with:' \
 #       --comment '`gpg --verify opencoarrays-'"${TRAVIS_TAG}"'-SHA256.txt.asc`' \
 #       "opencoarrays-${TRAVIS_TAG}-SHA256.txt"
-#     set +o errexit
 
 # deploy:
 #   provider: releases

CMakeLists.txt

@@ -5,6 +5,12 @@ set ( CMAKE_CONFIGURATION_TYPES "Debug" "Release" "MinSizeRel" "RelWithDebInfo"
 set ( CMAKE_BUILD_TYPE "Release"
   CACHE STRING "Select which configuration to build." )
 set_property ( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} )
+message( STATUS
+  "
+============================================================
+   Building OpenCoarrays configuration: ${CMAKE_BUILD_TYPE}
+============================================================
+")
 
 # Add option and check environment to determine if developer tests should be run
 if($ENV{OPENCOARRAYS_DEVELOPER})
@@ -624,7 +630,7 @@ endfunction(add_caf_test)
 
 if(opencoarrays_aware_compiler)
   if (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER})
-    message ( STATUS "Running Developer tests is enabled." )
+    message ( STATUS "Running Developer tests is enabled. Some tests may fail for open issues." )
   endif()
   # Unit tests targeting each libcaf_mpi function, argument, and branch of code
   add_caf_test(initialize_mpi 2 initialize_mpi)
@@ -651,13 +657,46 @@ if(opencoarrays_aware_compiler)
       add_caf_test(get_communicator 3 ${tests_root}/unit/teams/get_communicator)
     endif()
   endif()
+
+
+  if (gfortran_compiler)
+    if((NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
+      add_caf_test(send_convert_nums 2 send_convert_nums)
+      add_caf_test(sendget_convert_nums 3 sendget_convert_nums)
+      add_caf_test(sendget_convert_char_array 3 sendget_convert_char_array)
+    else()
+      message( AUTHOR_WARNING "Skipping the following tests due to GFortran < 7.0.0 lack of compatibility:
+        sendget_convert_nums.f90
+        sendget_convert_char_array.f90
+        send_convert_nums.f90")
+    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}))
+      message( AUTHOR_WARNING "Skipping the following tests to GFortran < 7.3.0 lack of compatibility:
+        send_convert_char_array.f90")
+    endif()
+  endif()
+
+  # Pure get tests
   add_caf_test(get_array 2 get_array)
   add_caf_test(get_self 2 get_self)
-  add_caf_test(send_array 2 send_array)
+  add_caf_test(get_convert_nums 2 get_convert_nums)
+  add_caf_test(get_convert_char_array 2 get_convert_char_array)
   add_caf_test(get_with_offset_1d 2 get_with_offset_1d)
   add_caf_test(whole_get_array 2 whole_get_array)
   add_caf_test(strided_get 2 strided_get)
+
+  # Pure send tests
+  add_caf_test(send_array 2 send_array)
+  add_caf_test(convert-before-put 3 convert-before-put)
+  add_caf_test(send_with_vector_index 2 send_with_vector_index)
+
+  # Pure sendget tests
   add_caf_test(strided_sendget 3 strided_sendget)
+  add_caf_test(get_with_vector_index 4 get_with_vector_index)
+
+
   add_caf_test(co_sum 4 co_sum_test)
   add_caf_test(co_broadcast 4 co_broadcast_test)
   add_caf_test(co_min 4 co_min_test)
@@ -693,10 +732,18 @@ if(opencoarrays_aware_compiler)
   endif()
 
   # Open GCC 7 regressions
-  if ((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}) OR (gfortran_compiler AND (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)))
-    add_caf_test(convert-before-put 3 convert-before-put)
-    add_caf_test(put-alloc-comp 2 issue-422-send)
-    add_caf_test(get-put-alloc-comp 3 issue-422-send-get)
+  if ((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}) OR
+      (gfortran_compiler AND (
+	  (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0) OR
+	  (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0)
+	  )))
+    add_caf_test(put-allocatable-coarray-comp 2 issue-422-send)
+    add_caf_test(get-put-allocatable-comp 3 issue-422-send-get)
+  else()
+    message( AUTHOR_WARNING
+      "Skipping regressions in GFortran 7.0:
+       put-allocatable-coarray-comp (issue-422)
+       get-put-allocatable-comp     (issue-422)")
   endif()
 
   add_caf_test(allocatable_p2p_event_post 4 allocatable_p2p_event_post)

src/extensions/cafrun.in

@@ -160,7 +160,7 @@ usage() {
   echo "                            failed image support is present, OpenCoarrays triggers cleanup"
   echo "                            explicitly when a failed/stopped image is encountered in an"
   echo "                            image control statement without a \`stat=\` clause."
-  ehco "   --show, -s,              Show the command that the wrapper will execute. You can pass"
+  echo "   --show, -s,              Show the command that the wrapper will execute. You can pass"
   echo "                            this as the first argument and then the additional arguments"
   echo "                            that you're planning to pass to perform a dry run."
   echo ""