From 2211824d555ccf00fa7cbdd38aae83851a0a194b Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Fri, 26 Apr 2019 23:27:04 +0200 Subject: [PATCH 1/1] move some calls out of the unimplemented zone --- include/smpi/smpi.h | 94 +++++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 45 deletions(-) diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 4fb2272709..06c2cabde9 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -509,6 +509,7 @@ MPI_CALL(XBT_PUBLIC int, MPI_Comm_size, (MPI_Comm comm, int* size)); MPI_CALL(XBT_PUBLIC int, MPI_Comm_get_name, (MPI_Comm comm, char* name, int* len)); MPI_CALL(XBT_PUBLIC int, MPI_Comm_set_name, (MPI_Comm comm, const char* name)); 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_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)); @@ -523,6 +524,10 @@ MPI_CALL(XBT_PUBLIC int, MPI_Comm_create_group, (MPI_Comm comm, MPI_Group group, MPI_CALL(XBT_PUBLIC int, MPI_Comm_free, (MPI_Comm * comm)); MPI_CALL(XBT_PUBLIC int, MPI_Comm_disconnect, (MPI_Comm * comm)); MPI_CALL(XBT_PUBLIC int, MPI_Comm_split, (MPI_Comm comm, int color, int key, MPI_Comm* comm_out)); +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_split_type, + (MPI_Comm comm, int split_type, int key, MPI_Info info, MPI_Comm* newcomm)); MPI_CALL(XBT_PUBLIC MPI_Comm, MPI_Comm_f2c, (MPI_Fint comm)); MPI_CALL(XBT_PUBLIC MPI_Fint, MPI_Comm_c2f, (MPI_Comm comm)); @@ -556,6 +561,7 @@ MPI_CALL(XBT_PUBLIC int, MPI_Testany, (int count, MPI_Request requests[], int* i MPI_CALL(XBT_PUBLIC int, MPI_Testall, (int count, MPI_Request* requests, int* flag, MPI_Status* statuses)); MPI_CALL(XBT_PUBLIC int, MPI_Testsome, (int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[])); +MPI_CALL(XBT_PUBLIC int, MPI_Test_cancelled, (const MPI_Status * status, int* flag)); MPI_CALL(XBT_PUBLIC int, MPI_Wait, (MPI_Request * request, MPI_Status* status)); MPI_CALL(XBT_PUBLIC int, MPI_Waitany, (int count, MPI_Request requests[], int* index, MPI_Status* status)); MPI_CALL(XBT_PUBLIC int, MPI_Waitall, (int count, MPI_Request requests[], MPI_Status status[])); @@ -734,6 +740,47 @@ MPI_CALL(XBT_PUBLIC int, MPI_Grequest_start, 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_Type_create_subarray, + (int ndims, const int* array_of_sizes, const int* array_of_subsizes, const int* array_of_starts, int order, MPI_Datatype oldtype, + MPI_Datatype* newtype)); + +MPI_CALL(XBT_PUBLIC int, MPI_File_open, (MPI_Comm comm, const char* filename, int amode, MPI_Info info, MPI_File* fh)); +MPI_CALL(XBT_PUBLIC int, MPI_File_close, (MPI_File * fh)); +MPI_CALL(XBT_PUBLIC int, MPI_File_delete, (const char* filename, MPI_Info info)); +MPI_CALL(XBT_PUBLIC int, MPI_File_get_size, (MPI_File fh, MPI_Offset* size)); +MPI_CALL(XBT_PUBLIC int, MPI_File_get_group, (MPI_File fh, MPI_Group* group)); +MPI_CALL(XBT_PUBLIC int, MPI_File_get_amode, (MPI_File fh, int* amode)); +MPI_CALL(XBT_PUBLIC int, MPI_File_set_info, (MPI_File fh, MPI_Info info)); +MPI_CALL(XBT_PUBLIC int, MPI_File_get_info, (MPI_File fh, MPI_Info* info_used)); +MPI_CALL(XBT_PUBLIC int, MPI_File_read_at, + (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_read_at_all, + (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_write_at, + (MPI_File fh, MPI_Offset offset, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_write_at_all, + (MPI_File fh, MPI_Offset offset, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_read, (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_read_all, + (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_write, + (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_write_all, + (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_seek, (MPI_File fh, MPI_Offset offset, int whenace)); +MPI_CALL(XBT_PUBLIC int, MPI_File_get_position, (MPI_File fh, MPI_Offset* offset)); +MPI_CALL(XBT_PUBLIC int, MPI_File_read_shared, + (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_write_shared, + (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_read_ordered, + (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_write_ordered, + (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_seek_shared, (MPI_File fh, MPI_Offset offset, int whence)); +MPI_CALL(XBT_PUBLIC int, MPI_File_get_position_shared, (MPI_File fh, MPI_Offset* offset)); +MPI_CALL(XBT_PUBLIC int, MPI_File_sync, (MPI_File fh)); + //FIXME: these are not yet implemented @@ -822,7 +869,6 @@ MPI_CALL(XBT_PUBLIC int, MPI_Rsend_init, (const void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_Irsend, (const void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request)); -MPI_CALL(XBT_PUBLIC int, MPI_Test_cancelled, (const MPI_Status * status, int* flag)); MPI_CALL(XBT_PUBLIC int, MPI_Get_elements, (MPI_Status * status, MPI_Datatype datatype, int* elements)); MPI_CALL(XBT_PUBLIC int, MPI_Pcontrol, (const int level, ...)); @@ -840,15 +886,7 @@ MPI_CALL(XBT_PUBLIC int, MPI_Pack_external, (char* datarep, void* inbuf, int inc 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_subarray, - (int ndims, const int* array_of_sizes, const int* array_of_subsizes, const 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_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_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, (const char* port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm* newcomm)); MPI_CALL(XBT_PUBLIC int, MPI_Unpublish_name, (char* service_name, MPI_Info info, char* port_name)); @@ -876,28 +914,12 @@ MPI_CALL(XBT_PUBLIC int, MPI_File_create_errhandler, (MPI_File_errhandler_function * function, MPI_Errhandler* errhandler)); MPI_CALL(XBT_PUBLIC int, MPI_File_set_errhandler, (MPI_File file, MPI_Errhandler errhandler)); MPI_CALL(XBT_PUBLIC int, MPI_File_get_errhandler, (MPI_File file, MPI_Errhandler* errhandler)); -MPI_CALL(XBT_PUBLIC int, MPI_File_open, (MPI_Comm comm, const char* filename, int amode, MPI_Info info, MPI_File* fh)); -MPI_CALL(XBT_PUBLIC int, MPI_File_close, (MPI_File * fh)); -MPI_CALL(XBT_PUBLIC int, MPI_File_delete, (const char* filename, MPI_Info info)); MPI_CALL(XBT_PUBLIC int, MPI_File_set_size, (MPI_File fh, MPI_Offset size)); MPI_CALL(XBT_PUBLIC int, MPI_File_preallocate, (MPI_File fh, MPI_Offset size)); -MPI_CALL(XBT_PUBLIC int, MPI_File_get_size, (MPI_File fh, MPI_Offset* size)); -MPI_CALL(XBT_PUBLIC int, MPI_File_get_group, (MPI_File fh, MPI_Group* group)); -MPI_CALL(XBT_PUBLIC int, MPI_File_get_amode, (MPI_File fh, int* amode)); -MPI_CALL(XBT_PUBLIC int, MPI_File_set_info, (MPI_File fh, MPI_Info info)); -MPI_CALL(XBT_PUBLIC int, MPI_File_get_info, (MPI_File fh, MPI_Info* info_used)); MPI_CALL(XBT_PUBLIC int, MPI_File_set_view, (MPI_File fh, MPI_Offset disp, MPI_Datatype etype, MPI_Datatype filetype, const char* datarep, MPI_Info info)); MPI_CALL(XBT_PUBLIC int, MPI_File_get_view, (MPI_File fh, MPI_Offset* disp, MPI_Datatype* etype, MPI_Datatype* filetype, char* datarep)); -MPI_CALL(XBT_PUBLIC int, MPI_File_read_at, - (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_read_at_all, - (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_write_at, - (MPI_File fh, MPI_Offset offset, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_write_at_all, - (MPI_File fh, MPI_Offset offset, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); MPI_CALL(XBT_PUBLIC int, MPI_File_iread_at, (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_File_iwrite_at, @@ -906,13 +928,6 @@ MPI_CALL(XBT_PUBLIC int, MPI_File_iread_at_all, (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_File_iwrite_at_all, (MPI_File fh, MPI_Offset offset, const void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); -MPI_CALL(XBT_PUBLIC int, MPI_File_read, (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_read_all, - (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_write, - (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_write_all, - (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); MPI_CALL(XBT_PUBLIC int, MPI_File_iread, (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_File_iwrite, @@ -921,23 +936,11 @@ MPI_CALL(XBT_PUBLIC int, MPI_File_iread_all, (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_File_iwrite_all, (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); -MPI_CALL(XBT_PUBLIC int, MPI_File_seek, (MPI_File fh, MPI_Offset offset, int whenace)); -MPI_CALL(XBT_PUBLIC int, MPI_File_get_position, (MPI_File fh, MPI_Offset* offset)); MPI_CALL(XBT_PUBLIC int, MPI_File_get_byte_offset, (MPI_File fh, MPI_Offset offset, MPI_Offset* disp)); -MPI_CALL(XBT_PUBLIC int, MPI_File_read_shared, - (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_write_shared, - (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); MPI_CALL(XBT_PUBLIC int, MPI_File_iread_shared, (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_File_iwrite_shared, (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); -MPI_CALL(XBT_PUBLIC int, MPI_File_read_ordered, - (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_write_ordered, - (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_seek_shared, (MPI_File fh, MPI_Offset offset, int whence)); -MPI_CALL(XBT_PUBLIC int, MPI_File_get_position_shared, (MPI_File fh, MPI_Offset* offset)); MPI_CALL(XBT_PUBLIC int, MPI_File_read_at_all_begin, (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype)); MPI_CALL(XBT_PUBLIC int, MPI_File_read_at_all_end, (MPI_File fh, void* buf, MPI_Status* status)); @@ -955,9 +958,10 @@ MPI_CALL(XBT_PUBLIC int, MPI_File_write_ordered_end, (MPI_File fh, const void* b MPI_CALL(XBT_PUBLIC int, MPI_File_get_type_extent, (MPI_File fh, MPI_Datatype datatype, MPI_Aint* extent)); MPI_CALL(XBT_PUBLIC int, MPI_File_set_atomicity, (MPI_File fh, int flag)); MPI_CALL(XBT_PUBLIC int, MPI_File_get_atomicity, (MPI_File fh, int* flag)); -MPI_CALL(XBT_PUBLIC int, MPI_File_sync, (MPI_File fh)); MPI_CALL(XBT_PUBLIC int, MPI_Mrecv, (void* buf, int count, MPI_Datatype datatype, MPI_Message* message, MPI_Status* status)); MPI_CALL(XBT_PUBLIC int, MPI_Mprobe, (int source, int tag, MPI_Comm comm, MPI_Message* message, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_Imrecv, (void* buf, int count, MPI_Datatype datatype, MPI_Message* message, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Improbe, (int source, int tag, MPI_Comm comm, int *flag, MPI_Message* message, MPI_Status* status)); //FIXME: End of all the not yet implemented stuff // smpi functions -- 2.20.1