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 int running_processes = 0;
#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
integer _MPI_BOTTOM;
integer _MPI_STATUS_IGNORE;
integer _MPI_STATUSES_IGNORE;
- } smpi_f90;
+ } smpi_;
/* Convert between Fortran and C */
#define FORT_ADDR(addr, val) \
- (((void *)(addr) == (void*) &(smpi_f90._ ## 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)
xbt_dict_remove(op_lookup, get_key(key, op));
}
+static int new_win(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;
+}
+
+static MPI_Win get_win(int win) {
+ 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));
+}
+
+
void mpi_init_(int* ierr) {
if(!comm_lookup){
comm_lookup = xbt_dict_new_homogeneous(NULL);
new_comm(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);
new_datatype(MPI_BYTE);
new_datatype(MPI_CHAR);
+ #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
new_datatype(MPI_INT);
new_datatype(MPI_INT);
+ #else
+ new_datatype(MPI_LONG);
+ new_datatype(MPI_LONG);
+ #endif
new_datatype(MPI_INT8_T);
new_datatype(MPI_INT16_T);
new_datatype(MPI_INT32_T);
new_datatype(MPI_DOUBLE);
new_datatype(MPI_C_FLOAT_COMPLEX);
new_datatype(MPI_C_DOUBLE_COMPLEX);
+ #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
new_datatype(MPI_2INT);
+ #else
+ new_datatype(MPI_2LONG);
+ #endif
new_datatype(MPI_UINT8_T);
new_datatype(MPI_UINT16_T);
new_datatype(MPI_UINT32_T);
}
void mpi_win_fence_( int* assert, int* win, int* ierr){
- *ierr = MPI_Win_fence(* assert, *(MPI_Win*)win);
+ *ierr = MPI_Win_fence(* assert, get_win(*win));
}
void mpi_win_free_( int* win, int* ierr){
- *ierr = MPI_Win_free( (MPI_Win*)win);
+ MPI_Win tmp = get_win(*win);
+ *ierr = MPI_Win_free(&tmp);
+ if(*ierr == MPI_SUCCESS) {
+ free_win(*win);
+ }
}
void mpi_win_create_( int *base, MPI_Aint* size, int* disp_unit, int* info, int* comm, int *win, int* ierr){
- *ierr = MPI_Win_create( (void*)base, *size, *disp_unit, *(MPI_Info*)info, get_comm(*comm),(MPI_Win*)win);
+ MPI_Win tmp;
+ *ierr = MPI_Win_create( (void*)base, *size, *disp_unit, *(MPI_Info*)info, get_comm(*comm),&tmp);
+ if(*ierr == MPI_SUCCESS) {
+ *win = new_win(tmp);
+ }
+}
+
+void mpi_win_set_name_ (int* win, char * name, int* ierr, int size){
+ char* tname = xbt_malloc((size+1)*sizeof(char));
+ strncpy(tname, name, size);
+ tname[size]='\0';
+ *ierr = MPI_Win_set_name(get_win(*win), tname);
+ xbt_free(tname);
+}
+
+void mpi_win_get_name_ (int* win, char * name, int* len, int* ierr){
+ *ierr = MPI_Win_get_name(get_win(*win),name,len);
+ if(*len>0) name[*len]=' ';//blank padding, not \0
}
void mpi_info_create_( 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* target_datatype, int* win, int* ierr){
*ierr = MPI_Get( (void*)origin_addr,*origin_count, get_datatype(*origin_datatype),*target_rank,
- *target_disp, *target_count,get_datatype(*target_datatype), *(MPI_Win *)win);
+ *target_disp, *target_count,get_datatype(*target_datatype), get_win(*win));
+}
+
+void mpi_accumulate_( int *origin_addr, int* origin_count, int* origin_datatype, int *target_rank,
+ MPI_Aint* target_disp, int *target_count, int* target_datatype, int* op, int* win, int* ierr){
+ *ierr = MPI_Accumulate( (void*)origin_addr,*origin_count, get_datatype(*origin_datatype),*target_rank,
+ *target_disp, *target_count,get_datatype(*target_datatype), get_op(*op), get_win(*win));
+}
+
+void mpi_put_( int *origin_addr, int* origin_count, int* origin_datatype, int *target_rank,
+ MPI_Aint* target_disp, int *target_count, int* target_datatype, int* win, int* ierr){
+ *ierr = MPI_Put( (void*)origin_addr,*origin_count, get_datatype(*origin_datatype),*target_rank,
+ *target_disp, *target_count,get_datatype(*target_datatype), get_win(*win));
}
}
}
-void mpi_type_set_name_ (int* datatype, char * name, int* ierr){
-
- *ierr = MPI_Type_set_name(get_datatype(*datatype), name);
+void mpi_type_set_name_ (int* datatype, char * name, int* ierr, int size){
+ char* tname = xbt_malloc((size+1)*sizeof(char));
+ strncpy(tname, name, size);
+ tname[size]='\0';
+ *ierr = MPI_Type_set_name(get_datatype(*datatype), tname);
+ xbt_free(tname);
}
void mpi_type_get_name_ (int* datatype, char * name, int* len, int* ierr){
-
*ierr = MPI_Type_get_name(get_datatype(*datatype),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_comm_get_name_ (int* comm, char* name, int* len, int* ierr){
-
*ierr = MPI_Comm_get_name(get_comm(*comm), name, len);
+ if(*len>0) name[*len]=' ';
}
void mpi_comm_compare_ (int* comm1, int* comm2, int *result, int* ierr){
*ierr = MPI_Exscan(sendbuf, recvbuf, *count, get_datatype(*datatype), get_op(*op), get_comm(*comm));
}
-void mpi_comm_set_name_ (int* comm, char* name, int* ierr){
- *ierr = MPI_Comm_set_name (get_comm(*comm), name);
+void mpi_comm_set_name_ (int* comm, char* name, int* ierr, int size){
+ char* tname = xbt_malloc((size+1)*sizeof(char));
+ strncpy(tname, name, size);
+ tname[size]='\0';
+ *ierr = MPI_Comm_set_name (get_comm(*comm), tname);
+ xbt_free(tname);
}
void mpi_comm_dup_with_info_ (int* comm, int* info, int* newcomm, int* ierr){
