A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sanitize the OOP of kernel::profile
[simgrid.git]
/
src
/
smpi
/
colls
/
smpi_default_selector.cpp
diff --git
a/src/smpi/colls/smpi_default_selector.cpp
b/src/smpi/colls/smpi_default_selector.cpp
index
f48c4bf
..
3b8252a
100644
(file)
--- a/
src/smpi/colls/smpi_default_selector.cpp
+++ b/
src/smpi/colls/smpi_default_selector.cpp
@@
-1,13
+1,12
@@
/* selector with default/naive Simgrid algorithms. These should not be trusted for performance evaluations */
/* selector with default/naive Simgrid algorithms. These should not be trusted for performance evaluations */
-/* Copyright (c) 2009-2010, 2013-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2009-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 "colls_private.hpp"
/* 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 "colls_private.hpp"
-#include "s
mpi_process
.hpp"
+#include "s
rc/smpi/include/smpi_actor
.hpp"
namespace simgrid{
namespace smpi{
namespace simgrid{
namespace smpi{
@@
-213,7
+212,7
@@
int Coll_reduce_default::reduce(void *sendbuf, void *recvbuf, int count, MPI_Dat
int rank = comm->rank();
int size = comm->size();
int rank = comm->rank();
int size = comm->size();
- if
(size==
0)
+ if
(size <=
0)
return MPI_ERR_COMM;
//non commutative case, use a working algo from openmpi
if (op != MPI_OP_NULL && not op->is_commutative()) {
return MPI_ERR_COMM;
//non commutative case, use a working algo from openmpi
if (op != MPI_OP_NULL && not op->is_commutative()) {
@@
-277,9
+276,9
@@
int Coll_reduce_default::reduce(void *sendbuf, void *recvbuf, int count, MPI_Dat
int Coll_allreduce_default::allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
{
int ret;
int Coll_allreduce_default::allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
{
int ret;
- ret = Coll
s
::reduce(sendbuf, recvbuf, count, datatype, op, 0, comm);
+ ret = Coll
_reduce_default
::reduce(sendbuf, recvbuf, count, datatype, op, 0, comm);
if(ret==MPI_SUCCESS)
if(ret==MPI_SUCCESS)
- ret = Coll
s
::bcast(recvbuf, count, datatype, 0, comm);
+ ret = Coll
_bcast_default
::bcast(recvbuf, count, datatype, 0, comm);
return ret;
}
return ret;
}