X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1847d1441271d076b3de449c8853031ea208ce8f..286e92b3ac7d4d1247ee3239cc46b00b3b9e60b6:/src/smpi/mpi/smpi_comm.cpp diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp index e70e2052c5..6baa55961e 100644 --- a/src/smpi/mpi/smpi_comm.cpp +++ b/src/smpi/mpi/smpi_comm.cpp @@ -1,22 +1,18 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2019. 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" -#include "private.h" -#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_status.hpp" #include "smpi_win.hpp" -#include "src/simix/smx_private.h" -#include +#include "smpi_info.hpp" +#include "src/smpi/include/smpi_actor.hpp" +#include "src/surf/HostImpl.hpp" + #include -#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi, "Logging specific to SMPI (comm)"); @@ -32,16 +28,17 @@ namespace smpi{ std::unordered_map Comm::keyvals_; 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, int smp) : group_(group), topo_(topo),is_smp_comm_(smp) { - 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; - leaders_map_ = nullptr; - is_blocked_=0; + leaders_map_ = nullptr; + is_blocked_ = 0; + info_ = MPI_INFO_NULL; } void Comm::destroy(Comm* comm) @@ -55,32 +52,59 @@ void Comm::destroy(Comm* comm) } 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(s4u::Actor::self()); } 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; - void* value_out; + int flag=0; + void* value_out=nullptr; for (auto const& it : *attributes()) { smpi_key_elem elem = keyvals_.at(it.first); - if (elem != nullptr && elem->copy_fn.comm_copy_fn != MPI_NULL_COPY_FN) { - ret = elem->copy_fn.comm_copy_fn(this, it.first, nullptr, it.second, &value_out, &flag); + if (elem != nullptr){ + if( elem->copy_fn.comm_copy_fn != MPI_NULL_COPY_FN && + elem->copy_fn.comm_copy_fn != MPI_COMM_DUP_FN) + ret = elem->copy_fn.comm_copy_fn(this, it.first, elem->extra_state, it.second, &value_out, &flag); + else if ( elem->copy_fn.comm_copy_fn_fort != MPI_NULL_COPY_FN && + *(int*)*elem->copy_fn.comm_copy_fn_fort != 1){ + value_out=(int*)xbt_malloc(sizeof(int)); + elem->copy_fn.comm_copy_fn_fort(this, it.first, elem->extra_state, it.second, value_out, &flag,&ret); + } if (ret != MPI_SUCCESS) { Comm::destroy(*newcomm); *newcomm = MPI_COMM_NULL; return ret; } - if (flag){ + if (elem->copy_fn.comm_copy_fn == MPI_COMM_DUP_FN || + ((elem->copy_fn.comm_copy_fn_fort != MPI_NULL_COPY_FN) && *(int*)*elem->copy_fn.comm_copy_fn_fort == 1)){ + elem->refcount++; + (*newcomm)->attributes()->insert({it.first, it.second}); + }else if (flag){ elem->refcount++; (*newcomm)->attributes()->insert({it.first, value_out}); } } } } + //duplicate info if present + if(info_!=MPI_INFO_NULL) + (*newcomm)->info_ = new simgrid::smpi::Info(info_); + return ret; +} + +int Comm::dup_with_info(MPI_Info info, MPI_Comm* newcomm){ + int ret = dup(newcomm); + if((*newcomm)->info_!=MPI_INFO_NULL){ + simgrid::smpi::Info::unref((*newcomm)->info_); + (*newcomm)->info_=MPI_INFO_NULL; + } + if(info != MPI_INFO_NULL){ + (*newcomm)->info_=info; + } return ret; } @@ -91,10 +115,6 @@ MPI_Group Comm::group() return group_; } -MPI_Topology Comm::topo() { - return topo_; -} - int Comm::size() { if (this == MPI_COMM_UNINITIALIZED) @@ -106,7 +126,7 @@ int Comm::rank() { if (this == MPI_COMM_UNINITIALIZED) return smpi_process()->comm_world()->rank(); - return group_->rank(smpi_process()->index()); + return group_->rank(s4u::Actor::self()); } void Comm::get_name (char* name, int* len) @@ -115,14 +135,27 @@ void Comm::get_name (char* name, int* len) smpi_process()->comm_world()->get_name(name, len); return; } - if(this == MPI_COMM_WORLD) { - strncpy(name, "WORLD",5); - *len = 5; + if(this == MPI_COMM_WORLD && name_.empty()) { + strncpy(name, "MPI_COMM_WORLD", 15); + *len = 14; + } else if(this == MPI_COMM_SELF && name_.empty()) { + strncpy(name, "MPI_COMM_SELF", 14); + *len = 13; } else { - *len = snprintf(name, MPI_MAX_NAME_STRING, "%p", this); + *len = snprintf(name, MPI_MAX_NAME_STRING+1, "%s", name_.c_str()); + } +} + +void Comm::set_name (const char* name) +{ + if (this == MPI_COMM_UNINITIALIZED){ + smpi_process()->comm_world()->set_name(name); + return; } + name_.replace (0, MPI_MAX_NAME_STRING+1, name); } + void Comm::set_leaders_comm(MPI_Comm leaders){ if (this == MPI_COMM_UNINITIALIZED){ smpi_process()->comm_world()->set_leaders_comm(leaders); @@ -131,10 +164,6 @@ void Comm::set_leaders_comm(MPI_Comm leaders){ leaders_comm_=leaders; } -void Comm::set_intra_comm(MPI_Comm leaders){ - intra_comm_=leaders; -} - int* Comm::get_non_uniform_map(){ if (this == MPI_COMM_UNINITIALIZED) return smpi_process()->comm_world()->get_non_uniform_map(); @@ -171,6 +200,12 @@ int Comm::is_blocked(){ return is_blocked_; } +int Comm::is_smp_comm(){ + if (this == MPI_COMM_UNINITIALIZED) + return smpi_process()->comm_world()->is_smp_comm(); + return is_smp_comm_; +} + MPI_Comm Comm::split(int color, int key) { if (this == MPI_COMM_UNINITIALIZED) @@ -181,13 +216,13 @@ MPI_Comm Comm::split(int color, int key) MPI_Group group_root = nullptr; MPI_Group group_out = nullptr; MPI_Group group = this->group(); - int rank = this->rank(); + int myrank = this->rank(); int size = this->size(); /* Gather all colors and keys on rank 0 */ int* sendbuf = xbt_new(int, 2); sendbuf[0] = color; sendbuf[1] = key; - if(rank == 0) { + if (myrank == 0) { recvbuf = xbt_new(int, 2 * size); } else { recvbuf = nullptr; @@ -195,7 +230,7 @@ MPI_Comm Comm::split(int color, int key) Coll_gather_default::gather(sendbuf, 2, MPI_INT, recvbuf, 2, MPI_INT, 0, this); xbt_free(sendbuf); /* Do the actual job */ - if(rank == 0) { + if (myrank == 0) { MPI_Group* group_snd = xbt_new(MPI_Group, size); std::vector> rankmap; rankmap.reserve(size); @@ -217,8 +252,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++) { - int index = group->index(rankmap[j].second); - group_out->set_mapping(index, j); + s4u::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; @@ -261,10 +296,8 @@ void Comm::cleanup_smp(){ 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) - xbt_free(leaders_map_); + xbt_free(non_uniform_map_); + delete[] leaders_map_; } void Comm::unref(Comm* comm){ @@ -282,9 +315,35 @@ void Comm::unref(Comm* comm){ } } +MPI_Comm Comm::find_intra_comm(int * leader){ + //get the indices 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 + for (auto& actor : process_list) { + int index = actor.get_pid(); + if (this->group()->rank(actor.iface()) != MPI_UNDEFINED) { // Is this process in the current group? + intra_comm_size++; + if (index < min_index) + min_index = index; + } + } + 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; + for (auto& actor : process_list) { + if (this->group()->rank(actor.iface()) != MPI_UNDEFINED) { + group_intra->set_mapping(actor.iface(), i); + i++; + } + } + *leader=min_index; + return new Comm(group_intra, nullptr, 1); +} + void Comm::init_smp(){ int leader = -1; - + int i = 0; if (this == MPI_COMM_UNINITIALIZED) smpi_process()->comm_world()->init_smp(); @@ -298,63 +357,35 @@ void Comm::init_smp(){ 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(s4u::Actor::self()); } //identify neighbours in comm - //get the indexes of all processes sharing the same simix host - xbt_swag_t process_list = sg_host_self()->extension()->process_list; - 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; + MPI_Comm comm_intra = find_intra_comm(&leader); - if (this->group()->rank(index) != MPI_UNDEFINED) { - intra_comm_size++; - // the process is in the comm - if (index < min_index) - min_index = index; - } - } - 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); - i++; - } - } - - MPI_Comm comm_intra = new Comm(group_intra, nullptr); - leader=min_index; - int * leaders_map= static_cast(xbt_malloc0(sizeof(int)*comm_size)); - int * leader_list= static_cast(xbt_malloc0(sizeof(int)*comm_size)); - for(i=0; iindex()); + if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) { + // we need to switch as the called function may silently touch global variables + smpi_switch_data_segment(s4u::Actor::self()); } if(leaders_map_==nullptr){ leaders_map_= leaders_map; }else{ - xbt_free(leaders_map); + delete[] leaders_map; } - int j=0; int leader_group_size = 0; for(i=0; iset_mapping(leader_list[i], i); - leader_comm = new Comm(leaders_group, nullptr); + leaders_group->set_mapping(s4u::Actor::by_pid(leader_list[i]), i); + leader_comm = new Comm(leaders_group, nullptr,1); this->set_leaders_comm(leader_comm); this->set_intra_comm(comm_intra); // create intracommunicator }else{ for (i=0; i< leader_group_size;i++) - leaders_group->set_mapping(leader_list[i], i); + leaders_group->set_mapping(s4u::Actor::by_pid(leader_list[i]), i); if(this->get_leaders_comm()==MPI_COMM_NULL){ - leader_comm = new Comm(leaders_group, nullptr); + leader_comm = new Comm(leaders_group, nullptr,1); this->set_leaders_comm(leader_comm); }else{ leader_comm=this->get_leaders_comm(); @@ -397,7 +428,7 @@ void Comm::init_smp(){ if(comm_intra->rank()==0) { int is_uniform = 1; int* non_uniform_map = xbt_new0(int,leader_group_size); - Coll_allgather_mpich::allgather(&my_local_size, 1, MPI_INT, + Coll_allgather_ring::allgather(&my_local_size, 1, MPI_INT, non_uniform_map, 1, MPI_INT, leader_comm); for(i=0; i < leader_group_size; i++) { if(non_uniform_map[0] != non_uniform_map[i]) { @@ -412,16 +443,17 @@ void Comm::init_smp(){ } is_uniform_=is_uniform; } - Coll_bcast_mpich::bcast(&(is_uniform_),1, MPI_INT, 0, comm_intra ); + Coll_bcast_scatter_LR_allgather::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(s4u::Actor::self()); } // 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++) { - 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; @@ -439,7 +471,7 @@ void Comm::init_smp(){ }else{ is_blocked_=global_blocked; } - xbt_free(leader_list); + delete[] leader_list; if(replaying) smpi_process()->set_replaying(true); @@ -492,7 +524,34 @@ void Comm::finish_rma_calls(){ } } +MPI_Info Comm::info(){ + if(info_== MPI_INFO_NULL) + info_ = new Info(); + info_->ref(); + return info_; } + +void Comm::set_info(MPI_Info info){ + if(info_!= MPI_INFO_NULL) + info->ref(); + info_=info; } +MPI_Comm Comm::split_type(int type, int /*key*/, MPI_Info) +{ + //MPI_UNDEFINED can be given to some nodes... but we need them to still perform the smp part which is collective + if(type != MPI_COMM_TYPE_SHARED && type != MPI_UNDEFINED){ + return MPI_COMM_NULL; + } + int leader=0; + MPI_Comm res= this->find_intra_comm(&leader); + if(type != MPI_UNDEFINED) + return res; + else{ + Comm::destroy(res); + return MPI_COMM_NULL; + } +} +} // namespace smpi +} // namespace simgrid