X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea10e88fd41a11386d9e3868d72ab8cb933a4292..HEAD:/src/kernel/lmm/bmf.hpp diff --git a/src/kernel/lmm/bmf.hpp b/src/kernel/lmm/bmf.hpp index 771eab4f54..3bebff17d9 100644 --- a/src/kernel/lmm/bmf.hpp +++ b/src/kernel/lmm/bmf.hpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -7,12 +7,23 @@ #define SIMGRID_KERNEL_LMM_BMF_HPP #include "src/kernel/lmm/System.hpp" +#include "xbt/config.hpp" + +#include + +#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 +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + #include -namespace simgrid { -namespace kernel { -namespace lmm { +namespace simgrid::kernel::lmm { /** @brief Generate all combinations of valid allocation */ class XBT_PUBLIC AllocationGenerator { @@ -65,6 +76,12 @@ private: * @endrst */ class XBT_PUBLIC BmfSolver { + inline static simgrid::config::Flag 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 cfg_bmf_precision{ + "bmf/precision", {"precision/bmf"}, "Numerical precision used when computing resource sharing", 1E-12}; + public: /** * @brief Instantiate the BMF solver @@ -187,7 +204,7 @@ private: std::set> allocations_; //!< set of already tested allocations, since last identified loop AllocationGenerator gen_; static constexpr int NO_RESOURCE = -1; //!< flag to indicate player has selected no resource - int max_iteration_; //!< number maximum of iterations of BMF algorithm + int max_iteration_ = cfg_bmf_max_iteration; //!< number maximum of iterations of BMF algorithm }; /** @@ -269,8 +286,6 @@ private: std::unordered_map cnst2idx_; //!< Conversely map constraint to index }; -} // namespace lmm -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::lmm #endif