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
Remove unused variables.
[simgrid.git]
/
src
/
smpi
/
colls
/
reduce-flat-tree.c
diff --git
a/src/smpi/colls/reduce-flat-tree.c
b/src/smpi/colls/reduce-flat-tree.c
index
e6434c1
..
f304e78
100644
(file)
--- a/
src/smpi/colls/reduce-flat-tree.c
+++ b/
src/smpi/colls/reduce-flat-tree.c
@@
-1,4
+1,4
@@
-#include "colls.h"
+#include "colls
_private
.h"
//#include <star-reduction.c>
int
//#include <star-reduction.c>
int
@@
-14,14
+14,14
@@
smpi_coll_tuned_reduce_flat_tree(void *sbuf, void *rbuf, int count,
char *inbuf;
MPI_Status status;
char *inbuf;
MPI_Status status;
-
MPI_Comm_rank(comm, &rank
);
-
MPI_Comm_size(comm, &size
);
+
rank = smpi_comm_rank(comm
);
+
size = smpi_comm_size(comm
);
/* If not root, send data to the root. */
/* If not root, send data to the root. */
-
MPI_Type_extent(dtype, &extent
);
+
extent = smpi_datatype_get_extent(dtype
);
if (rank != root) {
if (rank != root) {
-
MPI_S
end(sbuf, count, dtype, root, tag, comm);
+
smpi_mpi_s
end(sbuf, count, dtype, root, tag, comm);
return 0;
}
return 0;
}
@@
-29,15
+29,15
@@
smpi_coll_tuned_reduce_flat_tree(void *sbuf, void *rbuf, int count,
messages. */
if (size > 1)
messages. */
if (size > 1)
- origin = (char *) malloc(count * extent);
+ origin = (char *)
xbt_
malloc(count * extent);
/* Initialize the receive buffer. */
if (rank == (size - 1))
/* Initialize the receive buffer. */
if (rank == (size - 1))
-
MPI_S
endrecv(sbuf, count, dtype, rank, tag,
+
smpi_mpi_s
endrecv(sbuf, count, dtype, rank, tag,
rbuf, count, dtype, rank, tag, comm, &status);
else
rbuf, count, dtype, rank, tag, comm, &status);
else
-
MPI_R
ecv(rbuf, count, dtype, size - 1, tag, comm, &status);
+
smpi_mpi_r
ecv(rbuf, count, dtype, size - 1, tag, comm, &status);
/* Loop receiving and calling reduction function (C or Fortran). */
/* Loop receiving and calling reduction function (C or Fortran). */
@@
-45,12
+45,12
@@
smpi_coll_tuned_reduce_flat_tree(void *sbuf, void *rbuf, int count,
if (rank == i)
inbuf = sbuf;
else {
if (rank == i)
inbuf = sbuf;
else {
-
MPI_R
ecv(origin, count, dtype, i, tag, comm, &status);
+
smpi_mpi_r
ecv(origin, count, dtype, i, tag, comm, &status);
inbuf = origin;
}
/* Call reduction function. */
inbuf = origin;
}
/* Call reduction function. */
- s
tar_reduction
(op, inbuf, rbuf, &count, &dtype);
+ s
mpi_op_apply
(op, inbuf, rbuf, &count, &dtype);
}
}