-/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2020. 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_group.hpp"
#include "smpi_comm.hpp"
#include <string>
-#include <xbt/log.h>
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_group, smpi, "Logging specific to SMPI (group)");
simgrid::smpi::Group mpi_MPI_GROUP_EMPTY;
MPI_Group MPI_GROUP_EMPTY=&mpi_MPI_GROUP_EMPTY;
namespace simgrid{
namespace smpi{
-Group::Group(Group* origin)
+Group::Group(const Group* origin)
{
if (origin != MPI_GROUP_NULL && origin != MPI_GROUP_EMPTY) {
size_ = origin->size();
int Group::rank(s4u::Actor* actor)
{
auto iterator = actor_to_rank_map_.find(actor);
+ //I'm not in the communicator ... but maybe my parent is ?
+ if (iterator == actor_to_rank_map_.end())
+ iterator = actor_to_rank_map_.find(s4u::Actor::by_pid(actor->get_ppid()).get());
return (iterator == actor_to_rank_map_.end()) ? MPI_UNDEFINED : (*iterator).second;
}
int Group::incl(int n, const int* ranks, MPI_Group* newgroup)
{
- int i=0;
if (n == 0) {
*newgroup = MPI_GROUP_EMPTY;
} else if (n == size_) {
this->ref();
} else {
*newgroup = new Group(n);
- for (i = 0; i < n; i++) {
+ for (int i = 0; i < n; i++) {
s4u::Actor* actor = this->actor(ranks[i]); // ranks[] was passed as a param!
(*newgroup)->set_mapping(actor, i);
}
}
delete[] to_exclude;
return MPI_SUCCESS;
-
}
static bool is_rank_in_range(int rank, int first, int last)
char key[KEY_SIZE];
return static_cast<MPI_Group>(F2C::f2c_lookup()->at(get_key(key, id)));
} else {
- return static_cast<MPI_Group>(MPI_GROUP_NULL);
+ return MPI_GROUP_NULL;
}
}