[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1rc2-74-g356762d

mysql vizuser noreply at mpich.org
Wed Dec 18 13:15:17 CST 2013 

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  356762dbfb82359a673598c1e3577111eb4def99 (commit)
       via  b34fc532842ef51a9f240a6220227bd36df3d3c4 (commit)
       via  0c7ce9e24a3731e3d2275170de6e3aaa9a58ee1c (commit)
      from  d2b786dc15ec29c53330cf44afe8ef250e302e0f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/356762dbfb82359a673598c1e3577111eb4def99

commit 356762dbfb82359a673598c1e3577111eb4def99
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Wed Dec 11 15:19:17 2013 -0600

    ROMIO standalone: check for large-count routines
    
    the MPI_Type_size_x and MPI_Status_set_elements_x might not be available
    on older MPI implementations.
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac
index c5ca7ee..8f05dfa 100644
--- a/src/mpi/romio/configure.ac
+++ b/src/mpi/romio/configure.ac
@@ -1547,7 +1547,9 @@ elif test $FROM_MPICH = yes ; then
    DEFINE_HAVE_MPI_GREQUEST="#define HAVE_MPI_GREQUEST 1"
    AC_DEFINE(HAVE_MPIU_FUNCS,1,[Define if MPICH memory tracing macros defined])
    AC_DEFINE(HAVE_MPIX_H, 1, [])
-   AC_DEFINE(HAVE_MPIIO_CONST, const, Set if MPI-IO prototypes use const qualifier),
+   AC_DEFINE(HAVE_MPIIO_CONST, const, Set if MPI-IO prototypes use const qualifier)
+   AC_DEFINE(HAVE_MPI_TYPE_SIZE_X, 1, [Define if MPI library provides MPI_TYPE_SIZE_X])
+   AC_DEFINE(HAVE_MPI_STATUS_SET_ELEMENTS_X, 1, [Define if MPI library provides MPI_STATUS_SET_ELEMENTS_X])
 fi
 #
 #
@@ -1562,6 +1564,7 @@ if test $WITHIN_KNOWN_MPI_IMPL = no ; then
    AC_CHECK_TYPE(MPI_Count,[],[AC_DEFINE_UNQUOTED([MPI_Count],[MPI_Aint],[Define to "MPI_Aint" if MPI does not provide MPI_Count]) ])
    PAC_TEST_NEEDS_CONST
    AC_CHECK_DECLS([MPI_COMBINER_HINDEXED_BLOCK], [], [], [[#include <mpi.h>]])
+   AC_CHECK_FUNCS(MPI_Type_size_x MPI_Status_set_elements_x)
 fi
 #
 if test -z "$TEST_CC" ; then
diff --git a/src/mpi/romio/mpi-io/glue/Makefile.mk b/src/mpi/romio/mpi-io/glue/Makefile.mk
index ca3bafe..05954a1 100644
--- a/src/mpi/romio/mpi-io/glue/Makefile.mk
+++ b/src/mpi/romio/mpi-io/glue/Makefile.mk
@@ -7,3 +7,8 @@
 
 include $(top_srcdir)/mpi-io/glue/default/Makefile.mk
 include $(top_srcdir)/mpi-io/glue/mpich/Makefile.mk
+
+if !BUILD_ROMIO_EMBEDDED
+romio_other_sources += \
+	mpi-io/glue/large_count.c
+endif
diff --git a/src/mpi/romio/mpi-io/glue/large_count.c b/src/mpi/romio/mpi-io/glue/large_count.c
new file mode 100644
index 0000000..ee31e2b
--- /dev/null
+++ b/src/mpi/romio/mpi-io/glue/large_count.c
@@ -0,0 +1,26 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */
+/*
+ *   Copyright (C) 2013 University of Chicago.
+ *   See COPYRIGHT notice in top-level directory.
+ */
+
+#include "mpioimpl.h"
+
+#ifndef HAVE_MPI_TYPE_SIZE_X
+int MPI_Type_size_x(MPI_Datatype datatype, MPI_Count *size)
+{
+    int size_int, ret;
+    ret = MPI_Type_size(datatype, &size_int);
+    *size = size_int;
+    return ret;
+}
+#endif
+
+#ifndef HAVE_MPI_STATUS_SET_ELEMENTS_X
+int MPI_Status_set_elements_x(MPI_Status *status, MPI_Datatype datatype,
+	MPI_Count count)
+{
+    int count_int = (int) count;
+    return MPI_Status_set_elements(status, datatype, count_int);
+}
+#endif

http://git.mpich.org/mpich.git/commitdiff/b34fc532842ef51a9f240a6220227bd36df3d3c4

commit b34fc532842ef51a9f240a6220227bd36df3d3c4
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Wed Dec 11 15:17:09 2013 -0600

    ROMIO standalone: fix up link-time errors
    
    - zap the TRACE_ERR routine
    - use ADIOI_MAX instead of pami-defined MAX
    - find proper header file for Kernel_GetPersonality
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c b/src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c
index d6eeff4..dea444e 100644
--- a/src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c
+++ b/src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c
@@ -28,6 +28,10 @@
   #define AGG_DEBUG 1
 #endif
 
+#ifndef TRACE_ERR
+#  define TRACE_ERR(format...)
+#endif
+
 /* Comments copied from common:
  * This file contains four functions:
  *
diff --git a/src/mpi/romio/adio/ad_bg/ad_bg_pset.c b/src/mpi/romio/adio/ad_bg/ad_bg_pset.c
index ea6774f..3e842da 100644
--- a/src/mpi/romio/adio/ad_bg/ad_bg_pset.c
+++ b/src/mpi/romio/adio/ad_bg/ad_bg_pset.c
@@ -16,12 +16,17 @@
 #include <stdlib.h>
 #include "ad_bg.h"
 #include "ad_bg_pset.h"
+#include <spi/include/kernel/process.h>
 #include <firmware/include/personality.h>
 
 #ifdef HAVE_MPIX_H
 #include <mpix.h>
 #endif
 
+#ifndef TRACE_ERR
+#  define TRACE_ERR(fmt...)
+#endif
+
 ADIOI_BG_ProcInfo_t *
 ADIOI_BG_ProcInfo_new()
 {
@@ -258,7 +263,7 @@ ADIOI_BG_persInfo_init(ADIOI_BG_ConfInfo_t *conf,
       if(conf->nAggrs <=0) 
          conf->nAggrs = bgmpio_bg_nagg_pset;
       if(conf->ioMinSize <= conf->nAggrs) 
-        conf->nAggrs = MAX(1,conf->ioMinSize-1); /* not including bridge itself */
+        conf->nAggrs = ADIOI_MAX(1,conf->ioMinSize-1); /* not including bridge itself */
 /*      if(conf->nAggrs > conf->numBridgeRanks) 
          conf->nAggrs = conf->numBridgeRanks; 
 */

http://git.mpich.org/mpich.git/commitdiff/0c7ce9e24a3731e3d2275170de6e3aaa9a58ee1c

commit 0c7ce9e24a3731e3d2275170de6e3aaa9a58ee1c
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Wed Dec 11 14:38:36 2013 -0600

    ROMIO standalone: actually install library
    
    the "install these bits" part had been removed in the great makefile
    shakeup of late 2011.  now "make install" installs a 'libromio' library
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/mpi/romio/Makefile.am b/src/mpi/romio/Makefile.am
index 1626304..e27323f 100644
--- a/src/mpi/romio/Makefile.am
+++ b/src/mpi/romio/Makefile.am
@@ -86,7 +86,12 @@ libpromio_la_CPPFLAGS = $(AM_CPPFLAGS) -DMPIO_BUILD_PROFILING
 endif BUILD_PROFILING_LIB
 
 else !BUILD_ROMIO_EMBEDDED
-## TODO build a libromio.la (non-convenience) and possibly a libglue.la or something?
+lib_LTLIBRARIES = libromio.la
+libromio_la_SOURCES = $(romio_mpi_sources) $(romio_other_sources) $(glue_sources)
+if BUILD_PROFILING_LIB
+libpromio_la_SOURCES = $(romio_mpi_sources)
+libpromio_la_CPPFLAGS = $(AM_CPPFLAGS) -DMPIO_BUILD_PROFILING
+endif BUILD_PROFILING_LIB
 
 endif
 
diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac
index 726237f..c5ca7ee 100644
--- a/src/mpi/romio/configure.ac
+++ b/src/mpi/romio/configure.ac
@@ -632,8 +632,7 @@ else
 fi
 AC_SUBST(HAVE_WEAK_SYMBOLS)
 
-# FIXME we only build ROMIO in embedded mode for now
-AM_CONDITIONAL([BUILD_ROMIO_EMBEDDED],[true])
+AM_CONDITIONAL([BUILD_ROMIO_EMBEDDED],[test "$WITHIN_KNOWN_MPI_IMPL" = "yes" ])
 # FIXME need to get this right for non-MPICH builds
 AM_CONDITIONAL([BUILD_MPIO_REQUEST],[false])
 # FIXME need to get this right for non-MPICH builds

-----------------------------------------------------------------------

Summary of changes:
 src/mpi/romio/Makefile.am               |    7 ++++++-
 src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c  |    4 ++++
 src/mpi/romio/adio/ad_bg/ad_bg_pset.c   |    7 ++++++-
 src/mpi/romio/configure.ac              |    8 +++++---
 src/mpi/romio/mpi-io/glue/Makefile.mk   |    5 +++++
 src/mpi/romio/mpi-io/glue/large_count.c |   26 ++++++++++++++++++++++++++
 6 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 src/mpi/romio/mpi-io/glue/large_count.c


hooks/post-receive
-- 
MPICH primary repository

More information about the commits mailing list