/* 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. */
-#ifndef SURF_BMF_HPP
-#define SURF_BMF_HPP
+#ifndef SIMGRID_KERNEL_LMM_BMF_HPP
+#define SIMGRID_KERNEL_LMM_BMF_HPP
+
+#include "src/kernel/lmm/System.hpp"
+#include "xbt/config.hpp"
+
+#ifdef __clang__
+// Ignore deprecation warnings with Eigen < 4.0 (see https://gitlab.com/libeigen/eigen/-/issues/1850)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+#include <Eigen/Dense>
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
-#include "src/kernel/lmm/maxmin.hpp"
-#include <boost/container_hash/hash.hpp>
-#include <eigen3/Eigen/Dense>
#include <unordered_set>
-namespace simgrid {
-namespace kernel {
-namespace lmm {
+namespace simgrid::kernel::lmm {
/** @brief Generate all combinations of valid allocation */
class XBT_PUBLIC AllocationGenerator {
* @endrst
*/
class XBT_PUBLIC BmfSolver {
+ inline static 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};
+
+ inline static simgrid::config::Flag<double> cfg_bmf_precision{
+ "bmf/precision", "Numerical precision used when computing resource sharing", 1E-12};
+
public:
/**
* @brief Instantiate the BMF solver
* @return Actual resource capacity
*/
double get_resource_capacity(int resource, const std::vector<int>& bounded_players) const;
+ /**
+ * @brief Get maxmin share of the resource
+ *
+ * @param resource Internal index of resource in C_ vector
+ * @param bounded_players List of players that are externally bounded
+ * @return maxmin share
+ */
+ double get_maxmin_share(int resource, const std::vector<int>& bounded_players) const;
+ /**
+ * @brief Auxiliary method to get list of bounded player from allocation
+ *
+ * @param alloc Current allocation
+ * @return list of bounded players
+ */
+ std::vector<int> get_bounded_players(const allocation_map_t& alloc) const;
/**
* @brief Given an allocation calculates the speed/rho for each player
std::vector<bool> C_shared_; //!< shared_j Resource j is shared or not
Eigen::VectorXd phi_; //!< phi_i bound for each player
- std::unordered_set<std::vector<int>, boost::hash<std::vector<int>>> allocations_;
+ std::set<std::vector<int>> allocations_; //!< set of already tested allocations, since last identified loop
AllocationGenerator gen_;
- std::vector<int> allocations_age_;
static constexpr int NO_RESOURCE = -1; //!< flag to indicate player has selected no resource
- int max_iteration_ = sg_bmf_max_iterations; //!< number maximum of iterations of BMF algorithm
+ int max_iteration_ = cfg_bmf_max_iteration; //!< number maximum of iterations of BMF algorithm
};
/**
class XBT_PUBLIC BmfSystem : public System {
public:
using System::System;
- /** @brief Implements the solve method to calculate a BMF allocation */
- void solve() final;
private:
+ /** @brief Implements the solve method to calculate a BMF allocation */
+ void do_solve() final;
using allocation_map_t = std::unordered_map<int, std::unordered_set<int>>;
/**
* @brief Solve equation system to find a fair-sharing of resources
* @param maxA Max subflow consumption matrix (OUTPUT)
* @param phi Bounds for variables
*/
- void get_flows_data(int number_cnsts, Eigen::MatrixXd& A, Eigen::MatrixXd& maxA, Eigen::VectorXd& phi);
+ void get_flows_data(Eigen::Index number_cnsts, Eigen::MatrixXd& A, Eigen::MatrixXd& maxA, Eigen::VectorXd& phi);
/**
* @brief Builds the vector C_ with resource's capacity
*
std::unordered_map<int, Variable*> idx2Var_; //!< Map player index (and position in matrices) to system's variable
std::unordered_map<const Constraint*, int> cnst2idx_; //!< Conversely map constraint to index
- bool warned_nonlinear_ = false;
};
-} // namespace lmm
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::lmm
-#endif
\ No newline at end of file
+#endif