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
Add MPI_Compare_and_swap (normally atomic) call
[simgrid.git]
/
src
/
smpi
/
colls
/
gather
/
gather-mvapich.cpp
diff --git
a/src/smpi/colls/gather/gather-mvapich.cpp
b/src/smpi/colls/gather/gather-mvapich.cpp
index 97e14116aad8ba49dbb4e8411c7d473b5513ee52..21c2142d5629a1b87a15ca35724b72162e607eb9 100644
(file)
--- a/
src/smpi/colls/gather/gather-mvapich.cpp
+++ b/
src/smpi/colls/gather/gather-mvapich.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
@@
-37,9
+37,13
@@
#include "../colls_private.h"
#include "../colls_private.h"
-#define MPIR_Gather_MV2_Direct smpi_coll_tuned_gather_ompi_basic_linear
-#define MPIR_Gather_MV2_two_level_Direct smpi_coll_tuned_gather_ompi_basic_linear
-#define MPIR_Gather_intra smpi_coll_tuned_gather_mpich
+
+
+
+
+#define MPIR_Gather_MV2_Direct Coll_gather_ompi_basic_linear::gather
+#define MPIR_Gather_MV2_two_level_Direct Coll_gather_ompi_basic_linear::gather
+#define MPIR_Gather_intra Coll_gather_mpich::gather
typedef int (*MV2_Gather_function_ptr) (void *sendbuf,
int sendcnt,
MPI_Datatype sendtype,
typedef int (*MV2_Gather_function_ptr) (void *sendbuf,
int sendcnt,
MPI_Datatype sendtype,
@@
-54,6
+58,10
@@
extern MV2_Gather_function_ptr MV2_Gather_intra_node_function;
#define TEMP_BUF_HAS_NO_DATA (0)
#define TEMP_BUF_HAS_DATA (1)
#define TEMP_BUF_HAS_NO_DATA (0)
#define TEMP_BUF_HAS_DATA (1)
+
+namespace simgrid{
+namespace smpi{
+
/* sendbuf - (in) sender's buffer
* sendcnt - (in) sender's element count
* sendtype - (in) sender's data type
/* sendbuf - (in) sender's buffer
* sendcnt - (in) sender's element count
* sendtype - (in) sender's data type
@@
-121,7
+129,8
@@
static int MPIR_pt_pt_intra_gather( void *sendbuf, int sendcnt, MPI_Datatype sen
}
}
-int smpi_coll_tuned_gather_mvapich2_two_level(void *sendbuf,
+
+int Coll_gather_mvapich2_two_level::gather(void *sendbuf,
int sendcnt,
MPI_Datatype sendtype,
void *recvbuf,
int sendcnt,
MPI_Datatype sendtype,
void *recvbuf,
@@
-146,7
+155,7
@@
int smpi_coll_tuned_gather_mvapich2_two_level(void *sendbuf,
//if not set (use of the algo directly, without mvapich2 selector)
if(MV2_Gather_intra_node_function==NULL)
//if not set (use of the algo directly, without mvapich2 selector)
if(MV2_Gather_intra_node_function==NULL)
- MV2_Gather_intra_node_function=
smpi_coll_tuned_gather_mpich
;
+ MV2_Gather_intra_node_function=
Coll_gather_mpich::gather
;
if(comm->get_leaders_comm()==MPI_COMM_NULL){
comm->init_smp();
if(comm->get_leaders_comm()==MPI_COMM_NULL){
comm->init_smp();
@@
-324,7
+333,7
@@
int smpi_coll_tuned_gather_mvapich2_two_level(void *sendbuf,
recvcnts[i] = node_sizes[i] * recvcnt;
}
}
recvcnts[i] = node_sizes[i] * recvcnt;
}
}
-
smpi_mpi_
gatherv(tmp_buf,
+
Colls::
gatherv(tmp_buf,
local_size * nbytes,
MPI_BYTE, recvbuf, recvcnts,
displs, recvtype,
local_size * nbytes,
MPI_BYTE, recvbuf, recvcnts,
displs, recvtype,
@@
-342,7
+351,7
@@
int smpi_coll_tuned_gather_mvapich2_two_level(void *sendbuf,
recvcnts[i] = node_sizes[i] * nbytes;
}
}
recvcnts[i] = node_sizes[i] * nbytes;
}
}
-
smpi_mpi_
gatherv(tmp_buf, local_size * nbytes,
+
Colls::
gatherv(tmp_buf, local_size * nbytes,
MPI_BYTE, leader_gather_buf,
recvcnts, displs, MPI_BYTE,
leader_root, leader_comm);
MPI_BYTE, leader_gather_buf,
recvcnts, displs, MPI_BYTE,
leader_root, leader_comm);
@@
-410,4
+419,6
@@
int smpi_coll_tuned_gather_mvapich2_two_level(void *sendbuf,
return (mpi_errno);
}
return (mpi_errno);
}
+}
+}