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 3e5395d452339bdb009f4c5b505c02bde0c9ee6d (commit) via 339b9cc661a5c5039826bb9def4c6bc5a3ca96d9 (commit) via 8189d9cf4c080a86033a3c1b731e37976c6130e2 (commit) from 494f597b956c4a1557c986848e3b5eabb80faa32 (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/3e5395d452339bdb009f4c5b505c02bde0... commit 3e5395d452339bdb009f4c5b505c02bde0c9ee6d Author: Wesley Bland <[email protected]> Date: Fri Apr 11 12:41:44 2014 -0500 Move MPIX functions to the end of mpi.h Moving the MPIX functions to the end of the mpi.h.in file will help with ABI compatibility. Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index ebdce0f..20a9c33 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -1484,13 +1484,6 @@ int MPI_Type_size_x(MPI_Datatype datatype, MPI_Count *size); int MPI_Comm_create_group(MPI_Comm comm, MPI_Group group, int tag, MPI_Comm *newcomm); -/* Non-standard but public extensions to MPI */ -/* Fault Tolerance Extensions */ -int MPIX_Comm_group_failed(MPI_Comm comm, MPI_Group *failed_group); -int MPIX_Comm_remote_group_failed(MPI_Comm comm, MPI_Group *failed_group); -int MPIX_Comm_reenable_anysource(MPI_Comm comm, MPI_Group *failed_group); - - /* MPI_T interface */ /* The MPI_T routines are available only in C bindings - tell tools that they can skip these prototypes */ @@ -1531,6 +1524,15 @@ int MPI_T_category_get_pvars(int cat_index, int len, int indices[]); int MPI_T_category_get_categories(int cat_index, int len, int indices[]); int MPI_T_category_changed(int *stamp); /* End Skip Prototypes */ + + +/* Non-standard but public extensions to MPI */ +/* Fault Tolerance Extensions */ +int MPIX_Comm_group_failed(MPI_Comm comm, MPI_Group *failed_group); +int MPIX_Comm_remote_group_failed(MPI_Comm comm, MPI_Group *failed_group); +int MPIX_Comm_reenable_anysource(MPI_Comm comm, MPI_Group *failed_group); + + /* End Prototypes */ #endif /* MPICH_SUPPRESS_PROTOTYPES */ @@ -2119,12 +2121,6 @@ int PMPI_Type_get_extent_x(MPI_Datatype datatype, MPI_Count *lb, MPI_Count *exte int PMPI_Type_get_true_extent_x(MPI_Datatype datatype, MPI_Count *lb, MPI_Count *extent); int PMPI_Type_size_x(MPI_Datatype datatype, MPI_Count *size); -/* Non-standard but public extensions to MPI */ -/* Fault Tolerance Extensions */ -int PMPIX_Comm_group_failed(MPI_Comm comm, MPI_Group *failed_group); -int PMPIX_Comm_remote_group_failed(MPI_Comm comm, MPI_Group *failed_group); -int PMPIX_Comm_reenable_anysource(MPI_Comm comm, MPI_Group *failed_group); - /* MPI_T interface */ /* The MPI_T routines are available only in C bindings - tell tools that they @@ -2166,6 +2162,15 @@ int PMPI_T_category_get_pvars(int cat_index, int len, int indices[]); int PMPI_T_category_get_categories(int cat_index, int len, int indices[]); int PMPI_T_category_changed(int *stamp); /* End Skip Prototypes */ + + +/* Non-standard but public extensions to MPI */ +/* Fault Tolerance Extensions */ +int PMPIX_Comm_group_failed(MPI_Comm comm, MPI_Group *failed_group); +int PMPIX_Comm_remote_group_failed(MPI_Comm comm, MPI_Group *failed_group); +int PMPIX_Comm_reenable_anysource(MPI_Comm comm, MPI_Group *failed_group); + + #endif /* MPI_BUILD_PROFILING */ /* End of MPI bindings */ http://git.mpich.org/mpich.git/commitdiff/339b9cc661a5c5039826bb9def4c6bc5a3... commit 339b9cc661a5c5039826bb9def4c6bc5a3ca96d9 Author: Wesley Bland <[email protected]> Date: Tue Jul 29 10:16:32 2014 -0500 Move MPIX_ERR_FAIL_STOP to the MPIX errcode section MPIX error codes now have their own section. Move MPIX_ERR_FAIL_STOP to that section with a new value. This does not break ABI compatiblity because this error code was prefixed MPIX and therefore is not available in all implementations. Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index 45c3b52..ebdce0f 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -842,8 +842,6 @@ typedef int (MPIX_Grequest_wait_function)(int, void **, double, MPI_Status *); #define MPI_ERR_DISP 52 /* */ #define MPI_ERR_ASSERT 53 /* */ -#define MPIX_ERR_PROC_FAIL_STOP 54 /* Process failure */ - #define MPI_ERR_RMA_RANGE 55 /* */ #define MPI_ERR_RMA_ATTACH 56 /* */ #define MPI_ERR_RMA_SHARED 57 /* */ @@ -879,6 +877,7 @@ typedef int (MPIX_Grequest_wait_function)(int, void **, double, MPI_Status *); * range. All MPIX error codes will be * above this value to be ABI complaint. */ +#define MPIX_ERR_PROC_FAIL_STOP MPICH_ERR_FIRST_MPIX+1 /* Process failure */ /* End of MPI's error classes */ http://git.mpich.org/mpich.git/commitdiff/8189d9cf4c080a86033a3c1b731e37976c... commit 8189d9cf4c080a86033a3c1b731e37976c6130e2 Author: Wesley Bland <[email protected]> Date: Mon Jul 28 16:45:51 2014 -0500 Reorganize mpi.h for MPIX err codes The mpi.h header already had one MPIX error code in the middle of the regular MPI error codes. This is bad for ABI compatibility since if that error code ever needs to change, it might cause problems. To avoid this, we'll now have a new value called MPI_ERR_FIRST_MPIX which is bigger than MPICH_ERR_LAST_CLASS. All MPIX error classes will be based on this value. If anything above that value ever changes, it's not a problem because it's MPIX and not part of the ABI agreement. There is a gap between MPICH_ERR_LAST_CLASS and MPICH_ERR_FIRST_MPIX because sock is currently using these values for some of its internal error codes. Someday in the future, we could consider removing this gap if sock goes away. This commit also does some minor reordering of the error codes within the file (not their values) for readability reasons. Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index bd047ce..45c3b52 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -802,18 +802,18 @@ typedef int (MPIX_Grequest_wait_function)(int, void **, double, MPI_Status *); #define MPI_ERR_PENDING 18 /* Pending request */ /* New MPI-2 Error classes */ -#define MPI_ERR_FILE 27 /* */ #define MPI_ERR_ACCESS 20 /* */ #define MPI_ERR_AMODE 21 /* */ #define MPI_ERR_BAD_FILE 22 /* */ +#define MPI_ERR_CONVERSION 23 /* */ +#define MPI_ERR_DUP_DATAREP 24 /* */ #define MPI_ERR_FILE_EXISTS 25 /* */ #define MPI_ERR_FILE_IN_USE 26 /* */ +#define MPI_ERR_FILE 27 /* */ +#define MPI_ERR_IO 32 /* */ #define MPI_ERR_NO_SPACE 36 /* */ #define MPI_ERR_NO_SUCH_FILE 37 /* */ -#define MPI_ERR_IO 32 /* */ #define MPI_ERR_READ_ONLY 40 /* */ -#define MPI_ERR_CONVERSION 23 /* */ -#define MPI_ERR_DUP_DATAREP 24 /* */ #define MPI_ERR_UNSUPPORTED_DATAREP 43 /* */ /* MPI_ERR_INFO is NOT defined in the MPI-2 standard. I believe that @@ -873,6 +873,13 @@ typedef int (MPIX_Grequest_wait_function)(int, void **, double, MPI_Status *); /* WARNING: this is also defined in mpishared.h. Update both locations */ #define MPICH_ERR_LAST_CLASS 72 /* It is also helpful to know the last valid class */ + +#define MPICH_ERR_FIRST_MPIX 100 /* Define a gap here because sock is + * already using some of the values in this + * range. All MPIX error codes will be + * above this value to be ABI complaint. */ + + /* End of MPI's error classes */ /* Function type defs */ ----------------------------------------------------------------------- Summary of changes: src/include/mpi.h.in | 49 ++++++++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 19 deletions(-) hooks/post-receive -- MPICH primary repository