-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-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 "private.h"
-#include "smpi_comm.hpp"
+#include "private.hpp"
#include "smpi_coll.hpp"
+#include "smpi_comm.hpp"
#include "smpi_datatype_derived.hpp"
#include "smpi_op.hpp"
-#include "smpi_process.hpp"
+#include "src/smpi/include/smpi_actor.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi);
-
/* PMPI User level calls */
-extern "C" { // Obviously, the C MPI interface should use the C linkage
int PMPI_Group_free(MPI_Group * group)
{
} else if (rank == nullptr) {
return MPI_ERR_ARG;
} else {
- *rank = group->rank(smpi_process()->index());
+ *rank = group->rank(simgrid::s4u::this_actor::get_pid());
return MPI_SUCCESS;
}
}
-int PMPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1, MPI_Group group2, int *ranks2)
+int PMPI_Group_translate_ranks(MPI_Group group1, int n, const int *ranks1, MPI_Group group2, int *ranks2)
{
if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
return MPI_ERR_GROUP;
if(ranks1[i]==MPI_PROC_NULL){
ranks2[i]=MPI_PROC_NULL;
}else{
- int index = group1->index(ranks1[i]);
- ranks2[i] = group2->rank(index);
+ simgrid::s4u::ActorPtr actor = group1->actor(ranks1[i]);
+ ranks2[i] = group2->rank(actor);
}
}
return MPI_SUCCESS;
}
}
-int PMPI_Group_incl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup)
+int PMPI_Group_incl(MPI_Group group, int n, const int *ranks, MPI_Group * newgroup)
{
if (group == MPI_GROUP_NULL) {
return MPI_ERR_GROUP;
}
}
-int PMPI_Group_excl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup)
+int PMPI_Group_excl(MPI_Group group, int n, const int *ranks, MPI_Group * newgroup)
{
if (group == MPI_GROUP_NULL) {
return MPI_ERR_GROUP;
MPI_Fint PMPI_Group_c2f(MPI_Group group){
return group->c2f();
}
-
-
-}