#include <xbt/ex.hpp>
#include <simgrid/s4u/host.hpp>
+#include <src/smpi/smpi_group.hpp>
#include "private.h"
#include "smpi_mpi_dt_private.h"
if(smpi_privatize_global_variables){ //we need to switch as the called function may silently touch global variables
smpi_switch_data_segment(smpi_process_index());
}
- MPI_Group cp=smpi_group_copy(smpi_comm_group(comm));
+ MPI_Group cp=new simgrid::SMPI::Group(smpi_comm_group(comm));
(*newcomm) = smpi_comm_new(cp, smpi_comm_topo(comm));
int ret = MPI_SUCCESS;
if(comm->attributes !=nullptr){
- (*newcomm)->attributes=xbt_dict_new();
- xbt_dict_cursor_t cursor = nullptr;
- int *key;
- int flag;
- void* value_in;
- void* value_out;
- xbt_dict_foreach(comm->attributes, cursor, key, value_in){
- smpi_comm_key_elem elem =
- static_cast<smpi_comm_key_elem>(xbt_dict_get_or_null_ext(smpi_comm_keyvals, reinterpret_cast<const char*>(key), sizeof(int)));
- if(elem!=nullptr && elem->copy_fn!=MPI_NULL_COPY_FN){
- ret = elem->copy_fn(comm, *key, nullptr, value_in, &value_out, &flag );
- if(ret!=MPI_SUCCESS){
- smpi_comm_destroy(*newcomm);
- *newcomm=MPI_COMM_NULL;
- xbt_dict_cursor_free(&cursor);
- return ret;
- }
- if(flag)
- xbt_dict_set_ext((*newcomm)->attributes, reinterpret_cast<const char*>(key), sizeof(int),value_out, nullptr);
+ (*newcomm)->attributes = xbt_dict_new_homogeneous(nullptr);
+ xbt_dict_cursor_t cursor = nullptr;
+ char* key;
+ int flag;
+ void* value_in;
+ void* value_out;
+ xbt_dict_foreach (comm->attributes, cursor, key, value_in) {
+ smpi_comm_key_elem elem =
+ static_cast<smpi_comm_key_elem>(xbt_dict_get_or_null_ext(smpi_comm_keyvals, key, sizeof(int)));
+ if (elem != nullptr && elem->copy_fn != MPI_NULL_COPY_FN) {
+ ret = elem->copy_fn(comm, atoi(key), nullptr, value_in, &value_out, &flag);
+ if (ret != MPI_SUCCESS) {
+ smpi_comm_destroy(*newcomm);
+ *newcomm = MPI_COMM_NULL;
+ xbt_dict_cursor_free(&cursor);
+ return ret;
}
+ if (flag)
+ xbt_dict_set_ext((*newcomm)->attributes, key, sizeof(int), value_out, nullptr);
+ }
}
}
return ret;
{
if (comm == MPI_COMM_UNINITIALIZED)
comm = smpi_process_comm_world();
- return smpi_group_size(smpi_comm_group(comm));
+ return smpi_comm_group(comm)->getsize();
+ return smpi_comm_group(this)->size();
}
int smpi_comm_rank(MPI_Comm comm)
{
if (comm == MPI_COMM_UNINITIALIZED)
comm = smpi_process_comm_world();
- return smpi_group_rank(smpi_comm_group(comm), smpi_process_index());
+ return smpi_comm_group(comm)->rank(smpi_process_index());
}
void smpi_comm_get_name (MPI_Comm comm, char* name, int* len)
if (comm == MPI_COMM_UNINITIALIZED)
comm = smpi_process_comm_world();
int system_tag = 123;
- int index, rank, size, i, j, count, reqs;
- int* sendbuf;
int* recvbuf;
- int* rankmap;
- MPI_Group group, group_root, group_out;
- MPI_Group* group_snd;
- MPI_Request* requests;
-
- group_root = nullptr;
- group_out = nullptr;
- group = smpi_comm_group(comm);
- rank = smpi_comm_rank(comm);
- size = smpi_comm_size(comm);
+
+ MPI_Group group_root = nullptr;
+ MPI_Group group_out = nullptr;
+ MPI_Group group = smpi_comm_group(comm);
+ int rank = smpi_comm_rank(comm);
+ int size = smpi_comm_size(comm);
/* Gather all colors and keys on rank 0 */
- sendbuf = xbt_new(int, 2);
+ int* sendbuf = xbt_new(int, 2);
sendbuf[0] = color;
sendbuf[1] = key;
if(rank == 0) {
xbt_free(sendbuf);
/* Do the actual job */
if(rank == 0) {
- group_snd = xbt_new(MPI_Group, size);
- rankmap = xbt_new(int, 2 * size);
- for(i = 0; i < size; i++) {
- if(recvbuf[2 * i] != MPI_UNDEFINED) {
-
- count = 0;
- for(j = i + 1; j < size; j++) {
+ MPI_Group* group_snd = xbt_new(MPI_Group, size);
+ int* rankmap = xbt_new(int, 2 * size);
+ for (int i = 0; i < size; i++) {
+ if (recvbuf[2 * i] != MPI_UNDEFINED) {
+ int count = 0;
+ for (int j = i + 1; j < size; j++) {
if(recvbuf[2 * i] == recvbuf[2 * j]) {
recvbuf[2 * j] = MPI_UNDEFINED;
rankmap[2 * count] = j;
rankmap[2 * count + 1] = recvbuf[2 * i + 1];
count++;
qsort(rankmap, count, 2 * sizeof(int), &smpi_compare_rankmap);
- group_out = smpi_group_new(count);
- if(i == 0) {
+ group_out = new simgrid::SMPI::Group(count);
+ if (i == 0) {
group_root = group_out; /* Save root's group */
}
- for(j = 0; j < count; j++) {
- index = smpi_group_index(group, rankmap[2 * j]);
- smpi_group_set_mapping(group_out, index, j);
+ for (int j = 0; j < count; j++) {
+ int index = group->index(rankmap[2 * j]);
+ group_out->set_mapping(index, j);
}
- requests = xbt_new(MPI_Request, count);
- reqs = 0;
- for(j = 0; j < count; j++) {
+ MPI_Request* requests = xbt_new(MPI_Request, count);
+ int reqs = 0;
+ for (int j = 0; j < count; j++) {
if(rankmap[2 * j] != 0) {
- group_snd[reqs]=smpi_group_copy(group_out);
+ group_snd[reqs]=new simgrid::SMPI::Group(group_out);
requests[reqs] = smpi_mpi_isend(&(group_snd[reqs]), 1, MPI_PTR, rankmap[2 * j], system_tag, comm);
reqs++;
}
}
if(i != 0) {
- smpi_group_destroy(group_out);
+ group_out->destroy();
}
smpi_mpi_waitall(reqs, requests, MPI_STATUS_IGNORE);
xbt_free(requests);
void smpi_comm_use(MPI_Comm comm){
if (comm == MPI_COMM_UNINITIALIZED)
comm = smpi_process_comm_world();
- smpi_group_use(comm->group);
+ comm->group->use();
comm->refcount++;
}
void smpi_comm_cleanup_attributes(MPI_Comm comm){
if(comm->attributes !=nullptr){
xbt_dict_cursor_t cursor = nullptr;
- int* key;
- void * value;
+ char* key;
+ void* value;
int flag;
- xbt_dict_foreach(comm->attributes, cursor, key, value){
- smpi_comm_key_elem elem =
- static_cast<smpi_comm_key_elem>(xbt_dict_get_or_null(smpi_comm_keyvals, reinterpret_cast<const char*>(key)));
- if(elem!=nullptr && elem->delete_fn!=nullptr)
- elem->delete_fn(comm, *key, value, &flag);
+ xbt_dict_foreach (comm->attributes, cursor, key, value) {
+ smpi_comm_key_elem elem = static_cast<smpi_comm_key_elem>(xbt_dict_get_or_null(smpi_comm_keyvals, key));
+ if (elem != nullptr && elem->delete_fn != nullptr)
+ elem->delete_fn(comm, atoi(key), value, &flag);
}
xbt_dict_free(&comm->attributes);
}
}
void smpi_comm_cleanup_smp(MPI_Comm comm){
- if(comm->intra_comm != MPI_COMM_NULL)
- smpi_comm_unuse(comm->intra_comm);
- if(comm->leaders_comm != MPI_COMM_NULL)
- smpi_comm_unuse(comm->leaders_comm);
- if(comm->non_uniform_map !=nullptr)
- xbt_free(comm->non_uniform_map);
- if(comm->leaders_map !=nullptr)
- xbt_free(comm->leaders_map);
+ if (comm->intra_comm != MPI_COMM_NULL)
+ smpi_comm_unuse(comm->intra_comm);
+ if (comm->leaders_comm != MPI_COMM_NULL)
+ smpi_comm_unuse(comm->leaders_comm);
+ if (comm->non_uniform_map != nullptr)
+ xbt_free(comm->non_uniform_map);
+ if (comm->leaders_map != nullptr)
+ xbt_free(comm->leaders_map);
}
void smpi_comm_unuse(MPI_Comm comm){
if (comm == MPI_COMM_UNINITIALIZED)
comm = smpi_process_comm_world();
comm->refcount--;
- smpi_group_unuse(comm->group);
+ comm->group->unuse();
if(comm->refcount==0){
smpi_comm_cleanup_smp(comm);
xbt_swag_foreach(process, process_list) {
int index = process->pid -1;
- if(smpi_group_rank(smpi_comm_group(comm), index)!=MPI_UNDEFINED){
+ if(smpi_comm_group(comm)->rank(index)!=MPI_UNDEFINED){
intra_comm_size++;
//the process is in the comm
if(index < min_index)
}
}
XBT_DEBUG("number of processes deployed on my node : %d", intra_comm_size);
- MPI_Group group_intra = smpi_group_new(intra_comm_size);
+ MPI_Group group_intra = new simgrid::SMPI::Group(intra_comm_size);
i=0;
process = nullptr;
xbt_swag_foreach(process, process_list) {
int index = process->pid -1;
- if(smpi_group_rank(smpi_comm_group(comm), index)!=MPI_UNDEFINED){
- smpi_group_set_mapping(group_intra, index, i);
+ if(smpi_comm_group(comm)->rank(index)!=MPI_UNDEFINED){
+ group_intra->set_mapping(index, i);
i++;
}
}
}
qsort(leader_list, leader_group_size, sizeof(int),compare_ints);
- MPI_Group leaders_group = smpi_group_new(leader_group_size);
+ MPI_Group leaders_group = new simgrid::SMPI::Group(leader_group_size);
MPI_Comm leader_comm = MPI_COMM_NULL;
if(MPI_COMM_WORLD!=MPI_COMM_UNINITIALIZED && comm!=MPI_COMM_WORLD){
//create leader_communicator
for (i=0; i< leader_group_size;i++)
- smpi_group_set_mapping(leaders_group, leader_list[i], i);
+ leaders_group->set_mapping(leader_list[i], i);
leader_comm = smpi_comm_new(leaders_group, nullptr);
smpi_comm_set_leaders_comm(comm, leader_comm);
smpi_comm_set_intra_comm(comm, comm_intra);
//create intracommunicator
}else{
for (i=0; i< leader_group_size;i++)
- smpi_group_set_mapping(leaders_group, leader_list[i], i);
+ leaders_group->set_mapping(leader_list[i], i);
if(smpi_comm_get_leaders_comm(comm)==MPI_COMM_NULL){
leader_comm = smpi_comm_new(leaders_group, nullptr);
smpi_comm_set_leaders_comm(comm, leader_comm);
}else{
leader_comm=smpi_comm_get_leaders_comm(comm);
- smpi_group_unuse(leaders_group);
+ leaders_group->unuse();
}
smpi_process_set_comm_intra(comm_intra);
}
}
// Are the ranks blocked ? = allocated contiguously on the SMP nodes
int is_blocked=1;
- int prev=smpi_group_rank(smpi_comm_group(comm), smpi_group_index(smpi_comm_group(comm_intra), 0));
+ int prev=smpi_comm_group(comm)->rank(smpi_comm_group(comm_intra)->index(0));
for (i=1; i<my_local_size; i++){
- int that=smpi_group_rank(smpi_comm_group(comm),smpi_group_index(smpi_comm_group(comm_intra), i));
+ int that=smpi_comm_group(comm)->rank(smpi_comm_group(comm_intra)->index(i));
if(that!=prev+1){
is_blocked=0;
break;
return MPI_SUCCESS;
}
try {
- *static_cast<void**>(attr_value) = xbt_dict_get_ext(comm->attributes,
- reinterpret_cast<const char*>(&keyval), sizeof(int));
+ *static_cast<void**>(attr_value) =
+ xbt_dict_get_ext(comm->attributes, reinterpret_cast<const char*>(&keyval), sizeof(int));
*flag=1;
}
catch (xbt_ex& ex) {
int smpi_comm_attr_put(MPI_Comm comm, int keyval, void* attr_value){
if(smpi_comm_keyvals==nullptr)
- smpi_comm_keyvals = xbt_dict_new();
+ smpi_comm_keyvals = xbt_dict_new_homogeneous(nullptr);
smpi_comm_key_elem elem =
static_cast<smpi_comm_key_elem>(xbt_dict_get_or_null_ext(smpi_comm_keyvals, reinterpret_cast<const char*>(&keyval), sizeof(int)));
if(elem==nullptr)
return ret;
}
if(comm->attributes==nullptr)
- comm->attributes=xbt_dict_new();
+ comm->attributes = xbt_dict_new_homogeneous(nullptr);
xbt_dict_set_ext(comm->attributes, reinterpret_cast<const char*>(&keyval), sizeof(int), attr_value, nullptr);
return MPI_SUCCESS;
int smpi_comm_keyval_create(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval,
void* extra_state){
if(smpi_comm_keyvals==nullptr)
- smpi_comm_keyvals = xbt_dict_new();
+ smpi_comm_keyvals = xbt_dict_new_homogeneous(nullptr);
smpi_comm_key_elem value = static_cast<smpi_comm_key_elem>(xbt_new0(s_smpi_mpi_comm_key_elem_t,1));
