[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-312-gf8bedf1

[mysql vizuser]

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  f8bedf1e74383cf166a278dd93fdad078cefc78e (commit)
       via  a502e2d7355700d3e2343954ebc994e56a63b916 (commit)
      from  ef0c452628efb4e63b1b69aff05335c1ced77434 (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/f8bedf1e74383cf166a278dd93fdad078cefc78e

commit f8bedf1e74383cf166a278dd93fdad078cefc78e
Author: Joe Ratterman <jratt at us.ibm.com>
Date:   Wed Sep 28 16:05:45 2011 -0500

    Trap unsupported read- and write-conversions.
    
    This change was originally part of an extensive 'PE Code Merge' commit
    that was a sqaushed commit of approximately 50 defect and feature code
    changes.
    
    (ibm) 17b9e8973047abdb461f0303bc6c15509aef160b

diff --git a/src/mpi/romio/mpi-io/register_datarep.c b/src/mpi/romio/mpi-io/register_datarep.c
index c4f6a46..84767e8 100644
--- a/src/mpi/romio/mpi-io/register_datarep.c
+++ b/src/mpi/romio/mpi-io/register_datarep.c
@@ -96,6 +96,19 @@ int MPI_Register_datarep(const char *datarep,
 	}
     }
 
+    /* Check Non-NULL Read and Write conversion function pointer */
+    /* Read and Write conversions are currently not supported.   */
+    if ( (read_conversion_fn != NULL) || (write_conversion_fn != NULL) )
+    {
+        error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE,
+                                          myname, __LINE__,
+                                          MPI_ERR_CONVERSION,
+                                          "**drconvnotsupported", 0);
+
+	error_code = MPIO_Err_return_file(MPI_FILE_NULL, error_code);
+	goto fn_exit;
+    }
+
     /* check extent function pointer */
     if (dtype_file_extent_fn == NULL)
     {

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

commit a502e2d7355700d3e2343954ebc994e56a63b916
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Tue Jun 11 12:00:21 2013 -0500

    automake doesn't like CFLAGS and CPPFLAGS
    
    automake yelled at me for overriding potentially user-supplied variables

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 77b21f0..b38a6a7 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,15 +9,15 @@
 # all of these?
 MPICHDIR=..
 #CC       = $(MPICHDIR)/bin/mpicc
-CFLAGS   = $(WRAPPER_CFLAGS)
+AM_CFLAGS   = $(WRAPPER_CFLAGS)
 CXXFLAGS = $(WRAPPER_CXXFLAGS)
 FFLAGS   = $(WRAPPER_FFLAGS)
 FCFLAGS  = $(WRAPPER_FCFLAGS)
-LDFLAGS  =
-CPPFLAGS = $(WRAPPER_CPPFLAGS)
+AM_LDFLAGS  =
+AM_CPPFLAGS = $(WRAPPER_CPPFLAGS)
 #DEFS     = 
 
-AM_CPPFLAGS = -I$(top_builddir)/src/include -I${top_srcdir}/src/include
+AM_CPPFLAGS += -I$(top_builddir)/src/include -I${top_srcdir}/src/include
 if BUILD_ROMIO
 AM_CPPFLAGS += -I$(top_builddir)/src/mpi/romio/include -I${top_srcdir}/mpi/romio/include/include
 endif BUILD_ROMIO
@@ -34,14 +34,14 @@ cpi_DEPENDENCIES =
 # is a better system?
 
 # the make-time instances of libpmpich.la and libmpich.la live here
-LDFLAGS += -L../lib
+AM_LDFLAGS += -L../lib
 # the make-time instances of libmpl.la and libopa.la live here
-LDFLAGS += -L at mpllibdir@ -L at opalibdir@
+AM_LDFLAGS += -L at mpllibdir@ -L at opalibdir@
 
 # Wrapper LDFLAGS need to be added at the end to make sure we link
 # with the libraries we just built, and not any previously installed
 # libraries.
-LDFLAGS += $(WRAPPER_LDFLAGS)
+AM_LDFLAGS += $(WRAPPER_LDFLAGS)
 
 external_libs = -l at MPLLIBNAME@ -l at OPALIBNAME@ $(WRAPPER_LIBS)
 if BUILD_PROFILING_LIB
@@ -78,7 +78,7 @@ parent_SOURCES = parent.c
 # --disable-static" is passed to configure.
 cpi_SOURCES = cpi.c
 cpi_LDADD = -lm
-cpi_LDFLAGS = $(LDFLAGS) $(mpich_libtool_static_flag)
+cpi_LDFLAGS = $(AM_LDFLAGS) $(mpich_libtool_static_flag)
 
 icpi_SOURCES = icpi.c
 icpi_LDADD = -lm

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

Summary of changes:
 examples/Makefile.am                    |   16 ++++++++--------
 src/mpi/romio/mpi-io/register_datarep.c |   13 +++++++++++++
 2 files changed, 21 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
MPICH primary repository