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 branches 'master' and 'master' of github.com:simgrid/simgrid
[simgrid.git]
/
src
/
smpi
/
colls
/
allgather
/
allgather-2dmesh.cpp
diff --git
a/src/smpi/colls/allgather/allgather-2dmesh.cpp
b/src/smpi/colls/allgather/allgather-2dmesh.cpp
index
21be3ac
..
786b0af
100644
(file)
--- a/
src/smpi/colls/allgather/allgather-2dmesh.cpp
+++ b/
src/smpi/colls/allgather/allgather-2dmesh.cpp
@@
-1,4
+1,4
@@
-/* 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
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-105,8
+105,13
@@
static int is_2dmesh(int num, int *i, int *j)
* "simple"
* Auther: Ahmad Faraj
****************************************************************************/
* "simple"
* Auther: Ahmad Faraj
****************************************************************************/
+
+namespace simgrid{
+namespace smpi{
+
+
int
int
-
smpi_coll_tuned_allgather_2dmesh
(void *send_buff, int send_count, MPI_Datatype
+
Coll_allgather_2dmesh::allgather
(void *send_buff, int send_count, MPI_Datatype
send_type, void *recv_buff, int recv_count,
MPI_Datatype recv_type, MPI_Comm comm)
{
send_type, void *recv_buff, int recv_count,
MPI_Datatype recv_type, MPI_Comm comm)
{
@@
-125,7
+130,7
@@
smpi_coll_tuned_allgather_2dmesh(void *send_buff, int send_count, MPI_Datatype
block_size = extent * send_count;
block_size = extent * send_count;
- if (
!
is_2dmesh(num_procs, &X, &Y))
+ if (
not
is_2dmesh(num_procs, &X, &Y))
THROWF(arg_error,0, "allgather_2dmesh algorithm can't be used with this number of processes! ");
my_row_base = (rank / Y) * Y;
THROWF(arg_error,0, "allgather_2dmesh algorithm can't be used with this number of processes! ");
my_row_base = (rank / Y) * Y;
@@
-192,3
+197,6
@@
smpi_coll_tuned_allgather_2dmesh(void *send_buff, int send_count, MPI_Datatype
return MPI_SUCCESS;
}
return MPI_SUCCESS;
}
+
+}
+}