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' into actor-yield
[simgrid.git]
/
src
/
smpi
/
colls
/
alltoall
/
alltoall-rdb.cpp
diff --git
a/src/smpi/colls/alltoall/alltoall-rdb.cpp
b/src/smpi/colls/alltoall/alltoall-rdb.cpp
index
f41ded7
..
31e521f
100644
(file)
--- a/
src/smpi/colls/alltoall/alltoall-rdb.cpp
+++ b/
src/smpi/colls/alltoall/alltoall-rdb.cpp
@@
-1,10
+1,11
@@
-/* Copyright (c) 2013-201
4
. The SimGrid Team.
+/* Copyright (c) 2013-201
7
. 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. */
* 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 "../colls_private.hpp"
+#include "smpi_status.hpp"
/*****************************************************************************
/*****************************************************************************
@@
-12,7
+13,7
@@
* Return: int
* Return: int
- * inputs:
+ * inputs:
send_buff: send input buffer
send_count: number of elements to send
send_type: data type of elements being sent
send_buff: send input buffer
send_count: number of elements to send
send_type: data type of elements being sent
@@
-24,9
+25,11
@@
* Descrp: Function realizes the allgather operation using the recursive
doubling algorithm.
* Descrp: Function realizes the allgather operation using the recursive
doubling algorithm.
- * Auther: MPICH / slightly modified by Ahmad Faraj.
+ * Auther: MPICH / slightly modified by Ahmad Faraj.
****************************************************************************/
****************************************************************************/
+namespace simgrid{
+namespace smpi{
int Coll_alltoall_rdb::alltoall(void *send_buff, int send_count,
MPI_Datatype send_type,
void *recv_buff, int recv_count,
int Coll_alltoall_rdb::alltoall(void *send_buff, int send_count,
MPI_Datatype send_type,
void *recv_buff, int recv_count,
@@
-78,7
+81,7
@@
int Coll_alltoall_rdb::alltoall(void *send_buff, int send_count,
tmp_buff + recv_offset, mask * recv_count * num_procs,
recv_type, dst, tag, comm, &status);
tmp_buff + recv_offset, mask * recv_count * num_procs,
recv_type, dst, tag, comm, &status);
- last_recv_count =
smpi_mpi_
get_count(&status, recv_type);
+ last_recv_count =
Status::
get_count(&status, recv_type);
curr_size += last_recv_count;
}
curr_size += last_recv_count;
}
@@
-131,7
+134,7
@@
int Coll_alltoall_rdb::alltoall(void *send_buff, int send_count,
mask * num_procs * send_count, send_type, dst,
tag, comm, &status);
mask * num_procs * send_count, send_type, dst,
tag, comm, &status);
- last_recv_count =
smpi_mpi_
get_count(&status, send_type);
+ last_recv_count =
Status::
get_count(&status, send_type);
curr_size += last_recv_count;
}
curr_size += last_recv_count;
}
@@
-152,3
+155,5
@@
int Coll_alltoall_rdb::alltoall(void *send_buff, int send_count,
smpi_free_tmp_buffer(tmp_buff);
return MPI_SUCCESS;
}
smpi_free_tmp_buffer(tmp_buff);
return MPI_SUCCESS;
}
+}
+}