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-rsag.c
diff --git
a/src/smpi/colls/allreduce-smp-rsag.c
b/src/smpi/colls/allreduce-smp-rsag.c
index
24ccaa0
..
1bc921c
100644
(file)
--- a/
src/smpi/colls/allreduce-smp-rsag.c
+++ b/
src/smpi/colls/allreduce-smp-rsag.c
@@
-1,10
+1,10
@@
-#include "colls_private.h"
+/* 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. */
-/* 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
+#include "colls_private.h"
/*
This fucntion performs all-reduce operation as follow.
/*
This fucntion performs all-reduce operation as follow.
@@
-19,10
+19,16
@@
int smpi_coll_tuned_allreduce_smp_rsag(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;
MPI_Status status;
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));
+ }
/*
#ifdef MPICH2_REDUCTION
MPI_User_function * uop = MPIR_Op_table[op % 16 - 1];
/*
#ifdef MPICH2_REDUCTION
MPI_User_function * uop = MPIR_Op_table[op % 16 - 1];