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
adapt two collectives of starmpi to avoid timing issues, by using only smpi calls...
[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
5e3cf46
..
fec95bc
100644
(file)
--- a/
src/smpi/colls/allreduce-rdb.c
+++ b/
src/smpi/colls/allreduce-rdb.c
@@
-6,7
+6,7
@@
int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
{
int nprocs, rank, type_size, tag = 543;
int mask, dst, pof2, newrank, rem, newdst;
- MPI_Aint extent;
+ MPI_Aint extent
, lb
;
MPI_Status status;
void *tmp_buf = NULL;
/*
@@
-19,20
+19,20
@@
int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
uop = op_ptr->op;
#endif
*/
-
MPI_Comm_size(comm, &nprocs
);
-
MPI_Comm_rank(comm, &rank
);
+
nprocs=smpi_comm_size(comm
);
+
rank=smpi_comm_rank(comm
);
-
MPI_Type_extent(dtype
, &extent);
+
smpi_datatype_extent(dtype,&lb
, &extent);
tmp_buf = (void *) malloc(count * extent);
if (!tmp_buf) {
printf("Could not allocate memory for tmp_buf\n");
return 1;
}
-
MPI_S
endrecv(sbuff, count, dtype, rank, 500,
+
smpi_mpi_s
endrecv(sbuff, count, dtype, rank, 500,
rbuff, count, dtype, rank, 500, comm, &status);
-
MPI_Type_size(dtype, &type_siz
e);
+
type_size=smpi_datatype_size(dtyp
e);
// find nearest power-of-two less than or equal to comm_size
pof2 = 1;
@@
-52,7
+52,7
@@
int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
// even
if (rank % 2 == 0) {
-
MPI_S
end(rbuff, count, dtype, rank + 1, tag, comm);
+
smpi_mpi_s
end(rbuff, count, dtype, rank + 1, tag, comm);
// temporarily set the rank to -1 so that this
// process does not pariticipate in recursive
@@
-60,7
+60,7
@@
int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
newrank = -1;
} else // odd
{
-
MPI_R
ecv(tmp_buf, count, dtype, rank - 1, tag, comm, &status);
+
smpi_mpi_r
ecv(tmp_buf, count, dtype, rank - 1, tag, comm, &status);
// do the reduction on received data. since the
// ordering is right, it doesn't matter whether
// the operation is commutative or not.
@@
-92,7
+92,7
@@
int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
// Send the most current data, which is in recvbuf. Recv
// into tmp_buf
-
MPI_S
endrecv(rbuff, count, dtype, dst, tag, tmp_buf, count, dtype,
+
smpi_mpi_s
endrecv(rbuff, count, dtype, dst, tag, tmp_buf, count, dtype,
dst, tag, comm, &status);
// tmp_buf contains data received in this step.
@@
-108,7
+108,7
@@
int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
star_reduction(op, rbuff, tmp_buf, &count, &dtype);
// copy result back into recvbuf
-
MPI_S
endrecv(tmp_buf, count, dtype, rank, tag, rbuff, count,
+
smpi_mpi_s
endrecv(tmp_buf, count, dtype, rank, tag, rbuff, count,
dtype, rank, tag, comm, &status);
}
mask <<= 1;
@@
-120,9
+120,9
@@
int smpi_coll_tuned_allreduce_rdb(void *sbuff, void *rbuff, int count,
if (rank < 2 * rem) {
if (rank % 2) // odd
-
MPI_S
end(rbuff, count, dtype, rank - 1, tag, comm);
+
smpi_mpi_s
end(rbuff, count, dtype, rank - 1, tag, comm);
else // even
-
MPI_R
ecv(rbuff, count, dtype, rank + 1, tag, comm, &status);
+
smpi_mpi_r
ecv(rbuff, count, dtype, rank + 1, tag, comm, &status);
}
free(tmp_buf);