-/* Copyright (c) 2004-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-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/internal_config.h"
#include "src/kernel/lmm/fair_bottleneck.hpp"
#include "src/kernel/lmm/maxmin.hpp"
+#include "src/simgrid/math_utils.h"
#if SIMGRID_HAVE_EIGEN3
#include "src/kernel/lmm/bmf.hpp"
#endif
+
#include <boost/core/demangle.hpp>
#include <typeinfo>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_lmm, kernel, "Kernel Linear Max-Min solver");
-double sg_maxmin_precision = 1E-5; /* Change this with --cfg=maxmin/precision:VALUE */
-double sg_surf_precision = 1E-9; /* Change this with --cfg=surf/precision:VALUE */
+double sg_precision_workamount = 1E-5; /* Change this with --cfg=precision/work-amount:VALUE */
+double sg_precision_timing = 1E-9; /* Change this with --cfg=precision/timing:VALUE */
int sg_concurrency_limit = -1; /* Change this with --cfg=maxmin/concurrency-limit:VALUE */
namespace simgrid::kernel::lmm {
int Element::get_concurrency() const
{
+ // just to try having the computation of the concurrency
+ if (constraint->get_sharing_policy() == Constraint::SharingPolicy::WIFI) {
+ return 1;
+ }
+
// Ignore element with weight less than one (e.g. cross-traffic)
return (consumption_weight >= 1) ? 1 : 0;
// There are other alternatives, but they will change the behavior of the model..
"Concurrency limit overflow!");
}
-System* System::build(const std::string& solver_name, bool selective_update)
+System* System::build(std::string_view solver_name, bool selective_update)
{
System* system = nullptr;
if (solver_name == "bmf") {
}
XBT_DEBUG("%s", buf.c_str());
buf.clear();
- xbt_assert(not double_positive(sum - cnst.bound_, cnst.bound_ * sg_maxmin_precision),
+ xbt_assert(not double_positive(sum - cnst.bound_, cnst.bound_ * sg_precision_workamount),
"Incorrect value (%f is not smaller than %f): %g", sum, cnst.bound_, sum - cnst.bound_);
}
for (Variable const& var : variable_set) {
if (var.bound_ > 0) {
XBT_DEBUG("'%d'(%f) : %f (<=%f)", var.rank_, var.sharing_penalty_, var.value_, var.bound_);
- xbt_assert(not double_positive(var.value_ - var.bound_, var.bound_ * sg_maxmin_precision),
+ xbt_assert(not double_positive(var.value_ - var.bound_, var.bound_ * sg_precision_workamount),
"Incorrect value (%f is not smaller than %f", var.value_, var.bound_);
} else {
XBT_DEBUG("'%d'(%f) : %f", var.rank_, var.sharing_penalty_, var.value_);
void Constraint::set_sharing_policy(SharingPolicy policy, const s4u::NonLinearResourceCb& cb)
{
- xbt_assert(policy == SharingPolicy::NONLINEAR || not cb,
+ xbt_assert(policy == SharingPolicy::NONLINEAR || policy == SharingPolicy::WIFI || not cb,
"Invalid sharing policy for constraint. Callback should be used with NONLINEAR sharing policy");
sharing_policy_ = policy;
dyn_constraint_cb_ = cb;