X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c6b98b47d12d799b9da4232012268f39ea424daa..3907e83884bae6278656e9cd2cb7ef92a8f707fb:/src/smpi/mpi/smpi_topo.cpp diff --git a/src/smpi/mpi/smpi_topo.cpp b/src/smpi/mpi/smpi_topo.cpp index 5f28d6fc49..48b723dc3c 100644 --- a/src/smpi/mpi/smpi_topo.cpp +++ b/src/smpi/mpi/smpi_topo.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-2023. 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. */ @@ -16,8 +16,7 @@ static int assignnodes(int ndim, const std::vector& factors, std::vector& dims); static int getfactors(int num, std::vector& factors); -namespace simgrid{ -namespace smpi{ +namespace simgrid::smpi { void Topo::setComm(MPI_Comm comm) { @@ -38,9 +37,6 @@ Topo_Cart::Topo_Cart(int ndims) : ndims_(ndims), dims_(ndims), periodic_(ndims), Topo_Cart::Topo_Cart(MPI_Comm comm_old, int ndims, const int dims[], const int periods[], int /*reorder*/, MPI_Comm* comm_cart) : Topo_Cart(ndims) { - MPI_Group newGroup; - MPI_Group oldGroup; - int rank = comm_old->rank(); if(ndims != 0) { @@ -66,10 +62,10 @@ Topo_Cart::Topo_Cart(MPI_Comm comm_old, int ndims, const int dims[], const int p position_[i] = rank / nranks; rank = rank % nranks; } - + if(comm_cart != nullptr){ - oldGroup = comm_old->group(); - newGroup = new Group(newSize); + const Group* oldGroup = comm_old->group(); + auto* newGroup = new Group(newSize); for (int i = 0 ; i < newSize ; i++) { newGroup->set_mapping(oldGroup->actor(i), i); } @@ -323,8 +319,7 @@ int Topo_Cart::Dims_create(int nnodes, int ndims, int dims[]) return MPI_SUCCESS; } -} -} +} // namespace simgrid::smpi /* * assignnodes