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
SMPI: add utility to keep the order of collective calls performed by each process...
[simgrid.git]
/
src
/
smpi
/
mpi
/
smpi_comm.cpp
diff --git
a/src/smpi/mpi/smpi_comm.cpp
b/src/smpi/mpi/smpi_comm.cpp
index
683a64a
..
84f604d
100644
(file)
--- a/
src/smpi/mpi/smpi_comm.cpp
+++ b/
src/smpi/mpi/smpi_comm.cpp
@@
-242,14
+242,14
@@
bool Comm::is_uniform() const
{
if (this == MPI_COMM_UNINITIALIZED)
return smpi_process()->comm_world()->is_uniform();
- return is_uniform_
!= 0
;
+ return is_uniform_;
}
bool Comm::is_blocked() const
{
if (this == MPI_COMM_UNINITIALIZED)
return smpi_process()->comm_world()->is_blocked();
- return is_blocked_
!= 0
;
+ return is_blocked_;
}
bool Comm::is_smp_comm() const
@@
-365,6
+365,8
@@
void Comm::unref(Comm* comm){
delete[] comm->errhandlers_;
} else if (comm->errhandler_ != MPI_ERRHANDLER_NULL)
simgrid::smpi::Errhandler::unref(comm->errhandler_);
+ if(comm->collectives_counts_!=nullptr)
+ delete[] comm->collectives_counts_;
}
Group::unref(comm->group_);
if(comm->refcount_==0)
@@
-474,8
+476,9
@@
void Comm::init_smp(){
// Are the nodes uniform ? = same number of process/node
int my_local_size=comm_intra->size();
+ int is_uniform;
if(comm_intra->rank()==0) {
- i
nt is_uniform
= 1;
+ i
s_uniform
= 1;
auto* non_uniform_map = xbt_new0(int, leader_group_size);
allgather__ring(&my_local_size, 1, MPI_INT,
non_uniform_map, 1, MPI_INT, leader_comm);
@@
-490,9
+493,9
@@
void Comm::init_smp(){
}else{
xbt_free(non_uniform_map);
}
- is_uniform_=is_uniform;
}
- bcast__scatter_LR_allgather(&is_uniform_, 1, MPI_INT, 0, comm_intra);
+ bcast__scatter_LR_allgather(&is_uniform, 1, MPI_INT, 0, comm_intra);
+ is_uniform_ = (is_uniform != 0);
// we need to switch as the called function may silently touch global variables
smpi_switch_data_segment(s4u::Actor::self());
@@
-512,13
+515,8
@@
void Comm::init_smp(){
int global_blocked;
allreduce__default(&is_blocked, &global_blocked, 1, MPI_INT, MPI_LAND, this);
- if(MPI_COMM_WORLD==MPI_COMM_UNINITIALIZED || this==MPI_COMM_WORLD){
- if(this->rank()==0){
- is_blocked_ = global_blocked;
- }
- }else{
- is_blocked_=global_blocked;
- }
+ if ((MPI_COMM_WORLD != MPI_COMM_UNINITIALIZED && this != MPI_COMM_WORLD) || this->rank() == 0)
+ is_blocked_ = (global_blocked != 0);
delete[] leader_list;
if(replaying)
@@
-654,5
+652,31
@@
void Comm::increment_received_messages_count(int src, int dst, int tag)
recv_messages_[hash_message(src, dst, tag)]++;
}
+unsigned int Comm::get_collectives_count()
+{
+ if (this==MPI_COMM_UNINITIALIZED){
+ return smpi_process()->comm_world()->get_collectives_count();
+ }else if(this == MPI_COMM_WORLD || this == smpi_process()->comm_world()){
+ if(collectives_counts_==nullptr)
+ collectives_counts_=new unsigned int[this->size()]{0};
+ return collectives_counts_[this->rank()];
+ }else{
+ return collectives_count_;
+ }
+}
+
+void Comm::increment_collectives_count()
+{
+ if (this==MPI_COMM_UNINITIALIZED){
+ smpi_process()->comm_world()->increment_collectives_count();
+ }else if (this == MPI_COMM_WORLD || this == smpi_process()->comm_world()){
+ if(collectives_counts_==nullptr)
+ collectives_counts_=new unsigned int[this->size()]{0};
+ collectives_counts_[this->rank()]++;
+ }else{
+ collectives_count_++;
+ }
+}
+
} // namespace smpi
} // namespace simgrid