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
avoid warning by checking index in the right order
[simgrid.git]
/
src
/
smpi
/
colls
/
allreduce-smp-binomial-pipeline.c
diff --git
a/src/smpi/colls/allreduce-smp-binomial-pipeline.c
b/src/smpi/colls/allreduce-smp-binomial-pipeline.c
index
68c99f5
..
e831be9
100644
(file)
--- a/
src/smpi/colls/allreduce-smp-binomial-pipeline.c
+++ b/
src/smpi/colls/allreduce-smp-binomial-pipeline.c
@@
-1,3
+1,9
@@
+/* Copyright (c) 2013-2014. The SimGrid Team.
+ * All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
#include "colls_private.h"
/* IMPLEMENTED BY PITCH PATARASUK
Non-topoloty-specific (however, number of cores/node need to be changed)
#include "colls_private.h"
/* IMPLEMENTED BY PITCH PATARASUK
Non-topoloty-specific (however, number of cores/node need to be changed)
@@
-6,11
+12,7
@@
inter-communication
The communication are done in a pipeline fashion */
inter-communication
The communication are done in a pipeline fashion */
-/* change number of core per smp-node
- we assume that number of core per process will be the same for all implementations */
-#ifndef NUM_CORE
-#define NUM_CORE 8
-#endif
+
/* this is a default segment size for pipelining,
but it is typically passed as a command line argument */
/* this is a default segment size for pipelining,
but it is typically passed as a command line argument */
@@
-46,7
+48,13
@@
int smpi_coll_tuned_allreduce_smp_binomial_pipeline(void *send_buf,
int tag = COLL_TAG_ALLREDUCE;
int mask, src, dst;
MPI_Status status;
int tag = COLL_TAG_ALLREDUCE;
int mask, src, dst;
MPI_Status status;
- int num_core = NUM_CORE;
+ if(smpi_comm_get_leaders_comm(comm)==MPI_COMM_NULL){
+ smpi_comm_init_smp(comm);
+ }
+ int num_core=1;
+ if (smpi_comm_is_uniform(comm)){
+ num_core = smpi_comm_size(smpi_comm_get_intra_comm(comm));
+ }
comm_size = smpi_comm_size(comm);
rank = smpi_comm_rank(comm);
comm_size = smpi_comm_size(comm);
rank = smpi_comm_rank(comm);