[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-281-gb2770c7
Service Account
noreply at mpich.org
Wed Jul 22 13:44:59 CDT 2015
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 b2770c7e195d091f5710c8016cff5b39c4496832 (commit)
via 17992398fc238f5c35aee493628b61c8d40414b4 (commit)
via abe0e7b6abb59046a520067ee9aa76a3b6203dea (commit)
via 47a8a8113c9d2ef26c276ce59a8faf5f628faebb (commit)
from 9acdb05448288f3bc26559edec91b5904746b8b1 (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/b2770c7e195d091f5710c8016cff5b39c4496832
commit b2770c7e195d091f5710c8016cff5b39c4496832
Author: Pavan Balaji <balaji at anl.gov>
Date: Wed Jul 22 13:34:59 2015 -0500
nb_test is incorrect, not an xfail.
No reviewer.
diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in
index 8d24f0b..c824afd 100644
--- a/test/mpi/rma/testlist.in
+++ b/test/mpi/rma/testlist.in
@@ -164,4 +164,4 @@ cas_flush_get 3 mpiversion=3.0
## specified by the standard and might not be true. Commenting this
## out till be find a better way to test the original problem with
## MPI_Test.
-# nb_test 2 mpiversion=3.0 xfail=ticket1910
+# nb_test 2 mpiversion=3.0
http://git.mpich.org/mpich.git/commitdiff/17992398fc238f5c35aee493628b61c8d40414b4
commit 17992398fc238f5c35aee493628b61c8d40414b4
Author: Pavan Balaji <balaji at anl.gov>
Date: Thu Jul 16 02:40:50 2015 -0500
Remove unnecessary macro.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/include/mpimem.h b/src/include/mpimem.h
index e1478a5..9bd5a8f 100644
--- a/src/include/mpimem.h
+++ b/src/include/mpimem.h
@@ -282,15 +282,12 @@ extern char *strdup( const char * );
/* Memory allocation macros. See document. */
-/* You can redefine this to indicate whether memory allocation errors
- are fatal. Recoverable by default */
-#define MPIU_CHKMEM_ISFATAL MPIR_ERR_RECOVERABLE
-
-/* Standard macro for generating error codes. */
+/* Standard macro for generating error codes. We set the error to be
+ * recoverable by default, but this can be changed. */
#ifdef HAVE_ERROR_CHECKING
#define MPIU_CHKMEM_SETERR(rc_,nbytes_,name_) \
rc_=MPIR_Err_create_code( MPI_SUCCESS, \
- MPIU_CHKMEM_ISFATAL, FCNAME, __LINE__, \
+ MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, \
MPI_ERR_OTHER, "**nomem2", "**nomem2 %d %s", nbytes_, name_ )
#else
#define MPIU_CHKMEM_SETERR(rc_,nbytes_,name_) rc_=MPI_ERR_OTHER
http://git.mpich.org/mpich.git/commitdiff/abe0e7b6abb59046a520067ee9aa76a3b6203dea
commit abe0e7b6abb59046a520067ee9aa76a3b6203dea
Author: Pavan Balaji <balaji at anl.gov>
Date: Thu Jul 16 02:29:22 2015 -0500
Get rid of MPIUI_Memcpy.
MPIU_ functions are not meant to be device-overridable functions. If
we want to do that, we need to expose an additional MPID_ function and
use that everywhere. The device might simply map the MPID_ function
to the MPIU_ equivalent if it does not have anything special to do.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index d975d6b..02d29c0 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -143,16 +143,6 @@ int usleep(useconds_t usec);
/* FIXME: ... to do ... */
#include "mpitypedefs.h"
-/* This is the default implementation of MPIU_Memcpy. We define this
- before including mpidpre.h so that it can be used when a device or
- channel can use it if it's overriding MPIU_Memcpy. */
-MPIU_DBG_ATTRIBUTE_NOINLINE
-ATTRIBUTE((unused))
-static MPIU_DBG_INLINE_KEYWORD void MPIUI_Memcpy(void * dst, const void * src, size_t len)
-{
- memcpy(dst, src, len);
-}
-
/* Include definitions from the device which must exist before items in this
file (mpiimpl.h) can be defined. mpidpre.h must be included before any
files that allow the device to override or extend any terms; this includes
@@ -162,18 +152,16 @@ static MPIU_DBG_INLINE_KEYWORD void MPIUI_Memcpy(void * dst, const void * src, s
/* ------------------------------------------------------------------------- */
/* Overriding memcpy:
- Devices and channels can override the default implementation of
- MPIU_Memcpy by defining the MPIU_Memcpy macro. The implementation
- can call MPIUI_Memcpy for the default memcpy implementation.
- Note that MPIU_Memcpy and MPIUI_Memcpy return void rather than a
- pointer to the destination buffer. This is different from C89
- memcpy.
+ This is a utility function for memory copy. The device might use
+ this directly or override it with a different device-specific
+ mechanism to provide an MPID_Memcpy function. However, we
+ currently do not provide such an ADI function.
*/
#ifndef MPIU_Memcpy
#define MPIU_Memcpy(dst, src, len) \
do { \
MPIU_MEM_CHECK_MEMCPY((dst),(src),(len)); \
- MPIUI_Memcpy((dst), (src), (len)); \
+ memcpy((dst), (src), (len)); \
} while (0)
#endif
diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c
index 5639213..337fa4e 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c
@@ -180,8 +180,8 @@ static int alloc_sc_plfd_tbls (void)
if (mpi_errno != MPI_SUCCESS) MPIU_ERR_POP (mpi_errno);
MPIU_Assert(0 == idx); /* assumed in other parts of this file */
- MPIUI_Memcpy (&g_sc_tbl[idx], &MPID_nem_tcp_g_lstn_sc, sizeof(MPID_nem_tcp_g_lstn_sc));
- MPIUI_Memcpy (&MPID_nem_tcp_plfd_tbl[idx], &MPID_nem_tcp_g_lstn_plfd, sizeof(MPID_nem_tcp_g_lstn_plfd));
+ MPIU_Memcpy (&g_sc_tbl[idx], &MPID_nem_tcp_g_lstn_sc, sizeof(MPID_nem_tcp_g_lstn_sc));
+ MPIU_Memcpy (&MPID_nem_tcp_plfd_tbl[idx], &MPID_nem_tcp_g_lstn_plfd, sizeof(MPID_nem_tcp_g_lstn_plfd));
MPIU_Assert(MPID_nem_tcp_plfd_tbl[idx].fd == g_sc_tbl[idx].fd);
MPIU_Assert(MPID_nem_tcp_plfd_tbl[idx].events == POLLIN);
http://git.mpich.org/mpich.git/commitdiff/47a8a8113c9d2ef26c276ce59a8faf5f628faebb
commit 47a8a8113c9d2ef26c276ce59a8faf5f628faebb
Author: Pavan Balaji <balaji at anl.gov>
Date: Thu Jul 16 02:16:06 2015 -0500
Move default PMI version to the device.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index d90f8de..d975d6b 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -114,10 +114,6 @@ int usleep(useconds_t usec);
#define MAX_HOSTNAME_LEN MAXHOSTNAMELEN
#endif
-/* Default PMI version to use */
-#define MPIU_DEFAULT_PMI_VERSION 1
-#define MPIU_DEFAULT_PMI_SUBVERSION 1
-
/* This allows us to keep names local to a single file when we can use
weak symbols */
#ifdef USE_WEAK_SYMBOLS
diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h
index 8db9b56..8f6c7e3 100644
--- a/src/mpid/ch3/include/mpidimpl.h
+++ b/src/mpid/ch3/include/mpidimpl.h
@@ -45,6 +45,10 @@
int gethostname(char *name, size_t len);
# endif
+/* Default PMI version to use */
+#define MPIDI_CH3I_DEFAULT_PMI_VERSION 1
+#define MPIDI_CH3I_DEFAULT_PMI_SUBVERSION 1
+
/* group of processes detected to have failed. This is a subset of
comm_world group. */
extern MPID_Group *MPIDI_Failed_procs_group;
diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c
index 1fad710..4715fdb 100644
--- a/src/mpid/ch3/src/mpid_vc.c
+++ b/src/mpid/ch3/src/mpid_vc.c
@@ -1077,7 +1077,8 @@ int MPIDI_Populate_vc_node_ids(MPIDI_PG_t *pg, int our_pg_rank)
char *node_name_buf;
int no_local = 0;
int odd_even_cliques = 0;
- int pmi_version = MPIU_DEFAULT_PMI_VERSION, pmi_subversion = MPIU_DEFAULT_PMI_SUBVERSION;
+ int pmi_version = MPIDI_CH3I_DEFAULT_PMI_VERSION;
+ int pmi_subversion = MPIDI_CH3I_DEFAULT_PMI_SUBVERSION;
MPIU_CHKLMEM_DECL(4);
/* See if the user wants to override our default values */
-----------------------------------------------------------------------
Summary of changes:
src/include/mpiimpl.h | 26 ++++-----------------
src/include/mpimem.h | 9 ++-----
src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c | 4 +-
src/mpid/ch3/include/mpidimpl.h | 4 +++
src/mpid/ch3/src/mpid_vc.c | 3 +-
test/mpi/rma/testlist.in | 2 +-
6 files changed, 17 insertions(+), 31 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list