Skip to content
GitLab
Commit 57350dc5 authored by Pavan Balaji's avatar Pavan Balaji
Browse files

[svn-r10411] Rename the MPIX_ routines and constants that are a part of MPI-3 to 

MPI_.

A slightly older version of this patch was reviewed by goodell.
parent 5c9711a2
Expand all Hide whitespace changes
Inline Side-by-side
src/binding/cxx/buildiface
View file @ 57350dc5
......@@ -1861,7 +1861,7 @@ extern Datatype TWOINTEGER;
# Modes for comm_split_type
foreach $int (SHARED) {
print $OUTFD "${extern}const int COMM_TYPE_$int";
if ($giveValue) { print $OUTFD " = MPIX_COMM_TYPE_$int;\n"; }
if ($giveValue) { print $OUTFD " = MPI_COMM_TYPE_$int;\n"; }
else { print $OUTFD ";\n"; }
}
......@@ -1869,17 +1869,11 @@ extern Datatype TWOINTEGER;
foreach $int (CONTIGUOUS, DARRAY, DUP, F90_COMPLEX, F90_INTEGER,
F90_REAL, HINDEXED_INTEGER, HINDEXED, HVECTOR_INTEGER,
HVECTOR, INDEXED_BLOCK, INDEXED, NAMED, RESIZED,
STRUCT_INTEGER, STRUCT, SUBARRAY, VECTOR) {
STRUCT_INTEGER, STRUCT, SUBARRAY, VECTOR, HINDEXED_BLOCK) {
print $OUTFD "${extern}const int COMBINER_$int";
if ($giveValue) { print $OUTFD " = MPI_COMBINER_$int;\n"; }
else { print $OUTFD ";\n"; }
}
# FIXME: Merge with the above list when it's no longer MPIX_
foreach $int (HINDEXED_BLOCK) {
print $OUTFD "${extern}const int COMBINER_$int";
if ($giveValue) { print $OUTFD " = MPIX_COMBINER_$int;\n"; }
else { print $OUTFD ";\n"; }
}
# MPI Thread levels
foreach $int (FUNNELED, MULTIPLE, SERIALIZED, SINGLE) {
......
src/binding/f77/buildiface
View file @ 57350dc5
......@@ -48,7 +48,7 @@ $within_fint = 0; # This is set to 1 while generating code for the
# do_fint branch
%fintToHandle = ( 'int' => 1, 'MPI_Request' => 1, 'MPI_Group' => 1,
'MPI_Win' => 1, 'MPI_Info' => 1, 'MPI_Errhandler' => 1,
'MPI_File' => 1, 'MPI_Op' => 1, 'MPIX_Message' => 1 );
'MPI_File' => 1, 'MPI_Op' => 1, 'MPI_Message' => 1 );
@arg_addresses = ();
#
......@@ -174,7 +174,7 @@ foreach $_ (@ARGV) {
'MPI_Op' => 'MPI_Fint *',
'MPI_Info' => 'MPI_Fint *',
'MPI_Errhandler' => 'MPI_Fint *',
'MPIX_Message' => 'MPI_Fint *',
'MPI_Message' => 'MPI_Fint *',
'MPI_Aint' => 'MPI_Fint *', # Should be MPIR_FAint
'MPI_FAintp' => 'MPI_Aint *', # Used to force an MPI_Aint*
'MPI_Offset' => 'MPI_Offset *', # Should be MPIR_FOint
......@@ -188,7 +188,7 @@ foreach $_ (@ARGV) {
'MPI_Win*' => 'MPI_Fint *',
'MPI_Group*' => 'MPI_Fint *',
'MPI_Request*' => 'MPI_Fint *',
'MPIX_Message*' => 'MPI_Fint *',
'MPI_Message*' => 'MPI_Fint *',
'MPI_Aint*' => 'MPI_Fint *', # Should be MPIR_FAint
'int *' => 'MPI_Fint *',
'int*' => 'MPI_Fint *', # Catch missing space
......@@ -241,7 +241,7 @@ foreach $_ (@ARGV) {
'MPI_Datatype *' => '(MPI_Datatype *)(ARG)',
'MPI_Info *' => '(MPI_Info *)(ARG)',
'MPI_Info' => '(MPI_Info)(ARG)',
'MPIX_Message *' => '(MPIX_Message *)(ARG)',
'MPI_Message *' => '(MPI_Message *)(ARG)',
'int [][3]' => '(int (*)[3])(ARG)'
);
......@@ -3739,13 +3739,9 @@ if ($write_mpif) {
foreach $key (NAMED, DUP, CONTIGUOUS, VECTOR, HVECTOR_INTEGER, HVECTOR,
INDEXED, HINDEXED_INTEGER, HINDEXED, INDEXED_BLOCK,
STRUCT_INTEGER, STRUCT, SUBARRAY, DARRAY, F90_REAL,
F90_COMPLEX, F90_INTEGER, RESIZED) {
F90_COMPLEX, F90_INTEGER, RESIZED, HINDEXED_BLOCK) {
&print_mpif_int( "MPI_COMBINER_$key" );
}
# FIXME: Merge with the above list when it's no longer MPIX_
foreach $key (HINDEXED_BLOCK) {
&print_mpif_int( "MPIX_COMBINER_$key" );
}
# Typeclasses
foreach $key (REAL, INTEGER, COMPLEX) {
&print_mpif_int( "MPI_TYPECLASS_$key" );
......@@ -3758,10 +3754,10 @@ if ($write_mpif) {
# comm_split_types
foreach $type (SHARED) {
&print_mpif_int( "MPIX_COMM_TYPE_$type" );
&print_mpif_int( "MPI_COMM_TYPE_$type" );
}
&print_mpif_int( "MPIX_MESSAGE_NULL" );
&print_mpif_int( "MPIX_MESSAGE_NO_PROC" );
&print_mpif_int( "MPI_MESSAGE_NULL" );
&print_mpif_int( "MPI_MESSAGE_NO_PROC" );
# Thread values
foreach my $threadlevel (SINGLE, FUNNELED, SERIALIZED, MULTIPLE) {
......
src/binding/f90/buildiface
View file @ 57350dc5
......@@ -107,6 +107,8 @@ $outfile_prefix = "mpi";
'MPI_Win*' => 'INTEGER', # Never an array of win
'MPI_File' => 'INTEGER',
'MPI_File*' => 'INTEGER', # Never an array of files
'MPI_Message' => 'INTEGER',
'MPI_Message*' => 'INTEGER', # Never an array of messages
);
# special_args provides for handling of arguments that require special
......
src/include/mpi.h.in
View file @ 57350dc5
This diff is collapsed.
src/include/mpiimpl.h
View file @ 57350dc5
......@@ -3443,8 +3443,8 @@ enum MPIR_T_pvar_impl_kind {
};
/* These are descriptors that lower level intialization code creates and feeds
* into the overall MPIX_T_pvar_ system in order to permit the upper level code
* to implement MPIX_T_pvar_{get_num,get_info,handle_alloc}. */
* into the overall MPI_T_pvar_ system in order to permit the upper level code
* to implement MPI_T_pvar_{get_num,get_info,handle_alloc}. */
struct MPIR_T_pvar_info {
int idx; /* pvar index value for pvar_get_info and friends */
......@@ -3498,7 +3498,7 @@ struct MPIR_T_pvar_hnd_vtable {
};
/* Called by lower-level initialization code to add pvars to the global list.
* Will cause the value returned by MPIX_T_pvar_get_num to be incremented and
* Will cause the value returned by MPI_T_pvar_get_num to be incremented and
* sets up that new index to work with get_info, handle_alloc, etc. */
int MPIR_T_pvar_add(const char *name,
enum MPIR_T_verbosity_t verbosity,
......@@ -4170,36 +4170,36 @@ int MPIR_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dat
int MPIR_Ialltoallw_intra(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPID_Comm *comm_ptr, MPID_Sched_t s);
int MPIR_Ialltoallw_inter(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPID_Comm *comm_ptr, MPID_Sched_t s);
/* begin impl functions for MPI_T (MPIX_T_ right now) */
/* begin impl functions for MPI_T (MPI_T_ right now) */
int MPIR_T_init_thread_impl(int required, int *provided);
int MPIR_T_finalize_impl(void);
int MPIR_T_enum_get_info_impl(MPIX_T_enum enumtype, int num, char *name, int *name_len);
int MPIR_T_enum_get_item_impl(MPIX_T_enum enumtype, int num, int *value, char *name, int *name_len);
int MPIR_T_enum_get_info_impl(MPI_T_enum enumtype, int num, char *name, int *name_len);
int MPIR_T_enum_get_item_impl(MPI_T_enum enumtype, int num, int *value, char *name, int *name_len);
int MPIR_T_cvar_get_num_impl(int *num_cvar);
int MPIR_T_cvar_get_info_impl(int cvar_index, char *name, int *name_len, int *verbosity, MPI_Datatype *datatype, MPIX_T_enum *enumtype, char *desc, int *desc_len, int *binding, int *scope);
int MPIR_T_cvar_handle_alloc_impl(int cvar_index, void *obj_handle, MPIX_T_cvar_handle *handle, int *count);
int MPIR_T_cvar_handle_free_impl(MPIX_T_cvar_handle *handle);
int MPIR_T_cvar_read_impl(MPIX_T_cvar_handle handle, void *buf);
int MPIR_T_cvar_write_impl(MPIX_T_cvar_handle handle, void *buf);
int MPIR_T_cvar_get_info_impl(int cvar_index, char *name, int *name_len, int *verbosity, MPI_Datatype *datatype, MPI_T_enum *enumtype, char *desc, int *desc_len, int *binding, int *scope);
int MPIR_T_cvar_handle_alloc_impl(int cvar_index, void *obj_handle, MPI_T_cvar_handle *handle, int *count);
int MPIR_T_cvar_handle_free_impl(MPI_T_cvar_handle *handle);
int MPIR_T_cvar_read_impl(MPI_T_cvar_handle handle, void *buf);
int MPIR_T_cvar_write_impl(MPI_T_cvar_handle handle, void *buf);
int MPIR_T_pvar_get_num_impl(int *num_pvar);
int MPIR_T_pvar_get_info_impl(int pvar_index, char *name, int *name_len, int *verbosity, int *var_class, MPI_Datatype *datatype, MPIX_T_enum *enumtype, char *desc, int *desc_len, int *binding, int *readonly, int *continuous, int *atomic);
int MPIR_T_pvar_session_create_impl(MPIX_T_pvar_session *session);
int MPIR_T_pvar_session_free_impl(MPIX_T_pvar_session *session);
int MPIR_T_pvar_handle_alloc_impl(MPIX_T_pvar_session session, int pvar_index, void *obj_handle, MPIX_T_pvar_handle *handle, int *count);
int MPIR_T_pvar_handle_free_impl(MPIX_T_pvar_session session, MPIX_T_pvar_handle *handle);
int MPIR_T_pvar_start_impl(MPIX_T_pvar_session session, MPIX_T_pvar_handle handle);
int MPIR_T_pvar_stop_impl(MPIX_T_pvar_session session, MPIX_T_pvar_handle handle);
int MPIR_T_pvar_read_impl(MPIX_T_pvar_session session, MPIX_T_pvar_handle handle, void *buf);
int MPIR_T_pvar_write_impl(MPIX_T_pvar_session session, MPIX_T_pvar_handle handle, void *buf);
int MPIR_T_pvar_reset_impl(MPIX_T_pvar_session session, MPIX_T_pvar_handle handle);
int MPIR_T_pvar_readreset_impl(MPIX_T_pvar_session session, MPIX_T_pvar_handle handle, void *buf);
int MPIR_T_pvar_get_info_impl(int pvar_index, char *name, int *name_len, int *verbosity, int *var_class, MPI_Datatype *datatype, MPI_T_enum *enumtype, char *desc, int *desc_len, int *binding, int *readonly, int *continuous, int *atomic);
int MPIR_T_pvar_session_create_impl(MPI_T_pvar_session *session);
int MPIR_T_pvar_session_free_impl(MPI_T_pvar_session *session);
int MPIR_T_pvar_handle_alloc_impl(MPI_T_pvar_session session, int pvar_index, void *obj_handle, MPI_T_pvar_handle *handle, int *count);
int MPIR_T_pvar_handle_free_impl(MPI_T_pvar_session session, MPI_T_pvar_handle *handle);
int MPIR_T_pvar_start_impl(MPI_T_pvar_session session, MPI_T_pvar_handle handle);
int MPIR_T_pvar_stop_impl(MPI_T_pvar_session session, MPI_T_pvar_handle handle);
int MPIR_T_pvar_read_impl(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *buf);
int MPIR_T_pvar_write_impl(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *buf);
int MPIR_T_pvar_reset_impl(MPI_T_pvar_session session, MPI_T_pvar_handle handle);
int MPIR_T_pvar_readreset_impl(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *buf);
int MPIR_T_category_get_num_impl(int *num_cat);
int MPIR_T_category_get_info_impl(int cat_index, char *name, int *name_len, char *desc, int *desc_len, int *num_controlvars, int *num_pvars, int *num_categories);
int MPIR_T_category_get_cvars_impl(int cat_index, int len, int indices[]);
int MPIR_T_category_get_pvars_impl(int cat_index[], int len, int indices[]);
int MPIR_T_category_get_categories_impl(int cat_index, int len, int indices[]);
int MPIR_T_category_changed_impl(int *stamp);
/* end impl functions for MPI_T (MPIX_T_ right now) */
/* end impl functions for MPI_T (MPI_T_ right now) */
int MPIR_T_is_initialized(void);
......
src/mpi/attr/win_get_attr.c
View file @ 57350dc5
......@@ -113,11 +113,11 @@ int MPIR_WinGetAttr( MPI_Win win, int win_keyval, void *attribute_val,
win_ptr->copyDispUnit = win_ptr->disp_unit;
*attr_val_p = &win_ptr->copyDispUnit;
break;
case MPIX_WIN_CREATE_FLAVOR:
case MPI_WIN_CREATE_FLAVOR:
win_ptr->copyCreateFlavor = win_ptr->create_flavor;
*attr_val_p = &win_ptr->copyCreateFlavor;
break;
case MPIX_WIN_MODEL:
case MPI_WIN_MODEL:
win_ptr->copyModel = win_ptr->model;
*attr_val_p = &win_ptr->copyModel;
break;
......@@ -137,10 +137,10 @@ int MPIR_WinGetAttr( MPI_Win win, int win_keyval, void *attribute_val,
not a pointer to the value */
*attr_int = win_ptr->disp_unit;
break;
case MPIR_ATTR_C_TO_FORTRAN(MPIX_WIN_CREATE_FLAVOR):
case MPIR_ATTR_C_TO_FORTRAN(MPI_WIN_CREATE_FLAVOR):
*attr_int = win_ptr->create_flavor;
break;
case MPIR_ATTR_C_TO_FORTRAN(MPIX_WIN_MODEL):
case MPIR_ATTR_C_TO_FORTRAN(MPI_WIN_MODEL):
*attr_int = win_ptr->model;
break;
#endif
......
src/mpi/coll/iallgather.c
View file @ 57350dc5
......@@ -6,21 +6,21 @@
#include "mpiimpl.h"
/* -- Begin Profiling Symbol Block for routine MPIX_Iallgather */
/* -- Begin Profiling Symbol Block for routine MPI_Iallgather */
#if defined(HAVE_PRAGMA_WEAK)
#pragma weak MPIX_Iallgather = PMPIX_Iallgather
#pragma weak MPI_Iallgather = PMPI_Iallgather
#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
#pragma _HP_SECONDARY_DEF PMPIX_Iallgather MPIX_Iallgather
#pragma _HP_SECONDARY_DEF PMPI_Iallgather MPI_Iallgather
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Iallgather as PMPIX_Iallgather
#pragma _CRI duplicate MPI_Iallgather as PMPI_Iallgather
#endif
/* -- End Profiling Symbol Block */
/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
the MPI routines */
#ifndef MPICH_MPI_FROM_PMPI
#undef MPIX_Iallgather
#define MPIX_Iallgather PMPIX_Iallgather
#undef MPI_Iallgather
#define MPI_Iallgather PMPI_Iallgather
/* any non-MPI functions go here, especially non-static ones */
......@@ -618,11 +618,11 @@ fn_fail:
#endif /* MPICH_MPI_FROM_PMPI */
#undef FUNCNAME
#define FUNCNAME MPIX_Iallgather
#define FUNCNAME MPI_Iallgather
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPIX_Iallgather - XXX description here
MPI_Iallgather - XXX description here
Input Parameters:
+ sendbuf - starting address of the send buffer (choice)
......@@ -642,14 +642,14 @@ Output Parameters:
.N Errors
@*/
int MPIX_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)
int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIX_IALLGATHER);
MPID_MPI_STATE_DECL(MPID_STATE_MPI_IALLGATHER);
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_IALLGATHER);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_IALLGATHER);
/* Validate parameters, especially handles needing to be converted */
# ifdef HAVE_ERROR_CHECKING
......@@ -709,7 +709,7 @@ int MPIX_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, v
/* ... end of body of routine ... */
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_IALLGATHER);
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_IALLGATHER);
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
......
src/mpi/coll/iallgatherv.c
View file @ 57350dc5
......@@ -6,21 +6,21 @@
#include "mpiimpl.h"
/* -- Begin Profiling Symbol Block for routine MPIX_Iallgatherv */
/* -- Begin Profiling Symbol Block for routine MPI_Iallgatherv */
#if defined(HAVE_PRAGMA_WEAK)
#pragma weak MPIX_Iallgatherv = PMPIX_Iallgatherv
#pragma weak MPI_Iallgatherv = PMPI_Iallgatherv
#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
#pragma _HP_SECONDARY_DEF PMPIX_Iallgatherv MPIX_Iallgatherv
#pragma _HP_SECONDARY_DEF PMPI_Iallgatherv MPI_Iallgatherv
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Iallgatherv as PMPIX_Iallgatherv
#pragma _CRI duplicate MPI_Iallgatherv as PMPI_Iallgatherv
#endif
/* -- End Profiling Symbol Block */
/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
the MPI routines */
#ifndef MPICH_MPI_FROM_PMPI
#undef MPIX_Iallgatherv
#define MPIX_Iallgatherv PMPIX_Iallgatherv
#undef MPI_Iallgatherv
#define MPI_Iallgatherv PMPI_Iallgatherv
#undef FUNCNAME
#define FUNCNAME MPIR_Iallgatherv_rec_dbl
......@@ -708,11 +708,11 @@ fn_fail:
#endif /* MPICH_MPI_FROM_PMPI */
#undef FUNCNAME
#define FUNCNAME MPIX_Iallgatherv
#define FUNCNAME MPI_Iallgatherv
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPIX_Iallgatherv - XXX description here
MPI_Iallgatherv - XXX description here
Input Parameters:
+ sendbuf - starting address of the send buffer (choice)
......@@ -733,14 +733,14 @@ Output Parameters:
.N Errors
@*/
int MPIX_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)
int MPI_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIX_IALLGATHERV);
MPID_MPI_STATE_DECL(MPID_STATE_MPI_IALLGATHERV);
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_IALLGATHERV);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_IALLGATHERV);
/* Validate parameters, especially handles needing to be converted */
# ifdef HAVE_ERROR_CHECKING
......@@ -804,7 +804,7 @@ int MPIX_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
/* ... end of body of routine ... */
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_IALLGATHERV);
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_IALLGATHERV);
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
......
src/mpi/coll/iallreduce.c
View file @ 57350dc5
......@@ -7,21 +7,21 @@
#include "mpiimpl.h"
#include "collutil.h"
/* -- Begin Profiling Symbol Block for routine MPIX_Iallreduce */
/* -- Begin Profiling Symbol Block for routine MPI_Iallreduce */
#if defined(HAVE_PRAGMA_WEAK)
#pragma weak MPIX_Iallreduce = PMPIX_Iallreduce
#pragma weak MPI_Iallreduce = PMPI_Iallreduce
#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
#pragma _HP_SECONDARY_DEF PMPIX_Iallreduce MPIX_Iallreduce
#pragma _HP_SECONDARY_DEF PMPI_Iallreduce MPI_Iallreduce
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Iallreduce as PMPIX_Iallreduce
#pragma _CRI duplicate MPI_Iallreduce as PMPI_Iallreduce
#endif
/* -- End Profiling Symbol Block */
/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
the MPI routines */
#ifndef MPICH_MPI_FROM_PMPI
#undef MPIX_Iallreduce
#define MPIX_Iallreduce PMPIX_Iallreduce
#undef MPI_Iallreduce
#define MPI_Iallreduce PMPI_Iallreduce
/* any non-MPI functions go here, especially non-static ones */
......@@ -676,11 +676,11 @@ fn_fail:
#endif /* MPICH_MPI_FROM_PMPI */
#undef FUNCNAME
#define FUNCNAME MPIX_Iallreduce
#define FUNCNAME MPI_Iallreduce
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPIX_Iallreduce - XXX description here
MPI_Iallreduce - XXX description here
Input Parameters:
+ sendbuf - starting address of the send buffer (choice)
......@@ -699,14 +699,14 @@ Output Parameters:
.N Errors
@*/
int MPIX_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request)
int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request)
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIX_IALLREDUCE);
MPID_MPI_STATE_DECL(MPID_STATE_MPI_IALLREDUCE);
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_IALLREDUCE);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_IALLREDUCE);
/* Validate parameters, especially handles needing to be converted */
# ifdef HAVE_ERROR_CHECKING
......@@ -772,7 +772,7 @@ int MPIX_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype
/* ... end of body of routine ... */
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_IALLREDUCE);
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_IALLREDUCE);
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
......
src/mpi/coll/ialltoall.c
View file @ 57350dc5
......@@ -7,21 +7,21 @@
#include "mpiimpl.h"
#include "collutil.h"
/* -- Begin Profiling Symbol Block for routine MPIX_Ialltoall */
/* -- Begin Profiling Symbol Block for routine MPI_Ialltoall */
#if defined(HAVE_PRAGMA_WEAK)
#pragma weak MPIX_Ialltoall = PMPIX_Ialltoall
#pragma weak MPI_Ialltoall = PMPI_Ialltoall
#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
#pragma _HP_SECONDARY_DEF PMPIX_Ialltoall MPIX_Ialltoall
#pragma _HP_SECONDARY_DEF PMPI_Ialltoall MPI_Ialltoall
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Ialltoall as PMPIX_Ialltoall
#pragma _CRI duplicate MPI_Ialltoall as PMPI_Ialltoall
#endif
/* -- End Profiling Symbol Block */
/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
the MPI routines */
#ifndef MPICH_MPI_FROM_PMPI
#undef MPIX_Ialltoall
#define MPIX_Ialltoall PMPIX_Ialltoall
#undef MPI_Ialltoall
#define MPI_Ialltoall PMPI_Ialltoall
/* any non-MPI functions go here, especially non-static ones */
......@@ -548,11 +548,11 @@ fn_fail:
#endif /* MPICH_MPI_FROM_PMPI */
#undef FUNCNAME
#define FUNCNAME MPIX_Ialltoall
#define FUNCNAME MPI_Ialltoall
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPIX_Ialltoall - XXX description here
MPI_Ialltoall - XXX description here
Input Parameters:
+ sendbuf - starting address of the send buffer (choice)
......@@ -572,14 +572,14 @@ Output Parameters:
.N Errors
@*/
int MPIX_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)
int MPI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIX_IALLTOALL);
MPID_MPI_STATE_DECL(MPID_STATE_MPI_IALLTOALL);
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_IALLTOALL);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_IALLTOALL);
/* Validate parameters, especially handles needing to be converted */
# ifdef HAVE_ERROR_CHECKING
......@@ -641,7 +641,7 @@ int MPIX_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, vo
/* ... end of body of routine ... */
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_IALLTOALL);
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_IALLTOALL);
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
......
src/mpi/coll/ialltoallv.c
View file @ 57350dc5
......@@ -6,21 +6,21 @@
#include "mpiimpl.h"
/* -- Begin Profiling Symbol Block for routine MPIX_Ialltoallv */
/* -- Begin Profiling Symbol Block for routine MPI_Ialltoallv */
#if defined(HAVE_PRAGMA_WEAK)
#pragma weak MPIX_Ialltoallv = PMPIX_Ialltoallv
#pragma weak MPI_Ialltoallv = PMPI_Ialltoallv
#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
#pragma _HP_SECONDARY_DEF PMPIX_Ialltoallv MPIX_Ialltoallv
#pragma _HP_SECONDARY_DEF PMPI_Ialltoallv MPI_Ialltoallv
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Ialltoallv as PMPIX_Ialltoallv
#pragma _CRI duplicate MPI_Ialltoallv as PMPI_Ialltoallv
#endif
/* -- End Profiling Symbol Block */
/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
the MPI routines */
#ifndef MPICH_MPI_FROM_PMPI
#undef MPIX_Ialltoallv
#define MPIX_Ialltoallv PMPIX_Ialltoallv
#undef MPI_Ialltoallv
#define MPI_Ialltoallv PMPI_Ialltoallv
/* any non-MPI functions go here, especially non-static ones */
......@@ -266,11 +266,11 @@ fn_fail:
#endif /* MPICH_MPI_FROM_PMPI */
#undef FUNCNAME
#define FUNCNAME MPIX_Ialltoallv
#define FUNCNAME MPI_Ialltoallv
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPIX_Ialltoallv - XXX description here
MPI_Ialltoallv - XXX description here
Input Parameters:
+ sendbuf - starting address of the send buffer (choice)
......@@ -292,14 +292,14 @@ Output Parameters:
.N Errors
@*/
int MPIX_Ialltoallv(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)
int MPI_Ialltoallv(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIX_IALLTOALLV);
MPID_MPI_STATE_DECL(MPID_STATE_MPI_IALLTOALLV);
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_IALLTOALLV);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_IALLTOALLV);
/* Validate parameters, especially handles needing to be converted */
# ifdef HAVE_ERROR_CHECKING
......@@ -367,7 +367,7 @@ int MPIX_Ialltoallv(const void *sendbuf, const int *sendcounts, const int *sdisp
/* ... end of body of routine ... */
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_IALLTOALLV);
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_IALLTOALLV);
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
......
src/mpi/coll/ialltoallw.c
View file @ 57350dc5
......@@ -6,21 +6,21 @@
#include "mpiimpl.h"
/* -- Begin Profiling Symbol Block for routine MPIX_Ialltoallw */
/* -- Begin Profiling Symbol Block for routine MPI_Ialltoallw */
#if defined(HAVE_PRAGMA_WEAK)
#pragma weak MPIX_Ialltoallw = PMPIX_Ialltoallw
#pragma weak MPI_Ialltoallw = PMPI_Ialltoallw
#elif defined(HAVE_PRAGMA_HP_SEC_DEF)
#pragma _HP_SECONDARY_DEF PMPIX_Ialltoallw MPIX_Ialltoallw
#pragma _HP_SECONDARY_DEF PMPI_Ialltoallw MPI_Ialltoallw
#elif defined(HAVE_PRAGMA_CRI_DUP)
#pragma _CRI duplicate MPIX_Ialltoallw as PMPIX_Ialltoallw
#pragma _CRI duplicate MPI_Ialltoallw as PMPI_Ialltoallw
#endif
/* -- End Profiling Symbol Block */
/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
the MPI routines */
#ifndef MPICH_MPI_FROM_PMPI
#undef MPIX_Ialltoallw
#define MPIX_Ialltoallw PMPIX_Ialltoallw
#undef MPI_Ialltoallw
#define MPI_Ialltoallw PMPI_Ialltoallw
/* any non-MPI functions go here, especially non-static ones */
......@@ -272,11 +272,11 @@ fn_fail:
#endif /* MPICH_MPI_FROM_PMPI */
#undef FUNCNAME
#define FUNCNAME MPIX_Ialltoallw
#define FUNCNAME MPI_Ialltoallw
#undef FCNAME
#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPIX_Ialltoallw - XXX description here
MPI_Ialltoallw - XXX description here
Input Parameters:
+ sendbuf - starting address of the send buffer (choice)
......@@ -298,14 +298,14 @@ Output Parameters:
.N Errors
@*/
int MPIX_Ialltoallw(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPI_Comm comm, MPI_Request *request)
int MPI_Ialltoallw(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPI_Comm comm, MPI_Request *request)
{
int mpi_errno = MPI_SUCCESS;
MPID_Comm *comm_ptr = NULL;
MPID_MPI_STATE_DECL(MPID_STATE_MPIX_IALLTOALLW);
MPID_MPI_STATE_DECL(MPID_STATE_MPI_IALLTOALLW);
MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPIX_IALLTOALLW);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_IALLTOALLW);
/* Validate parameters, especially handles needing to be converted */
# ifdef HAVE_ERROR_CHECKING
......@@ -357,7 +357,7 @@ int MPIX_Ialltoallw(const void *sendbuf, const int *sendcounts, const int *sdisp
/* ... end of body of routine ... */
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPIX_IALLTOALLW);
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_IALLTOALLW);
MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
......