namespace kernel {
namespace routing {
-void TorusZone::create_links(int id, int rank, unsigned int position)
+void TorusZone::create_torus_links(int id, int rank, unsigned int position)
{
/* Create all links that exist in the torus. Each rank creates @a dimensions-1 links */
int dim_product = 1; // Needed to calculate the next neighbor_id
const s4u::Link* linkup;
const s4u::Link* linkdown;
if (get_link_sharing_policy() == s4u::Link::SharingPolicy::SPLITDUPLEX) {
- linkup = create_link(link_id + "_UP", std::vector<double>{get_link_bandwidth()})
- ->set_latency(get_link_latency())
- ->seal();
- linkdown = create_link(link_id + "_DOWN", std::vector<double>{get_link_bandwidth()})
- ->set_latency(get_link_latency())
- ->seal();
+ linkup = create_link(link_id + "_UP", {get_link_bandwidth()})->set_latency(get_link_latency())->seal();
+ linkdown = create_link(link_id + "_DOWN", {get_link_bandwidth()})->set_latency(get_link_latency())->seal();
} else {
- linkup = create_link(link_id, std::vector<double>{get_link_bandwidth()})->set_latency(get_link_latency())->seal();
+ linkup = create_link(link_id, {get_link_bandwidth()})->set_latency(get_link_latency())->seal();
linkdown = linkup;
}
/*
boost::split(dimensions_str, topo_parameters, boost::is_any_of(","));
std::vector<unsigned int> dimensions;
- if (not dimensions_str.empty()) {
- /* We are in a torus cluster
- * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and save them into a vector.
- * Additionally, we need to know how many ranks we have in total
- */
- std::transform(begin(dimensions_str), end(dimensions_str), std::back_inserter(dimensions),
- [](const std::string& s) { return std::stoi(s); });
- }
+ /* We are in a torus cluster
+ * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and save them into a vector.
+ * Additionally, we need to know how many ranks we have in total
+ */
+ std::transform(begin(dimensions_str), end(dimensions_str), std::back_inserter(dimensions),
+ [](const std::string& s) { return std::stoi(s); });
+
return dimensions;
}
set_num_links_per_node(dimensions_.size());
}
-void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* lat)
+void TorusZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat)
{
XBT_VERB("torus getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
if (src->id() == dst->id() && has_loopback()) {
resource::LinkImpl* uplink = get_uplink_from(node_pos(src->id()));
- route->link_list_.push_back(uplink);
- if (lat)
- *lat += uplink->get_latency();
+ add_link_latency(route->link_list_, uplink, lat);
return;
}
* Arrays that hold the coordinates of the current node and the target; comparing the values at the i-th position of
* both arrays, we can easily assess whether we need to route into this dimension or not.
*/
- const unsigned int dsize = dimensions_.size();
+ const unsigned long dsize = dimensions_.size();
std::vector<unsigned int> myCoords(dsize);
std::vector<unsigned int> targetCoords(dsize);
unsigned int dim_size_product = 1;
- for (unsigned i = 0; i < dsize; i++) {
+ for (unsigned long i = 0; i < dsize; i++) {
unsigned cur_dim_size = dimensions_[i];
myCoords[i] = (src->id() / dim_size_product) % cur_dim_size;
targetCoords[i] = (dst->id() / dim_size_product) % cur_dim_size;
* linkOffset describes the offset where the link we want to use is stored(+1 is added because each node has a link
* from itself to itself, which can only be the case if src->m_id == dst->m_id -- see above for this special case)
*/
- int linkOffset = (dsize + 1) * src->id();
+ unsigned long linkOffset = (dsize + 1) * src->id();
bool use_lnk_up = false; // Is this link of the form "cur -> next" or "next -> cur"? false means: next -> cur
unsigned int current_node = src->id();
// HERE: We use *CURRENT* node for calculation (as opposed to next_node)
linkOffset = node_pos_with_loopback_limiter(current_node) + j;
use_lnk_up = true;
- assert(linkOffset >= 0);
} else { // Route to the left
if ((current_node / dim_product) % cur_dim == 0)
next_node = (current_node - dim_product + dim_product * cur_dim);
// HERE: We use *next* node for calculation (as opposed to current_node!)
linkOffset = node_pos_with_loopback_limiter(next_node) + j;
use_lnk_up = false;
-
- assert(linkOffset >= 0);
}
- XBT_DEBUG("torus_get_route_and_latency - current_node: %u, next_node: %u, linkOffset is %i", current_node,
+ XBT_DEBUG("torus_get_route_and_latency - current_node: %u, next_node: %u, linkOffset is %lu", current_node,
next_node, linkOffset);
break;
}
else
lnk = get_downlink_to(linkOffset);
- route->link_list_.push_back(lnk);
- if (lat)
- *lat += lnk->get_latency();
+ add_link_latency(route->link_list_, lnk, lat);
current_node = next_node;
}
Link* loopback;
zone->fill_leaf_from_cb(i, dimensions, set_callbacks, &netpoint, &loopback, &limiter);
- zone->create_links(netpoint->id(), i, zone->node_pos_with_loopback_limiter(netpoint->id()));
+ zone->create_torus_links(netpoint->id(), i, zone->node_pos_with_loopback_limiter(netpoint->id()));
}
return zone->get_iface();