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
proper check for the -std=gnu++11 standard, and take in on clang too
[simgrid.git]
/
src
/
smpi
/
colls
/
allreduce-smp-binomial.c
diff --git
a/src/smpi/colls/allreduce-smp-binomial.c
b/src/smpi/colls/allreduce-smp-binomial.c
index
ed9b68c
..
3d159be
100644
(file)
--- a/
src/smpi/colls/allreduce-smp-binomial.c
+++ b/
src/smpi/colls/allreduce-smp-binomial.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)
@@
-5,11
+11,6
@@
It uses 2-layer communication: binomial for both intra-communication
inter-communication*/
It uses 2-layer communication: binomial for both intra-communication
inter-communication*/
-/* 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
/* ** NOTE **
Use -DMPICH2 if this code does not compile.
/* ** NOTE **
Use -DMPICH2 if this code does not compile.
@@
-32,16
+33,23
@@
int smpi_coll_tuned_allreduce_smp_binomial(void *send_buf, void *recv_buf,
{
int comm_size, rank;
void *tmp_buf;
{
int comm_size, rank;
void *tmp_buf;
- int tag =
50
;
+ int tag =
COLL_TAG_ALLREDUCE
;
int mask, src, dst;
int mask, src, dst;
- 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));
+ }
MPI_Status status;
comm_size=smpi_comm_size(comm);
rank=smpi_comm_rank(comm);
MPI_Aint extent, lb;
smpi_datatype_extent(dtype, &lb, &extent);
MPI_Status status;
comm_size=smpi_comm_size(comm);
rank=smpi_comm_rank(comm);
MPI_Aint extent, lb;
smpi_datatype_extent(dtype, &lb, &extent);
- tmp_buf = (void *)
xbt_malloc
(count * extent);
+ tmp_buf = (void *)
smpi_get_tmp_sendbuffer
(count * extent);
/* compute intra and inter ranking */
int intra_rank, inter_rank;
/* compute intra and inter ranking */
int intra_rank, inter_rank;
@@
-142,6
+150,6
@@
int smpi_coll_tuned_allreduce_smp_binomial(void *send_buf, void *recv_buf,
mask >>= 1;
}
mask >>= 1;
}
-
free
(tmp_buf);
+
smpi_free_tmp_buffer
(tmp_buf);
return MPI_SUCCESS;
}
return MPI_SUCCESS;
}