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
Fix a doc error about actors (Tutorial_algorithms)
[simgrid.git]
/
src
/
smpi
/
colls
/
allreduce
/
allreduce-smp-rdb.cpp
diff --git
a/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp
b/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp
index
5c96b62
..
1e7504c
100644
(file)
--- a/
src/smpi/colls/allreduce/allreduce-smp-rdb.cpp
+++ b/
src/smpi/colls/allreduce/allreduce-smp-rdb.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
7
. The SimGrid Team.
+/* Copyright (c) 2013-201
9
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-28,12
+28,11
@@
This fucntion performs all-reduce operation as follow.
*/
namespace simgrid{
namespace smpi{
*/
namespace simgrid{
namespace smpi{
-int Coll_allreduce_smp_rdb::allreduce(void *send_buf, void *recv_buf, int count,
+int Coll_allreduce_smp_rdb::allreduce(
const
void *send_buf, void *recv_buf, int count,
MPI_Datatype dtype, MPI_Op op,
MPI_Comm comm)
{
int comm_size, rank;
MPI_Datatype dtype, MPI_Op op,
MPI_Comm comm)
{
int comm_size, rank;
- void *tmp_buf;
int tag = COLL_TAG_ALLREDUCE;
int mask, src, dst;
MPI_Status status;
int tag = COLL_TAG_ALLREDUCE;
int mask, src, dst;
MPI_Status status;
@@
-49,7
+48,7
@@
int Coll_allreduce_smp_rdb::allreduce(void *send_buf, void *recv_buf, int count,
MPI_User_function * uop = MPIR_Op_table[op % 16 - 1];
#else
MPI_User_function *uop;
MPI_User_function * uop = MPIR_Op_table[op % 16 - 1];
#else
MPI_User_function *uop;
-
struct
MPIR_OP *op_ptr;
+ MPIR_OP *op_ptr;
op_ptr = MPIR_ToPointer(op);
uop = op_ptr->op;
#endif
op_ptr = MPIR_ToPointer(op);
uop = op_ptr->op;
#endif
@@
-58,7
+57,7
@@
int Coll_allreduce_smp_rdb::allreduce(void *send_buf, void *recv_buf, int count,
rank = comm->rank();
MPI_Aint extent;
extent = dtype->get_extent();
rank = comm->rank();
MPI_Aint extent;
extent = dtype->get_extent();
-
tmp_buf = (void *)
smpi_get_tmp_sendbuffer(count * extent);
+
unsigned char* tmp_buf =
smpi_get_tmp_sendbuffer(count * extent);
/* compute intra and inter ranking */
int intra_rank, inter_rank;
/* compute intra and inter ranking */
int intra_rank, inter_rank;