-/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-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 "src/kernel/lmm/bmf.hpp"
-#include "xbt/config.hpp"
+#include "src/simgrid/math_utils.h"
#include <Eigen/LU>
#include <iostream>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_bmf, kernel, "Kernel BMF solver");
-simgrid::config::Flag<int>
- cfg_bmf_max_iteration("bmf/max-iterations",
- "Maximum number of steps to be performed while searching for a BMF allocation", 1000);
-
-simgrid::config::Flag<double> cfg_bmf_precision{"bmf/precision",
- "Numerical precision used when computing resource sharing", 1E-12};
-
-namespace simgrid {
-namespace kernel {
-namespace lmm {
+namespace simgrid::kernel::lmm {
AllocationGenerator::AllocationGenerator(Eigen::MatrixXd A) : A_(std::move(A)), alloc_(A_.cols(), 0)
{
, C_shared_(std::move(shared))
, phi_(std::move(phi))
, gen_(A_)
- , max_iteration_(cfg_bmf_max_iteration)
{
xbt_assert(max_iteration_ > 0,
std::string BmfSolver::debug_alloc(const allocation_map_t& alloc) const
{
std::stringstream debug;
- for (const auto& e : alloc) {
- debug << "{" + std::to_string(e.first) + ": [" + debug_vector(e.second) + "]}, ";
+ for (const auto& [resource, players] : alloc) {
+ debug << "{" + std::to_string(resource) + ": [" + debug_vector(players) + "]}, ";
}
return debug.str();
}
std::vector<int> BmfSolver::alloc_map_to_vector(const allocation_map_t& alloc) const
{
std::vector<int> alloc_by_player(A_.cols(), -1);
- for (const auto& it : alloc) {
- for (auto p : it.second) {
- alloc_by_player[p] = it.first;
+ for (const auto& [resource, players] : alloc) {
+ for (auto p : players) {
+ alloc_by_player[p] = resource;
}
}
return alloc_by_player;
std::vector<int> BmfSolver::get_bounded_players(const allocation_map_t& alloc) const
{
std::vector<int> bounded_players;
- for (const auto& e : alloc) {
- if (e.first == NO_RESOURCE) {
- bounded_players.insert(bounded_players.end(), e.second.begin(), e.second.end());
+ for (const auto& [resource, players] : alloc) {
+ if (resource == NO_RESOURCE) {
+ bounded_players.insert(bounded_players.end(), players.begin(), players.end());
}
}
return bounded_players;
int row = 0;
auto bounded_players = get_bounded_players(alloc);
- for (const auto& e : alloc) {
+ for (const auto& [resource, players] : alloc) {
// add one row for the resource with A[r,]
- int cur_resource = e.first;
/* bounded players, nothing to do */
- if (cur_resource == NO_RESOURCE)
+ if (resource == NO_RESOURCE)
continue;
/* not shared resource, each player can receive the full capacity of the resource */
- if (not C_shared_[cur_resource]) {
- for (int i : e.second) {
- C_p[row] = get_resource_capacity(cur_resource, bounded_players);
- A_p(row, i) = A_(cur_resource, i);
+ if (not C_shared_[resource]) {
+ for (int i : players) {
+ C_p[row] = get_resource_capacity(resource, bounded_players);
+ A_p(row, i) = A_(resource, i);
row++;
}
continue;
}
/* shared resource: fairly share it between players */
- A_p.row(row) = A_.row(cur_resource);
- C_p[row] = get_resource_capacity(cur_resource, bounded_players);
+ A_p.row(row) = A_.row(resource);
+ C_p[row] = get_resource_capacity(resource, bounded_players);
row++;
- if (e.second.size() > 1) {
+ if (players.size() > 1) {
// if 2 players have chosen the same resource
// they must have a fair sharing of this resource, adjust A_p and C_p accordingly
- auto it = e.second.begin();
+ auto it = players.begin();
int i = *it; // first player
/* for each other player sharing this resource */
- for (++it; it != e.second.end(); ++it) {
+ for (++it; it != players.end(); ++it) {
/* player i and k on this resource j: so maxA_ji*rho_i - maxA_jk*rho_k = 0 */
int k = *it;
C_p[row] = 0;
- A_p(row, i) = maxA_(cur_resource, i);
- A_p(row, k) = -maxA_(cur_resource, k);
+ A_p(row, i) = maxA_(resource, i);
+ A_p(row, k) = -maxA_(resource, k);
row++;
}
}
/* Note: the max_ may artificially increase the rate if priority < 0
* The equilibrium sets a rho which respects the C_ though */
- double rate = fair_sharing[cnst_idx] / maxA_(cnst_idx, player_idx);
- if (min_rate == -1 || double_positive(min_rate - rate, cfg_bmf_precision)) {
+ if (double rate = fair_sharing[cnst_idx] / maxA_(cnst_idx, player_idx);
+ min_rate == -1 || double_positive(min_rate - rate, cfg_bmf_precision)) {
selected_resource = cnst_idx;
min_rate = rate;
}
- double bound = initial ? -1 : phi_[player_idx];
/* Given that the priority may artificially increase the rate,
* we need to check that the bound given by user respects the resource capacity C_ */
- if (bound > 0 && bound * A_(cnst_idx, player_idx) < C_[cnst_idx] &&
- double_positive(min_rate - bound, cfg_bmf_precision)) {
+ if (double bound = initial ? -1 : phi_[player_idx]; bound > 0 &&
+ bound * A_(cnst_idx, player_idx) < C_[cnst_idx] &&
+ double_positive(min_rate - bound, cfg_bmf_precision)) {
selected_resource = NO_RESOURCE;
min_rate = bound;
}
}
alloc[selected_resource].insert(player_idx);
}
- bool is_stable = (alloc == last_alloc);
- if (is_stable)
+ if (alloc == last_alloc) // considered stable
return true;
- std::vector<int> alloc_by_player = alloc_map_to_vector(alloc);
- bool inserted = allocations_.insert(alloc_by_player).second;
- /* oops, allocation already tried, let's pertube it a bit */
- if (not inserted) {
+ if (auto alloc_by_player = alloc_map_to_vector(alloc); not allocations_.insert(alloc_by_player).second) {
+ /* oops, allocation already tried, let's pertube it a bit */
XBT_DEBUG("Allocation already tried: %s", debug_alloc(alloc).c_str());
return disturb_allocation(alloc, alloc_by_player);
}
Eigen::VectorXd remaining = (A_ * rho) - C_;
remaining = remaining.array() * shared.array(); // ignore non shared resources
bmf = bmf && (not std::any_of(remaining.data(), remaining.data() + remaining.size(),
- [](double v) { return double_positive(v, sg_maxmin_precision); }));
+ [](double v) { return double_positive(v, sg_precision_workamount); }));
// 3) every player receives maximum share in at least 1 saturated resource
// due to subflows, compare with the maximum consumption and not the A matrix
// matrix_ji: boolean indicating player p has the maximum share at resource j
Eigen::MatrixXi player_max_share =
- ((usage.array().colwise() - max_share.array()).abs() <= sg_maxmin_precision).cast<int>();
+ ((usage.array().colwise() - max_share.array()).abs() <= sg_precision_workamount).cast<int>();
// but only saturated resources must be considered
- Eigen::VectorXi saturated = (remaining.array().abs() <= sg_maxmin_precision).cast<int>();
+ Eigen::VectorXi saturated = (remaining.array().abs() <= sg_precision_workamount).cast<int>();
XBT_DEBUG("Saturated_j resources:\n%s", debug_eigen(saturated).c_str());
player_max_share.array().colwise() *= saturated.array();
// just check if it has received at least it's bound
for (int p = 0; p < rho.size(); p++) {
- if (double_equals(rho[p], phi_[p], sg_maxmin_precision)) {
+ if (double_equals(rho[p], phi_[p], sg_precision_workamount)) {
player_max_share(0, p) = 1; // it doesn't really matter, just to say that it's a bmf
saturated[0] = 1;
}
bool active = false;
bool linked = false; // variable is linked to some constraint (specially for selective_update)
for (const Element& elem : var.cnsts_) {
- const boost::intrusive::list_member_hook<>& cnst_hook = selective_update_active
- ? elem.constraint->modified_constraint_set_hook_
- : elem.constraint->active_constraint_set_hook_;
- if (not cnst_hook.is_linked())
+ if (const auto& cnst_hook = selective_update_active ? elem.constraint->modified_constraint_set_hook_
+ : elem.constraint->active_constraint_set_hook_;
+ not cnst_hook.is_linked())
continue;
/* active and linked variable, lets check its consumption */
linked = true;
}
}
-} // namespace lmm
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::lmm
