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
/
alltoall
/
alltoall-2dmesh.cpp
diff --git
a/src/smpi/colls/alltoall/alltoall-2dmesh.cpp
b/src/smpi/colls/alltoall/alltoall-2dmesh.cpp
index
bfc1bc4
..
7c476a3
100644
(file)
--- a/
src/smpi/colls/alltoall/alltoall-2dmesh.cpp
+++ b/
src/smpi/colls/alltoall/alltoall-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
@@
-52,6
+52,8
@@
static int alltoall_check_is_2dmesh(int num, int *i, int *j)
}
return 0;
}
}
return 0;
}
+namespace simgrid{
+namespace smpi{
int Coll_alltoall_2dmesh::alltoall(void *send_buff, int send_count,
MPI_Datatype send_type,
int Coll_alltoall_2dmesh::alltoall(void *send_buff, int send_count,
MPI_Datatype send_type,
@@
-72,7
+74,7
@@
int Coll_alltoall_2dmesh::alltoall(void *send_buff, int send_count,
num_procs = comm->size();
extent = send_type->get_extent();
num_procs = comm->size();
extent = send_type->get_extent();
- if (
!
alltoall_check_is_2dmesh(num_procs, &X, &Y))
+ if (
not
alltoall_check_is_2dmesh(num_procs, &X, &Y))
return MPI_ERR_OTHER;
my_row_base = (rank / Y) * Y;
return MPI_ERR_OTHER;
my_row_base = (rank / Y) * Y;
@@
-172,3
+174,5
@@
int Coll_alltoall_2dmesh::alltoall(void *send_buff, int send_count,
smpi_free_tmp_buffer(tmp_buff2);
return MPI_SUCCESS;
}
smpi_free_tmp_buffer(tmp_buff2);
return MPI_SUCCESS;
}
+}
+}