X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07f07c110338b034abedccf6fdb2d0dcbf6c7f3e..cd9affe6152d6bbec19a72ea6fe26ab9407b51b7:/src/smpi/colls/allgather-loosely-lr.c diff --git a/src/smpi/colls/allgather-loosely-lr.c b/src/smpi/colls/allgather-loosely-lr.c index 242990ff31..74df884b27 100644 --- a/src/smpi/colls/allgather-loosely-lr.c +++ b/src/smpi/colls/allgather-loosely-lr.c @@ -1,8 +1,10 @@ -#include "colls_private.h" +/* Copyright (c) 2013-2014. 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. */ -#ifndef NUM_CORE -#define NUM_CORE 4 -#endif +#include "colls_private.h" int smpi_coll_tuned_allgather_loosely_lr(void *sbuf, int scount, MPI_Datatype stype, void *rbuf, @@ -17,10 +19,13 @@ int smpi_coll_tuned_allgather_loosely_lr(void *sbuf, int scount, comm_size = smpi_comm_size(comm); - int num_core = simcall_host_get_core(SIMIX_host_self()); - // do we use the default one or the number of cores in the platform ? - // if the number of cores is one, the platform may be simulated with 1 node = 1 core - if (num_core == 1) num_core = NUM_CORE; +if(smpi_comm_get_leaders_comm(comm)==MPI_COMM_NULL){ + smpi_comm_init_smp(comm); + } + int num_core=1; + if (smpi_comm_is_uniform(comm)){ + num_core = smpi_comm_size(smpi_comm_get_intra_comm(comm)); + } if(comm_size%num_core) THROWF(arg_error,0, "allgather loosely lr algorithm can't be used with non multiple of NUM_CORE=%d number of processes ! ",num_core);