/* smpi_coll.c -- various optimized routing for collectives */
-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2019. 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. */
xbt_die("Collective " #cat " set to nullptr!"); \
}
-#define SET_COLL(coll) \
- name = xbt_cfg_get_string("smpi/" #coll); \
- if (name.empty()) \
- name = selector_name; \
- set_##coll(name);
-
namespace simgrid{
namespace smpi{
/* these arrays must be nullptr terminated */
s_mpi_coll_description_t Colls::mpi_coll_gather_description[] = {
- COLL_GATHERS(COLL_DESCRIPTION, COLL_COMMA), {nullptr, nullptr, nullptr} };
+ COLL_GATHERS(COLL_DESCRIPTION, COLL_COMMA), {"", "", nullptr} };
s_mpi_coll_description_t Colls::mpi_coll_allgather_description[] = {
- COLL_ALLGATHERS(COLL_DESCRIPTION, COLL_COMMA), {nullptr, nullptr, nullptr} };
+ COLL_ALLGATHERS(COLL_DESCRIPTION, COLL_COMMA), {"", "", nullptr} };
s_mpi_coll_description_t Colls::mpi_coll_allgatherv_description[] = {
- COLL_ALLGATHERVS(COLL_DESCRIPTION, COLL_COMMA), {nullptr, nullptr, nullptr} };
+ COLL_ALLGATHERVS(COLL_DESCRIPTION, COLL_COMMA), {"", "", nullptr} };
s_mpi_coll_description_t Colls::mpi_coll_allreduce_description[] ={
- COLL_ALLREDUCES(COLL_DESCRIPTION, COLL_COMMA), {nullptr, nullptr, nullptr} };
+ COLL_ALLREDUCES(COLL_DESCRIPTION, COLL_COMMA), {"", "", nullptr} };
s_mpi_coll_description_t Colls::mpi_coll_reduce_scatter_description[] = {
- COLL_REDUCE_SCATTERS(COLL_DESCRIPTION, COLL_COMMA), {nullptr, nullptr, nullptr} };
+ COLL_REDUCE_SCATTERS(COLL_DESCRIPTION, COLL_COMMA), {"", "", nullptr} };
s_mpi_coll_description_t Colls::mpi_coll_scatter_description[] ={
- COLL_SCATTERS(COLL_DESCRIPTION, COLL_COMMA), {nullptr, nullptr, nullptr} };
+ COLL_SCATTERS(COLL_DESCRIPTION, COLL_COMMA), {"", "", nullptr} };
s_mpi_coll_description_t Colls::mpi_coll_barrier_description[] ={
- COLL_BARRIERS(COLL_DESCRIPTION, COLL_COMMA), {nullptr, nullptr, nullptr} };
+ COLL_BARRIERS(COLL_DESCRIPTION, COLL_COMMA), {"", "", nullptr} };
s_mpi_coll_description_t Colls::mpi_coll_alltoall_description[] = {
- COLL_ALLTOALLS(COLL_DESCRIPTION, COLL_COMMA), {nullptr, nullptr, nullptr} };
+ COLL_ALLTOALLS(COLL_DESCRIPTION, COLL_COMMA), {"", "", nullptr} };
s_mpi_coll_description_t Colls::mpi_coll_alltoallv_description[] = {
- COLL_ALLTOALLVS(COLL_DESCRIPTION, COLL_COMMA), {nullptr, nullptr, nullptr} };
+ COLL_ALLTOALLVS(COLL_DESCRIPTION, COLL_COMMA), {"", "", nullptr} };
s_mpi_coll_description_t Colls::mpi_coll_bcast_description[] = {
- COLL_BCASTS(COLL_DESCRIPTION, COLL_COMMA), {nullptr, nullptr, nullptr} };
+ COLL_BCASTS(COLL_DESCRIPTION, COLL_COMMA), {"", "", nullptr} };
s_mpi_coll_description_t Colls::mpi_coll_reduce_description[] = {
- COLL_REDUCES(COLL_DESCRIPTION, COLL_COMMA), {nullptr, nullptr, nullptr} };
+ COLL_REDUCES(COLL_DESCRIPTION, COLL_COMMA), {"", "", nullptr} };
/** Displays the long description of all registered models, and quit */
void Colls::coll_help(const char *category, s_mpi_coll_description_t * table)
{
XBT_WARN("Long description of the %s models accepted by this simulator:\n", category);
- for (int i = 0; table[i].name; i++)
- XBT_WARN(" %s: %s\n", table[i].name, table[i].description);
+ for (int i = 0; not table[i].name.empty(); i++)
+ XBT_WARN(" %s: %s\n", table[i].name.c_str(), table[i].description.c_str());
}
int Colls::find_coll_description(s_mpi_coll_description_t* table, std::string name, const char* desc)
{
- for (int i = 0; table[i].name; i++)
+ for (int i = 0; not table[i].name.empty(); i++)
if (name == table[i].name) {
- if (strcmp(table[i].name,"default"))
- XBT_INFO("Switch to algorithm %s for collective %s",table[i].name,desc);
+ if (table[i].name != "default")
+ XBT_INFO("Switch to algorithm %s for collective %s",table[i].name.c_str(),desc);
return i;
}
- if (not table[0].name)
+ if (table[0].name.empty())
xbt_die("No collective is valid for '%s'! This is a bug.", name.c_str());
- std::string name_list = std::string(table[0].name);
- for (int i = 1; table[i].name; i++)
+ std::string name_list = table[0].name;
+ for (int i = 1; not table[i].name.empty(); i++)
name_list = name_list + ", " + table[i].name;
xbt_die("Collective '%s' is invalid! Valid collectives are: %s.", name.c_str(), name_list.c_str());
COLL_APPLY(COLL_SETTER,COLL_ALLTOALL_SIG,"");
COLL_APPLY(COLL_SETTER,COLL_ALLTOALLV_SIG,"");
-
void Colls::set_collectives(){
- std::string selector_name = xbt_cfg_get_string("smpi/coll-selector");
+ std::string selector_name = simgrid::config::get_value<std::string>("smpi/coll-selector");
if (selector_name.empty())
selector_name = "default";
- std::string name;
-
- SET_COLL(gather);
- SET_COLL(allgather);
- SET_COLL(allgatherv);
- SET_COLL(allreduce);
- SET_COLL(alltoall);
- SET_COLL(alltoallv);
- SET_COLL(reduce);
- SET_COLL(reduce_scatter);
- SET_COLL(scatter);
- SET_COLL(bcast);
- SET_COLL(barrier);
+ std::pair<std::string, std::function<void(std::string)>> setter_callbacks[] = {
+ {"gather", &Colls::set_gather}, {"allgather", &Colls::set_allgather},
+ {"allgatherv", &Colls::set_allgatherv}, {"allreduce", &Colls::set_allreduce},
+ {"alltoall", &Colls::set_alltoall}, {"alltoallv", &Colls::set_alltoallv},
+ {"reduce", &Colls::set_reduce}, {"reduce_scatter", &Colls::set_reduce_scatter},
+ {"scatter", &Colls::set_scatter}, {"bcast", &Colls::set_bcast},
+ {"barrier", &Colls::set_barrier}};
+
+ for (auto& elem : setter_callbacks) {
+ std::string name = simgrid::config::get_value<std::string>(("smpi/" + elem.first).c_str());
+ if (name.empty())
+ name = selector_name;
+
+ (elem.second)(name);
+ }
}
