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
address FIXME and kill useless code
[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
4998ea0
..
8eb30b5
100644
(file)
--- a/
src/smpi/mpi/smpi_comm.cpp
+++ b/
src/smpi/mpi/smpi_comm.cpp
@@
-1,27
+1,25
@@
-/* Copyright (c) 2010-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-201
8
. 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. */
#include "smpi_comm.hpp"
/* 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. */
#include "smpi_comm.hpp"
-#include "private.hpp"
-#include "simgrid/s4u/Host.hpp"
#include "smpi_coll.hpp"
#include "smpi_datatype.hpp"
#include "smpi_process.hpp"
#include "smpi_request.hpp"
#include "smpi_coll.hpp"
#include "smpi_datatype.hpp"
#include "smpi_process.hpp"
#include "smpi_request.hpp"
-#include "smpi_status.hpp"
#include "smpi_win.hpp"
#include "smpi_win.hpp"
-#include "src/s
imix/smx_private
.hpp"
-#include <algorithm>
+#include "src/s
urf/HostImpl
.hpp"
+
#include <climits>
#include <climits>
-#include <vector>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi, "Logging specific to SMPI (comm)");
simgrid::smpi::Comm mpi_MPI_COMM_UNINITIALIZED;
MPI_Comm MPI_COMM_UNINITIALIZED=&mpi_MPI_COMM_UNINITIALIZED;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi, "Logging specific to SMPI (comm)");
simgrid::smpi::Comm mpi_MPI_COMM_UNINITIALIZED;
MPI_Comm MPI_COMM_UNINITIALIZED=&mpi_MPI_COMM_UNINITIALIZED;
+using simgrid::s4u::ActorPtr;
+
/* Support for cartesian topology was added, but there are 2 other types of topology, graph et dist graph. In order to
* support them, we have to add a field SMPI_Topo_type, and replace the MPI_Topology field by an union. */
/* Support for cartesian topology was added, but there are 2 other types of topology, graph et dist graph. In order to
* support them, we have to add a field SMPI_Topo_type, and replace the MPI_Topology field by an union. */
@@
-33,14
+31,14
@@
int Comm::keyval_id_=0;
Comm::Comm(MPI_Group group, MPI_Topology topo) : group_(group), topo_(topo)
{
Comm::Comm(MPI_Group group, MPI_Topology topo) : group_(group), topo_(topo)
{
- refcount_
=
1;
- topoType_ = MPI_INVALID_TOPO;
- intra_comm_ = MPI_COMM_NULL;
- leaders_comm_ = MPI_COMM_NULL;
- is_uniform_
=
1;
+ refcount_
=
1;
+ topoType_
= MPI_INVALID_TOPO;
+ intra_comm_
= MPI_COMM_NULL;
+ leaders_comm_
= MPI_COMM_NULL;
+ is_uniform_
=
1;
non_uniform_map_ = nullptr;
non_uniform_map_ = nullptr;
- leaders_map_ = nullptr;
- is_blocked_
=
0;
+ leaders_map_
= nullptr;
+ is_blocked_
=
0;
}
void Comm::destroy(Comm* comm)
}
void Comm::destroy(Comm* comm)
@@
-54,12
+52,13
@@
void Comm::destroy(Comm* comm)
}
int Comm::dup(MPI_Comm* newcomm){
}
int Comm::dup(MPI_Comm* newcomm){
- if(smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP){ //we need to switch as the called function may silently touch global variables
- smpi_switch_data_segment(smpi_process()->index());
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
+ // we need to switch as the called function may silently touch global variables
+ smpi_switch_data_segment(simgrid::s4u::Actor::self());
}
MPI_Group cp = new Group(this->group());
}
MPI_Group cp = new Group(this->group());
- (*newcomm) = new Comm(cp, this->topo());
- int ret = MPI_SUCCESS;
+ (*newcomm)
= new Comm(cp, this->topo());
+ int ret
= MPI_SUCCESS;
if (not attributes()->empty()) {
int flag;
if (not attributes()->empty()) {
int flag;
@@
-105,7
+104,7
@@
int Comm::rank()
{
if (this == MPI_COMM_UNINITIALIZED)
return smpi_process()->comm_world()->rank();
{
if (this == MPI_COMM_UNINITIALIZED)
return smpi_process()->comm_world()->rank();
- return group_->rank(s
mpi_process()->index
());
+ return group_->rank(s
imgrid::s4u::Actor::self
());
}
void Comm::get_name (char* name, int* len)
}
void Comm::get_name (char* name, int* len)
@@
-115,7
+114,7
@@
void Comm::get_name (char* name, int* len)
return;
}
if(this == MPI_COMM_WORLD) {
return;
}
if(this == MPI_COMM_WORLD) {
- strncpy(name, "WORLD",
5
);
+ strncpy(name, "WORLD",
6
);
*len = 5;
} else {
*len = snprintf(name, MPI_MAX_NAME_STRING, "%p", this);
*len = 5;
} else {
*len = snprintf(name, MPI_MAX_NAME_STRING, "%p", this);
@@
-216,8
+215,8
@@
MPI_Comm Comm::split(int color, int key)
group_root = group_out; /* Save root's group */
}
for (unsigned j = 0; j < rankmap.size(); j++) {
group_root = group_out; /* Save root's group */
}
for (unsigned j = 0; j < rankmap.size(); j++) {
-
int index = group->index
(rankmap[j].second);
- group_out->set_mapping(
index
, j);
+
ActorPtr actor = group->actor
(rankmap[j].second);
+ group_out->set_mapping(
actor
, j);
}
MPI_Request* requests = xbt_new(MPI_Request, rankmap.size());
int reqs = 0;
}
MPI_Request* requests = xbt_new(MPI_Request, rankmap.size());
int reqs = 0;
@@
-260,10
+259,8
@@
void Comm::cleanup_smp(){
Comm::unref(intra_comm_);
if (leaders_comm_ != MPI_COMM_NULL)
Comm::unref(leaders_comm_);
Comm::unref(intra_comm_);
if (leaders_comm_ != MPI_COMM_NULL)
Comm::unref(leaders_comm_);
- if (non_uniform_map_ != nullptr)
- xbt_free(non_uniform_map_);
- if (leaders_map_ != nullptr)
- delete[] leaders_map_;
+ xbt_free(non_uniform_map_);
+ delete[] leaders_map_;
}
void Comm::unref(Comm* comm){
}
void Comm::unref(Comm* comm){
@@
-297,22
+294,19
@@
void Comm::init_smp(){
smpi_process()->set_replaying(false);
}
smpi_process()->set_replaying(false);
}
- if(smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP){ //we need to switch as the called function may silently touch global variables
- smpi_switch_data_segment(smpi_process()->index());
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
+ // we need to switch as the called function may silently touch global variables
+ smpi_switch_data_segment(simgrid::s4u::Actor::self());
}
//identify neighbours in comm
}
//identify neighbours in comm
- //get the ind
ex
es of all processes sharing the same simix host
-
xbt_swag_t process_list = sg_host_self()->extension<simgrid::simix::Host>()->process_list
;
+ //get the ind
ic
es of all processes sharing the same simix host
+
auto& process_list = sg_host_self()->pimpl_->process_list_
;
int intra_comm_size = 0;
int min_index = INT_MAX; // the minimum index will be the leader
int intra_comm_size = 0;
int min_index = INT_MAX; // the minimum index will be the leader
- smx_actor_t actor = nullptr;
- xbt_swag_foreach(actor, process_list)
- {
- int index = actor->pid - 1;
-
- if (this->group()->rank(index) != MPI_UNDEFINED) {
+ for (auto& actor : process_list) {
+ int index = actor.pid_;
+ if (this->group()->rank(actor.iface()) != MPI_UNDEFINED) { // Is this process in the current group?
intra_comm_size++;
intra_comm_size++;
- // the process is in the comm
if (index < min_index)
min_index = index;
}
if (index < min_index)
min_index = index;
}
@@
-320,11
+314,9
@@
void Comm::init_smp(){
XBT_DEBUG("number of processes deployed on my node : %d", intra_comm_size);
MPI_Group group_intra = new Group(intra_comm_size);
int i = 0;
XBT_DEBUG("number of processes deployed on my node : %d", intra_comm_size);
MPI_Group group_intra = new Group(intra_comm_size);
int i = 0;
- actor = nullptr;
- xbt_swag_foreach(actor, process_list) {
- int index = actor->pid -1;
- if(this->group()->rank(index)!=MPI_UNDEFINED){
- group_intra->set_mapping(index, i);
+ for (auto& actor : process_list) {
+ if (this->group()->rank(actor.iface()) != MPI_UNDEFINED) {
+ group_intra->set_mapping(actor.iface(), i);
i++;
}
}
i++;
}
}
@@
-339,8
+331,9
@@
void Comm::init_smp(){
Coll_allgather_mpich::allgather(&leader, 1, MPI_INT , leaders_map, 1, MPI_INT, this);
Coll_allgather_mpich::allgather(&leader, 1, MPI_INT , leaders_map, 1, MPI_INT, this);
- if(smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP){ //we need to switch as the called function may silently touch global variables
- smpi_switch_data_segment(smpi_process()->index());
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
+ // we need to switch as the called function may silently touch global variables
+ smpi_switch_data_segment(simgrid::s4u::Actor::self());
}
if(leaders_map_==nullptr){
}
if(leaders_map_==nullptr){
@@
-348,11
+341,10
@@
void Comm::init_smp(){
}else{
delete[] leaders_map;
}
}else{
delete[] leaders_map;
}
- int j=0;
int leader_group_size = 0;
for(i=0; i<comm_size; i++){
int already_done = 0;
int leader_group_size = 0;
for(i=0; i<comm_size; i++){
int already_done = 0;
- for (j = 0; j < leader_group_size; j++) {
+ for (
int
j = 0; j < leader_group_size; j++) {
if (leaders_map_[i] == leader_list[j]) {
already_done = 1;
}
if (leaders_map_[i] == leader_list[j]) {
already_done = 1;
}
@@
-370,7
+362,7
@@
void Comm::init_smp(){
if(MPI_COMM_WORLD!=MPI_COMM_UNINITIALIZED && this!=MPI_COMM_WORLD){
//create leader_communicator
for (i=0; i< leader_group_size;i++)
if(MPI_COMM_WORLD!=MPI_COMM_UNINITIALIZED && this!=MPI_COMM_WORLD){
//create leader_communicator
for (i=0; i< leader_group_size;i++)
- leaders_group->set_mapping(
leader_list[i]
, i);
+ leaders_group->set_mapping(
simgrid::s4u::Actor::by_pid(leader_list[i])
, i);
leader_comm = new Comm(leaders_group, nullptr);
this->set_leaders_comm(leader_comm);
this->set_intra_comm(comm_intra);
leader_comm = new Comm(leaders_group, nullptr);
this->set_leaders_comm(leader_comm);
this->set_intra_comm(comm_intra);
@@
-378,7
+370,7
@@
void Comm::init_smp(){
// create intracommunicator
}else{
for (i=0; i< leader_group_size;i++)
// create intracommunicator
}else{
for (i=0; i< leader_group_size;i++)
- leaders_group->set_mapping(
leader_list[i]
, i);
+ leaders_group->set_mapping(
simgrid::s4u::Actor::by_pid(leader_list[i])
, i);
if(this->get_leaders_comm()==MPI_COMM_NULL){
leader_comm = new Comm(leaders_group, nullptr);
if(this->get_leaders_comm()==MPI_COMM_NULL){
leader_comm = new Comm(leaders_group, nullptr);
@@
-412,14
+404,15
@@
void Comm::init_smp(){
}
Coll_bcast_mpich::bcast(&(is_uniform_),1, MPI_INT, 0, comm_intra );
}
Coll_bcast_mpich::bcast(&(is_uniform_),1, MPI_INT, 0, comm_intra );
- if(smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP){ //we need to switch as the called function may silently touch global variables
- smpi_switch_data_segment(smpi_process()->index());
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
+ // we need to switch as the called function may silently touch global variables
+ smpi_switch_data_segment(simgrid::s4u::Actor::self());
}
// Are the ranks blocked ? = allocated contiguously on the SMP nodes
int is_blocked=1;
}
// Are the ranks blocked ? = allocated contiguously on the SMP nodes
int is_blocked=1;
- int prev=this->group()->rank(comm_intra->group()->
index
(0));
+ int prev=this->group()->rank(comm_intra->group()->
actor
(0));
for (i = 1; i < my_local_size; i++) {
for (i = 1; i < my_local_size; i++) {
- int that = this->group()->rank(comm_intra->group()->
index
(i));
+ int that = this->group()->rank(comm_intra->group()->
actor
(i));
if (that != prev + 1) {
is_blocked = 0;
break;
if (that != prev + 1) {
is_blocked = 0;
break;
@@
-490,6
+483,17
@@
void Comm::finish_rma_calls(){
}
}
}
}
+MPI_Comm Comm::split_type(int type, int key, MPI_Info info)
+{
+ if(type != MPI_COMM_TYPE_SHARED){
+ return MPI_COMM_NULL;
+ }
+ this->init_smp();
+ this->ref();
+ this->get_intra_comm()->ref();
+ return this->get_intra_comm();
+}
+
}
}
}
}