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
Fix surf_usage
[simgrid.git]
/
src
/
simgrid
/
sg_config.c
diff --git
a/src/simgrid/sg_config.c
b/src/simgrid/sg_config.c
index
797a0ae
..
1726748
100644
(file)
--- a/
src/simgrid/sg_config.c
+++ b/
src/simgrid/sg_config.c
@@
-276,6
+276,15
@@
static void _sg_cfg_cb__coll_reduce(const char *name, int pos)
{
_sg_cfg_cb__coll("reduce", mpi_coll_reduce_description, name, pos);
}
+static void _sg_cfg_cb__coll_reduce_scatter(const char *name, int pos){
+ _sg_cfg_cb__coll("reduce_scatter", mpi_coll_reduce_scatter_description, name, pos);
+}
+static void _sg_cfg_cb__coll_scatter(const char *name, int pos){
+ _sg_cfg_cb__coll("scatter", mpi_coll_scatter_description, name, pos);
+}
+static void _sg_cfg_cb__coll_barrier(const char *name, int pos){
+ _sg_cfg_cb__coll("barrier", mpi_coll_barrier_description, name, pos);
+}
#endif
/* callback of the inclusion path */
@@
-772,6
+781,21
@@
void sg_config_init(int *argc, char **argv)
xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_allgather,
NULL);
+ xbt_cfg_register(&_sg_cfg_set, "smpi/barrier",
+ "Which collective to use for barrier",
+ xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_barrier,
+ NULL);
+
+ xbt_cfg_register(&_sg_cfg_set, "smpi/reduce_scatter",
+ "Which collective to use for reduce_scatter",
+ xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_reduce_scatter,
+ NULL);
+
+ xbt_cfg_register(&_sg_cfg_set, "smpi/scatter",
+ "Which collective to use for scatter",
+ xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_scatter,
+ NULL);
+
xbt_cfg_register(&_sg_cfg_set, "smpi/allgatherv",
"Which collective to use for allgatherv",
xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_allgatherv,
@@
-898,12
+922,12
@@
void surf_config_models_setup()
/* ********************************************************************* */
/* TUTORIAL: New model */
- int new_model_id = -1;
+
/*FIXME:UPDATE:
int new_model_id = -1;
char *new_model_name = NULL;
new_model_name = xbt_cfg_get_string(_sg_cfg_set, "new_model/model");
XBT_DEBUG("Call new model_init");
new_model_id = find_model_description(surf_new_model_description, new_model_name);
- surf_new_model_description[new_model_id].model_init_preparse();
+ surf_new_model_description[new_model_id].model_init_preparse();
*/
/* ********************************************************************* */
}