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 'xbt_random' into 'master'
[simgrid.git]
/
src
/
smpi
/
colls
/
bcast
/
bcast-SMP-linear.cpp
diff --git
a/src/smpi/colls/bcast/bcast-SMP-linear.cpp
b/src/smpi/colls/bcast/bcast-SMP-linear.cpp
index
a8c6bec
..
ea576fe
100644
(file)
--- a/
src/smpi/colls/bcast/bcast-SMP-linear.cpp
+++ b/
src/smpi/colls/bcast/bcast-SMP-linear.cpp
@@
-9,9
+9,9
@@
int bcast_SMP_linear_segment_byte = 8192;
namespace simgrid{
namespace smpi{
int bcast_SMP_linear_segment_byte = 8192;
namespace simgrid{
namespace smpi{
-int
Coll_bcast_SMP_linear::bcast
(void *buf, int count,
-
MPI_Datatype datatype, int root,
-
MPI_Comm comm)
+int
bcast__SMP_linear
(void *buf, int count,
+ MPI_Datatype datatype, int root,
+ MPI_Comm comm)
{
int tag = COLL_TAG_BCAST;
MPI_Status status;
{
int tag = COLL_TAG_BCAST;
MPI_Status status;
@@
-31,8
+31,7
@@
int Coll_bcast_SMP_linear::bcast(void *buf, int count,
num_core = comm->get_intra_comm()->size();
}else{
//implementation buggy in this case
num_core = comm->get_intra_comm()->size();
}else{
//implementation buggy in this case
- return Coll_bcast_mpich::bcast( buf , count, datatype,
- root, comm);
+ return bcast__mpich(buf, count, datatype, root, comm);
}
int segment = bcast_SMP_linear_segment_byte / extent;
}
int segment = bcast_SMP_linear_segment_byte / extent;
@@
-52,7
+51,7
@@
int Coll_bcast_SMP_linear::bcast(void *buf, int count,
// call native when MPI communication size is too small
if (size <= num_core) {
XBT_WARN("MPI_bcast_SMP_linear use default MPI_bcast.");
// call native when MPI communication size is too small
if (size <= num_core) {
XBT_WARN("MPI_bcast_SMP_linear use default MPI_bcast.");
-
Coll_bcast_default::bcas
t(buf, count, datatype, root, comm);
+
bcast__defaul
t(buf, count, datatype, root, comm);
return MPI_SUCCESS;
}
// if root is not zero send to rank zero first
return MPI_SUCCESS;
}
// if root is not zero send to rank zero first