X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25e228f53f694b5b97674343dac6f44f6fc1f73f..4f994c9a8d72e683e77173cb49c3949447c645cb:/include/smpi/smpi.h diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index bccb165e6d..1f19913b04 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -6,11 +6,13 @@ #ifndef SMPI_H #define SMPI_H -#include -#include #include #include +#include + #include +#include +#include #include #ifdef _WIN32 @@ -38,7 +40,6 @@ SG_BEGIN_DECL() #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 *)-111 #define MPI_PROC_NULL -666 @@ -47,80 +48,88 @@ SG_BEGIN_DECL() #define MPI_IN_PLACE (void *)-222 // errorcodes -#define MPI_SUCCESS 0 -#define MPI_ERR_COMM 1 -#define MPI_ERR_ARG 2 -#define MPI_ERR_TYPE 3 -#define MPI_ERR_REQUEST 4 -#define MPI_ERR_INTERN 5 -#define MPI_ERR_COUNT 6 -#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_IN_STATUS 13 -#define MPI_ERR_PENDING 14 -#define MPI_ERR_BUFFER 15 -#define MPI_ERR_NAME 16 -#define MPI_ERR_DIMS 17 -#define MPI_ERR_TOPOLOGY 18 -#define MPI_ERR_NO_MEM 19 -#define MPI_ERR_WIN 20 -#define MPI_ERR_INFO_VALUE 21 -#define MPI_ERR_INFO_KEY 22 -#define MPI_ERR_INFO_NOKEY 23 -#define MPI_ERR_ROOT 24 -#define MPI_ERR_UNKNOWN 25 -#define MPI_ERR_KEYVAL 26 -#define MPI_ERR_BASE 27 -#define MPI_ERR_SPAWN 28 -#define MPI_ERR_PORT 29 -#define MPI_ERR_SERVICE 30 -#define MPI_ERR_SIZE 31 -#define MPI_ERR_DISP 32 -#define MPI_ERR_INFO 33 -#define MPI_ERR_LOCKTYPE 34 -#define MPI_ERR_ASSERT 35 -#define MPI_RMA_CONFLICT 36 -#define MPI_RMA_SYNC 37 -#define MPI_ERR_FILE 38 -#define MPI_ERR_NOT_SAME 39 -#define MPI_ERR_AMODE 40 -#define MPI_ERR_UNSUPPORTED_DATAREP 41 -#define MPI_ERR_UNSUPPORTED_OPERATION 42 -#define MPI_ERR_NO_SUCH_FILE 43 -#define MPI_ERR_FILE_EXISTS 44 -#define MPI_ERR_BAD_FILE 45 -#define MPI_ERR_ACCESS 46 -#define MPI_ERR_NO_SPACE 47 -#define MPI_ERR_QUOTA 48 -#define MPI_ERR_READ_ONLY 49 -#define MPI_ERR_FILE_IN_USE 50 -#define MPI_ERR_DUP_DATAREP 51 -#define MPI_ERR_CONVERSION 52 -#define MPI_ERR_IO 53 -#define MPI_ERR_RMA_ATTACH 54 -#define MPI_ERR_RMA_CONFLICT 55 -#define MPI_ERR_RMA_RANGE 56 -#define MPI_ERR_RMA_SHARED 57 -#define MPI_ERR_RMA_SYNC 58 -#define MPI_ERR_RMA_FLAVOR 59 -#define MPI_T_ERR_CANNOT_INIT 60 -#define MPI_T_ERR_NOT_INITIALIZED 61 -#define MPI_T_ERR_MEMORY 62 -#define MPI_T_ERR_INVALID_INDEX 63 -#define MPI_T_ERR_INVALID_ITEM 64 -#define MPI_T_ERR_INVALID_SESSION 65 -#define MPI_T_ERR_INVALID_HANDLE 66 -#define MPI_T_ERR_OUT_OF_HANDLES 67 -#define MPI_T_ERR_OUT_OF_SESSIONS 68 -#define MPI_T_ERR_CVAR_SET_NOT_NOW 69 -#define MPI_T_ERR_CVAR_SET_NEVER 70 -#define MPI_T_ERR_PVAR_NO_WRITE 71 -#define MPI_T_ERR_PVAR_NO_STARTSTOP 72 -#define MPI_T_ERR_PVAR_NO_ATOMIC 73 +#define FOREACH_ERROR(ERROR) \ + ERROR(MPI_SUCCESS) \ + ERROR(MPI_ERR_COMM) \ + ERROR(MPI_ERR_ARG) \ + ERROR(MPI_ERR_TYPE) \ + ERROR(MPI_ERR_REQUEST) \ + ERROR(MPI_ERR_INTERN) \ + ERROR(MPI_ERR_COUNT) \ + ERROR(MPI_ERR_RANK) \ + ERROR(MPI_ERR_TAG) \ + ERROR(MPI_ERR_TRUNCATE) \ + ERROR(MPI_ERR_GROUP) \ + ERROR(MPI_ERR_OP) \ + ERROR(MPI_ERR_OTHER) \ + ERROR(MPI_ERR_IN_STATUS) \ + ERROR(MPI_ERR_PENDING) \ + ERROR(MPI_ERR_BUFFER) \ + ERROR(MPI_ERR_NAME) \ + ERROR(MPI_ERR_DIMS) \ + ERROR(MPI_ERR_TOPOLOGY) \ + ERROR(MPI_ERR_NO_MEM) \ + ERROR(MPI_ERR_WIN) \ + ERROR(MPI_ERR_INFO_VALUE) \ + ERROR(MPI_ERR_INFO_KEY) \ + ERROR(MPI_ERR_INFO_NOKEY) \ + ERROR(MPI_ERR_ROOT) \ + ERROR(MPI_ERR_UNKNOWN) \ + ERROR(MPI_ERR_KEYVAL) \ + ERROR(MPI_ERR_BASE) \ + ERROR(MPI_ERR_SPAWN) \ + ERROR(MPI_ERR_PORT) \ + ERROR(MPI_ERR_SERVICE) \ + ERROR(MPI_ERR_SIZE) \ + ERROR(MPI_ERR_DISP) \ + ERROR(MPI_ERR_INFO) \ + ERROR(MPI_ERR_LOCKTYPE) \ + ERROR(MPI_ERR_ASSERT) \ + ERROR(MPI_RMA_CONFLICT) \ + ERROR(MPI_RMA_SYNC) \ + ERROR(MPI_ERR_FILE) \ + ERROR(MPI_ERR_NOT_SAME) \ + ERROR(MPI_ERR_AMODE) \ + ERROR(MPI_ERR_UNSUPPORTED_DATAREP) \ + ERROR(MPI_ERR_UNSUPPORTED_OPERATION) \ + ERROR(MPI_ERR_NO_SUCH_FILE) \ + ERROR(MPI_ERR_FILE_EXISTS) \ + ERROR(MPI_ERR_BAD_FILE) \ + ERROR(MPI_ERR_ACCESS) \ + ERROR(MPI_ERR_NO_SPACE) \ + ERROR(MPI_ERR_QUOTA) \ + ERROR(MPI_ERR_READ_ONLY) \ + ERROR(MPI_ERR_FILE_IN_USE) \ + ERROR(MPI_ERR_DUP_DATAREP) \ + ERROR(MPI_ERR_CONVERSION) \ + ERROR(MPI_ERR_IO) \ + ERROR(MPI_ERR_RMA_ATTACH) \ + ERROR(MPI_ERR_RMA_CONFLICT) \ + ERROR(MPI_ERR_RMA_RANGE) \ + ERROR(MPI_ERR_RMA_SHARED) \ + ERROR(MPI_ERR_RMA_SYNC) \ + ERROR(MPI_ERR_RMA_FLAVOR) \ + ERROR(MPI_T_ERR_CANNOT_INIT) \ + ERROR(MPI_T_ERR_NOT_INITIALIZED) \ + ERROR(MPI_T_ERR_MEMORY) \ + ERROR(MPI_T_ERR_INVALID_INDEX) \ + ERROR(MPI_T_ERR_INVALID_ITEM) \ + ERROR(MPI_T_ERR_INVALID_SESSION) \ + ERROR(MPI_T_ERR_INVALID_HANDLE) \ + ERROR(MPI_T_ERR_OUT_OF_HANDLES) \ + ERROR(MPI_T_ERR_OUT_OF_SESSIONS) \ + ERROR(MPI_T_ERR_CVAR_SET_NOT_NOW) \ + ERROR(MPI_T_ERR_CVAR_SET_NEVER) \ + ERROR(MPI_T_ERR_PVAR_NO_WRITE) \ + ERROR(MPI_T_ERR_PVAR_NO_STARTSTOP) \ + ERROR(MPI_T_ERR_PVAR_NO_ATOMIC) + +#define GENERATE_ENUM(ENUM) ENUM, +#define GENERATE_STRING(STRING) #STRING, + +enum ERROR_ENUM { + FOREACH_ERROR(GENERATE_ENUM) +}; #define MPI_ERRCODES_IGNORE (int *)0 #define MPI_IDENT 0 @@ -171,8 +180,8 @@ SG_BEGIN_DECL() #define MPI_COMM_TYPE_SHARED 1 #define MPI_WIN_NULL ((MPI_Win)NULL) -#define MPI_VERSION 2 -#define MPI_SUBVERSION 2 +#define MPI_VERSION 3 +#define MPI_SUBVERSION 1 #define MPI_UNWEIGHTED (int *)0 #define MPI_ARGV_NULL (char **)0 #define MPI_ARGVS_NULL (char ***)0 @@ -198,9 +207,12 @@ SG_BEGIN_DECL() #define MPI_WIN_BASE -1 #define MPI_WIN_SIZE -2 #define MPI_WIN_DISP_UNIT -3 +#define MPI_WIN_CREATE_FLAVOR -4 +#define MPI_WIN_MODEL -5 typedef ptrdiff_t MPI_Aint; typedef long long MPI_Offset; +typedef long long MPI_Count; struct s_MPI_File; typedef struct s_MPI_File *MPI_File; @@ -213,6 +225,7 @@ typedef struct { int MPI_TAG; int MPI_ERROR; int count; + int cancelled; } MPI_Status; typedef SMPI_Win* MPI_Win; @@ -221,7 +234,7 @@ typedef SMPI_Info* MPI_Info; #define MPI_STATUS_IGNORE ((MPI_Status*)NULL) #define MPI_STATUSES_IGNORE ((MPI_Status*)NULL) -#define MPI_DATATYPE_NULL ((const MPI_Datatype)NULL) +XBT_PUBLIC_DATA const MPI_Datatype MPI_DATATYPE_NULL; XBT_PUBLIC_DATA const MPI_Datatype MPI_CHAR; XBT_PUBLIC_DATA const MPI_Datatype MPI_SHORT; XBT_PUBLIC_DATA const MPI_Datatype MPI_INT; @@ -280,9 +293,7 @@ XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER4; XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER8; XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER16; -//for now we only send int values at max -#define MPI_Count int -#define MPI_COUNT MPI_INT +XBT_PUBLIC_DATA const MPI_Datatype MPI_COUNT; //defines for fortran compatibility #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__) @@ -308,6 +319,11 @@ XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER16; #define MPI_DOUBLE_PRECISION MPI_DOUBLE #define MPI_2DOUBLE_PRECISION MPI_2DOUBLE +#define MPI_WIN_FLAVOR_CREATE 0 +#define MPI_WIN_FLAVOR_ALLOCATE 1 +#define MPI_WIN_FLAVOR_DYNAMIC 2 +#define MPI_WIN_FLAVOR_SHARED 3 + typedef void MPI_User_function(void *invec, void *inoutvec, int *len, MPI_Datatype * datatype); typedef SMPI_Op *MPI_Op; @@ -356,14 +372,28 @@ typedef enum SMPI_Topo_type { 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 void MPI_Copy_function_fort(MPI_Comm oldcomm, int keyval, void* extra_state, void* attribute_val_in, + void* attribute_val_out, int* flag, int* ierr); +typedef void MPI_Delete_function_fort(MPI_Comm comm, int keyval, void* attribute_val, void* extra_state, int* ierr); #define MPI_Comm_copy_attr_function MPI_Copy_function #define MPI_Comm_delete_attr_function MPI_Delete_function +#define MPI_Comm_copy_attr_function_fort MPI_Copy_function_fort +#define MPI_Comm_delete_attr_function_fort MPI_Delete_function_fort 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 int MPI_Win_copy_attr_function(MPI_Win win, int keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag); typedef int MPI_Win_delete_attr_function(MPI_Win win, int keyval, void* attribute_val, void* extra_state); +typedef void MPI_Type_copy_attr_function_fort(MPI_Datatype type, int keyval, void* extra_state, void* attribute_val_in, + void* attribute_val_out, int* flag, int* ierr); +typedef void MPI_Type_delete_attr_function_fort(MPI_Datatype type, int keyval, void* attribute_val, void* extra_state, int* ierr); +typedef void MPI_Win_copy_attr_function_fort(MPI_Win win, int keyval, void* extra_state, void* attribute_val_in, + void* attribute_val_out, int* flag, int* ierr); +typedef void MPI_Win_delete_attr_function_fort(MPI_Win win, int keyval, void* attribute_val, void* extra_state, int* ierr); +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_COMM_NULL_COPY_FN ((MPI_Comm_copy_attr_function*)0) #define MPI_COMM_NULL_DELETE_FN ((MPI_Comm_delete_attr_function*)0) #define MPI_TYPE_NULL_COPY_FN ((MPI_Type_copy_attr_function*)0) @@ -541,6 +571,40 @@ MPI_CALL(XBT_PUBLIC MPI_Fint, MPI_Request_c2f, (MPI_Request request)); MPI_CALL(XBT_PUBLIC int, MPI_Bcast, (void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm)); MPI_CALL(XBT_PUBLIC int, MPI_Barrier, (MPI_Comm comm)); +MPI_CALL(XBT_PUBLIC int, MPI_Ibarrier, (MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Ibcast, (void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Igather, (void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, + MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Igatherv, (void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, + int* recvcounts, int* displs, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Iallgather, (void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, + int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Iallgatherv, (void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, + int* recvcounts, int* displs, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Iscatter, (void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, + int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Iscatterv, (void* sendbuf, int* sendcounts, int* displs, MPI_Datatype sendtype, + void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Ireduce, + (void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Iallreduce, + (void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Iscan, + (void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Iexscan, + (void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Ireduce_scatter, + (void* sendbuf, void* recvbuf, int* recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Ireduce_scatter_block, + (void* sendbuf, void* recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Ialltoall, (void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, + int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Ialltoallv, + (void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype sendtype, void* recvbuf, int* recvcounts, + int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Ialltoallw, + (void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype* sendtypes, void* recvbuf, int* recvcounts, + int* recvdisps, MPI_Datatype* recvtypes, MPI_Comm comm, MPI_Request *request)); MPI_CALL(XBT_PUBLIC int, MPI_Gather, (void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm)); MPI_CALL(XBT_PUBLIC int, MPI_Gatherv, (void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, @@ -570,6 +634,9 @@ MPI_CALL(XBT_PUBLIC int, MPI_Alltoall, (void* sendbuf, int sendcount, MPI_Dataty MPI_CALL(XBT_PUBLIC int, MPI_Alltoallv, (void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype sendtype, void* recvbuf, int* recvcounts, int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm)); +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_Reduce_local, (void* inbuf, void* inoutbuf, int count, MPI_Datatype datatype, MPI_Op op)); MPI_CALL(XBT_PUBLIC int, MPI_Info_create, (MPI_Info * info)); @@ -589,6 +656,8 @@ 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_Win_allocate, (MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, void* base, MPI_Win* win)); +MPI_CALL(XBT_PUBLIC int, MPI_Win_allocate_shared, + (MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, void* base, MPI_Win* win)); MPI_CALL(XBT_PUBLIC int, MPI_Win_create_dynamic, (MPI_Info info, MPI_Comm comm, MPI_Win* win)); MPI_CALL(XBT_PUBLIC int, MPI_Win_attach, (MPI_Win win, void* base, MPI_Aint size)); MPI_CALL(XBT_PUBLIC int, MPI_Win_detach, (MPI_Win win, void* base)); @@ -617,6 +686,8 @@ MPI_CALL(XBT_PUBLIC int, MPI_Win_flush, (int rank, MPI_Win win)); MPI_CALL(XBT_PUBLIC int, MPI_Win_flush_local, (int rank, MPI_Win win)); MPI_CALL(XBT_PUBLIC int, MPI_Win_flush_all, (MPI_Win win)); MPI_CALL(XBT_PUBLIC int, MPI_Win_flush_local_all, (MPI_Win win)); +MPI_CALL(XBT_PUBLIC int, MPI_Win_shared_query, (MPI_Win win, int rank, MPI_Aint* size, int* disp_unit, void* baseptr)); +MPI_CALL(XBT_PUBLIC int, MPI_Win_sync, (MPI_Win win)); MPI_CALL(XBT_PUBLIC MPI_Win, MPI_Win_f2c, (MPI_Fint win)); MPI_CALL(XBT_PUBLIC MPI_Fint, MPI_Win_c2f, (MPI_Win win)); @@ -659,6 +730,13 @@ MPI_CALL(XBT_PUBLIC int, MPI_Cart_shift, (MPI_Comm comm, int direction, int disp MPI_CALL(XBT_PUBLIC int, MPI_Cart_sub, (MPI_Comm comm, int* remain_dims, MPI_Comm* comm_new)); MPI_CALL(XBT_PUBLIC int, MPI_Cartdim_get, (MPI_Comm comm, int* ndims)); MPI_CALL(XBT_PUBLIC int, MPI_Dims_create, (int nnodes, int ndims, int* dims)); +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)); //FIXME: these are not yet implemented @@ -691,10 +769,7 @@ typedef void* MPI_Errhandler; typedef void MPI_Comm_errhandler_function(MPI_Comm *, int *, ...); typedef void MPI_File_errhandler_function(MPI_File *, int *, ...); typedef void MPI_Win_errhandler_function(MPI_Win *, 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_DUP_FN 1 #define MPI_WIN_DUP_FN ((MPI_Win_copy_attr_function*)MPI_DUP_FN) #define MPI_TYPE_DUP_FN ((MPI_Type_copy_attr_function*)MPI_DUP_FN) @@ -702,7 +777,7 @@ typedef int MPI_Grequest_cancel_function(void *extra_state, int complete); typedef MPI_Comm_errhandler_function MPI_Comm_errhandler_fn; typedef MPI_File_errhandler_function MPI_File_errhandler_fn; typedef MPI_Win_errhandler_function MPI_Win_errhandler_fn; -#define MPI_INFO_ENV 1 +#define MPI_INFO_ENV smpi_process_info_env() XBT_PUBLIC_DATA const MPI_Datatype MPI_PACKED; XBT_PUBLIC_DATA MPI_Errhandler* MPI_ERRORS_RETURN; XBT_PUBLIC_DATA MPI_Errhandler* MPI_ERRORS_ARE_FATAL; @@ -772,9 +847,6 @@ 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_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)); @@ -782,13 +854,6 @@ 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)); @@ -900,6 +965,7 @@ MPI_CALL(XBT_PUBLIC int, MPI_File_sync, (MPI_File fh)); // smpi functions XBT_PUBLIC int smpi_global_size(); XBT_PUBLIC MPI_Comm smpi_process_comm_self(); +XBT_PUBLIC MPI_Info smpi_process_info_env(); XBT_PUBLIC void* smpi_process_get_user_data(); XBT_PUBLIC void smpi_process_set_user_data(void*); @@ -907,21 +973,22 @@ XBT_PUBLIC void smpi_execute_flops(double flops); XBT_PUBLIC void smpi_execute(double duration); XBT_PUBLIC void smpi_execute_benched(double duration); -XBT_PUBLIC double smpi_get_host_power_peak_at(int pstate_index); -XBT_PUBLIC double smpi_get_host_current_power_peak(); -XBT_PUBLIC int smpi_get_host_nb_pstates(); -XBT_PUBLIC void smpi_set_host_pstate(int pstate_index); -XBT_PUBLIC int smpi_get_host_pstate(); +// PLEASE NOTE: If you remove these functions, the entire smpi_dvfs.cpp file can be removed as well!! +XBT_ATTRIB_DEPRECATED_v324("Please use sg_host_get_pstate_speed(sg_host_self(), pstate_index) instead") XBT_PUBLIC double smpi_get_host_power_peak_at(int pstate_index); +XBT_ATTRIB_DEPRECATED_v324("Please use sg_host_speed(sg_host_self()) instead") XBT_PUBLIC double smpi_get_host_current_power_peak(); +XBT_ATTRIB_DEPRECATED_v324("Please use sg_host_get_nb_pstates(sg_host_self()) instead") XBT_PUBLIC int smpi_get_host_nb_pstates(); +XBT_ATTRIB_DEPRECATED_v324("Please use sg_host_set_pstate(sg_host_self(), pstate_index) instead") XBT_PUBLIC void smpi_set_host_pstate(int pstate_index); +XBT_ATTRIB_DEPRECATED_v324("Please use sg_host_get_pstate(sg_host_self()) instead") XBT_PUBLIC int smpi_get_host_pstate(); -XBT_PUBLIC double smpi_get_host_consumed_energy(); +XBT_ATTRIB_DEPRECATED_v324("Please use sg_host_get_consumed_energy(sg_host_self()) instead") XBT_PUBLIC double smpi_get_host_consumed_energy(); XBT_PUBLIC unsigned long long smpi_rastro_resolution(); XBT_PUBLIC unsigned long long smpi_rastro_timestamp(); XBT_PUBLIC void smpi_sample_1(int global, const char* file, int line, int iters, double threshold); -XBT_PUBLIC int smpi_sample_2(int global, const char* file, int line); +XBT_PUBLIC int smpi_sample_2(int global, const char* file, int line, int iter_count); XBT_PUBLIC void smpi_sample_3(int global, const char* file, int line); - +XBT_PUBLIC int smpi_sample_exit(int global, const char* file, int line, int iter_count); /** * Need a public setter for SMPI copy_callback function, so users can define * their own while still using default SIMIX_copy_callback for S4U copies. @@ -939,12 +1006,21 @@ XBT_PUBLIC void smpi_trace_set_call_location_(const char* file, int* line); /** Fortran binding + -fsecond-underscore **/ XBT_PUBLIC void smpi_trace_set_call_location__(const char* file, int* line); -#define SMPI_SAMPLE_LOOP(global, iters, thres) \ - for (smpi_sample_1(global, __FILE__, __LINE__, iters, thres); smpi_sample_2(global, __FILE__, __LINE__); \ - smpi_sample_3(global, __FILE__, __LINE__)) -#define SMPI_SAMPLE_LOCAL(iters, thres) SMPI_SAMPLE_LOOP(0, iters, thres) -#define SMPI_SAMPLE_GLOBAL(iters, thres) SMPI_SAMPLE_LOOP(1, iters, thres) - +#define SMPI_ITER_NAME1(line) iter_count##line +#define SMPI_ITER_NAME(line) SMPI_ITER_NAME1(line) +#define SMPI_SAMPLE_LOOP(loop_init, loop_end, loop_iter, global, iters, thres)\ + int SMPI_ITER_NAME(__LINE__)=0;\ + {loop_init;\ + while(loop_end){\ + SMPI_ITER_NAME(__LINE__)++;\ + loop_iter;\ + }} \ + for(loop_init; \ + loop_end ? (smpi_sample_1(global, __FILE__, __LINE__, iters, thres), (smpi_sample_2(global, __FILE__, __LINE__, SMPI_ITER_NAME(__LINE__)))) :\ + smpi_sample_exit(global, __FILE__, __LINE__, SMPI_ITER_NAME(__LINE__));\ + smpi_sample_3(global, __FILE__, __LINE__),loop_iter) +#define SMPI_SAMPLE_LOCAL(loop_init, loop_end, loop_iter, iters, thres) SMPI_SAMPLE_LOOP(loop_init, loop_end, loop_iter, 0, iters, thres) +#define SMPI_SAMPLE_GLOBAL(loop_init, loop_end, loop_iter,iters, thres) SMPI_SAMPLE_LOOP(loop_init, loop_end, loop_iter, 1, iters, thres) #define SMPI_SAMPLE_DELAY(duration) for(smpi_execute(duration); 0; ) #define SMPI_SAMPLE_FLOPS(flops) for(smpi_execute_flops(flops); 0; ) @@ -967,81 +1043,18 @@ XBT_PUBLIC void* smpi_shared_set_call(const char* func, const char* input, void* /* Fortran specific stuff */ XBT_PUBLIC int smpi_main(const char* program, int argc, char* argv[]); -XBT_ATTRIB_DEPRECATED_v322("Use s4u::this_actor::getPid(): v3.22 will turn this warning into an error.") XBT_PUBLIC - int smpi_process_index(); XBT_PUBLIC void smpi_process_init(int* argc, char*** argv); /* Trace replay specific stuff */ -XBT_PUBLIC void smpi_replay_init(int* argc, char*** argv); // Only initialization -XBT_PUBLIC void smpi_replay_main(int* argc, char*** argv); // Launch the replay once init is done -XBT_PUBLIC void smpi_replay_run(int* argc, char*** argv); // Both init and start +XBT_PUBLIC void smpi_replay_init(const char* instance_id, int rank, double start_delay_flops); // Only initialization +XBT_PUBLIC void smpi_replay_main(int rank, const char* trace_filename); // Launch the replay once init is done +XBT_PUBLIC void smpi_replay_run(const char* instance_id, int rank, double start_delay_flops, + const char* trace_filename); // Both init and start XBT_PUBLIC void SMPI_app_instance_register(const char* name, xbt_main_func_t code, int num_processes); XBT_PUBLIC void SMPI_init(); XBT_PUBLIC void SMPI_finalize(); -/* Manual global privatization fallback */ -XBT_PUBLIC void smpi_register_static(void* arg, void_f_pvoid_t free_fn); -XBT_PUBLIC void smpi_free_static(); - -#define SMPI_VARINIT_GLOBAL(name,type) \ -type *name = NULL; \ -static void __attribute__((constructor)) __preinit_##name(void) { \ - if(!name) \ - name = (type*)calloc(smpi_global_size(), sizeof(type)); \ -} \ -static void __attribute__((destructor)) __postfini_##name(void) { \ - free(name); \ - name = NULL; \ -} - -#define SMPI_VARINIT_GLOBAL_AND_SET(name,type,expr) \ -type *name = NULL; \ -static void __attribute__((constructor)) __preinit_##name(void) { \ - size_t size = smpi_global_size(); \ - size_t i; \ - type value = expr; \ - if(!name) { \ - name = (type*)malloc(size * sizeof(type)); \ - for(i = 0; i < size; i++) { \ - name[i] = value; \ - } \ - } \ -} \ -static void __attribute__((destructor)) __postfini_##name(void) { \ - free(name); \ - name = NULL; \ -} - -#define SMPI_VARGET_GLOBAL(name) name[SIMIX_process_self()->pid] - -/** - * This is used for the old privatization method, i.e., on old - * machines that do not yet support privatization via mmap - */ -#define SMPI_VARINIT_STATIC(name,type) \ -static type *name = NULL; \ -if(!name) { \ - name = (type*)calloc(smpi_global_size(), sizeof(type)); \ - smpi_register_static(name, xbt_free_f); \ -} - -#define SMPI_VARINIT_STATIC_AND_SET(name,type,expr) \ -static type *name = NULL; \ -if(!name) { \ - size_t size = smpi_global_size(); \ - size_t i; \ - type value = expr; \ - name = (type*)malloc(size * sizeof(type)); \ - for(i = 0; i < size; i++) { \ - name[i] = value; \ - } \ - smpi_register_static(name, xbt_free_f); \ -} - -#define SMPI_VARGET_STATIC(name) name[SIMIX_process_self()->pid] - - SG_END_DECL() /* C++ declarations for shared_malloc */ @@ -1050,12 +1063,11 @@ SG_END_DECL() XBT_PUBLIC int smpi_is_shared(void* ptr, std::vector>& private_blocks, size_t* offset); -std::vector> shift_and_frame_private_blocks(const std::vector> vec, +std::vector> shift_and_frame_private_blocks(const std::vector>& vec, size_t offset, size_t buff_size); -std::vector> merge_private_blocks(std::vector> src, - std::vector> dst); - - -#endif +std::vector> merge_private_blocks(const std::vector>& src, + const std::vector>& dst); #endif + +#endif