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
spell out -classpath with all letters as it seems to break on kfreebsd when written...
[simgrid.git]
/
src
/
smpi
/
colls
/
allreduce-rdb.c
diff --git
a/src/smpi/colls/allreduce-rdb.c
b/src/smpi/colls/allreduce-rdb.c
index
204de02
..
23e7e30
100644
(file)
--- a/
src/smpi/colls/allreduce-rdb.c
+++ b/
src/smpi/colls/allreduce-rdb.c
@@
-1,10
+1,10
@@
-#include "colls.h"
+#include "colls
_private
.h"
//#include <star-reduction.c>
int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
MPI_Datatype dtype, MPI_Op op, MPI_Comm comm)
{
//#include <star-reduction.c>
int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
MPI_Datatype dtype, MPI_Op op, MPI_Comm comm)
{
- int nprocs, rank, t
ype_size, tag = 543
;
+ int nprocs, rank, t
ag = COLL_TAG_ALLREDUCE
;
int mask, dst, pof2, newrank, rem, newdst;
MPI_Aint extent, lb;
MPI_Status status;
int mask, dst, pof2, newrank, rem, newdst;
MPI_Aint extent, lb;
MPI_Status status;
@@
-28,8
+28,6
@@
int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
smpi_mpi_sendrecv(sbuff, count, dtype, rank, 500,
rbuff, count, dtype, rank, 500, comm, &status);
smpi_mpi_sendrecv(sbuff, count, dtype, rank, 500,
rbuff, count, dtype, rank, 500, comm, &status);
- type_size=smpi_datatype_size(dtype);
-
// find nearest power-of-two less than or equal to comm_size
pof2 = 1;
while (pof2 <= nprocs)
// find nearest power-of-two less than or equal to comm_size
pof2 = 1;
while (pof2 <= nprocs)
@@
-60,7
+58,7
@@
int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
// do the reduction on received data. since the
// ordering is right, it doesn't matter whether
// the operation is commutative or not.
// do the reduction on received data. since the
// ordering is right, it doesn't matter whether
// the operation is commutative or not.
- s
tar_reduction
(op, tmp_buf, rbuff, &count, &dtype);
+ s
mpi_op_apply
(op, tmp_buf, rbuff, &count, &dtype);
// change the rank
newrank = rank / 2;
// change the rank
newrank = rank / 2;
@@
-98,10
+96,10
@@
int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
// we assume it is commuttive op
// if (op -> op_commute || (dst < rank))
if ((dst < rank)) {
// we assume it is commuttive op
// if (op -> op_commute || (dst < rank))
if ((dst < rank)) {
- s
tar_reduction
(op, tmp_buf, rbuff, &count, &dtype);
+ s
mpi_op_apply
(op, tmp_buf, rbuff, &count, &dtype);
} else // op is noncommutative and the order is not right
{
} else // op is noncommutative and the order is not right
{
- s
tar_reduction
(op, rbuff, tmp_buf, &count, &dtype);
+ s
mpi_op_apply
(op, rbuff, tmp_buf, &count, &dtype);
// copy result back into recvbuf
smpi_mpi_sendrecv(tmp_buf, count, dtype, rank, tag, rbuff, count,
// copy result back into recvbuf
smpi_mpi_sendrecv(tmp_buf, count, dtype, rank, tag, rbuff, count,