-/* Copyright (c) 2014-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2023. 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 <simgrid/kernel/routing/FatTreeZone.hpp>
#include <simgrid/kernel/routing/NetPoint.hpp>
-#include "src/kernel/resource/StandardLinkImpl.hpp"
-#include "src/surf/xml/platf.hpp" // surf_parse_error() and surf_parse_assert()
+#include "src/kernel/resource/NetworkModel.hpp"
+#include "src/kernel/xml/platf.hpp" // simgrid_parse_error() and simgrid_parse_assert()
#include <fstream>
#include <numeric>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_fat_tree, surf, "Routing for fat trees");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_fat_tree, ker_platform, "Kernel Fat-Tree Routing");
namespace simgrid {
-namespace kernel {
-namespace routing {
+namespace kernel::routing {
bool FatTreeZone::is_in_sub_tree(const FatTreeNode* root, const FatTreeNode* node) const
{
for (unsigned int i = 0; i < currentNode->level; i++)
d /= this->num_parents_per_node_[i];
- int k = this->num_parents_per_node_[currentNode->level];
- d = d % k;
+ int k = this->num_parents_per_node_[currentNode->level] * this->num_port_lower_level_[currentNode->level];
+ d = d % k;
if (currentNode->limiter_link_)
into->link_list_.push_back(currentNode->limiter_link_);
// Down part
while (currentNode != destination) {
- for (unsigned int i = 0; i < currentNode->children.size(); i++) {
+ //pick cable when multiple parallels
+ int d = source->position % this->num_port_lower_level_[currentNode->level - 1];
+ for (unsigned int i = d * this->num_children_per_node_[currentNode->level - 1]; i < currentNode->children.size(); i++) {
if (i % this->num_children_per_node_[currentNode->level - 1] == destination->label[currentNode->level - 1]) {
add_link_latency(into->link_list_, currentNode->children[i]->down_link_, latency);
if (this->levels_ == 0) {
return;
}
- if (not XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
+ if (not XBT_LOG_ISENABLED(ker_routing_fat_tree, xbt_log_priority_debug)) {
return;
}
{
std::stringstream msgBuffer;
- if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
+ if (XBT_LOG_ISENABLED(ker_routing_fat_tree, xbt_log_priority_debug)) {
msgBuffer << "Are " << child->id << "(" << child->level << "," << child->position << ") <";
for (unsigned int i = 0; i < this->levels_; i++) {
this->nodes_by_level_[0] *= this->num_children_per_node_[i];
if (this->nodes_by_level_[0] != this->nodes_.size()) {
- surf_parse_error(std::string("The number of provided nodes does not fit with the wanted topology.") +
- " Please check your platform description (We need " + std::to_string(this->nodes_by_level_[0]) +
- "nodes, we got " + std::to_string(this->nodes_.size()));
+ simgrid_parse_error("The number of provided nodes does not fit with the wanted topology."
+ " Please check your platform description (We need " +
+ std::to_string(this->nodes_by_level_[0]) + "nodes, we got " +
+ std::to_string(this->nodes_.size()));
}
for (unsigned int i = 0; i < this->levels_; i++) {
}
for (unsigned int j = 0; j < this->nodes_by_level_[i]; j++) {
- if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
+ if (XBT_LOG_ISENABLED(ker_routing_fat_tree, xbt_log_priority_debug)) {
std::stringstream msgBuffer;
msgBuffer << "Assigning label <";
position++;
newNode->parents.resize(static_cast<size_t>(this->num_parents_per_node_[0]) * this->num_port_lower_level_[0]);
newNode->label.resize(this->levels_);
- this->compute_nodes_.insert(make_pair(id, newNode));
+ this->compute_nodes_.try_emplace(id, newNode);
this->nodes_.emplace_back(newNode);
}
std::vector<unsigned int> count;
boost::split(parameters, topo_parameters, boost::is_any_of(";"));
- surf_parse_assert(
+ simgrid_parse_assert(
parameters.size() == 4,
"Fat trees are defined by the levels number and 3 vectors, see the documentation for more information.");
try {
n_lev = std::stoi(parameters[0]);
} catch (const std::invalid_argument&) {
- surf_parse_error(std::string("First parameter is not the amount of levels: ") + parameters[0]);
+ simgrid_parse_error("First parameter is not the amount of levels: " + parameters[0]);
}
// Then, a l-sized vector standing for the children number by level
boost::split(tmp, parameters[1], boost::is_any_of(","));
- surf_parse_assert(tmp.size() == n_lev, std::string("You specified ") + std::to_string(n_lev) +
- " levels but the child count vector (the first one) contains " +
- std::to_string(tmp.size()) + " levels.");
+ simgrid_parse_assert(tmp.size() == n_lev, "You specified " + std::to_string(n_lev) +
+ " levels but the child count vector (the first one) contains " +
+ std::to_string(tmp.size()) + " levels.");
for (std::string const& level : tmp) {
try {
down.push_back(std::stoi(level));
} catch (const std::invalid_argument&) {
- surf_parse_error(std::string("Invalid child count: ") + level);
+ simgrid_parse_error("Invalid child count: " + level);
}
}
// Then, a l-sized vector standing for the parents number by level
boost::split(tmp, parameters[2], boost::is_any_of(","));
- surf_parse_assert(tmp.size() == n_lev, std::string("You specified ") + std::to_string(n_lev) +
- " levels but the parent count vector (the second one) contains " +
- std::to_string(tmp.size()) + " levels.");
+ simgrid_parse_assert(tmp.size() == n_lev, "You specified " + std::to_string(n_lev) +
+ " levels but the parent count vector (the second one) contains " +
+ std::to_string(tmp.size()) + " levels.");
for (std::string const& parent : tmp) {
try {
up.push_back(std::stoi(parent));
} catch (const std::invalid_argument&) {
- surf_parse_error(std::string("Invalid parent count: ") + parent);
+ simgrid_parse_error("Invalid parent count: " + parent);
}
}
// Finally, a l-sized vector standing for the ports number with the lower level
boost::split(tmp, parameters[3], boost::is_any_of(","));
- surf_parse_assert(tmp.size() == n_lev, std::string("You specified ") + std::to_string(n_lev) +
- " levels but the port count vector (the third one) contains " +
- std::to_string(tmp.size()) + " levels.");
+ simgrid_parse_assert(tmp.size() == n_lev, "You specified " + std::to_string(n_lev) +
+ " levels but the port count vector (the third one) contains " +
+ std::to_string(tmp.size()) + " levels.");
for (std::string const& port : tmp) {
try {
count.push_back(std::stoi(port));
} catch (const std::invalid_argument&) {
- throw std::invalid_argument(std::string("Invalid lower level port number:") + port);
+ throw std::invalid_argument("Invalid lower level port number:" + port);
}
}
return s4u::FatTreeParams(n_lev, down, up, count);
file << "}";
file.close();
}
-} // namespace routing
-} // namespace kernel
+} // namespace kernel::routing
namespace s4u {
FatTreeParams::FatTreeParams(unsigned int n_levels, const std::vector<unsigned int>& down_links,
