Rename NetworkModelIntf into NetworkModelFactors

[simgrid.git] / src / surf / network_smpi.cpp

diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp
index ab023e913eaeac6b8dd0af02ad1b4a90092afeec..4ca339fc9d7d8e81e88c5978cdef1aabb1269c1b 100644 (file)
--- a/src/surf/network_smpi.cpp
+++ b/src/surf/network_smpi.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-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. */
@@ -37,15 +37,19 @@ void surf_network_model_init_SMPI()
   engine->get_netzone_root()->set_network_model(net_model);
 
   simgrid::config::set_default<double>("network/weight-S", 8775);
+  simgrid::config::set_default<std::string>("network/bandwidth-factor",
+                                            "65472:0.940694;15424:0.697866;9376:0.58729;5776:1.08739;3484:0.77493;"
+                                            "1426:0.608902;732:0.341987;257:0.338112;0:0.812084");
+  simgrid::config::set_default<std::string>("network/latency-factor",
+                                            "65472:11.6436;15424:3.48845;9376:2.59299;5776:2.18796;3484:1.88101;"
+                                            "1426:1.61075;732:1.9503;257:1.95341;0:2.01467");
 }
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 
 void NetworkSmpiModel::check_lat_factor_cb()
 {
-  if (not simgrid::config::is_default("smpi/lat-factor")) {
+  if (not simgrid::config::is_default("network/latency-factor")) {
     throw std::invalid_argument(
         "NetworkModelIntf: Cannot mix network/latency-factor and callback configuration. Choose only one of them.");
   }
@@ -53,49 +57,10 @@ void NetworkSmpiModel::check_lat_factor_cb()
 
 void NetworkSmpiModel::check_bw_factor_cb()
 {
-  if (not simgrid::config::is_default("smpi/bw-factor")) {
+  if (not simgrid::config::is_default("network/bandwidth-factor")) {
     throw std::invalid_argument(
         "NetworkModelIntf: Cannot mix network/bandwidth-factor and callback configuration. Choose only one of them.");
   }
 }
 
-double NetworkSmpiModel::get_bandwidth_factor(double size)
-{
-  static std::vector<s_smpi_factor_t> smpi_bw_factor;
-  if (smpi_bw_factor.empty())
-    smpi_bw_factor = smpi::utils::parse_factor(config::get_value<std::string>("smpi/bw-factor"));
-
-  double current = 1.0;
-  for (auto const& fact : smpi_bw_factor) {
-    if (size <= fact.factor) {
-      XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
-      return current;
-    } else
-      current = fact.values.front();
-  }
-  XBT_DEBUG("%f > %zu return %f", size, smpi_bw_factor.back().factor, current);
-
-  return current;
-}
-
-double NetworkSmpiModel::get_latency_factor(double size)
-{
-  static std::vector<s_smpi_factor_t> smpi_lat_factor;
-  if (smpi_lat_factor.empty())
-    smpi_lat_factor = smpi::utils::parse_factor(config::get_value<std::string>("smpi/lat-factor"));
-
-  double current = 1.0;
-  for (auto const& fact : smpi_lat_factor) {
-    if (size <= fact.factor) {
-      XBT_DEBUG("%f <= %zu return %f", size, fact.factor, current);
-      return current;
-    } else
-      current = fact.values.front();
-  }
-  XBT_DEBUG("%f > %zu return %f", size, smpi_lat_factor.back().factor, current);
-
-  return current;
-}
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource