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 'xbt_random' into 'master'
[simgrid.git]
/
src
/
smpi
/
colls
/
reduce_scatter
/
reduce_scatter-ompi.cpp
diff --git
a/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
b/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
index
93ae0dc
..
79f77d7
100644
(file)
--- a/
src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
+++ b/
src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
@@
-41,16
+41,15
@@
* Returns: - MPI_SUCCESS or error code
* Limitation: - Works only for commutative operations.
*/
* Returns: - MPI_SUCCESS or error code
* Limitation: - Works only for commutative operations.
*/
-namespace simgrid{
-namespace smpi{
-int
-Coll_reduce_scatter_ompi_basic_recursivehalving::reduce_scatter(const void *sbuf,
- void *rbuf,
- const int *rcounts,
- MPI_Datatype dtype,
- MPI_Op op,
- MPI_Comm comm
- )
+namespace simgrid {
+namespace smpi {
+int reduce_scatter__ompi_basic_recursivehalving(const void *sbuf,
+ void *rbuf,
+ const int *rcounts,
+ MPI_Datatype dtype,
+ MPI_Op op,
+ MPI_Comm comm
+ )
{
int i, rank, size, count, err = MPI_SUCCESS;
int tmp_size = 1, remain = 0, tmp_rank;
{
int i, rank, size, count, err = MPI_SUCCESS;
int tmp_size = 1, remain = 0, tmp_rank;
@@
-348,12
+347,11
@@
Coll_reduce_scatter_ompi_basic_recursivehalving::reduce_scatter(const void *sbuf
* DONE :)
*
*/
* DONE :)
*
*/
-int
-Coll_reduce_scatter_ompi_ring::reduce_scatter(const void *sbuf, void *rbuf, const int *rcounts,
- MPI_Datatype dtype,
- MPI_Op op,
- MPI_Comm comm
- )
+int reduce_scatter__ompi_ring(const void *sbuf, void *rbuf, const int *rcounts,
+ MPI_Datatype dtype,
+ MPI_Op op,
+ MPI_Comm comm
+ )
{
int ret, line, rank, size, i, k, recv_from, send_to, total_count, max_block_count;
int inbi;
{
int ret, line, rank, size, i, k, recv_from, send_to, total_count, max_block_count;
int inbi;