X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/817b82b1072cd8f1a72de07a0223660f25fe164c..ea74f5d95928a521a588737e81f1de94eef25d19:/include/smpi/smpi.h diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index d1ac611984..e110d697ae 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2022. 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. */ @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -16,6 +17,7 @@ #include #ifdef __cplusplus +#include #include #endif @@ -29,7 +31,7 @@ type _XBT_CONCAT(P, name) args #endif -SG_BEGIN_DECL() +SG_BEGIN_DECL #define MPI_THREAD_SINGLE 0 #define MPI_THREAD_FUNNELED 1 #define MPI_THREAD_SERIALIZED 2 @@ -38,7 +40,7 @@ SG_BEGIN_DECL() #define MPI_MAX_PROCESSOR_NAME 100 #define MPI_MAX_NAME_STRING 100 #define MPI_MAX_ERROR_STRING 100 -#define MPI_MAX_DATAREP_STRIN 100 +#define MPI_MAX_DATAREP_STRING 128 #define MPI_MAX_INFO_KEY 100 #define MPI_MAX_INFO_VAL 100 #define MPI_MAX_OBJECT_NAME 100 @@ -152,6 +154,7 @@ enum ERROR_ENUM { #define MPI_TAG_LB -6 #define MPI_UNIVERSE_SIZE -7 #define MPI_LASTUSEDCODE -8 +#define MPI_KEYVAL_INVALID -9 #define MPI_MODE_NOSTORE 0x1 #define MPI_MODE_NOPUT 0x2 @@ -159,15 +162,12 @@ enum ERROR_ENUM { #define MPI_MODE_NOSUCCEED 0x8 #define MPI_MODE_NOCHECK 0x10 -#define MPI_KEYVAL_INVALID 0 #define MPI_NULL_COPY_FN NULL #define MPI_NULL_DELETE_FN NULL #define MPI_ERR_LASTCODE 74 -#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_REAL2 MPI_DATATYPE_NULL +#define MPI_COMPLEX4 MPI_DATATYPE_NULL #define MPI_DISTRIBUTE_BLOCK 0 #define MPI_DISTRIBUTE_NONE 1 @@ -187,6 +187,7 @@ enum ERROR_ENUM { #define MPI_VERSION 3 #define MPI_SUBVERSION 1 #define MPI_UNWEIGHTED (int *)0 +#define MPI_WEIGHTS_EMPTY (int *)1 #define MPI_ARGV_NULL (char **)0 #define MPI_ARGVS_NULL (char ***)0 #define MPI_LOCK_EXCLUSIVE 1 @@ -206,13 +207,15 @@ enum ERROR_ENUM { #define MPI_SEEK_SET 600 #define MPI_SEEK_CUR 602 #define MPI_SEEK_END 604 -#define MPI_MAX_DATAREP_STRING 128 #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 +#define MPI_WIN_UNIFIED 0 +#define MPI_WIN_SEPARATE 1 + typedef ptrdiff_t MPI_Aint; typedef long long MPI_Offset; @@ -236,69 +239,150 @@ typedef SMPI_Info* MPI_Info; #define MPI_STATUSES_IGNORE ((MPI_Status*)NULL) #define MPI_STATUS_SIZE 5 -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; -XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG; -XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG_LONG; +#if !defined(DLL_EXPORT) +#if defined(c_plusplus) || defined(__cplusplus) +#define SMPI_PREDEFINED_POINTER(type, internal) (static_cast (static_cast (&(internal)))) +#else +#define SMPI_PREDEFINED_POINTER(type, internal) ((type) ((void *) &(internal))) +#endif +#else +#define SMPI_PREDEFINED_POINTER(type, internal) ((type) &(internal)) +#endif + +extern SMPI_Datatype smpi_MPI_DATATYPE_NULL; +extern SMPI_Datatype smpi_MPI_CHAR; +extern SMPI_Datatype smpi_MPI_SHORT; +extern SMPI_Datatype smpi_MPI_INT; +extern SMPI_Datatype smpi_MPI_LONG; +extern SMPI_Datatype smpi_MPI_LONG_LONG; +extern SMPI_Datatype smpi_MPI_SIGNED_CHAR; +extern SMPI_Datatype smpi_MPI_UNSIGNED_CHAR; +extern SMPI_Datatype smpi_MPI_UNSIGNED_SHORT; +extern SMPI_Datatype smpi_MPI_UNSIGNED; +extern SMPI_Datatype smpi_MPI_UNSIGNED_LONG; +extern SMPI_Datatype smpi_MPI_UNSIGNED_LONG_LONG; +extern SMPI_Datatype smpi_MPI_FLOAT; +extern SMPI_Datatype smpi_MPI_DOUBLE; +extern SMPI_Datatype smpi_MPI_LONG_DOUBLE; +extern SMPI_Datatype smpi_MPI_WCHAR; +extern SMPI_Datatype smpi_MPI_C_BOOL; +extern SMPI_Datatype smpi_MPI_INT8_T; +extern SMPI_Datatype smpi_MPI_INT16_T; +extern SMPI_Datatype smpi_MPI_INT32_T; +extern SMPI_Datatype smpi_MPI_INT64_T; +extern SMPI_Datatype smpi_MPI_UINT8_T; +extern SMPI_Datatype smpi_MPI_BYTE; +extern SMPI_Datatype smpi_MPI_UINT16_T; +extern SMPI_Datatype smpi_MPI_UINT32_T; +extern SMPI_Datatype smpi_MPI_UINT64_T; +extern SMPI_Datatype smpi_MPI_C_FLOAT_COMPLEX; +extern SMPI_Datatype smpi_MPI_C_DOUBLE_COMPLEX; +extern SMPI_Datatype smpi_MPI_C_LONG_DOUBLE_COMPLEX; +extern SMPI_Datatype smpi_MPI_AINT; +extern SMPI_Datatype smpi_MPI_OFFSET; +extern SMPI_Datatype smpi_MPI_LB; +extern SMPI_Datatype smpi_MPI_UB; +extern SMPI_Datatype smpi_MPI_FLOAT_INT; +extern SMPI_Datatype smpi_MPI_LONG_INT; +extern SMPI_Datatype smpi_MPI_DOUBLE_INT; +extern SMPI_Datatype smpi_MPI_SHORT_INT; +extern SMPI_Datatype smpi_MPI_2INT; +extern SMPI_Datatype smpi_MPI_LONG_DOUBLE_INT; +extern SMPI_Datatype smpi_MPI_2FLOAT; +extern SMPI_Datatype smpi_MPI_2DOUBLE; +extern SMPI_Datatype smpi_MPI_2LONG; +extern SMPI_Datatype smpi_MPI_REAL; +extern SMPI_Datatype smpi_MPI_REAL4; +extern SMPI_Datatype smpi_MPI_REAL8; +extern SMPI_Datatype smpi_MPI_REAL16; +extern SMPI_Datatype smpi_MPI_COMPLEX8; +extern SMPI_Datatype smpi_MPI_COMPLEX16; +extern SMPI_Datatype smpi_MPI_COMPLEX32; +extern SMPI_Datatype smpi_MPI_INTEGER1; +extern SMPI_Datatype smpi_MPI_INTEGER2; +extern SMPI_Datatype smpi_MPI_INTEGER4; +extern SMPI_Datatype smpi_MPI_INTEGER8; +extern SMPI_Datatype smpi_MPI_INTEGER16; +extern SMPI_Datatype smpi_MPI_COUNT; +extern SMPI_Datatype smpi_MPI_CXX_BOOL; +extern SMPI_Datatype smpi_MPI_MPI_CXX_FLOAT_COMPLEX; +extern SMPI_Datatype smpi_MPI_MPI_CXX_DOULE_COMPLEX; +extern SMPI_Datatype smpi_MPI_MPI_CXX_LONG_DOUBLE_COMPLEX; + +#define MPI_DATATYPE_NULL SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_DATATYPE_NULL) +#define MPI_CHAR SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CHAR) +#define MPI_SHORT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_SHORT) +#define MPI_INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INT) +#define MPI_LONG SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_LONG) +#define MPI_LONG_LONG SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_LONG_LONG) #define MPI_LONG_LONG_INT MPI_LONG_LONG -XBT_PUBLIC_DATA const MPI_Datatype MPI_SIGNED_CHAR; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED_CHAR; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED_SHORT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED_LONG; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED_LONG_LONG; -XBT_PUBLIC_DATA const MPI_Datatype MPI_FLOAT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_DOUBLE; -XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG_DOUBLE; -XBT_PUBLIC_DATA const MPI_Datatype MPI_WCHAR; -XBT_PUBLIC_DATA const MPI_Datatype MPI_C_BOOL; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INT8_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INT16_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INT32_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INT64_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UINT8_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_BYTE; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UINT16_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UINT32_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UINT64_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_C_FLOAT_COMPLEX; +#define MPI_SIGNED_CHAR SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_SIGNED_CHAR) +#define MPI_UNSIGNED_CHAR SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UNSIGNED_CHAR) +#define MPI_UNSIGNED_SHORT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UNSIGNED_SHORT) +#define MPI_UNSIGNED SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UNSIGNED) +#define MPI_UNSIGNED_LONG SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UNSIGNED_LONG) +#define MPI_UNSIGNED_LONG_LONG SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UNSIGNED_LONG_LONG) +#define MPI_FLOAT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_FLOAT) +#define MPI_DOUBLE SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_DOUBLE) +#define MPI_LONG_DOUBLE SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_LONG_DOUBLE) +#define MPI_WCHAR SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_WCHAR) +#define MPI_C_BOOL SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_C_BOOL) +#define MPI_INT8_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INT8_T) +#define MPI_INT16_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INT16_T) +#define MPI_INT32_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INT32_T) +#define MPI_INT64_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INT64_T) +#define MPI_UINT8_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UINT8_T) +#define MPI_BYTE SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_BYTE) +#define MPI_UINT16_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UINT16_T) +#define MPI_UINT32_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UINT32_T) +#define MPI_UINT64_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UINT64_T) +#define MPI_C_FLOAT_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_C_FLOAT_COMPLEX) #define MPI_C_COMPLEX MPI_C_FLOAT_COMPLEX -XBT_PUBLIC_DATA const MPI_Datatype MPI_C_DOUBLE_COMPLEX; -XBT_PUBLIC_DATA const MPI_Datatype MPI_C_LONG_DOUBLE_COMPLEX; -XBT_PUBLIC_DATA const MPI_Datatype MPI_AINT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_OFFSET; -XBT_PUBLIC_DATA const MPI_Datatype MPI_LB; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UB; +#define MPI_C_DOUBLE_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_C_DOUBLE_COMPLEX) +#define MPI_C_LONG_DOUBLE_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_C_LONG_DOUBLE_COMPLEX) +#define MPI_AINT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_AINT) +#define MPI_OFFSET SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_OFFSET) +#define MPI_LB SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_LB) +#define MPI_UB SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UB) //The following are datatypes for the MPI functions MPI_MAXLOC and MPI_MINLOC. -XBT_PUBLIC_DATA const MPI_Datatype MPI_FLOAT_INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG_INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_DOUBLE_INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_SHORT_INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_2INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG_DOUBLE_INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_2FLOAT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_2DOUBLE; -XBT_PUBLIC_DATA const MPI_Datatype MPI_2LONG; // only for compatibility with Fortran - -XBT_PUBLIC_DATA const MPI_Datatype MPI_REAL; -XBT_PUBLIC_DATA const MPI_Datatype MPI_REAL4; -XBT_PUBLIC_DATA const MPI_Datatype MPI_REAL8; -XBT_PUBLIC_DATA const MPI_Datatype MPI_REAL16; -XBT_PUBLIC_DATA const MPI_Datatype MPI_COMPLEX8; -XBT_PUBLIC_DATA const MPI_Datatype MPI_COMPLEX16; -XBT_PUBLIC_DATA const MPI_Datatype MPI_COMPLEX32; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER1; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER2; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER4; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER8; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER16; - -XBT_PUBLIC_DATA const MPI_Datatype MPI_COUNT; +#define MPI_FLOAT_INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_FLOAT_INT) +#define MPI_LONG_INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_LONG_INT) +#define MPI_DOUBLE_INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_DOUBLE_INT) +#define MPI_SHORT_INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_SHORT_INT) +#define MPI_2INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_2INT) +#define MPI_LONG_DOUBLE_INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_LONG_DOUBLE_INT) +#define MPI_2FLOAT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_2FLOAT) +#define MPI_2DOUBLE SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_2DOUBLE) +#define MPI_2LONG SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_2LONG) + // only for compatibility with Fortran +#define MPI_REAL SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_REAL) +#define MPI_REAL4 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_REAL4) +#define MPI_REAL8 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_REAL8) +#define MPI_REAL16 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_REAL16) +#define MPI_COMPLEX8 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_COMPLEX8) +#define MPI_COMPLEX16 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_COMPLEX16) +#define MPI_COMPLEX32 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_COMPLEX32) +#define MPI_INTEGER1 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INTEGER1) +#define MPI_INTEGER2 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INTEGER2) +#define MPI_INTEGER4 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INTEGER4) +#define MPI_INTEGER8 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INTEGER8) +#define MPI_INTEGER16 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INTEGER16) +#define MPI_COUNT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_COUNT) + +#if defined(c_plusplus) || defined(__cplusplus) +#define MPI_CXX_BOOL SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CXX_BOOL) +#define MPI_CXX_FLOAT_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CXX_FLOAT_COMPLEX) +#define MPI_CXX_DOUBLE_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CXX_DOUBLE_COMPLEX) +#define MPI_CXX_LONG_DOUBLE_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CXX_LONG_DOUBLE_COMPLEX) +#else +#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 +#endif //defines for fortran compatibility -#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__) +#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__) || defined(__aarch64__) #define MPI_INTEGER MPI_INT #define MPI_2INTEGER MPI_2INT #define MPI_LOGICAL MPI_INT @@ -308,7 +392,7 @@ XBT_PUBLIC_DATA const MPI_Datatype MPI_COUNT; #define MPI_LOGICAL MPI_LONG #endif -#define MPI_Fint int +typedef int MPI_Fint; #define MPI_COMPLEX MPI_C_FLOAT_COMPLEX #define MPI_DOUBLE_COMPLEX MPI_C_DOUBLE_COMPLEX @@ -330,27 +414,45 @@ typedef void MPI_User_function(void *invec, void *inoutvec, int *len, MPI_Dataty typedef SMPI_Op *MPI_Op; #define MPI_OP_NULL ((MPI_Op)NULL) -XBT_PUBLIC_DATA MPI_Op MPI_MAX; -XBT_PUBLIC_DATA MPI_Op MPI_MIN; -XBT_PUBLIC_DATA MPI_Op MPI_MAXLOC; -XBT_PUBLIC_DATA MPI_Op MPI_MINLOC; -XBT_PUBLIC_DATA MPI_Op MPI_SUM; -XBT_PUBLIC_DATA MPI_Op MPI_PROD; -XBT_PUBLIC_DATA MPI_Op MPI_LAND; -XBT_PUBLIC_DATA MPI_Op MPI_LOR; -XBT_PUBLIC_DATA MPI_Op MPI_LXOR; -XBT_PUBLIC_DATA MPI_Op MPI_BAND; -XBT_PUBLIC_DATA MPI_Op MPI_BOR; -XBT_PUBLIC_DATA MPI_Op MPI_BXOR; +extern SMPI_Op smpi_MPI_MAX; +extern SMPI_Op smpi_MPI_MIN; +extern SMPI_Op smpi_MPI_MAXLOC; +extern SMPI_Op smpi_MPI_MINLOC; +extern SMPI_Op smpi_MPI_SUM; +extern SMPI_Op smpi_MPI_PROD; +extern SMPI_Op smpi_MPI_LAND; +extern SMPI_Op smpi_MPI_LOR; +extern SMPI_Op smpi_MPI_LXOR; +extern SMPI_Op smpi_MPI_BAND; +extern SMPI_Op smpi_MPI_BOR; +extern SMPI_Op smpi_MPI_BXOR; +extern SMPI_Op smpi_MPI_REPLACE; +extern SMPI_Op smpi_MPI_NO_OP; + +#define MPI_MAX SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_MAX) +#define MPI_MIN SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_MIN) +#define MPI_MAXLOC SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_MAXLOC) +#define MPI_MINLOC SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_MINLOC) +#define MPI_SUM SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_SUM) +#define MPI_PROD SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_PROD) +#define MPI_LAND SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_LAND) +#define MPI_LOR SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_LOR) +#define MPI_LXOR SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_LXOR) +#define MPI_BAND SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_BAND) +#define MPI_BOR SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_BOR) +#define MPI_BXOR SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_BXOR) + //For accumulate -XBT_PUBLIC_DATA MPI_Op MPI_REPLACE; -XBT_PUBLIC_DATA MPI_Op MPI_NO_OP; +#define MPI_REPLACE SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_REPLACE) +#define MPI_NO_OP SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_NO_OP) + typedef SMPI_Group* MPI_Group; -#define MPI_GROUP_NULL ((MPI_Group)NULL) +extern SMPI_Group smpi_MPI_GROUP_EMPTY; +#define MPI_GROUP_EMPTY SMPI_PREDEFINED_POINTER(MPI_Group, smpi_MPI_GROUP_EMPTY) -XBT_PUBLIC_DATA MPI_Group MPI_GROUP_EMPTY; +#define MPI_GROUP_NULL ((MPI_Group)NULL) typedef SMPI_Comm* MPI_Comm; @@ -366,7 +468,32 @@ typedef SMPI_Request* MPI_Request; typedef SMPI_Errhandler* MPI_Errhandler; #define MPI_ERRHANDLER_NULL ((MPI_Errhandler)NULL) +extern SMPI_Errhandler smpi_MPI_ERRORS_RETURN; +#define MPI_ERRORS_RETURN SMPI_PREDEFINED_POINTER(MPI_Errhandler, smpi_MPI_ERRORS_RETURN) +extern SMPI_Errhandler smpi_MPI_ERRORS_ARE_FATAL; +#define MPI_ERRORS_ARE_FATAL SMPI_PREDEFINED_POINTER(MPI_Errhandler, smpi_MPI_ERRORS_ARE_FATAL) +typedef enum SMPI_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 +}SMPI_Combiner_enum; typedef enum SMPI_Topo_type { MPI_GRAPH=1, @@ -437,6 +564,8 @@ 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_Address, (const void* location, MPI_Aint* address)); MPI_CALL(XBT_PUBLIC int, MPI_Get_address, (const void* location, MPI_Aint* address)); +MPI_CALL(XBT_PUBLIC MPI_Aint, MPI_Aint_diff, (MPI_Aint base, MPI_Aint disp)); +MPI_CALL(XBT_PUBLIC MPI_Aint, MPI_Aint_add, (MPI_Aint base, MPI_Aint disp)); MPI_CALL(XBT_PUBLIC int, MPI_Error_class, (int errorcode, int* errorclass)); MPI_CALL(XBT_PUBLIC int, MPI_Error_string, (int errorcode, char* string, int* resultlen)); @@ -451,7 +580,9 @@ 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_size_x, (MPI_Datatype datatype, MPI_Count* 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_extent_x, (MPI_Datatype datatype, MPI_Count* lb, MPI_Count* 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_get_true_extent_x, (MPI_Datatype datatype, MPI_Count* lb, MPI_Count* 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)); @@ -550,29 +681,35 @@ MPI_CALL(XBT_PUBLIC int, MPI_Comm_split_type, MPI_CALL(XBT_PUBLIC MPI_Comm, MPI_Comm_f2c, (MPI_Fint comm)); MPI_CALL(XBT_PUBLIC MPI_Fint, MPI_Comm_c2f, (MPI_Comm comm)); -MPI_CALL(XBT_PUBLIC int, MPI_Send_init, - (const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request)); -MPI_CALL(XBT_PUBLIC int, MPI_Recv_init, - (void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request* request)); + MPI_CALL(XBT_PUBLIC int, MPI_Start, (MPI_Request * request)); MPI_CALL(XBT_PUBLIC int, MPI_Startall, (int count, MPI_Request* requests)); MPI_CALL(XBT_PUBLIC int, MPI_Request_free, (MPI_Request * request)); +MPI_CALL(XBT_PUBLIC int, MPI_Recv, + (void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_Recv_init, + (void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_Irecv, (void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request* request)); +MPI_CALL(XBT_PUBLIC int, MPI_Send, (const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm)); +MPI_CALL(XBT_PUBLIC int, MPI_Send_init, + (const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_Isend, (const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request)); -MPI_CALL(XBT_PUBLIC int, MPI_Recv, - (void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_Send, (const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm)); MPI_CALL(XBT_PUBLIC int, MPI_Ssend, (const void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm)); MPI_CALL(XBT_PUBLIC int, MPI_Ssend_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_Issend, + (const void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_Bsend, (const void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm)); MPI_CALL(XBT_PUBLIC int, MPI_Bsend_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_Ibsend, (const void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request)); -MPI_CALL(XBT_PUBLIC int, MPI_Issend, +MPI_CALL(XBT_PUBLIC int, MPI_Rsend, (const void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm)); +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_Sendrecv, (const void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void* recvbuf, int recvcount, @@ -595,6 +732,7 @@ MPI_CALL(XBT_PUBLIC int, MPI_Iprobe, (int source, int tag, MPI_Comm comm, int* f MPI_CALL(XBT_PUBLIC int, MPI_Probe, (int source, int tag, MPI_Comm comm, MPI_Status* status)); 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 int, MPI_Cancel, (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)); @@ -764,6 +902,7 @@ 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_Status_set_elements_x, (MPI_Status * status, MPI_Datatype datatype, MPI_Count 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)); @@ -804,6 +943,11 @@ MPI_CALL(XBT_PUBLIC int, MPI_File_write_ordered, 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)); +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_Errhandler_set, (MPI_Comm comm, MPI_Errhandler errhandler)); MPI_CALL(XBT_PUBLIC int, MPI_Errhandler_create, (MPI_Handler_function * function, MPI_Errhandler* errhandler)); @@ -816,7 +960,18 @@ MPI_CALL(XBT_PUBLIC int, MPI_Comm_call_errhandler, (MPI_Comm comm, int errorcode MPI_CALL(XBT_PUBLIC int, MPI_Win_set_errhandler, (MPI_Win win, MPI_Errhandler errhandler)); MPI_CALL(XBT_PUBLIC int, MPI_Win_get_errhandler, (MPI_Win win, MPI_Errhandler* errhandler)); MPI_CALL(XBT_PUBLIC int, MPI_Win_create_errhandler, (MPI_Win_errhandler_fn * function, MPI_Errhandler* errhandler)); -MPI_CALL(XBT_PUBLIC int, MPI_Win_call_errhandler, (MPI_Win win, int errorcode));MPI_CALL(XBT_PUBLIC int, MPI_Type_get_envelope, +MPI_CALL(XBT_PUBLIC int, MPI_Win_call_errhandler, (MPI_Win win, int errorcode)); +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_Type_create_f90_integer, (int count, MPI_Datatype* newtype)); +MPI_CALL(XBT_PUBLIC int, MPI_Type_create_f90_real, (int prec, int exp, MPI_Datatype* newtype)); +MPI_CALL(XBT_PUBLIC int, MPI_Type_create_f90_complex, (int prec, int exp, MPI_Datatype* newtype)); + +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_get_envelope, (MPI_Datatype datatype, int* num_integers, int* num_addresses, int* num_datatypes, int* combiner)); MPI_CALL(XBT_PUBLIC int, MPI_File_call_errhandler, (MPI_File fh, int errorcode)); MPI_CALL(XBT_PUBLIC int, MPI_File_create_errhandler, @@ -825,41 +980,25 @@ MPI_CALL(XBT_PUBLIC int, MPI_File_set_errhandler, (MPI_File file, MPI_Errhandler MPI_CALL(XBT_PUBLIC int, MPI_File_get_errhandler, (MPI_File file, MPI_Errhandler* errhandler)); //FIXME: these are not yet implemented -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 void* MPI_Message; -#define MPI_DUP_FN 1 +#define MPI_MESSAGE_NULL NULL +#define MPI_MESSAGE_NO_PROC NULL + +#define MPI_DUP_FN ((void*) 1) +#define MPI_CONVERSION_FN_NULL NULL + +#define MPI_F_STATUS_IGNORE 0 +#define MPI_F_STATUSES_IGNORE NULL #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) #define MPI_COMM_DUP_FN ((MPI_Comm_copy_attr_function *)MPI_DUP_FN) #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; +extern SMPI_Datatype smpi_MPI_PACKED; +#define MPI_PACKED SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_PACKED) + -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_Cart_map, (MPI_Comm comm_old, int ndims, const int* dims, const int* periods, int* newrank)); MPI_CALL(XBT_PUBLIC int, MPI_Graph_create, (MPI_Comm comm_old, int nnodes, const int* index, const int* edges, int reorder, MPI_Comm* comm_graph)); @@ -872,23 +1011,15 @@ MPI_CALL(XBT_PUBLIC int, MPI_Topo_test, (MPI_Comm comm, int* top_type)); 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_Comm_test_inter, (MPI_Comm comm, int* flag)); MPI_CALL(XBT_PUBLIC int, MPI_Intercomm_create, (MPI_Comm local_comm, int local_leader, MPI_Comm peer_comm, int remote_leader, int tag, MPI_Comm* comm_out)); MPI_CALL(XBT_PUBLIC int, MPI_Intercomm_merge, (MPI_Comm comm, int high, MPI_Comm* comm_out)); MPI_CALL(XBT_PUBLIC int, MPI_Comm_remote_group, (MPI_Comm comm, MPI_Group* group)); MPI_CALL(XBT_PUBLIC int, MPI_Comm_remote_size, (MPI_Comm comm, int* size)); -MPI_CALL(XBT_PUBLIC int, MPI_Rsend, (const void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm)); -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_Get_elements, (MPI_Status * status, MPI_Datatype datatype, int* elements)); +MPI_CALL(XBT_PUBLIC int, MPI_Get_elements_x, (MPI_Status * status, MPI_Datatype datatype, MPI_Count* elements)); MPI_CALL(XBT_PUBLIC int, MPI_Pcontrol, (const int level, ...)); -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)); @@ -903,6 +1034,7 @@ MPI_CALL(XBT_PUBLIC int, MPI_Comm_connect, 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_idup, (MPI_Comm comm, MPI_Comm* newcomm, MPI_Request *request)); 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, (const char* port_name)); @@ -913,8 +1045,16 @@ 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_test, (MPI_Win win, int* flag)); +MPI_CALL(XBT_PUBLIC int, MPI_Dist_graph_create, (MPI_Comm comm_old, int n, const int* sources, const int* degrees, const int* destinations, + const int* weights, MPI_Info info, int reorder, MPI_Comm* comm_dist_graph)); +MPI_CALL(XBT_PUBLIC int, MPI_Dist_graph_create_adjacent, (MPI_Comm comm_old, int indegree, const int* sources, const int* sourceweights, + int outdegree, const int* destinations, const int* destweights, MPI_Info info, int reorder, MPI_Comm* comm_dist_graph)); +MPI_CALL(XBT_PUBLIC int, MPI_Dist_graph_neighbors, + (MPI_Comm comm, int maxindegree, int* sources, int* sourceweights, int maxoutdegree, int* destinations, + int* destweights)); +MPI_CALL(XBT_PUBLIC int, MPI_Dist_graph_neighbors_count, (MPI_Comm comm, int *indegree, int *outdegree, int *weighted)); +MPI_CALL(XBT_PUBLIC int, MPI_Win_test, (MPI_Win win, int* flag)); MPI_CALL(XBT_PUBLIC MPI_Fint, MPI_File_c2f, (MPI_File file)); MPI_CALL(XBT_PUBLIC MPI_File, MPI_File_f2c, (MPI_Fint file)); MPI_CALL(XBT_PUBLIC int, MPI_Register_datarep, (char* datarep, MPI_Datarep_conversion_function* read_conversion_fn, @@ -922,10 +1062,6 @@ MPI_CALL(XBT_PUBLIC int, MPI_Register_datarep, (char* datarep, MPI_Datarep_conve MPI_Datarep_extent_function* dtype_file_extent_fn, void* extra_state)); 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_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_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, @@ -964,10 +1100,41 @@ 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 MPI_Message, MPI_Message_f2c, (MPI_Fint message)); +MPI_CALL(XBT_PUBLIC MPI_Fint, MPI_Message_c2f, (MPI_Message message)); 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)); +MPI_CALL(XBT_PUBLIC int, MPI_Neighbor_allgather, (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, + int recvcount, MPI_Datatype recvtype, MPI_Comm comm)); +MPI_CALL(XBT_PUBLIC int, MPI_Neighbor_allgatherv, (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, + const int* recvcounts, const int* displs, MPI_Datatype recvtype, MPI_Comm comm)); +MPI_CALL(XBT_PUBLIC int, MPI_Neighbor_alltoall, (const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, + int recvcount, MPI_Datatype recvtype, MPI_Comm comm)); +MPI_CALL(XBT_PUBLIC int, MPI_Neighbor_alltoallv, + (const void* sendbuf, const int* sendcounts, const int* senddisps, MPI_Datatype sendtype, void* recvbuf, const int* recvcounts, + const int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm)); +MPI_CALL(XBT_PUBLIC int, MPI_Neighbor_alltoallw, + (const void* sendbuf, const int* sendcnts, const MPI_Aint* sdispls, const MPI_Datatype* sendtypes, void* recvbuf, const int* recvcnts, + const MPI_Aint* rdispls, const MPI_Datatype* recvtypes, MPI_Comm comm)); +MPI_CALL(XBT_PUBLIC int, MPI_Ineighbor_allgather, (const 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_Ineighbor_allgatherv, (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)); +MPI_CALL(XBT_PUBLIC int, MPI_Ineighbor_alltoall, (const 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_Ineighbor_alltoallv, + (const void* sendbuf, const int* sendcounts, const int* senddisps, MPI_Datatype sendtype, void* recvbuf, const int* recvcounts, + const int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Ineighbor_alltoallw, + (const void* sendbuf, const int* sendcounts, const MPI_Aint* senddisps, const MPI_Datatype* sendtypes, void* recvbuf, const int* recvcounts, + const MPI_Aint* recvdisps, const MPI_Datatype* recvtypes, MPI_Comm comm, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Status_f2c, (MPI_Fint *f_status, MPI_Status *c_status)); +MPI_CALL(XBT_PUBLIC int, MPI_Status_c2f, (MPI_Status *c_status, MPI_Fint *f_status)); + + + //FIXME: End of all the not yet implemented stuff // smpi functions @@ -976,17 +1143,22 @@ 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*); +XBT_PUBLIC void smpi_init_options(); XBT_PUBLIC void smpi_execute_flops(double flops); +XBT_PUBLIC void smpi_execute_flops_benched(double flops); XBT_PUBLIC void smpi_execute(double duration); XBT_PUBLIC void smpi_execute_benched(double duration); +XBT_PUBLIC void smpi_bench_begin(); +XBT_PUBLIC void smpi_bench_end(); + 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, 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); +XBT_PUBLIC void smpi_sample_1(int global, const char* file, const char* tag, int iters, double threshold); +XBT_PUBLIC int smpi_sample_2(int global, const char* file, const char* tag, int iter_count); +XBT_PUBLIC void smpi_sample_3(int global, const char* file, const char* tag); +XBT_PUBLIC int smpi_sample_exit(int global, const char* file, const char* tag, 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. @@ -1000,44 +1172,58 @@ XBT_PUBLIC void smpi_comm_set_copy_data_callback(void (*callback)(smx_activity_t */ XBT_PUBLIC void smpi_trace_set_call_location(const char* file, int line); /** Fortran binding **/ -XBT_PUBLIC void smpi_trace_set_call_location_(const char* file, int* line); +XBT_PUBLIC void smpi_trace_set_call_location_(const char* file, const int* line); /** Fortran binding + -fsecond-underscore **/ -XBT_PUBLIC void smpi_trace_set_call_location__(const char* file, int* line); +XBT_PUBLIC void smpi_trace_set_call_location__(const char* file, const int* line); #define SMPI_ITER_NAME1(line) _XBT_CONCAT(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_CTAG_NAME1(line) _XBT_CONCAT(ctag, line) +#define SMPI_CTAG_NAME(line) SMPI_CTAG_NAME1(line) + +#define SMPI_SAMPLE_LOOP(loop_init, loop_end, loop_iter, global, iters, thres, tag) \ + char SMPI_CTAG_NAME(__LINE__) [132]; \ + snprintf( SMPI_CTAG_NAME(__LINE__), 132, "%s%d", tag, __LINE__); \ + 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__, SMPI_CTAG_NAME(__LINE__), (iters), (thres)) \ + , (smpi_sample_2((global), __FILE__, SMPI_CTAG_NAME(__LINE__), SMPI_ITER_NAME(__LINE__)))) \ + : smpi_sample_exit((global), __FILE__, SMPI_CTAG_NAME(__LINE__), SMPI_ITER_NAME(__LINE__)); \ + smpi_sample_3((global), __FILE__, SMPI_CTAG_NAME(__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_LOCAL_TAG(loop_init, loop_end, loop_iter, iters, thres, tag) \ + SMPI_SAMPLE_LOOP(loop_init, (loop_end), (loop_iter), 0, (iters), (thres), tag) +#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_GLOBAL_TAG(loop_init, loop_end, loop_iter, iters, thres, tag) \ + SMPI_SAMPLE_LOOP(loop_init, (loop_end), (loop_iter), 1, (iters), (thres), tag) #define SMPI_SAMPLE_DELAY(duration) for(smpi_execute(duration); 0; ) #define SMPI_SAMPLE_FLOPS(flops) for(smpi_execute_flops(flops); 0; ) - XBT_PUBLIC void* smpi_shared_malloc(size_t size, const char* file, int line); -#define SMPI_SHARED_MALLOC(size) smpi_shared_malloc(size, __FILE__, __LINE__) -XBT_PUBLIC void* smpi_shared_malloc_partial(size_t size, size_t* shared_block_offsets, int nb_shared_blocks); +#define SMPI_SHARED_MALLOC(size) smpi_shared_malloc((size), __FILE__, __LINE__) +XBT_PUBLIC void* smpi_shared_malloc_partial(size_t size, const size_t* shared_block_offsets, int nb_shared_blocks); #define SMPI_PARTIAL_SHARED_MALLOC(size, shared_block_offsets, nb_shared_blocks) \ - smpi_shared_malloc_partial(size, shared_block_offsets, nb_shared_blocks) + smpi_shared_malloc_partial((size), (shared_block_offsets), (nb_shared_blocks)) + -XBT_PUBLIC void smpi_shared_free(void* data); #define SMPI_SHARED_FREE(data) smpi_shared_free(data) XBT_PUBLIC int smpi_shared_known_call(const char* func, const char* input); XBT_PUBLIC void* smpi_shared_get_call(const char* func, const char* input); XBT_PUBLIC void* smpi_shared_set_call(const char* func, const char* input, void* data); #define SMPI_SHARED_CALL(func, input, ...) \ - (smpi_shared_known_call(_XBT_STRINGIFY(func), input) \ - ? smpi_shared_get_call(_XBT_STRINGIFY(func), input) \ - : smpi_shared_set_call(_XBT_STRINGIFY(func), input, (func(__VA_ARGS__)))) + (smpi_shared_known_call(_XBT_STRINGIFY(func), (input)) \ + ? smpi_shared_get_call(_XBT_STRINGIFY(func), (input)) \ + : smpi_shared_set_call(_XBT_STRINGIFY(func), (input), ((func)(__VA_ARGS__)))) /* Fortran specific stuff */ @@ -1045,24 +1231,50 @@ XBT_PUBLIC int smpi_main(const char* program, int argc, char* argv[]); /* Trace replay specific stuff */ 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_main(int rank, const char* private_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 + const char* private_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(); +XBT_PUBLIC void SMPI_thread_create(); -SG_END_DECL() +SG_END_DECL -/* C++ declarations for shared_malloc */ +/* C++ declarations for shared_malloc and default copy buffer callback */ #ifdef __cplusplus -XBT_PUBLIC int smpi_is_shared(void* ptr, std::vector>& private_blocks, size_t* offset); +XBT_PUBLIC int smpi_is_shared(const void* ptr, std::vector>& private_blocks, size_t* offset); std::vector> shift_and_frame_private_blocks(const std::vector>& vec, size_t offset, size_t buff_size); std::vector> merge_private_blocks(const std::vector>& src, const std::vector>& dst); + +/* May be used by S4U simulations to manually initialize SMPI */ +XBT_PUBLIC void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, + size_t buff_size); + +/** + * @brief Callback to set cost for SMPI operations (send, recv, isend) + * + * This callback replaces the configuration parameters smpi/or, smpi/os, smpi/ois. + * It offers more flexibility for cost functions. + * + * @param size Size of message being received/sent + * @param source Source host + * @param dst Destination host + */ +using SmpiOpCostCb = std::function; +/** @brief SMPI functions that accept cost functions */ +enum class SmpiOperation { RECV = 2, SEND = 1, ISEND = 0 }; +/** + * @brief Register a cost callback for some SMPI function (MPI_Send, MPI_ISend or MPI_Recv) + * + * @param op SMPI function + * @param cb User's callback + */ +XBT_PUBLIC void smpi_register_op_cost_callback(SmpiOperation op, const SmpiOpCostCb& cb); #endif -#endif +#endif