-/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2022. 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/TorusZone.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "src/surf/network_interface.hpp"
+#include "src/kernel/resource/LinkImpl.hpp"
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
#include <string>
#include <vector>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_torus, surf_route_cluster, "Torus Routing part of surf");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_torus, ker_routing, "Kernel Torus Routing");
namespace simgrid {
namespace kernel {
namespace routing {
-void TorusZone::create_torus_links(int id, int rank, unsigned int position)
+void TorusZone::create_torus_links(unsigned long id, int rank, unsigned long 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
+ unsigned long dim_product = 1; // Needed to calculate the next neighbor_id
- for (unsigned int j = 0; j < dimensions_.size(); j++) {
- int current_dimension = dimensions_[j]; // which dimension are we currently in?
- // we need to iterate over all dimensions and create all links there
+ for (unsigned long j = 0; j < dimensions_.size(); j++) {
+ unsigned long current_dimension =
+ dimensions_[j]; // which dimension are we currently in?
+ // we need to iterate over all dimensions and create all links there
// The other node the link connects
- int neighbor_rank_id = ((rank / dim_product) % current_dimension == current_dimension - 1)
- ? rank - (current_dimension - 1) * dim_product
- : rank + dim_product;
+ unsigned long neighbor_rank_id = ((rank / dim_product) % current_dimension == current_dimension - 1)
+ ? rank - (current_dimension - 1) * dim_product
+ : rank + dim_product;
// name of neighbor is not right for non contiguous cluster radicals (as id != rank in this case)
std::string link_id = get_name() + "_link_from_" + std::to_string(id) + "_to_" + std::to_string(neighbor_rank_id);
const s4u::Link* linkup;
}
}
-std::vector<unsigned int> TorusZone::parse_topo_parameters(const std::string& topo_parameters)
+std::vector<unsigned long> TorusZone::parse_topo_parameters(const std::string& topo_parameters)
{
std::vector<std::string> dimensions_str;
boost::split(dimensions_str, topo_parameters, boost::is_any_of(","));
- std::vector<unsigned int> dimensions;
+ std::vector<unsigned long> dimensions;
/* We are in a torus cluster
* Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and save them into a vector.
return dimensions;
}
-void TorusZone::set_topology(const std::vector<unsigned int>& dimensions)
+void TorusZone::set_topology(const std::vector<unsigned long>& dimensions)
{
xbt_assert(not dimensions.empty(), "Torus dimensions cannot be empty");
dimensions_ = dimensions;
return;
if (src->id() == dst->id() && has_loopback()) {
- resource::LinkImpl* uplink = get_uplink_from(node_pos(src->id()));
+ resource::StandardLinkImpl* uplink = get_uplink_from(node_pos(src->id()));
add_link_latency(route->link_list_, uplink, lat);
return;
* both arrays, we can easily assess whether we need to route into this dimension or not.
*/
const unsigned long dsize = dimensions_.size();
- std::vector<unsigned int> myCoords(dsize);
- std::vector<unsigned int> targetCoords(dsize);
+ std::vector<unsigned long> myCoords(dsize);
+ std::vector<unsigned long> targetCoords(dsize);
unsigned int dim_size_product = 1;
for (unsigned long i = 0; i < dsize; i++) {
- unsigned cur_dim_size = dimensions_[i];
+ unsigned long 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;
dim_size_product *= cur_dim_size;
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();
+ unsigned long current_node = src->id();
while (current_node != dst->id()) {
- unsigned int next_node = 0;
- unsigned int dim_product = 1; // First, we will route in x-dimension
- for (unsigned j = 0; j < dsize; j++) {
- const unsigned cur_dim = dimensions_[j];
+ unsigned long next_node = 0;
+ unsigned long dim_product = 1; // First, we will route in x-dimension
+ for (unsigned long j = 0; j < dsize; j++) {
+ const unsigned long cur_dim = dimensions_[j];
// current_node/dim_product = position in current dimension
if ((current_node / dim_product) % cur_dim != (dst->id() / dim_product) % cur_dim) {
if ((targetCoords[j] > myCoords[j] &&
linkOffset = node_pos_with_loopback_limiter(next_node) + j;
use_lnk_up = false;
}
- XBT_DEBUG("torus_get_route_and_latency - current_node: %u, next_node: %u, linkOffset is %lu", current_node,
+ XBT_DEBUG("torus_get_route_and_latency - current_node: %lu, next_node: %lu, linkOffset is %lu", current_node,
next_node, linkOffset);
break;
}
route->link_list_.push_back(get_uplink_from(node_pos_with_loopback(current_node)));
}
- resource::LinkImpl* lnk;
+ resource::StandardLinkImpl* lnk;
if (use_lnk_up)
lnk = get_uplink_from(linkOffset);
else
namespace s4u {
-NetZone* create_torus_zone(const std::string& name, const NetZone* parent, const std::vector<unsigned int>& dimensions,
+NetZone* create_torus_zone(const std::string& name, const NetZone* parent, const std::vector<unsigned long>& dimensions,
const ClusterCallbacks& set_callbacks, double bandwidth, double latency,
Link::SharingPolicy sharing_policy)
{
