Merge pull request #5745 from raffenet/4.0rc2-patches

Fixes for 4.0rc2

Approved-by: Hui Zhou <hzhou321@anl.gov>

confdb/aclocal_modules.m4

@@ -23,8 +23,14 @@ AC_DEFUN([PAC_CONFIG_MPL],[
     ], [
         dnl ---- sub-configure (e.g. hydra, romio) ----
         if test "$FROM_MPICH" = "yes"; then
-            mpl_lib="$main_top_builddir/src/mpl/libmpl.la"
-            mpl_includedir='-I$(main_top_builddir)/src/mpl/include -I$(main_top_srcdir)/src/mpl/include'
+            dnl skip ROMIO since mpich already links libmpl.la
+            m4_if(AC_PACKAGE_NAME, [ROMIO], [], [
+                mpl_lib="$main_top_builddir/src/mpl/libmpl.la"
+            ])
+            mpl_includedir="-I$main_top_builddir/src/mpl/include -I$main_top_srcdir/src/mpl/include"
+            # source variables that are configured by MPL
+            AC_MSG_NOTICE([sourcing $main_top_srcdir/src/mpl/localdefs])
+            . $main_top_builddir/src/mpl/localdefs
         else
             PAC_CONFIG_MPL_EMBEDDED
             mpl_srcdir="mpl_embedded_dir"

configure.ac

@@ -3874,9 +3874,12 @@ m4_map([PAC_SUBCFG_CONFIGURE_SUBSYS], [PAC_SUBCFG_MODULE_LIST])
 
 # now configure any actual recursively configures subsystems, such as ROMIO and
 # hydra, or older components that haven't been updated to a subconfigure.m4 yet
+PAC_PUSH_ALL_FLAGS()
+PAC_RESET_ALL_FLAGS()
 for subsys in $devsubsystems $subsystems ; do
     PAC_CONFIG_SUBDIR([$subsys],[],[AC_MSG_ERROR([$subsys configure failed])])
 done
+PAC_POP_ALL_FLAGS()
 if test "$DEBUG_SUBDIR_CACHE" = yes -a "$enable_echo" != yes ; then
     set +x
 fi

maint/local_python/mpi_api.py

@@ -51,7 +51,7 @@ def load_C_func_list(binding_dir="src/binding", silent=False):
             func_list.append(f)
     func_list.sort(key = lambda f: f['dir'])
 
-    load_mpix_txt()
+    load_mpix_txt("%s/mpix.txt" % binding_dir)
 
     return func_list
 
@@ -93,11 +93,11 @@ def load_mpi_mapping(api_mapping_txt):
                     key, val = RE.m.group(1, 2)
                     G.default_descriptions[key] = val
 
-def load_mpix_txt():
+def load_mpix_txt(mpix_txt):
     G.mpix_symbols = {}
     stage = "functions"
-    if os.path.exists("src/binding/mpix.txt"):
-        with open("src/binding/mpix.txt") as In:
+    if os.path.exists(mpix_txt):
+        with open(mpix_txt, "r") as In:
             for line in In:
                 if RE.match(r'#\s*mpi.h\s+symbols', line):
                     stage = "symbols"

maint/version.m4

@@ -14,7 +14,7 @@
 # changing this by playing with diversions, but then we would probably be
 # playing with autotools-fire.
 
-m4_define([MPICH_VERSION_m4],[4.0rc1])dnl
+m4_define([MPICH_VERSION_m4],[4.0rc2])dnl
 m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl
 
 # For libtool ABI versioning rules see:

src/mpi/datatype/typerep/src/typerep_yaksa_pack.c

@@ -142,7 +142,10 @@ static int typerep_do_pack(const void *inbuf, MPI_Aint incount, MPI_Datatype dat
         MPIR_Datatype *dtp;
         MPIR_Datatype_get_ptr(datatype, dtp);
         is_contig = dtp->is_contig;
-        element_size = dtp->builtin_element_size;
+        /* NOTE: dtp->element_size may not be set if dtp is from a flattened type */
+        if (dtp->basic_type != MPI_DATATYPE_NULL) {
+            element_size = MPIR_Datatype_get_basic_size(datatype);
+        }
         inbuf_ptr = MPIR_get_contig_ptr(inbuf, dtp->true_lb);
         total_size = incount * dtp->size;
     }

src/mpi/romio/configure.ac

@@ -147,6 +147,10 @@ else
     mpl_libdir="-L${with_mpl_prefix}/lib"
     mpl_lib="-l${MPLLIBNAME}"
 fi
+else
+    # we are configuring romio inside mpich. MPICH should configured MPL already, following
+    # macro will just set mpl_includedir and source mpl/localdefs if any.
+    PAC_CONFIG_MPL
 fi
 
 CFLAGS=${CFLAGS:-""}

src/mpid/ch4/src/mpidig_rma_callbacks.c

@@ -806,6 +806,7 @@ static int handle_get_acc_cmpl(MPIR_Request * rreq)
                                                                                    req->
                                                                                    areq.target_datatype),
                       0, original, result_data_sz, &actual_pack_bytes);
+    MPIR_Assert(actual_pack_bytes == result_data_sz);
 
     mpi_errno = MPIDIG_compute_acc_op(MPIDIG_REQUEST(rreq, req->areq.data),
                                       MPIDIG_REQUEST(rreq, req->areq.origin_count),