DragonflyZone::DragonflyZone(const std::string& name) : ClusterBase(name) {}
-DragonflyZone::Coords DragonflyZone::rankId_to_coords(int rankId) const
+DragonflyZone::Coords DragonflyZone::rankId_to_coords(unsigned long rankId) const
{
// coords : group, chassis, blade, node
Coords coords;
return coords;
}
-void DragonflyZone::rankId_to_coords(int rankId, unsigned int coords[4]) const // XBT_ATTRIB_DEPRECATED_v330
-{
- const auto s_coords = rankId_to_coords(rankId);
- coords[0] = s_coords.group;
- coords[1] = s_coords.chassis;
- coords[2] = s_coords.blade;
- coords[3] = s_coords.node;
-}
-
void DragonflyZone::set_link_characteristics(double bw, double lat, s4u::Link::SharingPolicy sharing_policy)
{
ClusterBase::set_link_characteristics(bw, lat, sharing_policy);
void DragonflyZone::generate_routers(const s4u::ClusterCallbacks& set_callbacks)
{
- int id = 0;
+ unsigned long id = 2UL * num_groups_ * num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_;
/* get limiter for this router */
auto get_limiter = [this, &id, &set_callbacks](unsigned int i, unsigned int j,
unsigned int k) -> resource::LinkImpl* {
if (dst->is_router() || src->is_router())
return;
- XBT_VERB("dragonfly getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(),
+ XBT_VERB("dragonfly getLocalRoute from '%s'[%lu] to '%s'[%lu]", src->get_cname(), src->id(), dst->get_cname(),
dst->id());
if ((src->id() == dst->id()) && has_loopback()) {
const auto myCoords = rankId_to_coords(src->id());
const auto targetCoords = rankId_to_coords(dst->id());
- XBT_DEBUG("src : %u group, %u chassis, %u blade, %u node", myCoords.group, myCoords.chassis, myCoords.blade,
+ XBT_DEBUG("src : %lu group, %lu chassis, %lu blade, %lu node", myCoords.group, myCoords.chassis, myCoords.blade,
myCoords.node);
- XBT_DEBUG("dst : %u group, %u chassis, %u blade, %u node", targetCoords.group, targetCoords.chassis,
+ XBT_DEBUG("dst : %lu group, %lu chassis, %lu blade, %lu node", targetCoords.group, targetCoords.chassis,
targetCoords.blade, targetCoords.node);
DragonflyRouter* myRouter = &routers_[myCoords.group * (num_chassis_per_group_ * num_blades_per_chassis_) +
}
// node->router local link
- add_link_latency(route->link_list_, myRouter->my_nodes_[static_cast<size_t>(myCoords.node) * num_links_per_link_],
- latency);
+ add_link_latency(route->link_list_, myRouter->my_nodes_[myCoords.node * num_links_per_link_], latency);
if (targetRouter != myRouter) {
// are we on a different group ?
zone->set_link_characteristics(bandwidth, latency, sharing_policy);
/* populating it */
- std::vector<unsigned int> dimensions = {params.groups.first, params.chassis.first, params.routers.first,
- params.nodes};
+ std::vector<unsigned long> dimensions = {params.groups.first, params.chassis.first, params.routers.first,
+ params.nodes};
int tot_elements = std::accumulate(dimensions.begin(), dimensions.end(), 1, std::multiplies<>());
for (int i = 0; i < tot_elements; i++) {
kernel::routing::NetPoint* netpoint;
zone->fill_leaf_from_cb(i, dimensions, set_callbacks, &netpoint, &loopback, &limiter);
}
zone->build_upper_levels(set_callbacks);
-
return zone->get_iface();
}
} // namespace s4u