Merge branch 'master' into issue-427-fix-sendget

Author: zbeekman

.travis.yml

@@ -6,13 +6,13 @@ os: osx
 env:
   global:
     - CACHE="${HOME}/.local"
-    - MPICH_VER="3.2"
+    - MPICH_VER="3.2.1"
     - MPICH_URL_HEAD="https://www.mpich.org/static/downloads/${MPICH_VER}"
     - MPICH_URL_TAIL="mpich-${MPICH_VER}.tar.gz"
-    - 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"
+    - MPICH_GCC6_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/1956499/"
+    - MPICH_GCC7_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/1956441/"
+    - MPICH_BOT_URL_TAIL="mpich-3.2.1_1.high_sierra.bottle.1.tar.gz"
+    - BUILD_TYPES="Debug RelWithDebInfo Release CodeCoverage"
   matrix:
     - GCC=6 OSX_PACKAGES="gcc@6 shellcheck" BUILD_TYPE="InstallScript"
     - GCC="6 7" OSX_PACKAGES="gcc gcc@6 cmake shellcheck" BUILD_TYPE="cmake"

CMakeLists.txt

@@ -158,6 +158,10 @@ the C compiler if it matches the Fortran compiler ID." )
   set( CMAKE_Fortran_COMPILER_VERSION "${DETECTED_VER}" )
 endif()
 
+if(CMAKE_BUILD_TYPE MATCHES "Debug|DEBUG|debug")
+  add_definitions(-DEXTRA_DEBUG_OUTPUT)
+endif()
+
   # We have populated CMAKE_Fortran_COMPILER_VERSION if it was missing
   if(gfortran_compiler AND (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER 5.0.0))
     set(opencoarrays_aware_compiler true)
@@ -744,6 +748,11 @@ if(opencoarrays_aware_compiler)
     add_caf_test(source-alloc-no-sync 8 source-alloc-sync)
   endif()
 
+  # Fixed on GCC 6 > 6.4, 7 > 7.3 and 8.x
+  if (FALSE) # FIXME!
+    add_caf_test(non-coarray-vector-indexed-lhs issue-322-non-coarray-vector-idx-lhs)
+  endif()
+
   # Open GCC 7 regressions
   if ((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}) OR
       (gfortran_compiler AND (

developer-scripts/travis/install.linux.sh

@@ -25,16 +25,21 @@ if [[ "${BUILD_TYPE:-}" != InstallScript ]]; then # Ubuntu on Travis-CI, NOT tes
     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}"
-        tar -xzvf "${MPICH_URL_TAIL}"
-	export CC=gcc-${GCC}
-	export FC=gfortran-${GCC}
+        echo "Downloading MPICH from ${MPICH_URL_HEAD}/${MPICH_URL_TAIL} ..."
+        wget "${MPICH_URL_HEAD}/${MPICH_URL_TAIL}" > wget_mpich.log 2>&1 || cat wget_mpich.log
+        echo "Extracting MPICH ..."
+        tar -xzvf "${MPICH_URL_TAIL}" > tar_mpich.log 2>&1 || cat tar_mpich.log
+        export CC=gcc-${GCC}
+        export FC=gfortran-${GCC}
         (
-	    cd "${MPICH_URL_TAIL%.tar.gz}"
-            ./configure --prefix="${CACHE}"
-            make -j 4
-            make install
-	)
+            cd "${MPICH_URL_TAIL%.tar.gz}"
+            echo "Configuring MPICH ..."
+            ${TRAVIS:+travis_wait} ./configure --prefix="${CACHE}" > configure_mpich.log 2>&1 || cat configure_mpich.log
+            echo "Building MPICH ..."
+            ${TRAVIS:+travis_wait 30} make -j 4 > make_mpich.log 2>&1 || cat make_mpich.log
+            echo "Installing MPICH ..."
+            ${TRAVIS:+travis_wait} make install > install_mpich.log 2>&1 || cat install_mpich.log
+        )
     fi
 fi
 

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

@@ -33,7 +33,8 @@ for version in ${GCC}; do
 	# but puting it here simplifies the Travis code a lot
 	MPICH_BOT_URL_HEAD=MPICH_GCC${version}_BOT_URL_HEAD
 	brew uninstall --force --ignore-dependencies mpich || true
-	wget "${!MPICH_BOT_URL_HEAD}${MPICH_BOT_URL_TAIL}"
+	echo "Downloading Custom MPICH bottle ${!MPICH_BOT_URL_HEAD}${MPICH_BOT_URL_TAIL} ..."
+	wget "${!MPICH_BOT_URL_HEAD}${MPICH_BOT_URL_TAIL}" > wget_mpichbottle.log 2>&1 || cat wget_mpichbottle.log
 	brew install --force-bottle "${MPICH_BOT_URL_TAIL}"
 	brew ls --versions mpich >/dev/null || brew install --force-bottle mpich
 	rm "${MPICH_BOT_URL_TAIL}"

src/mpi/mpi_caf.c

@@ -263,13 +263,19 @@ bool caf_owns_mpi = false;
 
 /* Foo function pointers for coreduce.
   The handles when arguments are passed by reference.  */
+int (*int8_t_by_reference)(void *, void *);
+int (*int16_t_by_reference)(void *, void *);
 int (*int32_t_by_reference)(void *, void *);
+int (*int64_t_by_reference)(void *, void *);
 float (*float_by_reference)(void *, void *);
 double (*double_by_reference)(void *, void *);
 /* Strings are always passed by reference.  */
 void (*char_by_reference)(void *, int, void *, void *, int, int);
 /* The handles when arguments are passed by value.  */
+int8_t (*int8_t_by_value)(int8_t, int8_t);
+int16_t (*int16_t_by_value)(int16_t, int16_t);
 int (*int32_t_by_value)(int32_t, int32_t);
+int64_t (*int64_t_by_value)(int64_t, int64_t);
 float (*float_by_value)(float, float);
 double (*double_by_value)(double, double);
 
@@ -6686,7 +6692,10 @@ name##_by_value_adapter (void *invec, void *inoutvec, int *len, \
    } \
 }
 
+GEN_COREDUCE (redux_int8, int8_t)
+GEN_COREDUCE (redux_int16, int16_t)
 GEN_COREDUCE (redux_int32, int32_t)
+GEN_COREDUCE (redux_int64, int64_t)
 GEN_COREDUCE (redux_real32, float)
 GEN_COREDUCE (redux_real64, double)
 
@@ -7030,8 +7039,20 @@ PREFIX (co_reduce) (gfc_descriptor_t *a, void *(*opr) (void *, void *), int opr_
        * arguments to be passed by value. */
       if ((opr_flags & GFC_CAF_ARG_VALUE) > 0)
         {
-          int32_t_by_value = (typeof (VALUE_FUNC(int32_t)))opr;
-          MPI_Op_create(redux_int32_by_value_adapter, 1, &op);
+#define ifTypeGen(type) if (GFC_DESCRIPTOR_SIZE(a) == sizeof (type ## _t)) \
+            { \
+              type ## _t_by_value = (typeof (VALUE_FUNC(type ## _t)))opr; \
+              MPI_Op_create(redux_ ## type ## _by_value_adapter, 1, &op); \
+            }
+
+          ifTypeGen(int8)
+          else ifTypeGen(int16)
+          else ifTypeGen(int32)
+          else ifTypeGen(int64)
+          else
+            {
+              caf_runtime_error ("CO_REDUCE unsupported integer datatype");
+            }
         }
       else
         {

src/tests/regression/reported/CMakeLists.txt

@@ -9,6 +9,7 @@ caf_compile_executable(issue-488-multi-dim-cobounds issue-488-multi-dim-cobounds
 caf_compile_executable(issue-493-coindex-slice issue-493-coindex-slice.f90)
 caf_compile_executable(issue-503-multidim-array-broadcast issue-503-multidim-array-broadcast.f90)
 caf_compile_executable(issue-503-non-contig-red-ndarray issue-503-non-contig-red-ndarray.f90)
+caf_compile_executable(issue-322-non-coarray-vector-idx-lhs issue-322-non-coarray-vector-idx-lhs.f90)
 if (gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0))
   caf_compile_executable(issue-515-mimic-mpi-gatherv issue-515-mimic-mpi-gatherv.f90)
 endif()

src/tests/regression/reported/issue-322-non-coarray-vector-idx-lhs.f90

@@ -0,0 +1,32 @@
+program mod_vecsub_01
+  !! Issue #322 reported by @reinh-bader
+  !! https://github.com/sourceryinstitute/OpenCoarrays/issues/322
+  !! Related to other vector indexing issues
+  implicit none
+  integer, parameter :: ndim = 5, vdim = 2
+  real :: vec(ndim), res(ndim)[*]
+  integer :: idx(vdim)
+  integer :: i, me
+  logical :: ok[*]
+
+  res = [ (real(i), i=1, ndim) ]
+  vec = 0.0
+  idx = [ ndim, 1 ]
+  ok = .true.
+  sync all
+  me = this_image()
+  vec(idx) = res(1:2)[1]
+  if (vec(1) /= 2.0 .or. vec(5) /= 1.0) then
+    critical
+      ok[1] = .false.
+      write(*, *) 'FAIL on image ',me,vec(idx)
+    end critical
+  end if
+  if (me == 1) then
+     if (ok) then
+       write(*, *) 'Test passed.'
+     else
+        error stop 1
+     end if
+  end if
+end program