#include <limits.h>
#include <stdio.h>
-
+#include "smpi_mpi_dt_private.h"
#include "private.h"
#include "xbt.h"
-static xbt_dict_t comm_lookup = NULL;
-static xbt_dict_t group_lookup = NULL;
-static xbt_dict_t request_lookup = NULL;
-static xbt_dict_t datatype_lookup = NULL;
-static xbt_dict_t op_lookup = NULL;
-static xbt_dict_t win_lookup = NULL;
-static xbt_dict_t info_lookup = NULL;
+//TODO : remove all this.
+static xbt_dict_t comm_lookup = nullptr;
+static xbt_dict_t group_lookup = nullptr;
+static xbt_dict_t request_lookup = nullptr;
+static xbt_dict_t type_lookup = nullptr;
+static xbt_dict_t op_lookup = nullptr;
+static xbt_dict_t win_lookup = nullptr;
+static xbt_dict_t info_lookup = nullptr;
+static int comm_id=0;
+static int group_id=0;
+static int request_id=0;
+static int type_id=0;
+static int op_id=0;
+static int win_id=0;
+static int info_id=0;
+
static int running_processes = 0;
typedef unsigned long int uinteger;
#endif
-/* Bindings for MPI special values */
- struct s_smpi_common {
- integer _MPI_IN_PLACE;
- integer _MPI_BOTTOM;
- integer _MPI_STATUS_IGNORE;
- integer _MPI_STATUSES_IGNORE;
- } smpi_;
-
/* Convert between Fortran and C */
-#define FORT_ADDR(addr, val) \
- (((void *)(addr) == (void*) &(smpi_._ ## val)) \
- ? (val) : (void *)(addr))
-#define FORT_BOTTOM(addr) FORT_ADDR(addr, MPI_BOTTOM)
-#define FORT_IN_PLACE(addr) FORT_ADDR(addr, MPI_IN_PLACE)
-#define FORT_STATUS_IGNORE(addr) static_cast<MPI_Status*>(FORT_ADDR(addr, MPI_STATUS_IGNORE))
-#define FORT_STATUSES_IGNORE(addr) static_cast<MPI_Status*>(FORT_ADDR(addr, MPI_STATUSES_IGNORE))
+
+#define FORT_BOTTOM(addr) ((*(int*)addr) == -200 ? MPI_BOTTOM : (void*)addr)
+#define FORT_IN_PLACE(addr) ((*(int*)addr) == -100 ? MPI_IN_PLACE : (void*)addr)
+#define FORT_STATUS_IGNORE(addr) (static_cast<MPI_Status*>((*(int*)addr) == -300 ? MPI_STATUS_IGNORE : (void*)addr))
+#define FORT_STATUSES_IGNORE(addr) (static_cast<MPI_Status*>((*(int*)addr) == -400 ? MPI_STATUSES_IGNORE : (void*)addr))
#define KEY_SIZE (sizeof(int) * 2 + 1)
}
static void smpi_init_fortran_types(){
- if(!comm_lookup){
- comm_lookup = xbt_dict_new_homogeneous(NULL);
- smpi_comm_c2f(MPI_COMM_WORLD);
- group_lookup = xbt_dict_new_homogeneous(NULL);
- request_lookup = xbt_dict_new_homogeneous(NULL);
- datatype_lookup = xbt_dict_new_homogeneous(NULL);
- win_lookup = xbt_dict_new_homogeneous(NULL);
- info_lookup = xbt_dict_new_homogeneous(NULL);
- smpi_type_c2f(MPI_BYTE);
- smpi_type_c2f(MPI_CHAR);
- #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
- smpi_type_c2f(MPI_INT);
- smpi_type_c2f(MPI_INT);
- #else
- smpi_type_c2f(MPI_LONG);
- smpi_type_c2f(MPI_LONG);
- #endif
- smpi_type_c2f(MPI_INT8_T);
- smpi_type_c2f(MPI_INT16_T);
- smpi_type_c2f(MPI_INT32_T);
- smpi_type_c2f(MPI_INT64_T);
- smpi_type_c2f(MPI_FLOAT);
- smpi_type_c2f(MPI_FLOAT);
- smpi_type_c2f(MPI_DOUBLE);
- smpi_type_c2f(MPI_DOUBLE);
- smpi_type_c2f(MPI_C_FLOAT_COMPLEX);
- smpi_type_c2f(MPI_C_DOUBLE_COMPLEX);
- #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
- smpi_type_c2f(MPI_2INT);
- #else
- smpi_type_c2f(MPI_2LONG);
- #endif
- smpi_type_c2f(MPI_UINT8_T);
- smpi_type_c2f(MPI_UINT16_T);
- smpi_type_c2f(MPI_UINT32_T);
- smpi_type_c2f(MPI_UINT64_T);
- smpi_type_c2f(MPI_2FLOAT);
- smpi_type_c2f(MPI_2DOUBLE);
- smpi_type_c2f(MPI_DOUBLE);
- smpi_type_c2f(MPI_DOUBLE);
- smpi_type_c2f(MPI_INT);
- smpi_type_c2f(MPI_DATATYPE_NULL);
- smpi_type_c2f(MPI_DATATYPE_NULL);
- smpi_type_c2f(MPI_DATATYPE_NULL);
- smpi_type_c2f(MPI_DATATYPE_NULL);
- op_lookup = xbt_dict_new_homogeneous(NULL);
- smpi_op_c2f(MPI_MAX);
- smpi_op_c2f(MPI_MIN);
- smpi_op_c2f(MPI_MAXLOC);
- smpi_op_c2f(MPI_MINLOC);
- smpi_op_c2f(MPI_SUM);
- smpi_op_c2f(MPI_PROD);
- smpi_op_c2f(MPI_LAND);
- smpi_op_c2f(MPI_LOR);
- smpi_op_c2f(MPI_LXOR);
- smpi_op_c2f(MPI_BAND);
- smpi_op_c2f(MPI_BOR);
- smpi_op_c2f(MPI_BXOR);
+ if(comm_lookup == nullptr){
+ comm_lookup = xbt_dict_new_homogeneous(nullptr);
+ smpi_comm_add_f(MPI_COMM_WORLD);
+ group_lookup = xbt_dict_new_homogeneous(nullptr);
+ request_lookup = xbt_dict_new_homogeneous(nullptr);
+ type_lookup = xbt_dict_new_homogeneous(nullptr);
+ win_lookup = xbt_dict_new_homogeneous(nullptr);
+ info_lookup = xbt_dict_new_homogeneous(nullptr);
+ smpi_type_add_f(MPI_BYTE);//MPI_BYTE
+ smpi_type_add_f(MPI_CHAR);//MPI_CHARACTER
+#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
+ smpi_type_add_f(MPI_C_BOOL);//MPI_LOGICAL
+ smpi_type_add_f(MPI_INT);//MPI_INTEGER
+#else
+ smpi_type_add_f(MPI_C_BOOL);//MPI_LOGICAL
+ smpi_type_add_f(MPI_LONG);//MPI_INTEGER
+#endif
+ smpi_type_add_f(MPI_INT8_T);//MPI_INTEGER1
+ smpi_type_add_f(MPI_INT16_T);//MPI_INTEGER2
+ smpi_type_add_f(MPI_INT32_T);//MPI_INTEGER4
+ smpi_type_add_f(MPI_INT64_T);//MPI_INTEGER8
+ smpi_type_add_f(MPI_REAL);//MPI_REAL
+ smpi_type_add_f(MPI_REAL4);//MPI_REAL4
+ smpi_type_add_f(MPI_REAL8);//MPI_REAL8
+ smpi_type_add_f(MPI_DOUBLE);//MPI_DOUBLE_PRECISION
+ smpi_type_add_f(MPI_C_FLOAT_COMPLEX);//MPI_COMPLEX
+ smpi_type_add_f(MPI_C_DOUBLE_COMPLEX);//MPI_DOUBLE_COMPLEX
+#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
+ smpi_type_add_f(MPI_2INT);//MPI_2INTEGER
+#else
+ smpi_type_add_f(MPI_2LONG);//MPI_2INTEGER
+#endif
+ smpi_type_add_f(MPI_UINT8_T);//MPI_LOGICAL1
+ smpi_type_add_f(MPI_UINT16_T);//MPI_LOGICAL2
+ smpi_type_add_f(MPI_UINT32_T);//MPI_LOGICAL4
+ smpi_type_add_f(MPI_UINT64_T);//MPI_LOGICAL8
+ smpi_type_add_f(MPI_2FLOAT);//MPI_2REAL
+ smpi_type_add_f(MPI_2DOUBLE);//MPI_2DOUBLE_PRECISION
+ smpi_type_add_f(MPI_PTR);//MPI_AINT
+ smpi_type_add_f(MPI_OFFSET);//MPI_OFFSET
+ smpi_type_add_f(MPI_AINT);//MPI_COUNT
+ smpi_type_add_f(MPI_DATATYPE_NULL);//MPI_REAL16
+ smpi_type_add_f(MPI_DATATYPE_NULL);//MPI_COMPLEX8
+ smpi_type_add_f(MPI_DATATYPE_NULL);//MPI_COMPLEX16
+ smpi_type_add_f(MPI_DATATYPE_NULL);//MPI_COMPLEX32
+ smpi_type_add_f(MPI_DATATYPE_NULL);//MPI_PACKED
+ op_lookup = xbt_dict_new_homogeneous(nullptr);
+ smpi_op_add_f(MPI_MAX);
+ smpi_op_add_f(MPI_MIN);
+ smpi_op_add_f(MPI_MAXLOC);
+ smpi_op_add_f(MPI_MINLOC);
+ smpi_op_add_f(MPI_SUM);
+ smpi_op_add_f(MPI_PROD);
+ smpi_op_add_f(MPI_LAND);
+ smpi_op_add_f(MPI_LOR);
+ smpi_op_add_f(MPI_LXOR);
+ smpi_op_add_f(MPI_BAND);
+ smpi_op_add_f(MPI_BOR);
+ smpi_op_add_f(MPI_BXOR);
}
}
-int smpi_comm_c2f(MPI_Comm comm) {
- static int comm_id = 0;
- char key[KEY_SIZE];
- xbt_dict_set(comm_lookup, comm==MPI_COMM_WORLD? get_key(key, comm_id) : get_key_id(key, comm_id), comm, NULL);
- comm_id++;
- return comm_id-1;
-}
-
-static void free_comm(int comm) {
+template <typename T> int smpi_add_f(T t, xbt_dict_t dict, int* id) {
char key[KEY_SIZE];
- xbt_dict_remove(comm_lookup, comm==0? get_key(key, comm) : get_key_id(key, comm));
-}
-
-MPI_Comm smpi_comm_f2c(int comm) {
- smpi_init_fortran_types();
- if(comm == -2) {
- return MPI_COMM_SELF;
- }else if(comm==0){
- return MPI_COMM_WORLD;
- } else if(comm_lookup && comm >= 0) {
- char key[KEY_SIZE];
- MPI_Comm tmp = (MPI_Comm)xbt_dict_get_or_null(comm_lookup,get_key_id(key, comm));
- return tmp != NULL ? tmp : MPI_COMM_NULL ;
- }
- return MPI_COMM_NULL;
+ xbt_dict_set(dict, get_key(key, *id), t, nullptr);
+ (*id)++;
+ return *id-1;
}
-int smpi_group_c2f(MPI_Group group) {
- static int group_id = 0;
+template <> int smpi_add_f<MPI_Comm>(MPI_Comm comm, xbt_dict_t dict, int* id) {
char key[KEY_SIZE];
- xbt_dict_set(group_lookup, get_key(key, group_id), group, NULL);
- group_id++;
- return group_id-1;
-}
-
-MPI_Group smpi_group_f2c(int group) {
- smpi_init_fortran_types();
- if(group == -2) {
- return MPI_GROUP_EMPTY;
- } else if(group_lookup && group >= 0) {
- char key[KEY_SIZE];
- return (MPI_Group)xbt_dict_get_or_null(group_lookup, get_key(key, group));
- }
- return MPI_GROUP_NULL;
+ xbt_dict_set(dict, comm==MPI_COMM_WORLD? get_key(key, *id) : get_key_id(key, *id), comm, nullptr);
+ (*id)++;
+ return *id-1;
}
-static void free_group(int group) {
+template <> int smpi_add_f<MPI_Request>(MPI_Request request, xbt_dict_t dict, int* id) {
char key[KEY_SIZE];
- xbt_dict_remove(group_lookup, get_key(key, group));
+ xbt_dict_set(dict, get_key_id(key, *id), request, nullptr);
+ (*id)++;
+ return *id-1;
}
-int smpi_request_c2f(MPI_Request req) {
- static int request_id = 0;
- char key[KEY_SIZE];
- xbt_dict_set(request_lookup, get_key_id(key, request_id), req, NULL);
- request_id++;
- return request_id-1;
+template <typename T> int smpi_c2f(T t, xbt_dict_t dict, int* id) {
+ char* existing_key = xbt_dict_get_key(dict, t);
+ if(existing_key!=nullptr)
+ return atoi(existing_key);
+ else
+ return smpi_add_f<T>(t,dict,id);
}
-MPI_Request smpi_request_f2c(int req) {
- smpi_init_fortran_types();
+template <typename T> void free_f(int id, xbt_dict_t dict) {
char key[KEY_SIZE];
- if(req==MPI_FORTRAN_REQUEST_NULL)return MPI_REQUEST_NULL;
- return (MPI_Request)xbt_dict_get(request_lookup, get_key_id(key, req));
+ xbt_dict_remove(dict, get_key(key, id));
}
-static void free_request(int request) {
+template <> void free_f<MPI_Comm>(int id, xbt_dict_t dict) {
char key[KEY_SIZE];
- if(request!=MPI_FORTRAN_REQUEST_NULL)
- xbt_dict_remove(request_lookup, get_key_id(key, request));
+ xbt_dict_remove(dict, id==0? get_key(key, id) : get_key_id(key, id));
}
-int smpi_type_c2f(MPI_Datatype datatype) {
- static int datatype_id = 0;
+template <> void free_f<MPI_Request>(int id, xbt_dict_t dict) {
char key[KEY_SIZE];
- xbt_dict_set(datatype_lookup, get_key(key, datatype_id), datatype, NULL);
- datatype_id++;
- return datatype_id-1;
+ if(id!=MPI_FORTRAN_REQUEST_NULL)
+ xbt_dict_remove(dict, get_key_id(key, id));
}
-MPI_Datatype smpi_type_f2c(int datatype) {
+template <typename T> T smpi_f2c(int id, xbt_dict_t dict, void* null_id ) {
smpi_init_fortran_types();
char key[KEY_SIZE];
- return datatype >= 0 ? (MPI_Datatype)xbt_dict_get_or_null(datatype_lookup, get_key(key, datatype)): MPI_DATATYPE_NULL;
-}
-
-static void free_datatype(int datatype) {
- char key[KEY_SIZE];
- xbt_dict_remove(datatype_lookup, get_key(key, datatype));
-}
-
-int smpi_op_c2f(MPI_Op op) {
- static int op_id = 0;
- char key[KEY_SIZE];
- xbt_dict_set(op_lookup, get_key(key, op_id), op, NULL);
- op_id++;
- return op_id-1;
+ return id >= 0 ? static_cast<T>(xbt_dict_get_or_null(dict, get_key(key, id))): static_cast<T>(null_id);
}
-MPI_Op smpi_op_f2c(int op) {
+template <> MPI_Comm smpi_f2c<MPI_Comm>(int comm, xbt_dict_t dict, void* null_id) {
smpi_init_fortran_types();
- char key[KEY_SIZE];
- return op >= 0 ? (MPI_Op)xbt_dict_get_or_null(op_lookup, get_key(key, op)): MPI_OP_NULL;
-}
-
-static void free_op(int op) {
- char key[KEY_SIZE];
- xbt_dict_remove(op_lookup, get_key(key, op));
-}
-
-int smpi_win_c2f(MPI_Win win) {
- static int win_id = 0;
- char key[KEY_SIZE];
- xbt_dict_set(win_lookup, get_key(key, win_id), win, NULL);
- win_id++;
- return win_id-1;
+ if(comm == -2) {
+ return MPI_COMM_SELF;
+ } else if(comm==0){
+ return MPI_COMM_WORLD;
+ } else if(dict != nullptr && comm >= 0) {
+ char key[KEY_SIZE];
+ MPI_Comm tmp = static_cast<MPI_Comm>(xbt_dict_get_or_null(dict,get_key_id(key, comm)));
+ return tmp != nullptr ? tmp : static_cast<MPI_Comm>(null_id) ;
+ } else {
+ return static_cast<MPI_Comm>(null_id);
+ }
}
-MPI_Win smpi_win_f2c(int win) {
+template <> MPI_Group smpi_f2c<MPI_Group>(int group, xbt_dict_t dict, void* null_id) {
smpi_init_fortran_types();
- char key[KEY_SIZE];
- return win >= 0 ? (MPI_Win)xbt_dict_get_or_null(win_lookup, get_key(key, win)) : MPI_WIN_NULL;
-}
-
-static void free_win(int win) {
- char key[KEY_SIZE];
- xbt_dict_remove(win_lookup, get_key(key, win));
-}
-
-int smpi_info_c2f(MPI_Info info) {
- static int info_id = 0;
- char key[KEY_SIZE];
- xbt_dict_set(info_lookup, get_key(key, info_id), info, NULL);
- info_id++;
- return info_id-1;
+ if(group == -2) {
+ return MPI_GROUP_EMPTY;
+ } else if(dict != nullptr && group >= 0) {
+ char key[KEY_SIZE];
+ return static_cast<MPI_Group>(xbt_dict_get_or_null(dict, get_key(key, group)));
+ } else {
+ return static_cast<MPI_Group>(null_id);
+ }
}
-MPI_Info smpi_info_f2c(int info) {
+template <> MPI_Request smpi_f2c<MPI_Request>(int request, xbt_dict_t dict, void* null_id) {
smpi_init_fortran_types();
char key[KEY_SIZE];
- return info >= 0 ? (MPI_Info)xbt_dict_get_or_null(info_lookup, get_key(key, info)) : MPI_INFO_NULL;
-}
-
-static void free_info(int info) {
- char key[KEY_SIZE];
- xbt_dict_remove(info_lookup, get_key(key, info));
-}
+ if(request==MPI_FORTRAN_REQUEST_NULL)
+ return static_cast<MPI_Request>(null_id);
+ return static_cast<MPI_Request>(xbt_dict_get(dict, get_key_id(key, request)));
+}
+
+#define SMPI_F2C_C2F(type, name, null_id)\
+int smpi_##name##_add_f(type name){\
+ return smpi_add_f<type>(name, name##_lookup, &name##_id);\
+}\
+int smpi_##name##_c2f(type name){\
+ return smpi_c2f<type>(name, name##_lookup, &name##_id);\
+}\
+static void free_##name(int id) {\
+ free_f<type>(id, name##_lookup);\
+}\
+type smpi_##name##_f2c(int id){\
+ return smpi_f2c<type>(id, name##_lookup, static_cast<void*>(null_id));\
+}
+
+extern "C" { // This should really use the C linkage to be usable from Fortran
+
+SMPI_F2C_C2F(MPI_Comm, comm, MPI_COMM_NULL)
+SMPI_F2C_C2F(MPI_Group, group, MPI_GROUP_NULL)
+SMPI_F2C_C2F(MPI_Request, request, MPI_REQUEST_NULL)
+SMPI_F2C_C2F(MPI_Datatype, type, MPI_DATATYPE_NULL)
+SMPI_F2C_C2F(MPI_Win, win, MPI_WIN_NULL)
+SMPI_F2C_C2F(MPI_Op, op, MPI_OP_NULL)
+SMPI_F2C_C2F(MPI_Info, info, MPI_INFO_NULL)
void mpi_init_(int* ierr) {
smpi_init_fortran_types();
- *ierr = MPI_Init(NULL, NULL);
+ *ierr = MPI_Init(nullptr, nullptr);
running_processes++;
}
running_processes--;
if(running_processes==0){
xbt_dict_free(&op_lookup);
- xbt_dict_free(&datatype_lookup);
+ xbt_dict_free(&type_lookup);
xbt_dict_free(&request_lookup);
xbt_dict_free(&group_lookup);
xbt_dict_free(&comm_lookup);
xbt_dict_free(&win_lookup);
+ xbt_dict_free(&info_lookup);
}
}
*ierr = MPI_Comm_size(smpi_comm_f2c(*comm), size);
}
-double mpi_wtime_(void) {
+double mpi_wtime_() {
return MPI_Wtime();
}
-double mpi_wtick_(void) {
+double mpi_wtick_() {
return MPI_Wtick();
}
*ierr = MPI_Comm_dup(smpi_comm_f2c(*comm), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newcomm = smpi_comm_c2f(tmp);
+ *newcomm = smpi_comm_add_f(tmp);
}
}
*ierr = MPI_Comm_create(smpi_comm_f2c(*comm),smpi_group_f2c(*group), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newcomm = smpi_comm_c2f(tmp);
+ *newcomm = smpi_comm_add_f(tmp);
}
}
*ierr = MPI_Comm_split(smpi_comm_f2c(*comm), *color, *key, &tmp);
if(*ierr == MPI_SUCCESS) {
- *comm_out = smpi_comm_c2f(tmp);
+ *comm_out = smpi_comm_add_f(tmp);
}
}
*ierr = MPI_Group_incl(smpi_group_f2c(*group), *n, ranks, &tmp);
if(*ierr == MPI_SUCCESS) {
- *group_out = smpi_group_c2f(tmp);
+ *group_out = smpi_group_add_f(tmp);
}
}
void mpi_send_init_(void *buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* request, int* ierr) {
MPI_Request req;
- buf = (char *) FORT_BOTTOM(buf);
+ buf = static_cast<char *>(FORT_BOTTOM(buf));
*ierr = MPI_Send_init(buf, *count, smpi_type_f2c(*datatype), *dst, *tag, smpi_comm_f2c(*comm), &req);
if(*ierr == MPI_SUCCESS) {
- *request = smpi_request_c2f(req);
+ *request = smpi_request_add_f(req);
}
}
void mpi_isend_(void *buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* request, int* ierr) {
MPI_Request req;
- buf = (char *) FORT_BOTTOM(buf);
+ buf = static_cast<char *>(FORT_BOTTOM(buf));
*ierr = MPI_Isend(buf, *count, smpi_type_f2c(*datatype), *dst, *tag, smpi_comm_f2c(*comm), &req);
if(*ierr == MPI_SUCCESS) {
- *request = smpi_request_c2f(req);
+ *request = smpi_request_add_f(req);
}
}
void mpi_irsend_(void *buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* request, int* ierr) {
MPI_Request req;
- buf = (char *) FORT_BOTTOM(buf);
+ buf = static_cast<char *>(FORT_BOTTOM(buf));
*ierr = MPI_Irsend(buf, *count, smpi_type_f2c(*datatype), *dst, *tag, smpi_comm_f2c(*comm), &req);
if(*ierr == MPI_SUCCESS) {
- *request = smpi_request_c2f(req);
+ *request = smpi_request_add_f(req);
}
}
void mpi_send_(void* buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* ierr) {
- buf = (char *) FORT_BOTTOM(buf);
+ buf = static_cast<char *>(FORT_BOTTOM(buf));
*ierr = MPI_Send(buf, *count, smpi_type_f2c(*datatype), *dst, *tag, smpi_comm_f2c(*comm));
}
void mpi_rsend_(void* buf, int* count, int* datatype, int* dst, int* tag, int* comm, int* ierr) {
- buf = (char *) FORT_BOTTOM(buf);
+ buf = static_cast<char *>(FORT_BOTTOM(buf));
*ierr = MPI_Rsend(buf, *count, smpi_type_f2c(*datatype), *dst, *tag, smpi_comm_f2c(*comm));
}
void mpi_sendrecv_(void* sendbuf, int* sendcount, int* sendtype, int* dst, int* sendtag, void *recvbuf, int* recvcount,
int* recvtype, int* src, int* recvtag, int* comm, MPI_Status* status, int* ierr) {
- sendbuf = (char *) FORT_BOTTOM(sendbuf);
- recvbuf = (char *) FORT_BOTTOM(recvbuf);
+ sendbuf = static_cast<char *>( FORT_BOTTOM(sendbuf));
+ recvbuf = static_cast<char *>( FORT_BOTTOM(recvbuf));
*ierr = MPI_Sendrecv(sendbuf, *sendcount, smpi_type_f2c(*sendtype), *dst, *sendtag, recvbuf, *recvcount,
smpi_type_f2c(*recvtype), *src, *recvtag, smpi_comm_f2c(*comm), FORT_STATUS_IGNORE(status));
}
void mpi_recv_init_(void *buf, int* count, int* datatype, int* src, int* tag, int* comm, int* request, int* ierr) {
MPI_Request req;
- buf = (char *) FORT_BOTTOM(buf);
+ buf = static_cast<char *>( FORT_BOTTOM(buf));
*ierr = MPI_Recv_init(buf, *count, smpi_type_f2c(*datatype), *src, *tag, smpi_comm_f2c(*comm), &req);
if(*ierr == MPI_SUCCESS) {
- *request = smpi_request_c2f(req);
+ *request = smpi_request_add_f(req);
}
}
void mpi_irecv_(void *buf, int* count, int* datatype, int* src, int* tag, int* comm, int* request, int* ierr) {
MPI_Request req;
- buf = (char *) FORT_BOTTOM(buf);
+ buf = static_cast<char *>( FORT_BOTTOM(buf));
*ierr = MPI_Irecv(buf, *count, smpi_type_f2c(*datatype), *src, *tag, smpi_comm_f2c(*comm), &req);
if(*ierr == MPI_SUCCESS) {
- *request = smpi_request_c2f(req);
+ *request = smpi_request_add_f(req);
}
}
void mpi_recv_(void* buf, int* count, int* datatype, int* src, int* tag, int* comm, MPI_Status* status, int* ierr) {
- buf = (char *) FORT_BOTTOM(buf);
+ buf = static_cast<char *>( FORT_BOTTOM(buf));
*ierr = MPI_Recv(buf, *count, smpi_type_f2c(*datatype), *src, *tag, smpi_comm_f2c(*comm), status);
}
reqs[i] = smpi_request_f2c(requests[i]);
}
*ierr = MPI_Startall(*count, reqs);
- free(reqs);
+ xbt_free(reqs);
}
void mpi_wait_(int* request, MPI_Status* status, int* ierr) {
free_request(requests[*index]);
requests[*index]=MPI_FORTRAN_REQUEST_NULL;
}
- free(reqs);
+ xbt_free(reqs);
}
void mpi_waitall_(int* count, int* requests, MPI_Status* status, int* ierr) {
}
}
- free(reqs);
+ xbt_free(reqs);
}
void mpi_barrier_(int* comm, int* ierr) {
}
void mpi_reduce_(void* sendbuf, void* recvbuf, int* count, int* datatype, int* op, int* root, int* comm, int* ierr) {
- sendbuf = (char *) FORT_IN_PLACE(sendbuf);
- sendbuf = (char *) FORT_BOTTOM(sendbuf);
- recvbuf = (char *) FORT_BOTTOM(recvbuf);
+ sendbuf = static_cast<char *>( FORT_IN_PLACE(sendbuf));
+ sendbuf = static_cast<char *>( FORT_BOTTOM(sendbuf));
+ recvbuf = static_cast<char *>( FORT_BOTTOM(recvbuf));
*ierr = MPI_Reduce(sendbuf, recvbuf, *count, smpi_type_f2c(*datatype), smpi_op_f2c(*op), *root, smpi_comm_f2c(*comm));
}
void mpi_allreduce_(void* sendbuf, void* recvbuf, int* count, int* datatype, int* op, int* comm, int* ierr) {
- sendbuf = (char *) FORT_IN_PLACE(sendbuf);
+ sendbuf = static_cast<char *>( FORT_IN_PLACE(sendbuf));
*ierr = MPI_Allreduce(sendbuf, recvbuf, *count, smpi_type_f2c(*datatype), smpi_op_f2c(*op), smpi_comm_f2c(*comm));
}
void mpi_reduce_scatter_(void* sendbuf, void* recvbuf, int* recvcounts, int* datatype, int* op, int* comm, int* ierr) {
- sendbuf = (char *) FORT_IN_PLACE(sendbuf);
+ sendbuf = static_cast<char *>( FORT_IN_PLACE(sendbuf));
*ierr = MPI_Reduce_scatter(sendbuf, recvbuf, recvcounts, smpi_type_f2c(*datatype),
smpi_op_f2c(*op), smpi_comm_f2c(*comm));
}
void mpi_scatter_(void* sendbuf, int* sendcount, int* sendtype, void* recvbuf, int* recvcount, int* recvtype,
int* root, int* comm, int* ierr) {
- recvbuf = (char *) FORT_IN_PLACE(recvbuf);
+ recvbuf = static_cast<char *>( FORT_IN_PLACE(recvbuf));
*ierr = MPI_Scatter(sendbuf, *sendcount, smpi_type_f2c(*sendtype),
recvbuf, *recvcount, smpi_type_f2c(*recvtype), *root, smpi_comm_f2c(*comm));
}
void mpi_scatterv_(void* sendbuf, int* sendcounts, int* displs, int* sendtype,
void* recvbuf, int* recvcount, int* recvtype, int* root, int* comm, int* ierr) {
- recvbuf = (char *) FORT_IN_PLACE(recvbuf);
+ recvbuf = static_cast<char *>( FORT_IN_PLACE(recvbuf));
*ierr = MPI_Scatterv(sendbuf, sendcounts, displs, smpi_type_f2c(*sendtype),
recvbuf, *recvcount, smpi_type_f2c(*recvtype), *root, smpi_comm_f2c(*comm));
}
void mpi_gather_(void* sendbuf, int* sendcount, int* sendtype, void* recvbuf, int* recvcount, int* recvtype,
int* root, int* comm, int* ierr) {
- sendbuf = (char *) FORT_IN_PLACE(sendbuf);
- sendbuf = (char *) FORT_BOTTOM(sendbuf);
- recvbuf = (char *) FORT_BOTTOM(recvbuf);
+ sendbuf = static_cast<char *>( FORT_IN_PLACE(sendbuf));
+ sendbuf = sendbuf!=MPI_IN_PLACE ? static_cast<char *>( FORT_BOTTOM(sendbuf)) : MPI_IN_PLACE;
+ recvbuf = static_cast<char *>( FORT_BOTTOM(recvbuf));
*ierr = MPI_Gather(sendbuf, *sendcount, smpi_type_f2c(*sendtype),
recvbuf, *recvcount, smpi_type_f2c(*recvtype), *root, smpi_comm_f2c(*comm));
}
void mpi_gatherv_(void* sendbuf, int* sendcount, int* sendtype,
void* recvbuf, int* recvcounts, int* displs, int* recvtype, int* root, int* comm, int* ierr) {
- sendbuf = (char *) FORT_IN_PLACE(sendbuf);
- sendbuf = (char *) FORT_BOTTOM(sendbuf);
- recvbuf = (char *) FORT_BOTTOM(recvbuf);
+ sendbuf = static_cast<char *>( FORT_IN_PLACE(sendbuf));
+ sendbuf = sendbuf!=MPI_IN_PLACE ? static_cast<char *>( FORT_BOTTOM(sendbuf)) : MPI_IN_PLACE;
+ recvbuf = static_cast<char *>( FORT_BOTTOM(recvbuf));
*ierr = MPI_Gatherv(sendbuf, *sendcount, smpi_type_f2c(*sendtype),
recvbuf, recvcounts, displs, smpi_type_f2c(*recvtype), *root, smpi_comm_f2c(*comm));
}
void mpi_allgather_(void* sendbuf, int* sendcount, int* sendtype, void* recvbuf, int* recvcount, int* recvtype,
int* comm, int* ierr) {
- sendbuf = (char *) FORT_IN_PLACE(sendbuf);
+ sendbuf = static_cast<char *>( FORT_IN_PLACE(sendbuf));
*ierr = MPI_Allgather(sendbuf, *sendcount, smpi_type_f2c(*sendtype),
recvbuf, *recvcount, smpi_type_f2c(*recvtype), smpi_comm_f2c(*comm));
}
void mpi_allgatherv_(void* sendbuf, int* sendcount, int* sendtype,
void* recvbuf, int* recvcounts,int* displs, int* recvtype, int* comm, int* ierr) {
- sendbuf = (char *) FORT_IN_PLACE(sendbuf);
+ sendbuf = static_cast<char *>( FORT_IN_PLACE(sendbuf));
*ierr = MPI_Allgatherv(sendbuf, *sendcount, smpi_type_f2c(*sendtype),
recvbuf, recvcounts, displs, smpi_type_f2c(*recvtype), smpi_comm_f2c(*comm));
}
}
void mpi_testall_ (int* count, int * requests, int *flag, MPI_Status * statuses, int* ierr){
- MPI_Request* reqs;
int i;
- reqs = xbt_new(MPI_Request, *count);
+ MPI_Request* reqs = xbt_new(MPI_Request, *count);
for(i = 0; i < *count; i++) {
reqs[i] = smpi_request_f2c(requests[i]);
}
requests[i]=MPI_FORTRAN_REQUEST_NULL;
}
}
+ xbt_free(reqs);
}
void mpi_get_processor_name_(char *name, int *resultlen, int* ierr){
MPI_Datatype tmp;
*ierr= MPI_Type_vector(*count, *blocklen, *stride, smpi_type_f2c(*old_type), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
MPI_Datatype tmp;
*ierr= MPI_Type_vector(*count, *blocklen, *stride, smpi_type_f2c(*old_type), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
MPI_Datatype tmp;
*ierr= MPI_Type_hvector (*count, *blocklen, *stride, smpi_type_f2c(*old_type), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
MPI_Datatype tmp;
*ierr= MPI_Type_hvector(*count, *blocklen, *stride, smpi_type_f2c(*old_type), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
MPI_Datatype tmp= smpi_type_f2c(*datatype);
*ierr= MPI_Type_free (&tmp);
if(*ierr == MPI_SUCCESS) {
- free_datatype(*datatype);
+ free_type(*datatype);
}
}
void mpi_win_create_( int *base, MPI_Aint* size, int* disp_unit, int* info, int* comm, int *win, int* ierr){
MPI_Win tmp;
- *ierr = MPI_Win_create( (void*)base, *size, *disp_unit, smpi_info_f2c(*info), smpi_comm_f2c(*comm),&tmp);
+ *ierr = MPI_Win_create( static_cast<void*>(base), *size, *disp_unit, smpi_info_f2c(*info), smpi_comm_f2c(*comm),&tmp);
if(*ierr == MPI_SUCCESS) {
- *win = smpi_win_c2f(tmp);
+ *win = smpi_win_add_f(tmp);
}
}
}
void mpi_win_set_name_ (int* win, char * name, int* ierr, int size){
- //handle trailing blanks
- while(name[size-1]==' ')size--;
- while(*name==' '){//handle leading blanks
- size --;
- name++;
- }
- char* tname = xbt_new(char,size+1);
- strncpy(tname, name, size);
- tname[size]='\0';
- *ierr = MPI_Win_set_name(smpi_win_f2c(*win), tname);
- xbt_free(tname);
+ //handle trailing blanks
+ while(name[size-1]==' ')
+ size--;
+ while(*name==' '){//handle leading blanks
+ size--;
+ name++;
+ }
+ char* tname = xbt_new(char,size+1);
+ strncpy(tname, name, size);
+ tname[size]='\0';
+ *ierr = MPI_Win_set_name(smpi_win_f2c(*win), tname);
+ xbt_free(tname);
}
void mpi_win_get_name_ (int* win, char * name, int* len, int* ierr){
- *ierr = MPI_Win_get_name(smpi_win_f2c(*win),name,len);
- if(*len>0) name[*len]=' ';//blank padding, not \0
+ *ierr = MPI_Win_get_name(smpi_win_f2c(*win),name,len);
+ if(*len>0)
+ name[*len]=' ';//blank padding, not \0
}
void mpi_info_create_( int *info, int* ierr){
MPI_Info tmp;
*ierr = MPI_Info_create(&tmp);
if(*ierr == MPI_SUCCESS) {
- *info = smpi_info_c2f(tmp);
+ *info = smpi_info_add_f(tmp);
}
}
void mpi_info_set_( int *info, char *key, char *value, int* ierr, unsigned int keylen, unsigned int valuelen){
- //handle trailing blanks
- while(key[keylen-1]==' ')keylen--;
- while(*key==' '){//handle leading blanks
- keylen --;
- key++;
- }
- char* tkey = xbt_new(char,keylen+1);
- strncpy(tkey, key, keylen);
- tkey[keylen]='\0';
-
- while(value[valuelen-1]==' ')valuelen--;
- while(*value==' '){//handle leading blanks
- valuelen --;
- value++;
- }
- char* tvalue = xbt_new(char,valuelen+1);
- strncpy(tvalue, value, valuelen);
-
- tvalue[valuelen]='\0';
- *ierr = MPI_Info_set( smpi_info_f2c(*info), tkey, tvalue);
- xbt_free(tkey);
+ //handle trailing blanks
+ while(key[keylen-1]==' ')
+ keylen--;
+ while(*key==' '){//handle leading blanks
+ keylen--;
+ key++;
+ }
+ char* tkey = xbt_new(char,keylen+1);
+ strncpy(tkey, key, keylen);
+ tkey[keylen]='\0';
+
+ while(value[valuelen-1]==' ')
+ valuelen--;
+ while(*value==' '){//handle leading blanks
+ valuelen--;
+ value++;
+ }
+ char* tvalue = xbt_new(char,valuelen+1);
+ strncpy(tvalue, value, valuelen);
+ tvalue[valuelen]='\0';
+
+ *ierr = MPI_Info_set( smpi_info_f2c(*info), tkey, tvalue);
+ xbt_free(tkey);
+ xbt_free(tvalue);
}
void mpi_info_get_ (int* info,char *key,int* valuelen, char *value, int *flag, int* ierr, unsigned int keylen ){
- while(key[keylen-1]==' ')keylen--;
- while(*key==' '){//handle leading blanks
- keylen --;
- key++;
- } char* tkey = xbt_new(char,keylen+1);
- strncpy(tkey, key, keylen);
- tkey[keylen]='\0';
- *ierr = MPI_Info_get(smpi_info_f2c(*info),tkey,*valuelen, value, flag);
- xbt_free(tkey);
- int i = 0;
- for (i=strlen(value); i<*valuelen; i++)
- value[i]=' ';
+ while(key[keylen-1]==' ')
+ keylen--;
+ while(*key==' '){//handle leading blanks
+ keylen--;
+ key++;
+ }
+ char* tkey = xbt_new(char,keylen+1);
+ strncpy(tkey, key, keylen);
+ tkey[keylen]='\0';
+ *ierr = MPI_Info_get(smpi_info_f2c(*info),tkey,*valuelen, value, flag);
+ xbt_free(tkey);
+ if(*flag!=0){
+ int replace=0;
+ int i=0;
+ for (i=0; i<*valuelen; i++){
+ if(value[i]=='\0')
+ replace=1;
+ if(replace)
+ value[i]=' ';
+ }
+ }
}
void mpi_info_free_(int* info, int* ierr){
void mpi_get_( int *origin_addr, int* origin_count, int* origin_datatype, int *target_rank,
MPI_Aint* target_disp, int *target_count, int* tarsmpi_type_f2c, int* win, int* ierr){
- *ierr = MPI_Get( (void*)origin_addr,*origin_count, smpi_type_f2c(*origin_datatype),*target_rank,
+ *ierr = MPI_Get( static_cast<void*>(origin_addr),*origin_count, smpi_type_f2c(*origin_datatype),*target_rank,
*target_disp, *target_count,smpi_type_f2c(*tarsmpi_type_f2c), smpi_win_f2c(*win));
}
void mpi_accumulate_( int *origin_addr, int* origin_count, int* origin_datatype, int *target_rank,
MPI_Aint* target_disp, int *target_count, int* tarsmpi_type_f2c, int* op, int* win, int* ierr){
- *ierr = MPI_Accumulate( (void*)origin_addr,*origin_count, smpi_type_f2c(*origin_datatype),*target_rank,
+ *ierr = MPI_Accumulate( static_cast<void *>(origin_addr),*origin_count, smpi_type_f2c(*origin_datatype),*target_rank,
*target_disp, *target_count,smpi_type_f2c(*tarsmpi_type_f2c), smpi_op_f2c(*op), smpi_win_f2c(*win));
}
void mpi_put_( int *origin_addr, int* origin_count, int* origin_datatype, int *target_rank,
MPI_Aint* target_disp, int *target_count, int* tarsmpi_type_f2c, int* win, int* ierr){
- *ierr = MPI_Put( (void*)origin_addr,*origin_count, smpi_type_f2c(*origin_datatype),*target_rank,
+ *ierr = MPI_Put( static_cast<void *>(origin_addr),*origin_count, smpi_type_f2c(*origin_datatype),*target_rank,
*target_disp, *target_count,smpi_type_f2c(*tarsmpi_type_f2c), smpi_win_f2c(*win));
}
void mpi_init_thread_ (int* required, int *provided, int* ierr){
smpi_init_fortran_types();
- *ierr = MPI_Init_thread(NULL, NULL,*required, provided);
+ *ierr = MPI_Init_thread(nullptr, nullptr,*required, provided);
running_processes++;
}
MPI_Datatype tmp;
*ierr = MPI_Type_dup(smpi_type_f2c(*datatype), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newdatatype = smpi_type_c2f(tmp);
+ *newdatatype = smpi_type_add_f(tmp);
}
}
void mpi_type_get_name_ (int* datatype, char * name, int* len, int* ierr){
*ierr = MPI_Type_get_name(smpi_type_f2c(*datatype),name,len);
- if(*len>0) name[*len]=' ';
+ if(*len>0)
+ name[*len]=' ';
}
void mpi_type_get_attr_ (int* type, int* type_keyval, void *attribute_val, int* flag, int* ierr){
void mpi_type_create_keyval_ (void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr){
- *ierr = MPI_Type_create_keyval((MPI_Type_copy_attr_function*)copy_fn, (MPI_Type_delete_attr_function*) delete_fn,
+ *ierr = MPI_Type_create_keyval(reinterpret_cast<MPI_Type_copy_attr_function*>(copy_fn), reinterpret_cast<MPI_Type_delete_attr_function*>(delete_fn),
keyval, extra_state) ;
}
}
void mpi_pcontrol_ (int* level , int* ierr){
- *ierr = MPI_Pcontrol(*(const int*)level);
+ *ierr = MPI_Pcontrol(*static_cast<const int*>(level));
}
void mpi_type_get_extent_ (int* datatype, MPI_Aint * lb, MPI_Aint * extent, int* ierr){
void mpi_op_create_ (void * function, int* commute, int* op, int* ierr){
MPI_Op tmp;
- *ierr = MPI_Op_create((MPI_User_function*)function,* commute, &tmp);
+ *ierr = MPI_Op_create(reinterpret_cast<MPI_User_function*>(function),*commute, &tmp);
if(*ierr == MPI_SUCCESS) {
- *op = smpi_op_c2f(tmp);
+ smpi_op_set_fortran(tmp);
+ *op = smpi_op_add_f(tmp);
}
}
MPI_Group tmp;
*ierr = MPI_Group_union(smpi_group_f2c(*group1), smpi_group_f2c(*group2), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newgroup = smpi_group_c2f(tmp);
+ *newgroup = smpi_group_add_f(tmp);
}
}
MPI_Group tmp;
*ierr = MPI_Group_intersection(smpi_group_f2c(*group1), smpi_group_f2c(*group2), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newgroup = smpi_group_c2f(tmp);
+ *newgroup = smpi_group_add_f(tmp);
}
}
MPI_Group tmp;
*ierr = MPI_Group_difference(smpi_group_f2c(*group1), smpi_group_f2c(*group2), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newgroup = smpi_group_c2f(tmp);
+ *newgroup = smpi_group_add_f(tmp);
}
}
MPI_Group tmp;
*ierr = MPI_Group_excl(smpi_group_f2c(*group), *n, ranks, &tmp);
if(*ierr == MPI_SUCCESS) {
- *newgroup = smpi_group_c2f(tmp);
+ *newgroup = smpi_group_add_f(tmp);
}
}
MPI_Group tmp;
*ierr = MPI_Group_range_incl(smpi_group_f2c(*group), *n, ranges, &tmp);
if(*ierr == MPI_SUCCESS) {
- *newgroup = smpi_group_c2f(tmp);
+ *newgroup = smpi_group_add_f(tmp);
}
}
MPI_Group tmp;
*ierr = MPI_Group_range_excl(smpi_group_f2c(*group), *n, ranges, &tmp);
if(*ierr == MPI_SUCCESS) {
- *newgroup = smpi_group_c2f(tmp);
+ *newgroup = smpi_group_add_f(tmp);
}
}
void mpi_comm_create_keyval_ (void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr){
- *ierr = MPI_Comm_create_keyval((MPI_Comm_copy_attr_function*)copy_fn, (MPI_Comm_delete_attr_function*)delete_fn,
+ *ierr = MPI_Comm_create_keyval(reinterpret_cast<MPI_Comm_copy_attr_function*>(copy_fn), reinterpret_cast<MPI_Comm_delete_attr_function*>(delete_fn),
keyval, extra_state) ;
}
void mpi_comm_get_name_ (int* comm, char* name, int* len, int* ierr){
*ierr = MPI_Comm_get_name(smpi_comm_f2c(*comm), name, len);
- if(*len>0) name[*len]=' ';
+ if(*len>0)
+ name[*len]=' ';
}
void mpi_comm_compare_ (int* comm1, int* comm2, int *result, int* ierr){
reqs[i] = smpi_request_f2c(requests[i]);
}
*ierr = MPI_Testany(*count, reqs, index, flag, FORT_STATUS_IGNORE(status));
- if(*index!=MPI_UNDEFINED)
- if(reqs[*index]==MPI_REQUEST_NULL){
+ if(*index!=MPI_UNDEFINED && reqs[*index]==MPI_REQUEST_NULL){
free_request(requests[*index]);
requests[*index]=MPI_FORTRAN_REQUEST_NULL;
}
- free(reqs);
+ xbt_free(reqs);
}
void mpi_waitsome_ (int* incount, int* requests, int *outcount, int *indices, MPI_Status* status, int* ierr)
requests[indices[i]]=MPI_FORTRAN_REQUEST_NULL;
}
}
- free(reqs);
+ xbt_free(reqs);
}
void mpi_reduce_local_ (void *inbuf, void *inoutbuf, int* count, int* datatype, int* op, int* ierr){
void mpi_reduce_scatter_block_ (void *sendbuf, void *recvbuf, int* recvcount, int* datatype, int* op, int* comm,
int* ierr)
{
- sendbuf = (char *) FORT_IN_PLACE(sendbuf);
+ sendbuf = static_cast<char *>( FORT_IN_PLACE(sendbuf));
*ierr = MPI_Reduce_scatter_block(sendbuf, recvbuf, *recvcount, smpi_type_f2c(*datatype), smpi_op_f2c(*op),
smpi_comm_f2c(*comm));
}
MPI_Comm tmp;
*ierr = MPI_Cart_create(smpi_comm_f2c(*comm_old), *ndims, dims, periods, *reorder, &tmp);
if(*ierr == MPI_SUCCESS) {
- *comm_cart = smpi_comm_c2f(tmp);
+ *comm_cart = smpi_comm_add_f(tmp);
}
}
MPI_Comm tmp;
*ierr = MPI_Cart_sub(smpi_comm_f2c(*comm), remain_dims, &tmp);
if(*ierr == MPI_SUCCESS) {
- *comm_new = smpi_comm_c2f(tmp);
+ *comm_new = smpi_comm_add_f(tmp);
}
}
MPI_Comm tmp;
*ierr = MPI_Graph_create(smpi_comm_f2c(*comm_old), *nnodes, index, edges, *reorder, &tmp);
if(*ierr == MPI_SUCCESS) {
- *comm_graph = smpi_comm_c2f(tmp);
+ *comm_graph = smpi_comm_add_f(tmp);
}
}
}
void mpi_errhandler_create_ (void* function, void* errhandler, int* ierr) {
- *ierr = MPI_Errhandler_create((MPI_Handler_function*)function, (MPI_Errhandler*)errhandler);
+ *ierr = MPI_Errhandler_create(reinterpret_cast<MPI_Handler_function*>(function), static_cast<MPI_Errhandler*>(errhandler));
}
void mpi_errhandler_free_ (void* errhandler, int* ierr) {
- *ierr = MPI_Errhandler_free((MPI_Errhandler*)errhandler);
+ *ierr = MPI_Errhandler_free(static_cast<MPI_Errhandler*>(errhandler));
}
void mpi_errhandler_get_ (int* comm, void* errhandler, int* ierr) {
- *ierr = MPI_Errhandler_get(smpi_comm_f2c(*comm), (MPI_Errhandler*) errhandler);
+ *ierr = MPI_Errhandler_get(smpi_comm_f2c(*comm), static_cast<MPI_Errhandler*>(errhandler));
}
void mpi_errhandler_set_ (int* comm, void* errhandler, int* ierr) {
- *ierr = MPI_Errhandler_set(smpi_comm_f2c(*comm), *(MPI_Errhandler*)errhandler);
+ *ierr = MPI_Errhandler_set(smpi_comm_f2c(*comm), *static_cast<MPI_Errhandler*>(errhandler));
}
void mpi_comm_set_errhandler_ (int* comm, void* errhandler, int* ierr) {
- *ierr = MPI_Errhandler_set(smpi_comm_f2c(*comm), *(MPI_Errhandler*)errhandler);
+ *ierr = MPI_Errhandler_set(smpi_comm_f2c(*comm), *static_cast<MPI_Errhandler*>(errhandler));
}
void mpi_comm_get_errhandler_ (int* comm, void* errhandler, int* ierr) {
- *ierr = MPI_Errhandler_set(smpi_comm_f2c(*comm), (MPI_Errhandler*)errhandler);
+ *ierr = MPI_Errhandler_set(smpi_comm_f2c(*comm), static_cast<MPI_Errhandler*>(errhandler));
}
void mpi_type_contiguous_ (int* count, int* old_type, int* newtype, int* ierr) {
MPI_Datatype tmp;
*ierr = MPI_Type_contiguous(*count, smpi_type_f2c(*old_type), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
}
*ierr = MPI_Testsome(*incount, reqs, outcount, indices, FORT_STATUSES_IGNORE(statuses));
for(i=0;i<*incount;i++){
- if(indices[i]){
- if(reqs[indices[i]]==MPI_REQUEST_NULL){
- free_request(requests[indices[i]]);
- requests[indices[i]]=MPI_FORTRAN_REQUEST_NULL;
- }
+ if(indices[i] && reqs[indices[i]]==MPI_REQUEST_NULL){
+ free_request(requests[indices[i]]);
+ requests[indices[i]]=MPI_FORTRAN_REQUEST_NULL;
}
}
- free(reqs);
+ xbt_free(reqs);
}
void mpi_comm_test_inter_ (int* comm, int* flag, int* ierr) {
MPI_Datatype tmp;
*ierr = MPI_Type_hindexed(*count, blocklens, indices, smpi_type_f2c(*old_type), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
MPI_Datatype tmp;
*ierr = MPI_Type_create_hindexed(*count, blocklens, indices, smpi_type_f2c(*old_type), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
MPI_Datatype tmp;
*ierr = MPI_Type_create_hindexed_block(*count, *blocklength, indices, smpi_type_f2c(*old_type), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
MPI_Datatype tmp;
*ierr = MPI_Type_indexed(*count, blocklens, indices, smpi_type_f2c(*old_type), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
MPI_Datatype tmp;
*ierr = MPI_Type_create_indexed_block(*count, *blocklength, indices, smpi_type_f2c(*old_type), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
void mpi_type_struct_ (int* count, int* blocklens, MPI_Aint* indices, int* old_types, int* newtype, int* ierr) {
MPI_Datatype tmp;
int i=0;
- MPI_Datatype* types = (MPI_Datatype*)xbt_malloc(*count*sizeof(MPI_Datatype));
+ MPI_Datatype* types = static_cast<MPI_Datatype*>(xbt_malloc(*count*sizeof(MPI_Datatype)));
for(i=0; i< *count; i++){
types[i] = smpi_type_f2c(old_types[i]);
}
*ierr = MPI_Type_struct(*count, blocklens, indices, types, &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
xbt_free(types);
}
void mpi_type_create_struct_(int* count, int* blocklens, MPI_Aint* indices, int* old_types, int* newtype, int* ierr){
MPI_Datatype tmp;
int i=0;
- MPI_Datatype* types = (MPI_Datatype*)xbt_malloc(*count*sizeof(MPI_Datatype));
+ MPI_Datatype* types = static_cast<MPI_Datatype*>(xbt_malloc(*count*sizeof(MPI_Datatype)));
for(i=0; i< *count; i++){
types[i] = smpi_type_f2c(old_types[i]);
}
*ierr = MPI_Type_create_struct(*count, blocklens, indices, types, &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
xbt_free(types);
}
MPI_Request tmp;
*ierr = MPI_Ssend_init(buf, *count, smpi_type_f2c(*datatype), *dest, *tag, smpi_comm_f2c(*comm), &tmp);
if(*ierr == MPI_SUCCESS) {
- *request = smpi_request_c2f(tmp);
+ *request = smpi_request_add_f(tmp);
}
}
*ierr = MPI_Intercomm_create(smpi_comm_f2c(*local_comm), *local_leader,smpi_comm_f2c(*peer_comm), *remote_leader,
*tag, &tmp);
if(*ierr == MPI_SUCCESS) {
- *comm_out = smpi_comm_c2f(tmp);
+ *comm_out = smpi_comm_add_f(tmp);
}
}
MPI_Comm tmp;
*ierr = MPI_Intercomm_merge(smpi_comm_f2c(*comm), *high, &tmp);
if(*ierr == MPI_SUCCESS) {
- *comm_out = smpi_comm_c2f(tmp);
+ *comm_out = smpi_comm_add_f(tmp);
}
}
MPI_Request tmp;
*ierr = MPI_Bsend_init(buf, *count, smpi_type_f2c(*datatype), *dest, *tag, smpi_comm_f2c(*comm), &tmp);
if(*ierr == MPI_SUCCESS) {
- *request = smpi_request_c2f(tmp);
+ *request = smpi_request_add_f(tmp);
}
}
MPI_Request tmp;
*ierr = MPI_Ibsend(buf, *count, smpi_type_f2c(*datatype), *dest, *tag, smpi_comm_f2c(*comm), &tmp);
if(*ierr == MPI_SUCCESS) {
- *request = smpi_request_c2f(tmp);
+ *request = smpi_request_add_f(tmp);
}
}
MPI_Request tmp;
*ierr = MPI_Issend(buf, *count, smpi_type_f2c(*datatype), *dest, *tag, smpi_comm_f2c(*comm), &tmp);
if(*ierr == MPI_SUCCESS) {
- *request = smpi_request_c2f(tmp);
+ *request = smpi_request_add_f(tmp);
}
}
MPI_Request tmp;
*ierr = MPI_Rsend_init(buf, *count, smpi_type_f2c(*datatype), *dest, *tag, smpi_comm_f2c(*comm), &tmp);
if(*ierr == MPI_SUCCESS) {
- *request = smpi_request_c2f(tmp);
+ *request = smpi_request_add_f(tmp);
}
}
void mpi_keyval_create_ (void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr) {
- *ierr = MPI_Keyval_create((MPI_Copy_function*)copy_fn, (MPI_Delete_function*)delete_fn, keyval, extra_state);
+ *ierr = MPI_Keyval_create(reinterpret_cast<MPI_Copy_function*>(copy_fn),reinterpret_cast<MPI_Delete_function*>(delete_fn), keyval, extra_state);
}
void mpi_keyval_free_ (int* keyval, int* ierr) {
int* array_of_integers, MPI_Aint* array_of_addresses,
int* array_of_datatypes, int* ierr){
*ierr = MPI_Type_get_contents(smpi_type_f2c(*datatype), *max_integers, *max_addresses,*max_datatypes,
- array_of_integers, array_of_addresses, (MPI_Datatype*)array_of_datatypes);
+ array_of_integers, array_of_addresses, reinterpret_cast<MPI_Datatype*>(array_of_datatypes));
}
void mpi_type_create_darray_ (int* size, int* rank, int* ndims, int* array_of_gsizes, int* array_of_distribs,
array_of_distribs, array_of_dargs, array_of_psizes,
*order, smpi_type_f2c(*oldtype), &tmp) ;
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
MPI_Datatype tmp;
*ierr = MPI_Type_create_resized(smpi_type_f2c(*oldtype),*lb, *extent, &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
*ierr = MPI_Type_create_subarray(*ndims,array_of_sizes, array_of_subsizes, array_of_starts, *order,
smpi_type_f2c(*oldtype), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newtype = smpi_type_c2f(tmp);
+ *newtype = smpi_type_add_f(tmp);
}
}
void mpi_alltoallw_ ( void *sendbuf, int *sendcnts, int *sdispls, int* sendtypes, void *recvbuf, int *recvcnts,
int *rdispls, int* recvtypes, int* comm, int* ierr){
- *ierr = MPI_Alltoallw( sendbuf, sendcnts, sdispls, (MPI_Datatype*) sendtypes, recvbuf, recvcnts, rdispls,
- (MPI_Datatype*)recvtypes, smpi_comm_f2c(*comm));
+ *ierr = MPI_Alltoallw( sendbuf, sendcnts, sdispls, reinterpret_cast<MPI_Datatype*>(sendtypes), recvbuf, recvcnts, rdispls,
+ reinterpret_cast<MPI_Datatype*>(recvtypes), smpi_comm_f2c(*comm));
}
void mpi_exscan_ (void *sendbuf, void *recvbuf, int* count, int* datatype, int* op, int* comm, int* ierr){
MPI_Comm tmp;
*ierr = MPI_Comm_dup_with_info(smpi_comm_f2c(*comm),smpi_info_f2c(*info),&tmp);
if(*ierr == MPI_SUCCESS) {
- *newcomm = smpi_comm_c2f(tmp);
+ *newcomm = smpi_comm_add_f(tmp);
}
}
MPI_Comm tmp;
*ierr = MPI_Comm_split_type(smpi_comm_f2c(*comm), *split_type, *key, smpi_info_f2c(*info), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newcomm = smpi_comm_c2f(tmp);
+ *newcomm = smpi_comm_add_f(tmp);
}
}
}
void mpi_comm_create_errhandler_ ( void *function, void *errhandler, int* ierr){
- *ierr = MPI_Comm_create_errhandler( (MPI_Comm_errhandler_fn*) function, (MPI_Errhandler*)errhandler);
+ *ierr = MPI_Comm_create_errhandler( reinterpret_cast<MPI_Comm_errhandler_fn*>(function), static_cast<MPI_Errhandler*>(errhandler));
}
void mpi_add_error_class_ ( int *errorclass, int* ierr){
MPI_Info tmp;
*ierr = MPI_Info_dup(smpi_info_f2c(*info), &tmp);
if(*ierr==MPI_SUCCESS){
- *newinfo= smpi_info_c2f(tmp);
+ *newinfo= smpi_info_add_f(tmp);
}
}
void mpi_info_get_valuelen_ ( int* info, char *key, int *valuelen, int *flag, int* ierr, unsigned int keylen){
- while(key[keylen-1]==' ')keylen--;
- while(*key==' '){//handle leading blanks
- keylen --;
- key++;
- }
- char* tkey = xbt_new(char, keylen+1);
- strncpy(tkey, key, keylen);
- tkey[keylen]='\0';
- *ierr = MPI_Info_get_valuelen( smpi_info_f2c(*info), tkey, valuelen, flag);
- xbt_free(tkey);
+ while(key[keylen-1]==' ')
+ keylen--;
+ while(*key==' '){//handle leading blanks
+ keylen--;
+ key++;
+ }
+ char* tkey = xbt_new(char, keylen+1);
+ strncpy(tkey, key, keylen);
+ tkey[keylen]='\0';
+ *ierr = MPI_Info_get_valuelen( smpi_info_f2c(*info), tkey, valuelen, flag);
+ xbt_free(tkey);
}
void mpi_info_delete_ (int* info, char *key, int* ierr, unsigned int keylen){
- while(key[keylen-1]==' ')keylen--;
- while(*key==' '){//handle leading blanks
- keylen --;
- key++;
- }
- char* tkey = xbt_new(char, keylen+1);
- strncpy(tkey, key, keylen);
- tkey[keylen]='\0';
- *ierr = MPI_Info_delete(smpi_info_f2c(*info), tkey);
- xbt_free(tkey);
+ while(key[keylen-1]==' ')
+ keylen--;
+ while(*key==' '){//handle leading blanks
+ keylen--;
+ key++;
+ }
+ char* tkey = xbt_new(char, keylen+1);
+ strncpy(tkey, key, keylen);
+ tkey[keylen]='\0';
+ *ierr = MPI_Info_delete(smpi_info_f2c(*info), tkey);
+ xbt_free(tkey);
}
void mpi_info_get_nkeys_ ( int* info, int *nkeys, int* ierr){
}
void mpi_info_get_nthkey_ ( int* info, int* n, char *key, int* ierr, unsigned int keylen){
- *ierr = MPI_Info_get_nthkey( smpi_info_f2c(*info), *n, key);
- unsigned int i = 0;
- for (i=strlen(key); i<keylen; i++)
- key[i]=' ';
+ *ierr = MPI_Info_get_nthkey( smpi_info_f2c(*info), *n, key);
+ unsigned int i = 0;
+ for (i=strlen(key); i<keylen; i++)
+ key[i]=' ';
}
void mpi_get_version_ (int *version,int *subversion, int* ierr){
void mpi_grequest_start_ ( void *query_fn, void *free_fn, void *cancel_fn, void *extra_state, int*request, int* ierr){
MPI_Request tmp;
- *ierr = MPI_Grequest_start( (MPI_Grequest_query_function*)query_fn, (MPI_Grequest_free_function*)free_fn,
- (MPI_Grequest_cancel_function*)cancel_fn, extra_state, &tmp);
+ *ierr = MPI_Grequest_start( reinterpret_cast<MPI_Grequest_query_function*>(query_fn), reinterpret_cast<MPI_Grequest_free_function*>(free_fn),
+ reinterpret_cast<MPI_Grequest_cancel_function*>(cancel_fn), extra_state, &tmp);
if(*ierr == MPI_SUCCESS) {
- *request = smpi_request_c2f(tmp);
+ *request = smpi_request_add_f(tmp);
}
}
void mpi_comm_connect_ ( char *port_name, int* info, int* root, int* comm, int*newcomm, int* ierr){
MPI_Comm tmp;
- *ierr = MPI_Comm_connect( port_name, *(MPI_Info*)info, *root, smpi_comm_f2c(*comm), &tmp);
+ *ierr = MPI_Comm_connect( port_name, *reinterpret_cast<MPI_Info*>(info), *root, smpi_comm_f2c(*comm), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newcomm = smpi_comm_c2f(tmp);
+ *newcomm = smpi_comm_add_f(tmp);
}
}
void mpi_publish_name_ ( char *service_name, int* info, char *port_name, int* ierr){
- *ierr = MPI_Publish_name( service_name, *(MPI_Info*)info, port_name);
+ *ierr = MPI_Publish_name( service_name, *reinterpret_cast<MPI_Info*>(info), port_name);
}
void mpi_unpublish_name_ ( char *service_name, int* info, char *port_name, int* ierr){
- *ierr = MPI_Unpublish_name( service_name, *(MPI_Info*)info, port_name);
+ *ierr = MPI_Unpublish_name( service_name, *reinterpret_cast<MPI_Info*>(info), port_name);
}
void mpi_lookup_name_ ( char *service_name, int* info, char *port_name, int* ierr){
- *ierr = MPI_Lookup_name( service_name, *(MPI_Info*)info, port_name);
+ *ierr = MPI_Lookup_name( service_name, *reinterpret_cast<MPI_Info*>(info), port_name);
}
void mpi_comm_join_ ( int* fd, int* intercomm, int* ierr){
MPI_Comm tmp;
*ierr = MPI_Comm_join( *fd, &tmp);
if(*ierr == MPI_SUCCESS) {
- *intercomm = smpi_comm_c2f(tmp);
+ *intercomm = smpi_comm_add_f(tmp);
}
}
void mpi_open_port_ ( int* info, char *port_name, int* ierr){
- *ierr = MPI_Open_port( *(MPI_Info*)info,port_name);
+ *ierr = MPI_Open_port( *reinterpret_cast<MPI_Info*>(info),port_name);
}
void mpi_close_port_ ( char *port_name, int* ierr){
void mpi_comm_accept_ ( char *port_name, int* info, int* root, int* comm, int*newcomm, int* ierr){
MPI_Comm tmp;
- *ierr = MPI_Comm_accept( port_name, *(MPI_Info*)info, *root, smpi_comm_f2c(*comm), &tmp);
+ *ierr = MPI_Comm_accept( port_name, *reinterpret_cast<MPI_Info*>(info), *root, smpi_comm_f2c(*comm), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newcomm = smpi_comm_c2f(tmp);
+ *newcomm = smpi_comm_add_f(tmp);
}
}
void mpi_comm_spawn_ ( char *command, char *argv, int* maxprocs, int* info, int* root, int* comm, int* intercomm,
int* array_of_errcodes, int* ierr){
MPI_Comm tmp;
- *ierr = MPI_Comm_spawn( command, NULL, *maxprocs, *(MPI_Info*)info, *root, smpi_comm_f2c(*comm), &tmp,
+ *ierr = MPI_Comm_spawn( command, nullptr, *maxprocs, *reinterpret_cast<MPI_Info*>(info), *root, smpi_comm_f2c(*comm), &tmp,
array_of_errcodes);
if(*ierr == MPI_SUCCESS) {
- *intercomm = smpi_comm_c2f(tmp);
+ *intercomm = smpi_comm_add_f(tmp);
}
}
int* comm, int* intercomm, int* array_of_errcodes, int* ierr){
MPI_Comm tmp;
*ierr = MPI_Comm_spawn_multiple(* count, &array_of_commands, &array_of_argv, array_of_maxprocs,
- (MPI_Info*)array_of_info, *root, smpi_comm_f2c(*comm), &tmp, array_of_errcodes);
+ reinterpret_cast<MPI_Info*>(array_of_info), *root, smpi_comm_f2c(*comm), &tmp, array_of_errcodes);
if(*ierr == MPI_SUCCESS) {
- *intercomm = smpi_comm_c2f(tmp);
+ *intercomm = smpi_comm_add_f(tmp);
}
}
*parent = smpi_comm_c2f(tmp);
}
}
+
+void mpi_file_close_ ( int* file, int* ierr){
+ *ierr= MPI_File_close(reinterpret_cast<MPI_File*>(*file));
+}
+
+void mpi_file_delete_ ( char* filename, int* info, int* ierr){
+ *ierr= MPI_File_delete(filename, smpi_info_f2c(*info));
+}
+
+void mpi_file_open_ ( int* comm, char* filename, int* amode, int* info, int* fh, int* ierr){
+ *ierr= MPI_File_open(smpi_comm_f2c(*comm), filename, *amode, smpi_info_f2c(*info), reinterpret_cast<MPI_File*>(*fh));
+}
+
+void mpi_file_set_view_ ( int* fh, long long int* offset, int* etype, int* filetype, char* datarep, int* info, int* ierr){
+ *ierr= MPI_File_set_view(reinterpret_cast<MPI_File>(*fh) , reinterpret_cast<MPI_Offset>(*offset), smpi_type_f2c(*etype), smpi_type_f2c(*filetype), datarep, smpi_info_f2c(*info));
+}
+
+void mpi_file_read_ ( int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr){
+ *ierr= MPI_File_read(reinterpret_cast<MPI_File>(*fh), buf, *count, smpi_type_f2c(*datatype), status);
+}
+
+void mpi_file_write_ ( int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr){
+ *ierr= MPI_File_write(reinterpret_cast<MPI_File>(*fh), buf, *count, smpi_type_f2c(*datatype), status);
+}
+
+} // extern "C"
