A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid doing things when there is nothing to do.
[simgrid.git]
/
src
/
smpi
/
smpi_rma.cpp
diff --git
a/src/smpi/smpi_rma.cpp
b/src/smpi/smpi_rma.cpp
index
d4c51f4
..
6edbee3
100644
(file)
--- a/
src/smpi/smpi_rma.cpp
+++ b/
src/smpi/smpi_rma.cpp
@@
-1,4
+1,3
@@
-
/* Copyright (c) 2007-2015. The SimGrid Team.
* All rights reserved. */
/* Copyright (c) 2007-2015. The SimGrid Team.
* All rights reserved. */
@@
-6,12
+5,11
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
+#include <vector>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_rma, smpi, "Logging specific to SMPI (RMA operations)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_rma, smpi, "Logging specific to SMPI (RMA operations)");
-#define RMA_TAG -1234
-
-xbt_bar_t creation_bar = NULL;
+msg_bar_t creation_bar = nullptr;
typedef struct s_smpi_mpi_win{
void* base;
typedef struct s_smpi_mpi_win{
void* base;
@@
-20,12
+18,13
@@
typedef struct s_smpi_mpi_win{
MPI_Comm comm;
MPI_Info info;
int assert;
MPI_Comm comm;
MPI_Info info;
int assert;
-
xbt_dynar_t
requests;
-
xbt
_bar_t bar;
+
std::vector<MPI_Request> *
requests;
+
msg
_bar_t bar;
MPI_Win* connected_wins;
char* name;
int opened;
MPI_Group group;
MPI_Win* connected_wins;
char* name;
int opened;
MPI_Group group;
+ int count; //for ordering the accs
} s_smpi_mpi_win_t;
} s_smpi_mpi_win_t;
@@
-45,20
+44,20
@@
MPI_Win smpi_mpi_win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info
if(info!=MPI_INFO_NULL)
info->refcount++;
win->comm = comm;
if(info!=MPI_INFO_NULL)
info->refcount++;
win->comm = comm;
- win->name =
NULL
;
+ win->name =
nullptr
;
win->opened = 0;
win->group = MPI_GROUP_NULL;
win->opened = 0;
win->group = MPI_GROUP_NULL;
- win->requests =
xbt_dynar_new(sizeof(MPI_Request), NULL
);
+ win->requests =
new std::vector<MPI_Request>(
);
win->connected_wins = xbt_new0(MPI_Win, comm_size);
win->connected_wins[rank] = win;
win->connected_wins = xbt_new0(MPI_Win, comm_size);
win->connected_wins[rank] = win;
-
+ win->count = 0;
if(rank==0){
if(rank==0){
- win->bar
=xbt
_barrier_init(comm_size);
+ win->bar
= MSG
_barrier_init(comm_size);
}
mpi_coll_allgather_fun(&(win->connected_wins[rank]), sizeof(MPI_Win), MPI_BYTE, win->connected_wins, sizeof(MPI_Win),
MPI_BYTE, comm);
}
mpi_coll_allgather_fun(&(win->connected_wins[rank]), sizeof(MPI_Win), MPI_BYTE, win->connected_wins, sizeof(MPI_Win),
MPI_BYTE, comm);
- mpi_coll_bcast_fun(
&(win->bar), sizeof(xbt
_bar_t), MPI_BYTE, 0, comm);
+ mpi_coll_bcast_fun(
&(win->bar), sizeof(msg
_bar_t), MPI_BYTE, 0, comm);
mpi_coll_barrier_fun(comm);
mpi_coll_barrier_fun(comm);
@@
-67,10
+66,10
@@
MPI_Win smpi_mpi_win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info
int smpi_mpi_win_free( MPI_Win* win){
//As per the standard, perform a barrier to ensure every async comm is finished
int smpi_mpi_win_free( MPI_Win* win){
//As per the standard, perform a barrier to ensure every async comm is finished
-
xbt
_barrier_wait((*win)->bar);
-
xbt_dynar_free(&(*win)->requests)
;
+
MSG
_barrier_wait((*win)->bar);
+
delete (*win)->requests
;
xbt_free((*win)->connected_wins);
xbt_free((*win)->connected_wins);
- if ((*win)->name !=
NULL
){
+ if ((*win)->name !=
nullptr
){
xbt_free((*win)->name);
}
if((*win)->info!=MPI_INFO_NULL){
xbt_free((*win)->name);
}
if((*win)->info!=MPI_INFO_NULL){
@@
-80,16
+79,16
@@
int smpi_mpi_win_free( MPI_Win* win){
mpi_coll_barrier_fun((*win)->comm);
int rank=smpi_comm_rank((*win)->comm);
if(rank == 0)
mpi_coll_barrier_fun((*win)->comm);
int rank=smpi_comm_rank((*win)->comm);
if(rank == 0)
-
xbt
_barrier_destroy((*win)->bar);
+
MSG
_barrier_destroy((*win)->bar);
xbt_free(*win);
*win = MPI_WIN_NULL;
return MPI_SUCCESS;
}
void smpi_mpi_win_get_name(MPI_Win win, char* name, int* length){
xbt_free(*win);
*win = MPI_WIN_NULL;
return MPI_SUCCESS;
}
void smpi_mpi_win_get_name(MPI_Win win, char* name, int* length){
- if(win->name==
NULL
){
+ if(win->name==
nullptr
){
*length=0;
*length=0;
- name=
NULL
;
+ name=
nullptr
;
return;
}
*length = strlen(win->name);
return;
}
*length = strlen(win->name);
@@
-99,6
+98,8
@@
void smpi_mpi_win_get_name(MPI_Win win, char* name, int* length){
void smpi_mpi_win_get_group(MPI_Win win, MPI_Group* group){
if(win->comm != MPI_COMM_NULL){
*group = smpi_comm_group(win->comm);
void smpi_mpi_win_get_group(MPI_Win win, MPI_Group* group){
if(win->comm != MPI_COMM_NULL){
*group = smpi_comm_group(win->comm);
+ } else {
+ *group = MPI_GROUP_NULL;
}
}
}
}
@@
-111,27
+112,26
@@
int smpi_mpi_win_fence( int assert, MPI_Win win){
if(win->opened==0)
win->opened=1;
if(assert != MPI_MODE_NOPRECEDE){
if(win->opened==0)
win->opened=1;
if(assert != MPI_MODE_NOPRECEDE){
-
xbt
_barrier_wait(win->bar);
+
MSG
_barrier_wait(win->bar);
- xbt_dynar_t reqs = win->requests;
- int size = xbt_dynar_length(reqs);
- unsigned int cpt=0;
- MPI_Request req;
+ std::vector<MPI_Request> *reqs = win->requests;
+ int size = static_cast<int>(reqs->size());
// start all requests that have been prepared by another process
// start all requests that have been prepared by another process
- xbt_dynar_foreach(reqs, cpt, req){
- if (req->flags & PREPARED)
- smpi_mpi_start(req);
- }
+ if(size>0){
+ for(auto req: *reqs){
+ if (req && (req->flags & PREPARED))
+ smpi_mpi_start(req);
+ }
- MPI_Request* treqs = static_cast<MPI_Request*>(xbt_dynar_to_array(reqs));
- win->requests=xbt_dynar_new(sizeof(MPI_Request), NULL);
- smpi_mpi_waitall(size,treqs,MPI_STATUSES_IGNORE);
- xbt_free(treqs);
+ MPI_Request* treqs = &(*reqs)[0];
+ smpi_mpi_waitall(size,treqs,MPI_STATUSES_IGNORE);
+ }
+ win->count=0;
}
win->assert = assert;
}
win->assert = assert;
-
xbt
_barrier_wait(win->bar);
+
MSG
_barrier_wait(win->bar);
XBT_DEBUG("Leaving fence ");
return MPI_SUCCESS;
XBT_DEBUG("Leaving fence ");
return MPI_SUCCESS;
@@
-151,20
+151,20
@@
int smpi_mpi_put( void *origin_addr, int origin_count, MPI_Datatype origin_datat
if(target_rank != smpi_comm_rank(win->comm)){
//prepare send_request
MPI_Request sreq = smpi_rma_send_init(origin_addr, origin_count, origin_datatype, smpi_process_index(),
if(target_rank != smpi_comm_rank(win->comm)){
//prepare send_request
MPI_Request sreq = smpi_rma_send_init(origin_addr, origin_count, origin_datatype, smpi_process_index(),
- smpi_group_index(smpi_comm_group(win->comm),target_rank), RMA_TAG+1, win->comm, MPI_OP_NULL);
+ smpi_group_index(smpi_comm_group(win->comm),target_rank),
SMPI_
RMA_TAG+1, win->comm, MPI_OP_NULL);
//prepare receiver request
MPI_Request rreq = smpi_rma_recv_init(recv_addr, target_count, target_datatype, smpi_process_index(),
//prepare receiver request
MPI_Request rreq = smpi_rma_recv_init(recv_addr, target_count, target_datatype, smpi_process_index(),
- smpi_group_index(smpi_comm_group(win->comm),target_rank), RMA_TAG+1, recv_win->comm, MPI_OP_NULL);
+ smpi_group_index(smpi_comm_group(win->comm),target_rank),
SMPI_
RMA_TAG+1, recv_win->comm, MPI_OP_NULL);
//push request to receiver's win
//push request to receiver's win
-
xbt_dynar_push_as(recv_win->requests, MPI_Request,
rreq);
+
recv_win->requests->push_back(
rreq);
//start send
smpi_mpi_start(sreq);
//push request to sender's win
//start send
smpi_mpi_start(sreq);
//push request to sender's win
-
xbt_dynar_push_as(win->requests, MPI_Request,
sreq);
+
win->requests->push_back(
sreq);
}else{
smpi_datatype_copy(origin_addr, origin_count, origin_datatype, recv_addr, target_count, target_datatype);
}
}else{
smpi_datatype_copy(origin_addr, origin_count, origin_datatype, recv_addr, target_count, target_datatype);
}
@@
-186,25
+186,25
@@
int smpi_mpi_get( void *origin_addr, int origin_count, MPI_Datatype origin_datat
if(target_rank != smpi_comm_rank(win->comm)){
//prepare send_request
MPI_Request sreq = smpi_rma_send_init(send_addr, target_count, target_datatype,
if(target_rank != smpi_comm_rank(win->comm)){
//prepare send_request
MPI_Request sreq = smpi_rma_send_init(send_addr, target_count, target_datatype,
- smpi_group_index(smpi_comm_group(win->comm),target_rank), smpi_process_index(), RMA_TAG+2, send_win->comm,
+ smpi_group_index(smpi_comm_group(win->comm),target_rank), smpi_process_index(),
SMPI_
RMA_TAG+2, send_win->comm,
MPI_OP_NULL);
//prepare receiver request
MPI_Request rreq = smpi_rma_recv_init(origin_addr, origin_count, origin_datatype,
MPI_OP_NULL);
//prepare receiver request
MPI_Request rreq = smpi_rma_recv_init(origin_addr, origin_count, origin_datatype,
- smpi_group_index(smpi_comm_group(win->comm),target_rank), smpi_process_index(), RMA_TAG+2, win->comm,
+ smpi_group_index(smpi_comm_group(win->comm),target_rank), smpi_process_index(),
SMPI_
RMA_TAG+2, win->comm,
MPI_OP_NULL);
//start the send, with another process than us as sender.
smpi_mpi_start(sreq);
//push request to receiver's win
MPI_OP_NULL);
//start the send, with another process than us as sender.
smpi_mpi_start(sreq);
//push request to receiver's win
-
xbt_dynar_push_as(send_win->requests, MPI_Request,
sreq);
+
send_win->requests->push_back(
sreq);
//start recv
smpi_mpi_start(rreq);
//push request to sender's win
//start recv
smpi_mpi_start(rreq);
//push request to sender's win
-
xbt_dynar_push_as(win->requests, MPI_Request,
rreq);
+
win->requests->push_back(
rreq);
}else{
smpi_datatype_copy(send_addr, target_count, target_datatype, origin_addr, origin_count, origin_datatype);
}
}else{
smpi_datatype_copy(send_addr, target_count, target_datatype, origin_addr, origin_count, origin_datatype);
}
@@
-224,21
+224,23
@@
int smpi_mpi_accumulate( void *origin_addr, int origin_count, MPI_Datatype origi
void* recv_addr = static_cast<void*>(static_cast<char*>(recv_win->base) + target_disp * recv_win->disp_unit);
XBT_DEBUG("Entering MPI_Accumulate to %d", target_rank);
void* recv_addr = static_cast<void*>(static_cast<char*>(recv_win->base) + target_disp * recv_win->disp_unit);
XBT_DEBUG("Entering MPI_Accumulate to %d", target_rank);
-
+ //As the tag will be used for ordering of the operations, add count to it
//prepare send_request
MPI_Request sreq = smpi_rma_send_init(origin_addr, origin_count, origin_datatype,
//prepare send_request
MPI_Request sreq = smpi_rma_send_init(origin_addr, origin_count, origin_datatype,
- smpi_process_index(), smpi_group_index(smpi_comm_group(win->comm),target_rank),
RMA_TAG+3
, win->comm, op);
+ smpi_process_index(), smpi_group_index(smpi_comm_group(win->comm),target_rank),
SMPI_RMA_TAG+3+win->count
, win->comm, op);
//prepare receiver request
MPI_Request rreq = smpi_rma_recv_init(recv_addr, target_count, target_datatype,
//prepare receiver request
MPI_Request rreq = smpi_rma_recv_init(recv_addr, target_count, target_datatype,
- smpi_process_index(), smpi_group_index(smpi_comm_group(win->comm),target_rank), RMA_TAG+3, recv_win->comm, op);
+ smpi_process_index(), smpi_group_index(smpi_comm_group(win->comm),target_rank), SMPI_RMA_TAG+3+win->count, recv_win->comm, op);
+
+ win->count++;
//push request to receiver's win
//push request to receiver's win
-
xbt_dynar_push_as(recv_win->requests, MPI_Request,
rreq);
+
recv_win->requests->push_back(
rreq);
//start send
smpi_mpi_start(sreq);
//push request to sender's win
//start send
smpi_mpi_start(sreq);
//push request to sender's win
-
xbt_dynar_push_as(win->requests, MPI_Request,
sreq);
+
win->requests->push_back(
sreq);
return MPI_SUCCESS;
}
return MPI_SUCCESS;
}
@@
-264,7
+266,7
@@
int smpi_mpi_win_start(MPI_Group group, int assert, MPI_Win win){
while(j!=size){
int src=smpi_group_index(group,j);
if(src!=smpi_process_index()){
while(j!=size){
int src=smpi_group_index(group,j);
if(src!=smpi_process_index()){
- reqs[i]=smpi_irecv_init(
NULL, 0, MPI_CHAR, src,
RMA_TAG+4, MPI_COMM_WORLD);
+ reqs[i]=smpi_irecv_init(
nullptr, 0, MPI_CHAR, src,SMPI_
RMA_TAG+4, MPI_COMM_WORLD);
i++;
}
j++;
i++;
}
j++;
@@
-291,7
+293,7
@@
int smpi_mpi_win_post(MPI_Group group, int assert, MPI_Win win){
while(j!=size){
int dst=smpi_group_index(group,j);
if(dst!=smpi_process_index()){
while(j!=size){
int dst=smpi_group_index(group,j);
if(dst!=smpi_process_index()){
- reqs[i]=smpi_mpi_send_init(
NULL, 0, MPI_CHAR, dst,
RMA_TAG+4, MPI_COMM_WORLD);
+ reqs[i]=smpi_mpi_send_init(
nullptr, 0, MPI_CHAR, dst, SMPI_
RMA_TAG+4, MPI_COMM_WORLD);
i++;
}
j++;
i++;
}
j++;
@@
-322,7
+324,7
@@
int smpi_mpi_win_complete(MPI_Win win){
while(j!=size){
int dst=smpi_group_index(win->group,j);
if(dst!=smpi_process_index()){
while(j!=size){
int dst=smpi_group_index(win->group,j);
if(dst!=smpi_process_index()){
- reqs[i]=smpi_mpi_send_init(
NULL, 0, MPI_CHAR, dst,
RMA_TAG+5, MPI_COMM_WORLD);
+ reqs[i]=smpi_mpi_send_init(
nullptr, 0, MPI_CHAR, dst, SMPI_
RMA_TAG+5, MPI_COMM_WORLD);
i++;
}
j++;
i++;
}
j++;
@@
-339,22
+341,19
@@
int smpi_mpi_win_complete(MPI_Win win){
//now we can finish RMA calls
//now we can finish RMA calls
-
xbt_dynar_t
reqqs = win->requests;
- size =
xbt_dynar_length(reqqs
);
+
std::vector<MPI_Request> *
reqqs = win->requests;
+ size =
static_cast<int>(reqqs->size()
);
XBT_DEBUG("Win_complete - Finishing %d RMA calls", size);
XBT_DEBUG("Win_complete - Finishing %d RMA calls", size);
- unsigned int cpt=0;
- MPI_Request req;
// start all requests that have been prepared by another process
// start all requests that have been prepared by another process
-
xbt_dynar_foreach(reqqs, cpt, req
){
- if (req
->flags & PREPARED)
+
for (auto req: *reqqs
){
+ if (req
&& (req->flags & PREPARED))
smpi_mpi_start(req);
}
smpi_mpi_start(req);
}
- MPI_Request* treqs = static_cast<MPI_Request*>(xbt_dynar_to_array(reqqs));
- win->requests=xbt_dynar_new(sizeof(MPI_Request), NULL);
+ MPI_Request* treqs = &(*reqqs)[0];
smpi_mpi_waitall(size,treqs,MPI_STATUSES_IGNORE);
smpi_mpi_waitall(size,treqs,MPI_STATUSES_IGNORE);
-
xbt_free(treqs
);
+
reqqs->clear(
);
smpi_group_unuse(win->group);
win->opened--; //we're closed for business !
return MPI_SUCCESS;
smpi_group_unuse(win->group);
win->opened--; //we're closed for business !
return MPI_SUCCESS;
@@
-370,7
+369,7
@@
int smpi_mpi_win_wait(MPI_Win win){
while(j!=size){
int src=smpi_group_index(win->group,j);
if(src!=smpi_process_index()){
while(j!=size){
int src=smpi_group_index(win->group,j);
if(src!=smpi_process_index()){
- reqs[i]=smpi_irecv_init(
NULL, 0, MPI_CHAR, src,
RMA_TAG+5, MPI_COMM_WORLD);
+ reqs[i]=smpi_irecv_init(
nullptr, 0, MPI_CHAR, src,SMPI_
RMA_TAG+5, MPI_COMM_WORLD);
i++;
}
j++;
i++;
}
j++;
@@
-384,23
+383,20
@@
int smpi_mpi_win_wait(MPI_Win win){
}
xbt_free(reqs);
}
xbt_free(reqs);
-
xbt_dynar_t
reqqs = win->requests;
- size =
xbt_dynar_length(reqqs
);
+
std::vector<MPI_Request> *
reqqs = win->requests;
+ size =
static_cast<int>(reqqs->size()
);
XBT_DEBUG("Win_complete - Finishing %d RMA calls", size);
XBT_DEBUG("Win_complete - Finishing %d RMA calls", size);
- unsigned int cpt=0;
- MPI_Request req;
// start all requests that have been prepared by another process
// start all requests that have been prepared by another process
-
xbt_dynar_foreach(reqqs, cpt, req
){
- if (req
->flags & PREPARED)
+
for(auto req: *reqqs
){
+ if (req
&& (req->flags & PREPARED))
smpi_mpi_start(req);
}
smpi_mpi_start(req);
}
- MPI_Request* treqs = static_cast<MPI_Request*>(xbt_dynar_to_array(reqqs));
- win->requests=xbt_dynar_new(sizeof(MPI_Request), NULL);
+ MPI_Request* treqs = &(*reqqs)[0];
smpi_mpi_waitall(size,treqs,MPI_STATUSES_IGNORE);
smpi_mpi_waitall(size,treqs,MPI_STATUSES_IGNORE);
-
xbt_free(treqs
);
+
reqqs->clear(
);
smpi_group_unuse(win->group);
win->opened--; //we're opened for business !
return MPI_SUCCESS;
smpi_group_unuse(win->group);
win->opened--; //we're opened for business !
return MPI_SUCCESS;