X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c468e95ef526199c64b83d5ab0356100c532571d..9afa0d0db01da2ae64e48fb594cc87c186dde192:/src/smpi/colls/smpi_openmpi_selector.cpp diff --git a/src/smpi/colls/smpi_openmpi_selector.cpp b/src/smpi/colls/smpi_openmpi_selector.cpp index 5a762008ab..51602c6134 100644 --- a/src/smpi/colls/smpi_openmpi_selector.cpp +++ b/src/smpi/colls/smpi_openmpi_selector.cpp @@ -1,7 +1,7 @@ /* selector for collective algorithms based on openmpi's default coll_tuned_decision_fixed selector * Updated 02/2022 */ -/* Copyright (c) 2009-2022. The SimGrid Team. +/* Copyright (c) 2009-2023. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -11,16 +11,7 @@ #include -/* FIXME -add algos: -allreduce nonoverlapping, basic linear -alltoall linear_sync -bcast chain -scatter linear_nb -*/ - -namespace simgrid { -namespace smpi { +namespace simgrid::smpi { int allreduce__ompi(const void *sbuf, void *rbuf, int count, MPI_Datatype dtype, MPI_Op op, MPI_Comm comm) @@ -1069,10 +1060,10 @@ int allgatherv__ompi(const void *sbuf, int scount, int (*funcs[])(const void*, int, MPI_Datatype, void*, const int*, const int*, MPI_Datatype, MPI_Comm) = { &allgatherv__GB, - &allgatherv__ompi_bruck, - &allgatherv__mpich_ring, - &allgatherv__ompi_neighborexchange, - &allgatherv__pair + &allgatherv__ompi_bruck, + &allgatherv__mpich_ring, + &allgatherv__ompi_neighborexchange, + &allgatherv__pair }; /** Algorithms: * {1, "default"}, @@ -1195,8 +1186,8 @@ int gather__ompi(const void *sbuf, int scount, } int (*funcs[])(const void*, int, MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm) = { &gather__ompi_basic_linear, - &gather__ompi_binomial, - &gather__ompi_linear_sync + &gather__ompi_binomial, + &gather__ompi_linear_sync }; /** Algorithms: * {1, "basic_linear"}, @@ -1273,7 +1264,7 @@ int scatter__ompi(const void *sbuf, int scount, int (*funcs[])(const void*, int, MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm) = { &scatter__ompi_basic_linear, &scatter__ompi_binomial, - &scatter__ompi_basic_linear + &scatter__ompi_linear_nb }; /** Algorithms: * {1, "basic_linear"}, @@ -1344,5 +1335,4 @@ int scatter__ompi(const void *sbuf, int scount, return funcs[alg-1](sbuf, scount, sdtype, rbuf, rcount, rdtype, root, comm); } -} -} +} // namespace simgrid::smpi