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

mysql vizuser noreply at mpich.org
Tue Dec 10 19:46:35 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  6395fbaea13f9c1e92be521d15857562f5c84466 (commit)
       via  1dbbd09a9bf22dc3121f7fab9c75a382e7792c2e (commit)
       via  86d7bea5cd7c62fff00ba2cd6ef7cf27b1133fd4 (commit)
       via  5787d1e29260a9379348678eaf5a2615874ad426 (commit)
      from  fb0cc7ec359da14a3811b852ff9e0fe2d9a7576c (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/6395fbaea13f9c1e92be521d15857562f5c84466

commit 6395fbaea13f9c1e92be521d15857562f5c84466
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Mon Dec 9 13:23:21 2013 -0600

    ROMIO standalone: check for need of const
    
    const-ificaiton of MPI routines happened only in MPI-3.  making ROMIO's
    const-ification optional lets us work standalone with older libraries.
    
    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 8b867a5..726237f 100644
--- a/src/mpi/romio/configure.ac
+++ b/src/mpi/romio/configure.ac
@@ -1548,6 +1548,7 @@ 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),
 fi
 #
 #
@@ -1560,6 +1561,7 @@ if test $WITHIN_KNOWN_MPI_IMPL = no ; then
    PAC_TEST_MPIU_FUNCS
    AC_DEFINE(PRINT_ERR_MSG,1,[Define for printing error messages])
    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>]])
 fi
 #
diff --git a/src/mpi/romio/mpi-io/delete.c b/src/mpi/romio/mpi-io/delete.c
index bb15314..ed49e44 100644
--- a/src/mpi/romio/mpi-io/delete.c
+++ b/src/mpi/romio/mpi-io/delete.c
@@ -32,7 +32,7 @@ Input Parameters:
 
 .N fortran
 @*/
-int MPI_File_delete(const char *filename, MPI_Info info)
+int MPI_File_delete(ROMIO_CONST char *filename, MPI_Info info)
 {
     int error_code, file_system;
     char *tmp;
diff --git a/src/mpi/romio/mpi-io/iwrite.c b/src/mpi/romio/mpi-io/iwrite.c
index e6a2026..fa50fbe 100644
--- a/src/mpi/romio/mpi-io/iwrite.c
+++ b/src/mpi/romio/mpi-io/iwrite.c
@@ -41,7 +41,7 @@ Output Parameters:
 #include "mpiu_greq.h"
 #endif
 
-int MPI_File_iwrite(MPI_File fh, const void *buf, int count,
+int MPI_File_iwrite(MPI_File fh, ROMIO_CONST void *buf, int count,
 		    MPI_Datatype datatype, MPI_Request *request)
 {
     int error_code=MPI_SUCCESS;
diff --git a/src/mpi/romio/mpi-io/iwrite_at.c b/src/mpi/romio/mpi-io/iwrite_at.c
index 6974ed5..05f0b39 100644
--- a/src/mpi/romio/mpi-io/iwrite_at.c
+++ b/src/mpi/romio/mpi-io/iwrite_at.c
@@ -42,7 +42,7 @@ Output Parameters:
 #include "mpiu_greq.h"
 #endif
 
-int MPI_File_iwrite_at(MPI_File fh, MPI_Offset offset, const void *buf,
+int MPI_File_iwrite_at(MPI_File fh, MPI_Offset offset, ROMIO_CONST void *buf,
                        int count, MPI_Datatype datatype, 
                        MPIO_Request *request)
 {
diff --git a/src/mpi/romio/mpi-io/iwrite_sh.c b/src/mpi/romio/mpi-io/iwrite_sh.c
index 8d3c7cd..4221d33 100644
--- a/src/mpi/romio/mpi-io/iwrite_sh.c
+++ b/src/mpi/romio/mpi-io/iwrite_sh.c
@@ -41,7 +41,7 @@ Output Parameters:
 #include "mpiu_greq.h"
 #endif
 
-int MPI_File_iwrite_shared(MPI_File fh, const void *buf, int count,
+int MPI_File_iwrite_shared(MPI_File fh, ROMIO_CONST void *buf, int count,
 			   MPI_Datatype datatype, MPIO_Request *request)
 {
     int error_code, buftype_is_contig, filetype_is_contig;
diff --git a/src/mpi/romio/mpi-io/mpioimpl.h b/src/mpi/romio/mpi-io/mpioimpl.h
index e869684..77b18cb 100644
--- a/src/mpi/romio/mpi-io/mpioimpl.h
+++ b/src/mpi/romio/mpi-io/mpioimpl.h
@@ -14,7 +14,6 @@
 
 #include "adio.h"
 #include "mpio.h"
-#include "mpiu_external32.h"
 
 #ifdef ROMIO_INSIDE_MPICH
 #include "glue_romio.h"
@@ -59,6 +58,14 @@ MPI_Delete_function ADIOI_End_call;
 /* common initialization routine */
 void MPIR_MPIOInit(int * error_code);
 
+#ifdef HAVE_MPIIO_CONST
+#define ROMIO_CONST const
+#else
+#define ROMIO_CONST
+#endif
+
+#include "mpiu_external32.h"
+
 
 #include "mpioprof.h"
 
diff --git a/src/mpi/romio/mpi-io/mpiu_external32.c b/src/mpi/romio/mpi-io/mpiu_external32.c
index ba22df2..ce2253b 100644
--- a/src/mpi/romio/mpi-io/mpiu_external32.c
+++ b/src/mpi/romio/mpi-io/mpiu_external32.c
@@ -28,8 +28,13 @@ int MPIU_write_external32_conversion_fn (const void *userbuf, MPI_Datatype datat
 
     if (is_contig)
     {
+#ifdef HAVE_MPIIO_CONST
         mpi_errno = MPI_Pack_external("external32", userbuf, count,
                 datatype, filebuf, bytes, &position);
+#else
+        mpi_errno = MPI_Pack_external("external32", (void *)userbuf, count,
+                datatype, filebuf, bytes, &position);
+#endif
         if (mpi_errno != MPI_SUCCESS)
             goto fn_exit;
     }
@@ -43,8 +48,13 @@ int MPIU_write_external32_conversion_fn (const void *userbuf, MPI_Datatype datat
             goto fn_exit;
         }
 
+#ifdef HAVE_MPIIO_CONST
         mpi_errno = MPI_Pack_external("external32", userbuf, count,
                 datatype, tmp_buf, bytes, &position);
+#else
+        mpi_errno = MPI_Pack_external("external32", (void *)userbuf, count,
+                datatype, tmp_buf, bytes, &position);
+#endif
         if (mpi_errno != MPI_SUCCESS)
         {
             ADIOI_Free(tmp_buf);
diff --git a/src/mpi/romio/mpi-io/open.c b/src/mpi/romio/mpi-io/open.c
index 80ea26e..e8cdea3 100644
--- a/src/mpi/romio/mpi-io/open.c
+++ b/src/mpi/romio/mpi-io/open.c
@@ -43,7 +43,7 @@ Output Parameters:
 
 .N fortran
 @*/
-int MPI_File_open(MPI_Comm comm, const char *filename, int amode,
+int MPI_File_open(MPI_Comm comm, ROMIO_CONST char *filename, int amode,
                   MPI_Info info, MPI_File *fh)
 {
     int error_code = MPI_SUCCESS, file_system, flag, tmp_amode=0, rank;
diff --git a/src/mpi/romio/mpi-io/register_datarep.c b/src/mpi/romio/mpi-io/register_datarep.c
index 84767e8..c2dba7b 100644
--- a/src/mpi/romio/mpi-io/register_datarep.c
+++ b/src/mpi/romio/mpi-io/register_datarep.c
@@ -48,7 +48,7 @@ Input Parameters:
 .N fortran
   
   @*/
-int MPI_Register_datarep(const char *datarep,
+int MPI_Register_datarep(ROMIO_CONST char *datarep,
 			 MPI_Datarep_conversion_function *read_conversion_fn,
 			 MPI_Datarep_conversion_function *write_conversion_fn,
 			 MPI_Datarep_extent_function *dtype_file_extent_fn,
diff --git a/src/mpi/romio/mpi-io/set_view.c b/src/mpi/romio/mpi-io/set_view.c
index 89762b5..482b9ac 100644
--- a/src/mpi/romio/mpi-io/set_view.c
+++ b/src/mpi/romio/mpi-io/set_view.c
@@ -37,7 +37,7 @@ Input Parameters:
 .N fortran
 @*/
 int MPI_File_set_view(MPI_File fh, MPI_Offset disp, MPI_Datatype etype,
-		      MPI_Datatype filetype, const char *datarep, MPI_Info info)
+		      MPI_Datatype filetype, ROMIO_CONST char *datarep, MPI_Info info)
 {
     int error_code;
     MPI_Count filetype_size, etype_size;
diff --git a/src/mpi/romio/mpi-io/wr_atallb.c b/src/mpi/romio/mpi-io/wr_atallb.c
index 07fe989..17de197 100644
--- a/src/mpi/romio/mpi-io/wr_atallb.c
+++ b/src/mpi/romio/mpi-io/wr_atallb.c
@@ -36,7 +36,7 @@ Input Parameters:
 
 .N fortran
 @*/
-int MPI_File_write_at_all_begin(MPI_File fh, MPI_Offset offset, const void *buf,
+int MPI_File_write_at_all_begin(MPI_File fh, MPI_Offset offset, ROMIO_CONST void *buf,
 				int count, MPI_Datatype datatype)
 {
     int error_code;
diff --git a/src/mpi/romio/mpi-io/wr_atalle.c b/src/mpi/romio/mpi-io/wr_atalle.c
index dc41651..50b4732 100644
--- a/src/mpi/romio/mpi-io/wr_atalle.c
+++ b/src/mpi/romio/mpi-io/wr_atalle.c
@@ -35,7 +35,7 @@ Output Parameters:
 
 .N fortran
 @*/
-int MPI_File_write_at_all_end(MPI_File fh, const void *buf, MPI_Status *status)
+int MPI_File_write_at_all_end(MPI_File fh, ROMIO_CONST void *buf, MPI_Status *status)
 {
     int error_code;
     static char myname[] = "MPI_FILE_WRITE_AT_ALL_END";
diff --git a/src/mpi/romio/mpi-io/write.c b/src/mpi/romio/mpi-io/write.c
index ef066a1..2544db3 100644
--- a/src/mpi/romio/mpi-io/write.c
+++ b/src/mpi/romio/mpi-io/write.c
@@ -38,7 +38,7 @@ Output Parameters:
 
 .N fortran
 @*/
-int MPI_File_write(MPI_File fh, const void *buf, int count,
+int MPI_File_write(MPI_File fh, ROMIO_CONST void *buf, int count,
                    MPI_Datatype datatype, MPI_Status *status)
 {
     int error_code;
diff --git a/src/mpi/romio/mpi-io/write_all.c b/src/mpi/romio/mpi-io/write_all.c
index 822330a..f4307bb 100644
--- a/src/mpi/romio/mpi-io/write_all.c
+++ b/src/mpi/romio/mpi-io/write_all.c
@@ -39,7 +39,7 @@ Output Parameters:
 
 .N fortran
 @*/
-int MPI_File_write_all(MPI_File fh, const void *buf, int count,
+int MPI_File_write_all(MPI_File fh, ROMIO_CONST void *buf, int count,
                        MPI_Datatype datatype, MPI_Status *status)
 {
     int error_code;
diff --git a/src/mpi/romio/mpi-io/write_allb.c b/src/mpi/romio/mpi-io/write_allb.c
index e7e2fc2..adeeeee 100644
--- a/src/mpi/romio/mpi-io/write_allb.c
+++ b/src/mpi/romio/mpi-io/write_allb.c
@@ -35,7 +35,7 @@ Input Parameters:
 
 .N fortran
 @*/
-int MPI_File_write_all_begin(MPI_File fh, const void *buf, int count,
+int MPI_File_write_all_begin(MPI_File fh, ROMIO_CONST void *buf, int count,
 			     MPI_Datatype datatype)
 {
     int error_code;
diff --git a/src/mpi/romio/mpi-io/write_alle.c b/src/mpi/romio/mpi-io/write_alle.c
index 3e3d1a0..28972f1 100644
--- a/src/mpi/romio/mpi-io/write_alle.c
+++ b/src/mpi/romio/mpi-io/write_alle.c
@@ -35,7 +35,7 @@ Output Parameters:
 
 .N fortran
 @*/
-int MPI_File_write_all_end(MPI_File fh, const void *buf, MPI_Status *status)
+int MPI_File_write_all_end(MPI_File fh, ROMIO_CONST void *buf, MPI_Status *status)
 {
     int error_code;
     static char myname[] = "MPI_FILE_WRITE_ALL_END";
diff --git a/src/mpi/romio/mpi-io/write_at.c b/src/mpi/romio/mpi-io/write_at.c
index 16980ff..db1066d 100644
--- a/src/mpi/romio/mpi-io/write_at.c
+++ b/src/mpi/romio/mpi-io/write_at.c
@@ -39,7 +39,7 @@ Output Parameters:
 
 .N fortran
 @*/
-int MPI_File_write_at(MPI_File fh, MPI_Offset offset, const void *buf,
+int MPI_File_write_at(MPI_File fh, MPI_Offset offset, ROMIO_CONST void *buf,
                       int count, MPI_Datatype datatype, MPI_Status *status)
 {
     int error_code;
diff --git a/src/mpi/romio/mpi-io/write_atall.c b/src/mpi/romio/mpi-io/write_atall.c
index fda31ee..8f8328d 100644
--- a/src/mpi/romio/mpi-io/write_atall.c
+++ b/src/mpi/romio/mpi-io/write_atall.c
@@ -40,7 +40,7 @@ Output Parameters:
 
 .N fortran
 @*/
-int MPI_File_write_at_all(MPI_File fh, MPI_Offset offset, const void *buf,
+int MPI_File_write_at_all(MPI_File fh, MPI_Offset offset, ROMIO_CONST void *buf,
                           int count, MPI_Datatype datatype, 
                           MPI_Status *status)
 {
diff --git a/src/mpi/romio/mpi-io/write_ord.c b/src/mpi/romio/mpi-io/write_ord.c
index fd28480..3bd45ee 100644
--- a/src/mpi/romio/mpi-io/write_ord.c
+++ b/src/mpi/romio/mpi-io/write_ord.c
@@ -40,7 +40,7 @@ Output Parameters:
 
 .N fortran
 @*/
-int MPI_File_write_ordered(MPI_File fh, const void *buf, int count,
+int MPI_File_write_ordered(MPI_File fh, ROMIO_CONST void *buf, int count,
 			   MPI_Datatype datatype, MPI_Status *status)
 {
     int error_code, nprocs, myrank;
diff --git a/src/mpi/romio/mpi-io/write_ordb.c b/src/mpi/romio/mpi-io/write_ordb.c
index 968df19..1f16f45 100644
--- a/src/mpi/romio/mpi-io/write_ordb.c
+++ b/src/mpi/romio/mpi-io/write_ordb.c
@@ -36,7 +36,7 @@ Output Parameters:
 
 .N fortran
 @*/
-int MPI_File_write_ordered_begin(MPI_File fh, const void *buf, int count,
+int MPI_File_write_ordered_begin(MPI_File fh, ROMIO_CONST void *buf, int count,
 				 MPI_Datatype datatype)
 {
     int error_code, nprocs, myrank;
diff --git a/src/mpi/romio/mpi-io/write_orde.c b/src/mpi/romio/mpi-io/write_orde.c
index 75836fb..c8db36c 100644
--- a/src/mpi/romio/mpi-io/write_orde.c
+++ b/src/mpi/romio/mpi-io/write_orde.c
@@ -35,7 +35,7 @@ Output Parameters:
 
 .N fortran
 @*/
-int MPI_File_write_ordered_end(MPI_File fh, const void *buf, MPI_Status *status)
+int MPI_File_write_ordered_end(MPI_File fh, ROMIO_CONST void *buf, MPI_Status *status)
 {
     int error_code;
     static char myname[] = "MPI_FILE_WRITE_ORDERED_END";
diff --git a/src/mpi/romio/mpi-io/write_sh.c b/src/mpi/romio/mpi-io/write_sh.c
index 39b72ce..622dd27 100644
--- a/src/mpi/romio/mpi-io/write_sh.c
+++ b/src/mpi/romio/mpi-io/write_sh.c
@@ -39,7 +39,7 @@ Output Parameters:
 
 .N fortran
 @*/
-int MPI_File_write_shared(MPI_File fh, const void *buf, int count,
+int MPI_File_write_shared(MPI_File fh, ROMIO_CONST void *buf, int count,
                           MPI_Datatype datatype, MPI_Status *status)
 {
     int error_code, buftype_is_contig, filetype_is_contig;

http://git.mpich.org/mpich.git/commitdiff/1dbbd09a9bf22dc3121f7fab9c75a382e7792c2e

commit 1dbbd09a9bf22dc3121f7fab9c75a382e7792c2e
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Mon Dec 9 13:16:35 2013 -0600

    ROMIO standalone: check HINDEXED_BLOCK
    
    the HINDEXED_BLOCK combiner did not exist in older MPI implementations
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/mpi/romio/adio/common/flatten.c b/src/mpi/romio/adio/common/flatten.c
index 420ef21..6437705 100644
--- a/src/mpi/romio/adio/common/flatten.c
+++ b/src/mpi/romio/adio/common/flatten.c
@@ -454,7 +454,9 @@ void ADIOI_Flatten(MPI_Datatype datatype, ADIOI_Flatlist_node *flat,
         /* FIXME: using the same code as indexed_block for
          * hindexed_block doesn't look correct.  Needs to be carefully
          * looked into. */
+#if defined HAVE_DECL_MPI_COMBINER_HINDEXED_BLOCK && HAVE_DECL_MPI_COMBINER_HINDEXED_BLOCK
     case MPI_COMBINER_HINDEXED_BLOCK:
+#endif
     case MPI_COMBINER_INDEXED_BLOCK:
     #ifdef FLATTEN_DEBUG 
     DBG_FPRINTF(stderr,"ADIOI_Flatten:: MPI_COMBINER_INDEXED_BLOCK\n");
diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac
index 45be7c0..8b867a5 100644
--- a/src/mpi/romio/configure.ac
+++ b/src/mpi/romio/configure.ac
@@ -1560,6 +1560,7 @@ if test $WITHIN_KNOWN_MPI_IMPL = no ; then
    PAC_TEST_MPIU_FUNCS
    AC_DEFINE(PRINT_ERR_MSG,1,[Define for printing error messages])
    AC_CHECK_TYPE(MPI_Count,[],[AC_DEFINE_UNQUOTED([MPI_Count],[MPI_Aint],[Define to "MPI_Aint" if MPI does not provide MPI_Count]) ])
+   AC_CHECK_DECLS([MPI_COMBINER_HINDEXED_BLOCK], [], [], [[#include <mpi.h>]])
 fi
 #
 if test -z "$TEST_CC" ; then

http://git.mpich.org/mpich.git/commitdiff/86d7bea5cd7c62fff00ba2cd6ef7cf27b1133fd4

commit 86d7bea5cd7c62fff00ba2cd6ef7cf27b1133fd4
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Mon Dec 9 13:14:47 2013 -0600

    ROMIO standalone: remove internal headers
    
    the bluegene drivers can rely on MPIX routines (declared in mpix.h)
    instead of device-internal routines (e.g. MPIX_Hardware() )
    
    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 d8b42ef..d6eeff4 100644
--- a/src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c
+++ b/src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c
@@ -23,7 +23,6 @@
 #include "mpe.h"
 #endif
 
-#include "mpidi_macros.h"
 
 #ifdef USE_DBG_LOGGING
   #define AGG_DEBUG 1
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 5eaf1c1..ea6774f 100644
--- a/src/mpi/romio/adio/ad_bg/ad_bg_pset.c
+++ b/src/mpi/romio/adio/ad_bg/ad_bg_pset.c
@@ -16,9 +16,11 @@
 #include <stdlib.h>
 #include "ad_bg.h"
 #include "ad_bg_pset.h"
-#include "mpidimpl.h"
 #include <firmware/include/personality.h>
 
+#ifdef HAVE_MPIX_H
+#include <mpix.h>
+#endif
 
 ADIOI_BG_ProcInfo_t *
 ADIOI_BG_ProcInfo_new()
diff --git a/src/mpi/romio/adio/ad_bg/ad_bg_rdcoll.c b/src/mpi/romio/adio/ad_bg/ad_bg_rdcoll.c
index fe48755..2307dfd 100644
--- a/src/mpi/romio/adio/ad_bg/ad_bg_rdcoll.c
+++ b/src/mpi/romio/adio/ad_bg/ad_bg_rdcoll.c
@@ -19,7 +19,6 @@
 #include "ad_bg_pset.h"
 #include "ad_bg_aggrs.h"
 
-#include "mpitypedefs.h"
 
 #ifdef PROFILE
 #include "mpe.h"
diff --git a/src/mpi/romio/adio/ad_bg/ad_bg_wrcoll.c b/src/mpi/romio/adio/ad_bg/ad_bg_wrcoll.c
index c9312f3..a25fd04 100644
--- a/src/mpi/romio/adio/ad_bg/ad_bg_wrcoll.c
+++ b/src/mpi/romio/adio/ad_bg/ad_bg_wrcoll.c
@@ -18,7 +18,6 @@
 #include "ad_bg_pset.h"
 #include "ad_bg_aggrs.h"
 
-#include "mpitypedefs.h"
 
 #ifdef AGGREGATION_PROFILE
 #include "mpe.h"
diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac
index ee592ff..45be7c0 100644
--- a/src/mpi/romio/configure.ac
+++ b/src/mpi/romio/configure.ac
@@ -427,6 +427,7 @@ AC_TYPE_OFF_T
 # Find the CPP before the header check
 AC_PROG_CPP
 AC_CHECK_HEADERS([unistd.h fcntl.h malloc.h stddef.h sys/types.h])
+AC_CHECK_HEADERS(mpix.h,,,[#include <mpi.h>])
 #
 
 # When compiling ROMIO on Darwin with _POSIX_C_SOURCE defined (such as when
@@ -1546,6 +1547,7 @@ elif test $FROM_MPICH = yes ; then
    AC_DEFINE(HAVE_STATUS_SET_BYTES,1,[Define if status_set_bytes available])
    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, [])
 fi
 #
 #

http://git.mpich.org/mpich.git/commitdiff/5787d1e29260a9379348678eaf5a2615874ad426

commit 5787d1e29260a9379348678eaf5a2615874ad426
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Mon Dec 9 11:28:11 2013 -0600

    ROMIO standalone: check for MPI_Count
    
    older MPI implementations may not have MPI_Count.  MPI_Aint is an ok
    substitute.
    
    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 ba39b6f..ee592ff 100644
--- a/src/mpi/romio/configure.ac
+++ b/src/mpi/romio/configure.ac
@@ -1557,6 +1557,7 @@ if test $WITHIN_KNOWN_MPI_IMPL = no ; then
    PAC_TEST_MPI_GREQUEST
    PAC_TEST_MPIU_FUNCS
    AC_DEFINE(PRINT_ERR_MSG,1,[Define for printing error messages])
+   AC_CHECK_TYPE(MPI_Count,[],[AC_DEFINE_UNQUOTED([MPI_Count],[MPI_Aint],[Define to "MPI_Aint" if MPI does not provide MPI_Count]) ])
 fi
 #
 if test -z "$TEST_CC" ; then

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

Summary of changes:
 src/mpi/romio/adio/ad_bg/ad_bg_aggrs.c  |    1 -
 src/mpi/romio/adio/ad_bg/ad_bg_pset.c   |    4 +++-
 src/mpi/romio/adio/ad_bg/ad_bg_rdcoll.c |    1 -
 src/mpi/romio/adio/ad_bg/ad_bg_wrcoll.c |    1 -
 src/mpi/romio/adio/common/flatten.c     |    2 ++
 src/mpi/romio/configure.ac              |    6 ++++++
 src/mpi/romio/mpi-io/delete.c           |    2 +-
 src/mpi/romio/mpi-io/iwrite.c           |    2 +-
 src/mpi/romio/mpi-io/iwrite_at.c        |    2 +-
 src/mpi/romio/mpi-io/iwrite_sh.c        |    2 +-
 src/mpi/romio/mpi-io/mpioimpl.h         |    9 ++++++++-
 src/mpi/romio/mpi-io/mpiu_external32.c  |   10 ++++++++++
 src/mpi/romio/mpi-io/open.c             |    2 +-
 src/mpi/romio/mpi-io/register_datarep.c |    2 +-
 src/mpi/romio/mpi-io/set_view.c         |    2 +-
 src/mpi/romio/mpi-io/wr_atallb.c        |    2 +-
 src/mpi/romio/mpi-io/wr_atalle.c        |    2 +-
 src/mpi/romio/mpi-io/write.c            |    2 +-
 src/mpi/romio/mpi-io/write_all.c        |    2 +-
 src/mpi/romio/mpi-io/write_allb.c       |    2 +-
 src/mpi/romio/mpi-io/write_alle.c       |    2 +-
 src/mpi/romio/mpi-io/write_at.c         |    2 +-
 src/mpi/romio/mpi-io/write_atall.c      |    2 +-
 src/mpi/romio/mpi-io/write_ord.c        |    2 +-
 src/mpi/romio/mpi-io/write_ordb.c       |    2 +-
 src/mpi/romio/mpi-io/write_orde.c       |    2 +-
 src/mpi/romio/mpi-io/write_sh.c         |    2 +-
 27 files changed, 48 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
MPICH primary repository


More information about the commits mailing list