X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea810a594f8339ef7c0185dc2a9c02e673e68be1..5a97de8c98502af9f74cfceb924fa02e0fd80925:/include/smpi/smpi.h diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 330e94781f..0b8a267e64 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -69,6 +69,9 @@ SG_BEGIN_DECL() #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_ERRCODES_IGNORE (int *)0 #define MPI_IDENT 0 #define MPI_SIMILAR 1 @@ -111,7 +114,7 @@ SG_BEGIN_DECL() #define MPI_TYPECLASS_INTEGER 1 #define MPI_TYPECLASS_COMPLEX 2 #define MPI_ROOT 0 -#define MPI_INFO_NULL -1 +#define MPI_INFO_NULL NULL #define MPI_COMM_TYPE_SHARED 1 #define MPI_WIN_NULL NULL @@ -155,14 +158,8 @@ typedef enum MPIR_Topo_type { typedef ptrdiff_t MPI_Aint; typedef long long MPI_Offset; -// To compile code that declare MPI_File variables -struct s_empty { -#if !defined(__GNUC__) || defined(__STRICT_ANSI__) - char empty; -#endif -}; -typedef struct s_empty *MPI_File; - +struct s_MPI_File; +typedef struct s_MPI_File *MPI_File; struct s_smpi_mpi_datatype; typedef struct s_smpi_mpi_datatype *MPI_Datatype; @@ -176,7 +173,8 @@ typedef struct { struct s_smpi_mpi_win; typedef struct s_smpi_mpi_win* MPI_Win; -typedef int MPI_Info; +struct s_smpi_mpi_info; +typedef struct s_smpi_mpi_info *MPI_Info; #define MPI_STATUS_IGNORE ((MPI_Status*)NULL) #define MPI_STATUSES_IGNORE ((MPI_Status*)NULL) @@ -204,7 +202,7 @@ XBT_PUBLIC_DATA( MPI_Datatype ) MPI_INT16_T; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_INT32_T; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_INT64_T; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_UINT8_T; -#define MPI_BYTE MPI_UINT8_T +XBT_PUBLIC_DATA( MPI_Datatype ) MPI_BYTE; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_UINT16_T; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_UINT32_T; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_UINT64_T; @@ -226,6 +224,20 @@ XBT_PUBLIC_DATA(MPI_Datatype) MPI_LONG_DOUBLE_INT; XBT_PUBLIC_DATA(MPI_Datatype) MPI_2FLOAT; XBT_PUBLIC_DATA(MPI_Datatype) MPI_2DOUBLE; XBT_PUBLIC_DATA(MPI_Datatype) MPI_2LONG;//only for compatibility with Fortran + +XBT_PUBLIC_DATA(MPI_Datatype) MPI_REAL; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_REAL4; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_REAL8; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_REAL16; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_COMPLEX8; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_COMPLEX16; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_COMPLEX32; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_INTEGER1; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_INTEGER2; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_INTEGER4; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_INTEGER8; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_INTEGER16; + //for now we only send int values at max #define MPI_Count int #define MPI_COUNT MPI_INT @@ -240,14 +252,9 @@ XBT_PUBLIC_DATA(MPI_Datatype) MPI_2LONG;//only for compatibility with Fortran #define MPI_2INTEGER MPI_2LONG #define MPI_LOGICAL MPI_LONG #endif -#define MPI_INTEGER1 MPI_INT -#define MPI_INTEGER2 MPI_INT16_T -#define MPI_INTEGER4 MPI_INT32_T -#define MPI_INTEGER8 MPI_INT64_T -#define MPI_REAL MPI_FLOAT -#define MPI_REAL4 MPI_FLOAT -#define MPI_REAL8 MPI_DOUBLE -#define MPI_REAL16 MPI_DOUBLE + +#define MPI_Fint int + #define MPI_COMPLEX MPI_C_FLOAT_COMPLEX #define MPI_DOUBLE_COMPLEX MPI_C_DOUBLE_COMPLEX #define MPI_LOGICAL1 MPI_UINT8_T @@ -258,9 +265,7 @@ XBT_PUBLIC_DATA(MPI_Datatype) MPI_2LONG;//only for compatibility with Fortran #define MPI_CHARACTER MPI_CHAR #define MPI_DOUBLE_PRECISION MPI_DOUBLE #define MPI_2DOUBLE_PRECISION MPI_2DOUBLE -#define MPI_COMPLEX8 MPI_DATATYPE_NULL -#define MPI_COMPLEX16 MPI_DATATYPE_NULL -#define MPI_COMPLEX32 MPI_DATATYPE_NULL + typedef void MPI_User_function(void *invec, void *inoutvec, int *len, @@ -564,9 +569,10 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Reduce_local,(void *inbuf, void *inoutbuf, int cou MPI_Datatype datatype, MPI_Op op)); 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_Win_set_name,(MPI_Win win, char * name)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_get_name,(MPI_Win win, char * name, int* len)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_get_group,(MPI_Win win, MPI_Group * group)); MPI_CALL(XBT_PUBLIC(int), MPI_Win_fence,( int assert, MPI_Win win)); MPI_CALL(XBT_PUBLIC(int), MPI_Get,( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, @@ -578,6 +584,18 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Accumulate,( void *origin_addr, int origin_count, MPI_CALL(XBT_PUBLIC(int), MPI_Alloc_mem, (MPI_Aint size, MPI_Info info, void *baseptr)); MPI_CALL(XBT_PUBLIC(int), MPI_Free_mem, (void *base)); +MPI_CALL(XBT_PUBLIC(MPI_Datatype), MPI_Type_f2c,(MPI_Fint datatype)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Type_c2f,(MPI_Datatype datatype)); +MPI_CALL(XBT_PUBLIC(MPI_Group), MPI_Group_f2c,(MPI_Fint group)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Group_c2f,(MPI_Group group)); +MPI_CALL(XBT_PUBLIC(MPI_Request), MPI_Request_f2c,(MPI_Fint request)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Request_c2f,(MPI_Request request)); +MPI_CALL(XBT_PUBLIC(MPI_Win), MPI_Win_f2c,(MPI_Fint win)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Win_c2f,(MPI_Win win)); +MPI_CALL(XBT_PUBLIC(MPI_Op), MPI_Op_f2c,(MPI_Fint op)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Op_c2f,(MPI_Op op)); +MPI_CALL(XBT_PUBLIC(MPI_Comm), MPI_Comm_f2c,(MPI_Fint comm)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Comm_c2f,(MPI_Comm comm)); //FIXME: these are not yet implemented @@ -588,9 +606,8 @@ 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); +#define MPI_Comm_copy_attr_function MPI_Copy_function +#define MPI_Comm_delete_attr_function MPI_Delete_function 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); @@ -613,7 +630,10 @@ XBT_PUBLIC_DATA(MPI_Errhandler*) MPI_ERRORS_RETURN; XBT_PUBLIC_DATA(MPI_Errhandler*) MPI_ERRORS_ARE_FATAL; XBT_PUBLIC_DATA(MPI_Errhandler*) MPI_ERRHANDLER_NULL; - +MPI_CALL(XBT_PUBLIC(MPI_Info), MPI_Info_f2c,(MPI_Fint info)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Info_c2f,(MPI_Info info)); +MPI_CALL(XBT_PUBLIC(MPI_Errhandler), MPI_Errhandler_f2c,(MPI_Fint errhandler)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Errhandler_c2f,(MPI_Errhandler errhandler)); MPI_CALL(XBT_PUBLIC(int), MPI_Pack_size, (int incount, MPI_Datatype datatype, MPI_Comm comm, int* size)); MPI_CALL(XBT_PUBLIC(int), MPI_Cart_coords, (MPI_Comm comm, int rank, int maxdims, int* coords)); MPI_CALL(XBT_PUBLIC(int), MPI_Cart_create, (MPI_Comm comm_old, int ndims, int* dims, int* periods, int reorder, MPI_Comm* comm_cart)); @@ -736,6 +756,13 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Comm_spawn,( char *command, char **argv, int maxpr 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)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_complete,(MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_lock,(int lock_type, int rank, int assert, MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_post,(MPI_Group group, int assert, MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_start,(MPI_Group group, int assert, MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_test,(MPI_Win win, int *flag)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_unlock,(int rank, MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_wait,(MPI_Win win)); //FIXME: End of all the not yet implemented stuff