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
Merge branch 'dvfs'
[simgrid.git]
/
src
/
smpi
/
colls
/
allreduce-smp-binomial.c
diff --git
a/src/smpi/colls/allreduce-smp-binomial.c
b/src/smpi/colls/allreduce-smp-binomial.c
index
49bf0ab
..
77a5abc
100644
(file)
--- a/
src/smpi/colls/allreduce-smp-binomial.c
+++ b/
src/smpi/colls/allreduce-smp-binomial.c
@@
-32,20
+32,10
@@
int smpi_coll_tuned_allreduce_smp_binomial(void *send_buf, void *recv_buf,
{
int comm_size, rank;
void *tmp_buf;
- int tag =
50
;
+ int tag =
COLL_TAG_ALLREDUCE
;
int mask, src, dst;
int num_core = NUM_CORE;
MPI_Status status;
- /*
- #ifdef MPICH2_REDUCTION
- MPI_User_function * uop = MPIR_Op_table[op % 16 - 1];
- #else
- MPI_User_function *uop;
- struct MPIR_OP *op_ptr;
- op_ptr = MPIR_ToPointer(op);
- uop = op_ptr->op;
- #endif
- */
comm_size=smpi_comm_size(comm);
rank=smpi_comm_rank(comm);
@@
-73,7
+63,7
@@
int smpi_coll_tuned_allreduce_smp_binomial(void *send_buf, void *recv_buf,
src = (inter_rank * num_core) + (intra_rank | mask);
if (src < comm_size) {
smpi_mpi_recv(tmp_buf, count, dtype, src, tag, comm, &status);
- s
tar_reduction
(op, tmp_buf, recv_buf, &count, &dtype);
+ s
mpi_op_apply
(op, tmp_buf, recv_buf, &count, &dtype);
}
} else {
dst = (inter_rank * num_core) + (intra_rank & (~mask));
@@
-92,7
+82,7
@@
int smpi_coll_tuned_allreduce_smp_binomial(void *send_buf, void *recv_buf,
src = (inter_rank | mask) * num_core;
if (src < comm_size) {
smpi_mpi_recv(tmp_buf, count, dtype, src, tag, comm, &status);
- s
tar_reduction
(op, tmp_buf, recv_buf, &count, &dtype);
+ s
mpi_op_apply
(op, tmp_buf, recv_buf, &count, &dtype);
}
} else {
dst = (inter_rank & (~mask)) * num_core;