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 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
smpi
/
colls
/
allreduce-rab2.c
diff --git
a/src/smpi/colls/allreduce-rab2.c
b/src/smpi/colls/allreduce-rab2.c
index
982933c
..
372d5e8
100644
(file)
--- a/
src/smpi/colls/allreduce-rab2.c
+++ b/
src/smpi/colls/allreduce-rab2.c
@@
-1,3
+1,9
@@
+/* Copyright (c) 2013-2014. The SimGrid Team.
+ * All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
#include "colls_private.h"
//#include <star-reduction.c>
#include "colls_private.h"
//#include <star-reduction.c>
@@
-34,9
+40,9
@@
int smpi_coll_tuned_allreduce_rab2(void *sbuff, void *rbuff,
send_size = (count + nprocs) / nprocs;
nbytes = send_size * s_extent;
send_size = (count + nprocs) / nprocs;
nbytes = send_size * s_extent;
- send = (void *)
xbt_malloc
(s_extent * send_size * nprocs);
- recv = (void *)
xbt_malloc
(s_extent * send_size * nprocs);
- tmp = (void *)
xbt_malloc
(nbytes);
+ send = (void *)
smpi_get_tmp_sendbuffer
(s_extent * send_size * nprocs);
+ recv = (void *)
smpi_get_tmp_recvbuffer
(s_extent * send_size * nprocs);
+ tmp = (void *)
smpi_get_tmp_sendbuffer
(nbytes);
memcpy(send, sbuff, s_extent * count);
memcpy(send, sbuff, s_extent * count);
@@
-50,16
+56,16
@@
int smpi_coll_tuned_allreduce_rab2(void *sbuff, void *rbuff,
mpi_coll_allgather_fun(tmp, send_size, dtype, recv, send_size, dtype, comm);
memcpy(rbuff, recv, count * s_extent);
mpi_coll_allgather_fun(tmp, send_size, dtype, recv, send_size, dtype, comm);
memcpy(rbuff, recv, count * s_extent);
-
free
(recv);
-
free
(tmp);
-
free
(send);
+
smpi_free_tmp_buffer
(recv);
+
smpi_free_tmp_buffer
(tmp);
+
smpi_free_tmp_buffer
(send);
} else {
send = sbuff;
send_size = count / nprocs;
nbytes = send_size * s_extent;
r_offset = rank * nbytes;
} else {
send = sbuff;
send_size = count / nprocs;
nbytes = send_size * s_extent;
r_offset = rank * nbytes;
- recv = (void *)
xbt_malloc
(s_extent * send_size * nprocs);
+ recv = (void *)
smpi_get_tmp_recvbuffer
(s_extent * send_size * nprocs);
mpi_coll_alltoall_fun(send, send_size, dtype, recv, send_size, dtype, comm);
mpi_coll_alltoall_fun(send, send_size, dtype, recv, send_size, dtype, comm);
@@
-71,7
+77,7
@@
int smpi_coll_tuned_allreduce_rab2(void *sbuff, void *rbuff,
mpi_coll_allgather_fun((char *) rbuff + r_offset, send_size, dtype, rbuff, send_size,
dtype, comm);
mpi_coll_allgather_fun((char *) rbuff + r_offset, send_size, dtype, rbuff, send_size,
dtype, comm);
-
free
(recv);
+
smpi_free_tmp_buffer
(recv);
}
return MPI_SUCCESS;
}
return MPI_SUCCESS;