[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-10-gc3dbc09
Service Account
noreply at mpich.org
Thu Dec 3 12:40:19 CST 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 c3dbc09ae20a503ac4b870893e3e330d52ea5a3b (commit)
from f0ee51dcf99276370c8f904d2150ce95a04e265f (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/c3dbc09ae20a503ac4b870893e3e330d52ea5a3b
commit c3dbc09ae20a503ac4b870893e3e330d52ea5a3b
Author: Jeff Hammond <jeff.science at gmail.com>
Date: Mon Nov 30 20:50:23 2015 -0800
Remove const from declaration of MPI-2 functions
The following functions were deprecated in MPI-2 and deleted in MPI-3,
hence should not have const arguments, since that is an MPI-3 addition.
MPI_Type_hindexed
MPI_Type_struct
MPI_Address
PMPI_Type_hindexed
PMPI_Type_struct
PMPI_Address
See http://lists.mpich.org/pipermail/discuss/2015-November/004348.html
for related discussion. Closes #2318
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in
index 39cdec3..ddba429 100644
--- a/src/include/mpi.h.in
+++ b/src/include/mpi.h.in
@@ -980,13 +980,13 @@ int MPI_Type_hvector(int count, int blocklength, MPI_Aint stride, MPI_Datatype o
int MPI_Type_indexed(int count, const int *array_of_blocklengths,
const int *array_of_displacements, MPI_Datatype oldtype,
MPI_Datatype *newtype);
-int MPI_Type_hindexed(int count, const int *array_of_blocklengths,
- const MPI_Aint *array_of_displacements, MPI_Datatype oldtype,
+int MPI_Type_hindexed(int count, int *array_of_blocklengths,
+ MPI_Aint *array_of_displacements, MPI_Datatype oldtype,
MPI_Datatype *newtype);
-int MPI_Type_struct(int count, const int *array_of_blocklengths,
- const MPI_Aint *array_of_displacements,
- const MPI_Datatype *array_of_types, MPI_Datatype *newtype);
-int MPI_Address(const void *location, MPI_Aint *address);
+int MPI_Type_struct(int count, int *array_of_blocklengths,
+ MPI_Aint *array_of_displacements,
+ MPI_Datatype *array_of_types, MPI_Datatype *newtype);
+int MPI_Address(void *location, MPI_Aint *address);
int MPI_Type_extent(MPI_Datatype datatype, MPI_Aint *extent);
int MPI_Type_size(MPI_Datatype datatype, int *size);
int MPI_Type_lb(MPI_Datatype datatype, MPI_Aint *displacement);
@@ -1626,13 +1626,13 @@ int PMPI_Type_hvector(int count, int blocklength, MPI_Aint stride, MPI_Datatype
int PMPI_Type_indexed(int count, const int *array_of_blocklengths,
const int *array_of_displacements, MPI_Datatype oldtype,
MPI_Datatype *newtype);
-int PMPI_Type_hindexed(int count, const int *array_of_blocklengths,
- const MPI_Aint *array_of_displacements, MPI_Datatype oldtype,
+int PMPI_Type_hindexed(int count, int *array_of_blocklengths,
+ MPI_Aint *array_of_displacements, MPI_Datatype oldtype,
MPI_Datatype *newtype);
-int PMPI_Type_struct(int count, const int *array_of_blocklengths,
- const MPI_Aint *array_of_displacements,
- const MPI_Datatype *array_of_types, MPI_Datatype *newtype);
-int PMPI_Address(const void *location, MPI_Aint *address);
+int PMPI_Type_struct(int count, int *array_of_blocklengths,
+ MPI_Aint *array_of_displacements,
+ MPI_Datatype *array_of_types, MPI_Datatype *newtype);
+int PMPI_Address(void *location, MPI_Aint *address);
int PMPI_Type_extent(MPI_Datatype datatype, MPI_Aint *extent);
int PMPI_Type_size(MPI_Datatype datatype, int *size);
int PMPI_Type_lb(MPI_Datatype datatype, MPI_Aint *displacement);
diff --git a/src/mpi/datatype/address.c b/src/mpi/datatype/address.c
index 4557846..bd5819a 100644
--- a/src/mpi/datatype/address.c
+++ b/src/mpi/datatype/address.c
@@ -15,7 +15,7 @@
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPI_Address as PMPI_Address
#elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPI_Address(const void *location, MPI_Aint *address) __attribute__((weak,alias("PMPI_Address")));
+int MPI_Address(void *location, MPI_Aint *address) __attribute__((weak,alias("PMPI_Address")));
#endif
/* -- End Profiling Symbol Block */
@@ -59,7 +59,7 @@ The replacement for this routine is 'MPI_Get_address'.
.N MPI_SUCCESS
.N MPI_ERR_OTHER
@*/
-int MPI_Address(const void *location, MPI_Aint *address)
+int MPI_Address(void *location, MPI_Aint *address)
{
int mpi_errno = MPI_SUCCESS;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_ADDRESS);
diff --git a/src/mpi/datatype/type_hindexed.c b/src/mpi/datatype/type_hindexed.c
index 7ed7a2f..94d6cb4 100644
--- a/src/mpi/datatype/type_hindexed.c
+++ b/src/mpi/datatype/type_hindexed.c
@@ -15,8 +15,8 @@
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPI_Type_hindexed as PMPI_Type_hindexed
#elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPI_Type_hindexed(int count, const int *array_of_blocklengths,
- const MPI_Aint *array_of_displacements, MPI_Datatype oldtype,
+int MPI_Type_hindexed(int count, int *array_of_blocklengths,
+ MPI_Aint *array_of_displacements, MPI_Datatype oldtype,
MPI_Datatype *newtype) __attribute__((weak,alias("PMPI_Type_hindexed")));
#endif
/* -- End Profiling Symbol Block */
@@ -81,8 +81,8 @@ consider declaring the Fortran array with a zero origin
.N MPI_ERR_ARG
@*/
int MPI_Type_hindexed(int count,
- const int *array_of_blocklengths,
- const MPI_Aint *array_of_displacements,
+ int *array_of_blocklengths,
+ MPI_Aint *array_of_displacements,
MPI_Datatype oldtype,
MPI_Datatype *newtype)
{
diff --git a/src/mpi/datatype/type_struct.c b/src/mpi/datatype/type_struct.c
index fde6b8a..ca4e012 100644
--- a/src/mpi/datatype/type_struct.c
+++ b/src/mpi/datatype/type_struct.c
@@ -15,9 +15,9 @@
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPI_Type_struct as PMPI_Type_struct
#elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPI_Type_struct(int count, const int *array_of_blocklengths,
- const MPI_Aint *array_of_displacements,
- const MPI_Datatype *array_of_types, MPI_Datatype *newtype) __attribute__((weak,alias("PMPI_Type_struct")));
+int MPI_Type_struct(int count, int *array_of_blocklengths,
+ MPI_Aint *array_of_displacements,
+ MPI_Datatype *array_of_types, MPI_Datatype *newtype) __attribute__((weak,alias("PMPI_Type_struct")));
#endif
/* -- End Profiling Symbol Block */
@@ -149,9 +149,9 @@ for the structure foo
.N MPI_ERR_EXHAUSTED
@*/
int MPI_Type_struct(int count,
- const int *array_of_blocklengths,
- const MPI_Aint *array_of_displacements,
- const MPI_Datatype *array_of_types,
+ int *array_of_blocklengths,
+ MPI_Aint *array_of_displacements,
+ MPI_Datatype *array_of_types,
MPI_Datatype *newtype)
{
int mpi_errno = MPI_SUCCESS;
-----------------------------------------------------------------------
Summary of changes:
src/include/mpi.h.in | 24 ++++++++++++------------
src/mpi/datatype/address.c | 4 ++--
src/mpi/datatype/type_hindexed.c | 8 ++++----
src/mpi/datatype/type_struct.c | 12 ++++++------
4 files changed, 24 insertions(+), 24 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list