From e1e50fa3f7c4b7b6bcb94dba4d4032f4d69260b9 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Fri, 28 Jun 2013 13:32:17 +0200 Subject: [PATCH] Add a huge variety of not yet impelmented functions, to compile MPICH3 test suite (without RMA or fortran) --- include/smpi/smpi.h | 204 ++++++++++++++++++++-- src/smpi/private.h | 1 + src/smpi/smpi_f77.c | 2 +- src/smpi/smpi_global.c | 12 +- src/smpi/smpi_mpi.c | 305 ++++++++++++++++++++++++++++++++- src/smpi/smpi_pmpi.c | 380 ++++++++++++++++++++++++++++++++++++++++- 6 files changed, 887 insertions(+), 17 deletions(-) diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 035c074bdd..eea00325d0 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -37,6 +37,7 @@ SG_BEGIN_DECL() #define MPI_MAX_INFO_VAL 100 #define MPI_MAX_OBJECT_NAME 100 #define MPI_MAX_PORT_NAME 100 +#define MPI_MAX_LIBRARY_VERSION_STRING 100 #define SMPI_RAND_SEED 5 #define MPI_ANY_SOURCE -555 #define MPI_BOTTOM (void *)0 @@ -55,11 +56,14 @@ SG_BEGIN_DECL() #define MPI_ERR_RANK 7 #define MPI_ERR_TAG 8 #define MPI_ERR_TRUNCATE 9 -#define MPI_ERR_GROUP 10 -#define MPI_ERR_OP 11 -#define MPI_ERR_OTHER 12 +#define MPI_ERR_GROUP 10 +#define MPI_ERR_OP 11 +#define MPI_ERR_OTHER 12 #define MPI_ERR_IN_STATUS 13 #define MPI_ERR_PENDING 14 +#define MPI_ERR_BUFFER 15 +#define MPI_ERR_NAME 16 +#define MPI_ERRCODES_IGNORE (int *)0 #define MPI_IDENT 0 #define MPI_SIMILAR 1 #define MPI_UNEQUAL 2 @@ -70,6 +74,75 @@ SG_BEGIN_DECL() #define MPI_IO 0 #define MPI_BSEND_OVERHEAD 0 +#define MPI_KEYVAL_INVALID 0 +#define MPI_NULL_COPY_FN NULL +#define MPI_NULL_DELETE_FN NULL +#define MPI_APPNUM 0 +#define MPI_LASTUSEDCODE MPI_SUCCESS +#define MPI_ERR_LASTCODE MPI_SUCCESS + +#define MPI_CXX_BOOL MPI_DATATYPE_NULL +#define MPI_CXX_FLOAT_COMPLEX MPI_DATATYPE_NULL +#define MPI_CXX_DOUBLE_COMPLEX MPI_DATATYPE_NULL +#define MPI_CXX_LONG_DOUBLE_COMPLEX MPI_DATATYPE_NULL + +#define MPI_REAL4 MPI_DATATYPE_NULL +#define MPI_REAL8 MPI_DATATYPE_NULL +#define MPI_REAL16 MPI_DATATYPE_NULL +#define MPI_COMPLEX8 MPI_DATATYPE_NULL +#define MPI_COMPLEX16 MPI_DATATYPE_NULL +#define MPI_COMPLEX32 MPI_DATATYPE_NULL +#define MPI_INTEGER1 MPI_DATATYPE_NULL +#define MPI_INTEGER2 MPI_DATATYPE_NULL +#define MPI_INTEGER4 MPI_DATATYPE_NULL +#define MPI_INTEGER8 MPI_DATATYPE_NULL +#define MPI_COMPLEX MPI_DATATYPE_NULL +#define MPI_DOUBLE_COMPLEX MPI_DATATYPE_NULL + +#define MPI_DISTRIBUTE_BLOCK 0 +#define MPI_DISTRIBUTE_NONE 1 +#define MPI_DISTRIBUTE_CYCLIC 2 +#define MPI_DISTRIBUTE_DFLT_DARG 0 +#define MPI_ORDER_C 1 +#define MPI_ORDER_FORTRAN 0 + +#define MPI_TYPECLASS_REAL 0 +#define MPI_TYPECLASS_INTEGER 1 +#define MPI_TYPECLASS_COMPLEX 2 +#define MPI_ROOT 0 +#define MPI_INFO_NULL -1 +#define MPI_COMM_TYPE_SHARED 1 + +#define MPI_VERSION 1 +#define MPI_SUBVERSION 1 +#define MPI_UNWEIGHTED (int *)0 +#define MPI_ARGV_NULL (char **)0 +#define MPI_ARGVS_NULL (char ***)0 +#define MPI_LOCK_EXCLUSIVE 1 +#define MPI_LOCK_SHARED 2 + +typedef enum MPIR_Combiner_enum{ + MPI_COMBINER_NAMED, + MPI_COMBINER_DUP, + MPI_COMBINER_CONTIGUOUS, + MPI_COMBINER_VECTOR, + MPI_COMBINER_HVECTOR_INTEGER, + MPI_COMBINER_HVECTOR, + MPI_COMBINER_INDEXED, + MPI_COMBINER_HINDEXED_INTEGER, + MPI_COMBINER_HINDEXED, + MPI_COMBINER_INDEXED_BLOCK, + MPI_COMBINER_STRUCT_INTEGER, + MPI_COMBINER_STRUCT, + MPI_COMBINER_SUBARRAY, + MPI_COMBINER_DARRAY, + MPI_COMBINER_F90_REAL, + MPI_COMBINER_F90_COMPLEX, + MPI_COMBINER_F90_INTEGER, + MPI_COMBINER_RESIZED, + MPI_COMBINER_HINDEXED_BLOCK +}MPIR_Combiner_enum; + typedef enum MPIR_Topo_type { MPI_GRAPH=1, MPI_CART=2, @@ -136,7 +209,9 @@ XBT_PUBLIC_DATA(MPI_Datatype) MPI_2INT; XBT_PUBLIC_DATA(MPI_Datatype) MPI_LONG_DOUBLE_INT; XBT_PUBLIC_DATA(MPI_Datatype) MPI_2FLOAT; XBT_PUBLIC_DATA(MPI_Datatype) MPI_2DOUBLE; - +//for now we only send int values at max +#define MPI_Count int +#define MPI_COUNT MPI_INT typedef void MPI_User_function(void *invec, void *inoutvec, int *len, MPI_Datatype * datatype); struct s_smpi_mpi_op; @@ -168,6 +243,7 @@ typedef struct s_smpi_mpi_communicator *MPI_Comm; #define MPI_COMM_NULL NULL XBT_PUBLIC_DATA( MPI_Comm ) MPI_COMM_WORLD; +#define MPI_UNIVERSE_SIZE smpi_comm_size(MPI_COMM_WORLD) #define MPI_COMM_SELF smpi_process_comm_self() struct s_smpi_mpi_request; @@ -177,6 +253,7 @@ typedef struct s_smpi_mpi_request *MPI_Request; MPI_CALL(XBT_PUBLIC(int), MPI_Init, (int *argc, char ***argv)); MPI_CALL(XBT_PUBLIC(int), MPI_Finalize, (void)); +MPI_CALL(XBT_PUBLIC(int), MPI_Finalized, (int* flag)); MPI_CALL(XBT_PUBLIC(int), MPI_Init_thread, (int *argc, char ***argv, int required, int *provided)); @@ -186,12 +263,15 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Abort, (MPI_Comm comm, int errorcode)); MPI_CALL(XBT_PUBLIC(double), MPI_Wtime, (void)); MPI_CALL(XBT_PUBLIC(double), MPI_Wtick,(void)); MPI_CALL(XBT_PUBLIC(int), MPI_Address, (void *location, MPI_Aint * address)); - +MPI_CALL(XBT_PUBLIC(int), MPI_Get_address, (void *location, MPI_Aint * address)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_free, (MPI_Datatype * datatype)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_size, (MPI_Datatype datatype, int *size)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_get_extent, (MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_get_true_extent, + (MPI_Datatype datatype, MPI_Aint * lb, + MPI_Aint * extent)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_extent, (MPI_Datatype datatype, MPI_Aint * extent)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_lb, (MPI_Datatype datatype, MPI_Aint * disp)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_ub, (MPI_Datatype datatype, MPI_Aint * disp)); @@ -199,15 +279,27 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Type_commit, (MPI_Datatype* datatype)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_hindexed, (int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_create_hindexed_block, + (int count, int blocklength, MPI_Aint* indices, + MPI_Datatype old_type, MPI_Datatype* newtype)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_hvector, (int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_create_hvector, + (int count, int blocklen, MPI_Aint stride, + MPI_Datatype old_type, MPI_Datatype* newtype)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_indexed, (int count, int* blocklens, int* indices, MPI_Datatype old_type, MPI_Datatype* newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_create_indexed_block, + (int count, int blocklength, int* indices, + MPI_Datatype old_type, MPI_Datatype* newtype)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_struct, (int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_create_struct, + (int count, int* blocklens, MPI_Aint* indices, + MPI_Datatype* old_types, MPI_Datatype* newtype)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_vector, (int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* newtype)); @@ -265,7 +357,7 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Get_count, MPI_CALL(XBT_PUBLIC(int), MPI_Comm_group, (MPI_Comm comm, MPI_Group * group)); MPI_CALL(XBT_PUBLIC(int), MPI_Comm_compare, (MPI_Comm comm1, MPI_Comm comm2, int *result)); -MPI_CALL(XBT_PUBLIC(int), MPI_Comm_dup, (MPI_Comm comm, MPI_Comm * newcomm)); + MPI_CALL(XBT_PUBLIC(int), MPI_Comm_create, (MPI_Comm comm, MPI_Group group, MPI_Comm * newcomm)); MPI_CALL(XBT_PUBLIC(int), MPI_Comm_free, (MPI_Comm * comm)); @@ -380,6 +472,10 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Reduce_scatter, (void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)); +MPI_CALL(XBT_PUBLIC(int), MPI_Reduce_scatter_block, + (void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPI_Comm comm)); MPI_CALL(XBT_PUBLIC(int), MPI_Alltoall, (void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, @@ -397,7 +493,12 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Iprobe, MPI_CALL(XBT_PUBLIC(int), MPI_Probe, (int source, int tag, MPI_Comm comm, MPI_Status* status)); - +MPI_CALL(XBT_PUBLIC(int), MPI_Get_version, + (int *version,int *subversion)); +MPI_CALL(XBT_PUBLIC(int), MPI_Get_library_version, + (char *version,int *len)); +MPI_CALL(XBT_PUBLIC(int), MPI_Reduce_local,(void *inbuf, void *inoutbuf, int count, + MPI_Datatype datatype, MPI_Op op)); //FIXME: these are not yet implemented @@ -405,10 +506,30 @@ typedef void MPI_Handler_function(MPI_Comm*, int*, ...); typedef int MPI_Win; typedef int MPI_Info; typedef void* MPI_Errhandler; + typedef int MPI_Copy_function(MPI_Comm oldcomm, int keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag); typedef int MPI_Delete_function(MPI_Comm comm, int keyval, void* attribute_val, void* extra_state); - +typedef int MPI_Comm_copy_attr_function(MPI_Comm oldcomm, int keyval, void* extra_state, void* attribute_val_in, + void* attribute_val_out, int* flag); +typedef int MPI_Comm_delete_attr_function(MPI_Comm comm, int keyval, void* attribute_val, void* extra_state); +typedef int MPI_Type_copy_attr_function(MPI_Datatype type, int keyval, void* extra_state, void* attribute_val_in, + void* attribute_val_out, int* flag); +typedef int MPI_Type_delete_attr_function(MPI_Datatype type, int keyval, void* attribute_val, void* extra_state); +typedef void MPI_Comm_errhandler_function(MPI_Comm *, int *, ...); +typedef int MPI_Grequest_query_function(void *extra_state, MPI_Status *status); +typedef int MPI_Grequest_free_function(void *extra_state); +typedef int MPI_Grequest_cancel_function(void *extra_state, int complete); +#define MPI_DUP_FN MPI_Comm_dup +#define MPI_COMM_NULL_COPY_FN ((MPI_Comm_copy_attr_function*)0) +#define MPI_COMM_NULL_DELETE_FN ((MPI_Comm_delete_attr_function*)0) +#define MPI_COMM_DUP_FN ((MPI_Comm_copy_attr_function *)MPI_DUP_FN) +#define MPI_TYPE_NULL_COPY_FN ((MPI_Type_copy_attr_function*)0) +#define MPI_TYPE_NULL_DELETE_FN ((MPI_Type_delete_attr_function*)0) +#define MPI_TYPE_DUP_FN ((MPI_Type_copy_attr_function*)MPI_DUP_FN) + +typedef MPI_Comm_errhandler_function MPI_Comm_errhandler_fn; +#define MPI_INFO_ENV 1 XBT_PUBLIC_DATA(MPI_Datatype) MPI_PACKED; XBT_PUBLIC_DATA(MPI_Errhandler*) MPI_ERRORS_RETURN; XBT_PUBLIC_DATA(MPI_Errhandler*) MPI_ERRORS_ARE_FATAL; @@ -437,11 +558,29 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Errhandler_free, (MPI_Errhandler* errhandler)); MPI_CALL(XBT_PUBLIC(int), MPI_Errhandler_get, (MPI_Comm comm, MPI_Errhandler* errhandler)); MPI_CALL(XBT_PUBLIC(int), MPI_Error_string, (int errorcode, char* string, int* resultlen)); MPI_CALL(XBT_PUBLIC(int), MPI_Errhandler_set, (MPI_Comm comm, MPI_Errhandler errhandler)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_set_errhandler, (MPI_Comm comm, MPI_Errhandler errhandler)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_create_errhandler,( MPI_Comm_errhandler_fn *function, MPI_Errhandler *errhandler)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_call_errhandler,(MPI_Comm comm,int errorcode)); +MPI_CALL(XBT_PUBLIC(int), MPI_Add_error_class,( int *errorclass)); +MPI_CALL(XBT_PUBLIC(int), MPI_Add_error_code,( int errorclass, int *errorcode)); +MPI_CALL(XBT_PUBLIC(int), MPI_Add_error_string,( int errorcode, char *string)); MPI_CALL(XBT_PUBLIC(int), MPI_Cancel, (MPI_Request* request)); MPI_CALL(XBT_PUBLIC(int), MPI_Buffer_attach, (void* buffer, int size)); MPI_CALL(XBT_PUBLIC(int), MPI_Buffer_detach, (void* buffer, int* size)); MPI_CALL(XBT_PUBLIC(int), MPI_Comm_test_inter, (MPI_Comm comm, int* flag)); MPI_CALL(XBT_PUBLIC(int), MPI_Comm_get_attr, (MPI_Comm comm, int comm_keyval, void *attribute_val, int *flag)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_set_attr, (MPI_Comm comm, int comm_keyval, void *attribute_val)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_delete_attr, (MPI_Comm comm, int comm_keyval)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_create_keyval,(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval, void* extra_state)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_free_keyval,(int* keyval)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_get_attr, (MPI_Datatype type, int type_keyval, void *attribute_val, int* flag)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_set_attr, (MPI_Datatype type, int type_keyval, void *att)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_delete_attr, (MPI_Datatype type, int comm_keyval)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_create_keyval,(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_free_keyval,(int* keyval)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_dup,(MPI_Datatype datatype,MPI_Datatype *newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_set_name,(MPI_Datatype datatype, char * name)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_get_name,(MPI_Datatype datatype, char * name, int* len)); MPI_CALL(XBT_PUBLIC(int), MPI_Unpack, (void* inbuf, int insize, int* position, void* outbuf, int outcount, MPI_Datatype type, MPI_Comm comm)); MPI_CALL(XBT_PUBLIC(int), MPI_Ssend, (void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm)); MPI_CALL(XBT_PUBLIC(int), MPI_Ssend_init, (void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request)); @@ -471,10 +610,55 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Win_fence,( int assert, MPI_Win win)); MPI_CALL(XBT_PUBLIC(int), MPI_Win_free,( MPI_Win* win)); MPI_CALL(XBT_PUBLIC(int), MPI_Win_create,( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, MPI_Win *win)); MPI_CALL(XBT_PUBLIC(int), MPI_Info_create,( MPI_Info *info)); -MPI_CALL(XBT_PUBLIC(int), MPI_Info_set,( MPI_Info *info, char *key, char *value)); +MPI_CALL(XBT_PUBLIC(int), MPI_Info_set,( MPI_Info info, char *key, char *value)); +MPI_CALL(XBT_PUBLIC(int), MPI_Info_get,(MPI_Info info,char *key,int valuelen, char *value, int *flag)); MPI_CALL(XBT_PUBLIC(int), MPI_Info_free,( MPI_Info *info)); +MPI_CALL(XBT_PUBLIC(int), MPI_Info_delete,( MPI_Info info, char *key)); +MPI_CALL(XBT_PUBLIC(int), MPI_Info_dup,(MPI_Info info, MPI_Info *newinfo)); +MPI_CALL(XBT_PUBLIC(int), MPI_Info_get_nkeys,( MPI_Info info, int *nkeys)); +MPI_CALL(XBT_PUBLIC(int), MPI_Info_get_nthkey,( MPI_Info info, int n, char *key)); +MPI_CALL(XBT_PUBLIC(int), MPI_Info_get_valuelen,( MPI_Info info, char *key, int *valuelen, int *flag)); + MPI_CALL(XBT_PUBLIC(int), MPI_Get,( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_get_envelope,(MPI_Datatype datatype,int *num_integers,int *num_addresses,int *num_datatypes, int *combiner)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_get_contents,(MPI_Datatype datatype, int max_integers, int max_addresses, + int max_datatypes, int* array_of_integers, MPI_Aint* array_of_addresses, + MPI_Datatype *array_of_datatypes)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_create_darray,(int size, int rank, int ndims, int* array_of_gsizes, + int* array_of_distribs, int* array_of_dargs, int* array_of_psizes, + int order, MPI_Datatype oldtype, MPI_Datatype *newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Pack_external_size, (char *datarep, int incount, MPI_Datatype datatype, MPI_Aint *size)); +MPI_CALL(XBT_PUBLIC(int), MPI_Pack_external, (char *datarep, void *inbuf, int incount, MPI_Datatype datatype, void *outbuf, MPI_Aint outcount, MPI_Aint *position)); +MPI_CALL(XBT_PUBLIC(int), MPI_Unpack_external, ( char *datarep, void *inbuf, MPI_Aint insize, MPI_Aint *position, void *outbuf, int outcount, MPI_Datatype datatype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_create_resized ,(MPI_Datatype oldtype,MPI_Aint lb, MPI_Aint extent, MPI_Datatype *newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_create_subarray,(int ndims,int *array_of_sizes, int *array_of_subsizes, int *array_of_starts, int order, MPI_Datatype oldtype, MPI_Datatype *newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_match_size,(int typeclass,int size,MPI_Datatype *datatype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Alltoallw, ( void *sendbuf, int *sendcnts, int *sdispls, MPI_Datatype *sendtypes, void *recvbuf, int *recvcnts, int *rdispls, MPI_Datatype *recvtypes, MPI_Comm comm)); +MPI_CALL(XBT_PUBLIC(int), MPI_Exscan,(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_set_name, (MPI_Comm comm, char* name)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_set_info, (MPI_Comm comm, MPI_Info info)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_get_info, (MPI_Comm comm, MPI_Info* info)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_dup, (MPI_Comm comm, MPI_Comm * newcomm)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_dup_with_info,(MPI_Comm comm, MPI_Info info, MPI_Comm * newcomm)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_split_type,(MPI_Comm comm, int split_type, int key, MPI_Info info, MPI_Comm *newcomm)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_connect,( char *port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm *newcomm)); +MPI_CALL(XBT_PUBLIC(int), MPI_Request_get_status,( MPI_Request request, int *flag, MPI_Status *status)); +MPI_CALL(XBT_PUBLIC(int), MPI_Grequest_start,( MPI_Grequest_query_function *query_fn, MPI_Grequest_free_function *free_fn, MPI_Grequest_cancel_function *cancel_fn, void *extra_state, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC(int), MPI_Grequest_complete,( MPI_Request request)); +MPI_CALL(XBT_PUBLIC(int), MPI_Status_set_cancelled,(MPI_Status *status,int flag)); +MPI_CALL(XBT_PUBLIC(int), MPI_Status_set_elements,( MPI_Status *status, MPI_Datatype datatype, int count)); +MPI_CALL(XBT_PUBLIC(int), MPI_Unpublish_name,( char *service_name, MPI_Info info, char *port_name)); +MPI_CALL(XBT_PUBLIC(int), MPI_Publish_name,( char *service_name, MPI_Info info, char *port_name)); +MPI_CALL(XBT_PUBLIC(int), MPI_Lookup_name,( char *service_name, MPI_Info info, char *port_name)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_join,( int fd, MPI_Comm *intercomm)); +MPI_CALL(XBT_PUBLIC(int), MPI_Open_port,( MPI_Info info, char *port_name)); +MPI_CALL(XBT_PUBLIC(int), MPI_Close_port,( char *port_name)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_accept,( char *port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm *newcomm)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_spawn,( char *command, char **argv, int maxprocs, MPI_Info info, int root, MPI_Comm comm, MPI_Comm *intercomm, int* array_of_errcodes)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_spawn_multiple,( int count, char **array_of_commands, char*** array_of_argv, int* array_of_maxprocs, MPI_Info* array_of_info, + int root, MPI_Comm comm, MPI_Comm *intercomm, int* array_of_errcodes)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_get_parent,( MPI_Comm *parent)); //FIXME: End of all the not yet implemented stuff @@ -519,11 +703,11 @@ XBT_PUBLIC(void*) smpi_shared_set_call(const char* func, const char* input, void : smpi_shared_set_call(#func, input, (func(__VA_ARGS__)))) /* Fortran specific stuff */ + XBT_PUBLIC(int) __attribute__((weak)) smpi_simulated_main_(int argc, char** argv); XBT_PUBLIC(int) __attribute__((weak)) MAIN__(void); XBT_PUBLIC(int) smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[]); XBT_PUBLIC(void) __attribute__((weak)) user_main_(void); - XBT_PUBLIC(int) smpi_process_index(void); /* Trace replay specific stuff */ diff --git a/src/smpi/private.h b/src/smpi/private.h index 156337f827..11a8933e7b 100644 --- a/src/smpi/private.h +++ b/src/smpi/private.h @@ -82,6 +82,7 @@ typedef struct s_smpi_mpi_request { void smpi_process_init(int *argc, char ***argv); void smpi_process_destroy(void); void smpi_process_finalize(void); +int smpi_process_finalized(void); smpi_process_data_t smpi_process_data(void); smpi_process_data_t smpi_process_remote_data(int index); diff --git a/src/smpi/smpi_f77.c b/src/smpi/smpi_f77.c index f7a1583bbb..56fefc8e99 100644 --- a/src/smpi/smpi_f77.c +++ b/src/smpi/smpi_f77.c @@ -570,7 +570,7 @@ void mpi_info_create_( int *info, int* ierr){ } void mpi_info_set_( int *info, char *key, char *value, int* ierr){ - *ierr = MPI_Info_set( (MPI_Info *)info, key, value); + *ierr = MPI_Info_set( *(MPI_Info *)info, key, value); } void mpi_info_free_(int* info, int* ierr){ diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index c62c1036b9..8c7edeac53 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -79,7 +79,7 @@ void smpi_process_init(int *argc, char ***argv) void smpi_process_destroy(void) { int index = smpi_process_index(); - + process_data[index]->index=-100; XBT_DEBUG("<%d> Process left the game", index); } @@ -94,6 +94,16 @@ void smpi_process_finalize(void) } } +/** + * @brief Check if a process is finalized + */ +int smpi_process_finalized() +{ + // If finalized, this value has been set to -100; + return process_data[smpi_process_index()]->index==-100; +} + + #ifdef SMPI_F2C int smpi_process_argc(void) { smpi_process_data_t data = smpi_process_data(); diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c index 266ec5e4a8..f98336efd7 100644 --- a/src/smpi/smpi_mpi.c +++ b/src/smpi/smpi_mpi.c @@ -23,6 +23,11 @@ int MPI_Finalize(void) return PMPI_Finalize(); } +int MPI_Finalized(int * flag) +{ + return PMPI_Finalized(flag); +} + int MPI_Init_thread(int *argc, char ***argv, int required, int *provided) { return PMPI_Init_thread(argc, argv, required, provided); @@ -58,11 +63,55 @@ int MPI_Address(void *location, MPI_Aint * address) return PMPI_Address(location, address); } +int MPI_Get_address(void *location, MPI_Aint * address) +{ + return PMPI_Get_address(location, address); +} + int MPI_Type_free(MPI_Datatype * datatype) { return PMPI_Type_free(datatype); } +int MPI_Type_dup(MPI_Datatype datatype, MPI_Datatype * newdatatype) +{ + return PMPI_Type_dup(datatype, newdatatype); +} + +int MPI_Type_set_name(MPI_Datatype datatype, char * name) +{ + return PMPI_Type_set_name(datatype, name); +} + +int MPI_Type_get_name(MPI_Datatype datatype, char * name, int* len) +{ + return PMPI_Type_get_name(datatype,name,len); +} + +int MPI_Type_get_attr (MPI_Datatype type, int type_keyval, void *attribute_val, int* flag) +{ + return PMPI_Type_set_attr ( type, type_keyval, attribute_val); +} + +int MPI_Type_set_attr (MPI_Datatype type, int type_keyval, void *attribute_val) +{ + return PMPI_Type_set_attr ( type, type_keyval, attribute_val); +} + +int MPI_Type_delete_attr (MPI_Datatype type, int type_keyval) +{ + return PMPI_Type_delete_attr (type, type_keyval); +} + +int MPI_Type_create_keyval(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state) +{ + return PMPI_Type_create_keyval(copy_fn, delete_fn, keyval, extra_state) ; +} + +int MPI_Type_free_keyval(int* keyval) { + return PMPI_Type_free_keyval( keyval); +} + int MPI_Pcontrol(const int level ) { return PMPI_Pcontrol(level); @@ -78,6 +127,11 @@ int MPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent) return PMPI_Type_get_extent(datatype, lb, extent); } +int MPI_Type_get_true_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent) +{ + return PMPI_Type_get_true_extent(datatype, lb, extent); +} + int MPI_Type_extent(MPI_Datatype datatype, MPI_Aint * extent) { return PMPI_Type_extent(datatype, extent); @@ -181,6 +235,25 @@ int MPI_Comm_get_attr (MPI_Comm comm, int comm_keyval, void *attribute_val, int return PMPI_Comm_get_attr (comm, comm_keyval, attribute_val, flag); } +int MPI_Comm_set_attr (MPI_Comm comm, int comm_keyval, void *attribute_val) +{ + return PMPI_Comm_set_attr ( comm, comm_keyval, attribute_val); +} + +int MPI_Comm_delete_attr (MPI_Comm comm, int comm_keyval) +{ + return PMPI_Comm_delete_attr (comm, comm_keyval); +} + +int MPI_Comm_create_keyval(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval, void* extra_state) +{ + return PMPI_Comm_create_keyval(copy_fn, delete_fn, keyval, extra_state) ; +} + +int MPI_Comm_free_keyval(int* keyval) { + return PMPI_Comm_free_keyval( keyval); +} + int MPI_Comm_get_name (MPI_Comm comm, char* name, int* len) { return PMPI_Comm_get_name(comm, name, len); @@ -392,6 +465,11 @@ int MPI_Reduce(void *sendbuf, void *recvbuf, int count, return PMPI_Reduce(sendbuf, recvbuf, count, datatype, op, root, comm); } +int MPI_Reduce_local(void *inbuf, void *inoutbuf, int count, + MPI_Datatype datatype, MPI_Op op){ + return PMPI_Reduce_local(inbuf, inoutbuf, count, datatype, op); +} + int MPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { @@ -410,6 +488,12 @@ int MPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, return PMPI_Reduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm); } +int MPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + return PMPI_Reduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, comm); +} + int MPI_Alltoall(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) @@ -527,6 +611,10 @@ int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) { return PMPI_Errhandler_set(comm, errhandler); } +int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) { + return PMPI_Errhandler_set(comm, errhandler); +} + int MPI_Type_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* newtype) { return PMPI_Type_contiguous(count, old_type, newtype); } @@ -555,6 +643,18 @@ int MPI_Unpack(void* inbuf, int insize, int* position, void* outbuf, int outcoun return PMPI_Unpack(inbuf, insize, position, outbuf, outcount, type, comm); } +int MPI_Pack_external_size(char *datarep, int incount, MPI_Datatype datatype, MPI_Aint *size){ + return PMPI_Pack_external_size(datarep, incount, datatype, size); +} + +int MPI_Pack_external(char *datarep, void *inbuf, int incount, MPI_Datatype datatype, void *outbuf, MPI_Aint outcount, MPI_Aint *position){ + return PMPI_Pack_external(datarep, inbuf, incount, datatype, outbuf, outcount, position); +} + +int MPI_Unpack_external( char *datarep, void *inbuf, MPI_Aint insize, MPI_Aint *position, void *outbuf, int outcount, MPI_Datatype datatype){ + return PMPI_Unpack_external( datarep, inbuf, insize, position, outbuf, outcount, datatype); +} + int MPI_Type_commit(MPI_Datatype* datatype) { return PMPI_Type_commit(datatype); } @@ -563,6 +663,10 @@ int MPI_Type_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype return PMPI_Type_hindexed(count, blocklens, indices, old_type, newtype); } +int MPI_Type_create_hindexed_block(int count, int blocklength, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* newtype) { + return PMPI_Type_create_hindexed_block(count, blocklength, indices, old_type, newtype); +} + int MPI_Type_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* newtype) { return PMPI_Type_hvector(count, blocklen, stride, old_type, newtype); } @@ -571,10 +675,18 @@ int MPI_Type_indexed(int count, int* blocklens, int* indices, MPI_Datatype old_t return PMPI_Type_indexed(count, blocklens, indices, old_type, newtype); } +int MPI_Type_create_indexed_block(int count, int blocklength, int* indices, MPI_Datatype old_type, MPI_Datatype *newtype){ + return PMPI_Type_create_indexed_block(count, blocklength, indices, old_type, newtype); +} + int MPI_Type_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* newtype) { return PMPI_Type_struct(count, blocklens, indices, old_types, newtype); } +int MPI_Type_create_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* newtype) { + return PMPI_Type_create_struct(count, blocklens, indices, old_types, newtype); +} + int MPI_Type_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* newtype) { return PMPI_Type_vector(count, blocklen, stride, old_type, newtype); } @@ -699,7 +811,7 @@ int MPI_Info_create( MPI_Info *info){ return PMPI_Info_create( info); } -int MPI_Info_set( MPI_Info *info, char *key, char *value){ +int MPI_Info_set( MPI_Info info, char *key, char *value){ return PMPI_Info_set( info, key, value); } @@ -712,3 +824,194 @@ int MPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, return PMPI_Get( origin_addr,origin_count, origin_datatype,target_rank, target_disp, target_count,target_datatype, win); } + +int MPI_Type_get_envelope( MPI_Datatype datatype, int *num_integers, + int *num_addresses, int *num_datatypes, int *combiner){ + return PMPI_Type_get_envelope( datatype, num_integers, + num_addresses, num_datatypes, combiner); +} + +int MPI_Type_get_contents(MPI_Datatype datatype, int max_integers, int max_addresses, + int max_datatypes, int* array_of_integers, MPI_Aint* array_of_addresses, + MPI_Datatype *array_of_datatypes){ + return PMPI_Type_get_contents(datatype, max_integers, max_addresses, + max_datatypes, array_of_integers, array_of_addresses, + array_of_datatypes); +} + +int MPI_Type_create_darray(int size, int rank, int ndims, int* array_of_gsizes, + int* array_of_distribs, int* array_of_dargs, int* array_of_psizes, + int order, MPI_Datatype oldtype, MPI_Datatype *newtype) { + return PMPI_Type_create_darray(size, rank, ndims, array_of_gsizes, + array_of_distribs, array_of_dargs, array_of_psizes, + order, oldtype, newtype) ; +} + +int MPI_Type_create_resized(MPI_Datatype oldtype,MPI_Aint lb, MPI_Aint extent, MPI_Datatype *newtype){ + return PMPI_Type_create_resized(oldtype,lb, extent, newtype); +} + +int MPI_Type_create_subarray(int ndims,int *array_of_sizes, int *array_of_subsizes, int *array_of_starts, int order, MPI_Datatype oldtype, MPI_Datatype *newtype){ + return PMPI_Type_create_subarray(ndims,array_of_sizes, array_of_subsizes, array_of_starts, order, oldtype, newtype); +} + +int MPI_Type_match_size(int typeclass,int size,MPI_Datatype *datatype){ + return PMPI_Type_match_size(typeclass,size,datatype); +} + +int MPI_Alltoallw( void *sendbuf, int *sendcnts, int *sdispls, MPI_Datatype *sendtypes, + void *recvbuf, int *recvcnts, int *rdispls, MPI_Datatype *recvtypes, + MPI_Comm comm){ + return PMPI_Alltoallw( sendbuf, sendcnts, sdispls, sendtypes, + recvbuf, recvcnts, rdispls, recvtypes, + comm); +} + +int MPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, MPI_Comm comm){ + return PMPI_Exscan(sendbuf, recvbuf, count, datatype, op, comm); +} + +int MPI_Comm_set_name (MPI_Comm comm, char* name){ + return PMPI_Comm_set_name (comm, name); +} + +int MPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm * newcomm){ + return PMPI_Comm_dup_with_info(comm,info,newcomm); +} + +int MPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, MPI_Comm *newcomm){ + return PMPI_Comm_split_type(comm, split_type, key, info, newcomm); +} + +int MPI_Comm_set_info (MPI_Comm comm, MPI_Info info){ + return PMPI_Comm_set_info (comm, info); +} + +int MPI_Comm_get_info (MPI_Comm comm, MPI_Info* info){ + return PMPI_Comm_get_info (comm, info); +} + +int MPI_Info_get(MPI_Info info,char *key,int valuelen, char *value, int *flag){ + return PMPI_Info_get(info,key,valuelen, value, flag); +} + +int MPI_Comm_create_errhandler( MPI_Comm_errhandler_fn *function, MPI_Errhandler *errhandler){ + return PMPI_Comm_create_errhandler( function, errhandler); +} + +int MPI_Add_error_class( int *errorclass){ + return PMPI_Add_error_class( errorclass); +} + +int MPI_Add_error_code( int errorclass, int *errorcode){ + return PMPI_Add_error_code(errorclass, errorcode); +} + +int MPI_Add_error_string( int errorcode, char *string){ + return PMPI_Add_error_string(errorcode, string); +} + +int MPI_Comm_call_errhandler(MPI_Comm comm,int errorcode){ + return PMPI_Comm_call_errhandler(comm, errorcode); +} + +int MPI_Info_dup(MPI_Info info, MPI_Info *newinfo){ + return PMPI_Info_dup(info, newinfo); +} + +int MPI_Info_get_valuelen( MPI_Info info, char *key, int *valuelen, int *flag){ + return PMPI_Info_get_valuelen( info, key, valuelen, flag); +} + +int MPI_Info_delete(MPI_Info info, char *key){ + return PMPI_Info_delete(info, key); +} + +int MPI_Info_get_nkeys( MPI_Info info, int *nkeys){ + return PMPI_Info_get_nkeys( info, nkeys); +} + +int MPI_Info_get_nthkey( MPI_Info info, int n, char *key){ + return PMPI_Info_get_nthkey( info, n, key); +} + +int MPI_Get_version (int *version,int *subversion){ + return PMPI_Get_version (version,subversion); +} + +int MPI_Get_library_version (char *version,int *len){ + return PMPI_Get_library_version (version,len); +} + +int MPI_Request_get_status( MPI_Request request, int *flag, MPI_Status *status){ + return PMPI_Request_get_status( request, flag, status); +} + +int MPI_Grequest_start( MPI_Grequest_query_function *query_fn, MPI_Grequest_free_function *free_fn, MPI_Grequest_cancel_function *cancel_fn, void *extra_state, MPI_Request *request){ + return PMPI_Grequest_start( query_fn, free_fn, cancel_fn, extra_state, request); +} + +int MPI_Grequest_complete( MPI_Request request){ + return PMPI_Grequest_complete( request); +} + +int MPI_Status_set_cancelled(MPI_Status *status,int flag){ + return PMPI_Status_set_cancelled(status,flag); +} + +int MPI_Status_set_elements( MPI_Status *status, MPI_Datatype datatype, int count){ + return PMPI_Status_set_elements( status, datatype, count); +} + +int MPI_Comm_connect( char *port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm *newcomm){ + return PMPI_Comm_connect( port_name, info, root, comm, newcomm); +} + +int MPI_Publish_name( char *service_name, MPI_Info info, char *port_name){ + return PMPI_Publish_name( service_name, info, port_name); +} + +int MPI_Unpublish_name( char *service_name, MPI_Info info, char *port_name){ + return PMPI_Unpublish_name( service_name, info, port_name); +} + +int MPI_Lookup_name( char *service_name, MPI_Info info, char *port_name){ + return PMPI_Lookup_name( service_name, info, port_name); +} + +int MPI_Comm_join( int fd, MPI_Comm *intercomm){ + return PMPI_Comm_join( fd, intercomm); +} + +int MPI_Open_port( MPI_Info info, char *port_name){ + return PMPI_Open_port( info,port_name); +} + +int MPI_Close_port( char *port_name){ + return PMPI_Close_port( port_name); +} + +int MPI_Comm_accept( char *port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm *newcomm){ + return PMPI_Comm_accept( port_name, info, root, comm, newcomm); +} + +int MPI_Comm_spawn( char *command, char **argv, int maxprocs, MPI_Info info, int root, + MPI_Comm comm, MPI_Comm *intercomm, int* array_of_errcodes){ + return PMPI_Comm_spawn( command, argv, maxprocs, info, root, comm, intercomm, array_of_errcodes); +} + +int MPI_Comm_spawn_multiple( int count, char **array_of_commands, char*** array_of_argv, + int* array_of_maxprocs, MPI_Info* array_of_info, int root, + MPI_Comm comm, MPI_Comm *intercomm, int* array_of_errcodes){ + return PMPI_Comm_spawn_multiple( count, array_of_commands, array_of_argv, array_of_maxprocs, + array_of_info, root, comm, intercomm, array_of_errcodes); +} + +int MPI_Comm_get_parent( MPI_Comm *parent){ + return PMPI_Comm_get_parent( parent); +} + +int MPI_Type_create_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type) { + return PMPI_Type_create_hvector(count, blocklen, stride, old_type, new_type); +} diff --git a/src/smpi/smpi_pmpi.c b/src/smpi/smpi_pmpi.c index 5bd1361c41..70c1d2605f 100644 --- a/src/smpi/smpi_pmpi.c +++ b/src/smpi/smpi_pmpi.c @@ -50,6 +50,28 @@ int PMPI_Finalize(void) return MPI_SUCCESS; } +int PMPI_Finalized(int* flag) +{ + *flag=smpi_process_finalized(); + return MPI_SUCCESS; +} + +int PMPI_Get_version (int *version,int *subversion){ + *version = MPI_VERSION; + *subversion= MPI_SUBVERSION; + return MPI_SUCCESS; +} + +int PMPI_Get_library_version (char *version,int *len){ + int retval = MPI_SUCCESS; + smpi_bench_end(); + snprintf(version,MPI_MAX_LIBRARY_VERSION_STRING,"SMPI Version %d.%d. Copyright The Simgrid Team 2007-2013",SIMGRID_VERSION_MAJOR, + SIMGRID_VERSION_MINOR); + *len = strlen(version) > MPI_MAX_LIBRARY_VERSION_STRING ? MPI_MAX_LIBRARY_VERSION_STRING : strlen(version); + smpi_bench_begin(); + return retval; +} + int PMPI_Init_thread(int *argc, char ***argv, int required, int *provided) { if (provided != NULL) { @@ -131,6 +153,11 @@ int PMPI_Address(void *location, MPI_Aint * address) return retval; } +int PMPI_Get_address(void *location, MPI_Aint * address) +{ + return PMPI_Address(location, address); +} + int PMPI_Type_free(MPI_Datatype * datatype) { int retval; @@ -179,6 +206,11 @@ int PMPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent return retval; } +int PMPI_Type_get_true_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent) +{ + return PMPI_Type_get_extent(datatype, lb, extent); +} + int PMPI_Type_extent(MPI_Datatype datatype, MPI_Aint * extent) { int retval; @@ -1808,6 +1840,21 @@ int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, return retval; } +int PMPI_Reduce_local(void *inbuf, void *inoutbuf, int count, + MPI_Datatype datatype, MPI_Op op){ + int retval; + + smpi_bench_end(); + if (datatype == MPI_DATATYPE_NULL || op == MPI_OP_NULL) { + retval = MPI_ERR_ARG; + } else { + smpi_op_apply(op, inbuf, inoutbuf, &count, &datatype); + retval=MPI_SUCCESS; + } + smpi_bench_begin(); + return retval; +} + int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { @@ -1898,6 +1945,41 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, return retval; } +int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +{ + int retval,i; + smpi_bench_end(); +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + TRACE_smpi_computing_out(rank); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__); +#endif + if (comm == MPI_COMM_NULL) { + retval = MPI_ERR_COMM; + } else if (datatype == MPI_DATATYPE_NULL) { + retval = MPI_ERR_TYPE; + } else if (op == MPI_OP_NULL) { + retval = MPI_ERR_OP; + } else if (recvcount < 0) { + retval = MPI_ERR_ARG; + } else { + int count=smpi_comm_size(comm); + int* recvcounts=(int*)xbt_malloc(count); + for (i=0; i