From 78b786f599846a182722690739c50e734dbe0676 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Tue, 28 Aug 2018 17:37:50 +0200 Subject: [PATCH] update ompi selector as well with "recent" version --- src/smpi/colls/barrier/barrier-mpich-smp.cpp | 6 ++++++ src/smpi/colls/smpi_openmpi_selector.cpp | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/smpi/colls/barrier/barrier-mpich-smp.cpp b/src/smpi/colls/barrier/barrier-mpich-smp.cpp index 6df4962690..2820a06f1b 100644 --- a/src/smpi/colls/barrier/barrier-mpich-smp.cpp +++ b/src/smpi/colls/barrier/barrier-mpich-smp.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2013-2018. 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. */ + /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ /* * diff --git a/src/smpi/colls/smpi_openmpi_selector.cpp b/src/smpi/colls/smpi_openmpi_selector.cpp index 4a25997a50..23271f6e40 100644 --- a/src/smpi/colls/smpi_openmpi_selector.cpp +++ b/src/smpi/colls/smpi_openmpi_selector.cpp @@ -96,7 +96,7 @@ int Coll_alltoallv_ompi::alltoallv(void *sbuf, int *scounts, int *sdisps, ) { /* For starters, just keep the original algorithm. */ - return Coll_alltoallv_ompi_basic_linear::alltoallv(sbuf, scounts, sdisps, sdtype, + return Coll_alltoallv_ring::alltoallv(sbuf, scounts, sdisps, sdtype, rbuf, rcounts, rdisps,rdtype, comm); } @@ -491,10 +491,7 @@ int Coll_allgatherv_ompi::allgatherv(void *sbuf, int scount, /* Decision based on allgather decision. */ if (total_dsize < 50000) { -/* return Coll_allgatherv_intra_bruck::allgatherv(sbuf, scount, sdtype, - rbuf, rcounts, rdispls, rdtype, - comm, module);*/ - return Coll_allgatherv_ring::allgatherv(sbuf, scount, sdtype, + return Coll_allgatherv_ompi_bruck::allgatherv(sbuf, scount, sdtype, rbuf, rcounts, rdispls, rdtype, comm); -- 2.20.1