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
Sort include lists according to clang-format.
[simgrid.git]
/
src
/
smpi
/
colls
/
barrier
/
barrier-mvapich2-pair.cpp
diff --git
a/src/smpi/colls/barrier/barrier-mvapich2-pair.cpp
b/src/smpi/colls/barrier/barrier-mvapich2-pair.cpp
index
51bc6b6
..
0a9b3b4
100644
(file)
--- a/
src/smpi/colls/barrier/barrier-mvapich2-pair.cpp
+++ b/
src/smpi/colls/barrier/barrier-mvapich2-pair.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
@@
-19,7
+19,7
@@
*
* Additional copyrights may follow
*/
*
* Additional copyrights may follow
*/
-
+
/* -*- Mode: C; c-basic-offset:4 ; -*- */
/*
*
/* -*- Mode: C; c-basic-offset:4 ; -*- */
/*
*
@@
-39,9
+39,10
@@
*
*/
*
*/
-#include "../colls_private.h"
-#include "../coll_tuned_topo.h"
-
+#include "../coll_tuned_topo.hpp"
+#include "../colls_private.hpp"
+namespace simgrid{
+namespace smpi{
int Coll_barrier_mvapich2_pair::barrier(MPI_Comm comm)
{
int Coll_barrier_mvapich2_pair::barrier(MPI_Comm comm)
{
@@
-59,7
+60,7
@@
int Coll_barrier_mvapich2_pair::barrier(MPI_Comm comm)
/* N2_prev = greatest power of two < size of Comm */
for( N2_prev = 1; N2_prev <= size; N2_prev <<= 1 );
N2_prev >>= 1;
/* N2_prev = greatest power of two < size of Comm */
for( N2_prev = 1; N2_prev <= size; N2_prev <<= 1 );
N2_prev >>= 1;
-
+
int surfeit = size - N2_prev;
/* Perform a combine-like operation */
int surfeit = size - N2_prev;
/* Perform a combine-like operation */
@@
-96,3
+97,6
@@
int Coll_barrier_mvapich2_pair::barrier(MPI_Comm comm)
return mpi_errno;
}
return mpi_errno;
}
+
+}
+}