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
add allgatherv algo from ompi
[simgrid.git]
/
src
/
smpi
/
colls
/
smpi_openmpi_selector.c
diff --git
a/src/smpi/colls/smpi_openmpi_selector.c
b/src/smpi/colls/smpi_openmpi_selector.c
index
2c4fc10
..
36f901f
100644
(file)
--- a/
src/smpi/colls/smpi_openmpi_selector.c
+++ b/
src/smpi/colls/smpi_openmpi_selector.c
@@
-40,7
+40,6
@@
int smpi_coll_tuned_allreduce_ompi(void *sbuf, void *rbuf, int count,
return smpi_coll_tuned_allreduce_lr(sbuf, rbuf, count, dtype,
op, comm);
} else {
return smpi_coll_tuned_allreduce_lr(sbuf, rbuf, count, dtype,
op, comm);
} else {
- // return (smpi_coll_tuned_allreduce_intra_ring_segmented (sbuf, rbuf,
return (smpi_coll_tuned_allreduce_ompi_ring_segmented (sbuf, rbuf,
count, dtype,
op, comm
return (smpi_coll_tuned_allreduce_ompi_ring_segmented (sbuf, rbuf,
count, dtype,
op, comm
@@
-427,15
+426,15
@@
int smpi_coll_tuned_allgather_ompi(void *sbuf, int scount,
comm);
}
} else {
comm);
}
} else {
-
//
if (communicator_size % 2) {
+ if (communicator_size % 2) {
return smpi_coll_tuned_allgather_ring(sbuf, scount, sdtype,
rbuf, rcount, rdtype,
comm);
return smpi_coll_tuned_allgather_ring(sbuf, scount, sdtype,
rbuf, rcount, rdtype,
comm);
-
/*
} else {
- return smpi_coll_tuned_allgather_
intra
_neighborexchange(sbuf, scount, sdtype,
+ } else {
+ return smpi_coll_tuned_allgather_
ompi
_neighborexchange(sbuf, scount, sdtype,
rbuf, rcount, rdtype,
rbuf, rcount, rdtype,
- comm
, module
);
- }
*/
+ comm);
+ }
}
#if defined(USE_MPICH2_DECISION)
}
#if defined(USE_MPICH2_DECISION)
@@
-449,17
+448,17
@@
int smpi_coll_tuned_allgather_ompi(void *sbuf, int scount,
- for everything else use ring.
*/
if ((pow2_size == communicator_size) && (total_dsize < 524288)) {
- for everything else use ring.
*/
if ((pow2_size == communicator_size) && (total_dsize < 524288)) {
- return smpi_coll_tuned_allgather_
intra_recursivedoubling
(sbuf, scount, sdtype,
+ return smpi_coll_tuned_allgather_
rdb
(sbuf, scount, sdtype,
rbuf, rcount, rdtype,
rbuf, rcount, rdtype,
- comm
, module
);
+ comm);
} else if (total_dsize <= 81920) {
} else if (total_dsize <= 81920) {
- return smpi_coll_tuned_allgather_
intra_
bruck(sbuf, scount, sdtype,
+ return smpi_coll_tuned_allgather_bruck(sbuf, scount, sdtype,
rbuf, rcount, rdtype,
rbuf, rcount, rdtype,
- comm
, module
);
+ comm);
}
}
- return smpi_coll_tuned_allgather_
intra_
ring(sbuf, scount, sdtype,
+ return smpi_coll_tuned_allgather_ring(sbuf, scount, sdtype,
rbuf, rcount, rdtype,
rbuf, rcount, rdtype,
- comm
, module
);
+ comm);
#endif /* defined(USE_MPICH2_DECISION) */
}
#endif /* defined(USE_MPICH2_DECISION) */
}
@@
-501,15
+500,15
@@
int smpi_coll_tuned_allgatherv_ompi(void *sbuf, int scount,
comm);
} else {
comm);
} else {
-
//
if (communicator_size % 2) {
+ if (communicator_size % 2) {
return smpi_coll_tuned_allgatherv_ring(sbuf, scount, sdtype,
rbuf, rcounts, rdispls, rdtype,
comm);
return smpi_coll_tuned_allgatherv_ring(sbuf, scount, sdtype,
rbuf, rcounts, rdispls, rdtype,
comm);
-
/*
} else {
- return smpi_coll_tuned_allgatherv_
intra
_neighborexchange(sbuf, scount, sdtype,
+ } else {
+ return smpi_coll_tuned_allgatherv_
ompi
_neighborexchange(sbuf, scount, sdtype,
rbuf, rcounts, rdispls, rdtype,
rbuf, rcounts, rdispls, rdtype,
- comm
, module
);
- }
*/
+ comm);
+ }
}
}
/*
}
}
/*