Cleanups. Kill useless code

- Kill check_lat_factor_cb() and check_bw_factor_cb(): Now cleanly in NetworkModelFactors
- Kill the NetworkSmpiModel type: useless and empty
- Kill files network_smpi.[ch]pp: empty

diff --git a/MANIFEST.in b/MANIFEST.in
index c3f5610..2626342 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2622,8 +2622,6 @@ include src/surf/network_ib.cpp
 include src/surf/network_ib.hpp
 include src/surf/network_ns3.cpp
 include src/surf/network_ns3.hpp
-include src/surf/network_smpi.cpp
-include src/surf/network_smpi.hpp
 include src/surf/ns3/ns3_simulator.cpp
 include src/surf/ns3/ns3_simulator.hpp
 include src/surf/ptask_L07.cpp

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index c0f1e0f..87b6cdb 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -75,6 +75,34 @@ void surf_network_model_init_CM02()
   engine->get_netzone_root()->set_network_model(net_model);
 }
 
+/********************************************************************/
+/* Model based on LV08 and experimental results of MPI ping-pongs   */
+/********************************************************************/
+/* @Inproceedings{smpi_ipdps, */
+/*  author={Pierre-Nicolas Clauss and Mark Stillwell and Stéphane Genaud and Frédéric Suter and Henri Casanova and
+ * Martin Quinson}, */
+/*  title={Single Node On-Line Simulation of {MPI} Applications with SMPI}, */
+/*  booktitle={25th IEEE International Parallel and Distributed Processing Symposium (IPDPS'11)}, */
+/*  address={Anchorage (Alaska) USA}, */
+/*  month=may, */
+/*  year={2011} */
+/*  } */
+void surf_network_model_init_SMPI()
+{
+  auto net_model = std::make_shared<simgrid::kernel::resource::NetworkCm02Model>("Network_SMPI");
+  auto* engine   = simgrid::kernel::EngineImpl::get_instance();
+  engine->add_model(net_model);
+  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::kernel::resource {
 
 NetworkCm02Model::NetworkCm02Model(const std::string& name) : NetworkModel(name)
@@ -97,22 +125,6 @@ NetworkCm02Model::NetworkCm02Model(const std::string& name) : NetworkModel(name)
   loopback_->get_iface()->seal();
 }
 
-void NetworkCm02Model::check_lat_factor_cb()
-{
-  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.");
-  }
-}
-
-void NetworkCm02Model::check_bw_factor_cb()
-{
-  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.");
-  }
-}
-
 StandardLinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vector<double>& bandwidths)
 {
   xbt_assert(bandwidths.size() == 1, "Non-WIFI links must use only 1 bandwidth.");

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 130c4f3..1f6b46b 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -54,10 +54,6 @@ public:
   void update_actions_state_lazy(double now, double delta) override;
   void update_actions_state_full(double now, double delta) override;
   Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
-
-protected:
-  virtual void check_lat_factor_cb();
-  virtual void check_bw_factor_cb();
 };
 
 /************

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 0592a7d..6055916 100644 (file)
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -78,7 +78,7 @@ void NetworkIBModel::IB_comm_start_callback(const activity::CommImpl& comm)
   ibModel->update_IB_factors(action, act_src, act_dst, 0);
 }
 
-NetworkIBModel::NetworkIBModel(const std::string& name) : NetworkSmpiModel(name)
+NetworkIBModel::NetworkIBModel(const std::string& name) : NetworkCm02Model(name)
 {
   std::string IB_factors_string = config::get_value<std::string>("smpi/IB-penalty-factors");
   std::vector<std::string> radical_elements;

diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp
index 69b52fc..915c0a7 100644 (file)
--- a/src/surf/network_ib.hpp
+++ b/src/surf/network_ib.hpp
@@ -7,7 +7,7 @@
 #ifndef SURF_NETWORK_IB_HPP_
 #define SURF_NETWORK_IB_HPP_
 
-#include "src/surf/network_smpi.hpp"
+#include "src/surf/network_cm02.hpp"
 #include "xbt/base.h"
 
 #include <map>
@@ -35,7 +35,7 @@ public:
   explicit IBNode(int id) : id_(id){};
 };
 
-class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {
+class XBT_PRIVATE NetworkIBModel : public NetworkCm02Model {
   std::unordered_map<std::string, IBNode> active_nodes;
   std::unordered_map<NetworkAction*, std::pair<IBNode*, IBNode*>> active_comms;
 

diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp
deleted file mode 100644 (file)
index 4ca339f..0000000
--- a/src/surf/network_smpi.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/* 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. */
-
-#include <simgrid/kernel/routing/NetZoneImpl.hpp>
-#include <simgrid/s4u/Engine.hpp>
-
-#include "simgrid/sg_config.hpp"
-#include "smpi_utils.hpp"
-#include "src/kernel/EngineImpl.hpp"
-#include "src/surf/network_smpi.hpp"
-
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
-
-/*********
- * Model *
- *********/
-
-/************************************************************************/
-/* New model based on LV08 and experimental results of MPI ping-pongs   */
-/************************************************************************/
-/* @Inproceedings{smpi_ipdps, */
-/*  author={Pierre-Nicolas Clauss and Mark Stillwell and Stéphane Genaud and Frédéric Suter and Henri Casanova and
- * Martin Quinson}, */
-/*  title={Single Node On-Line Simulation of {MPI} Applications with SMPI}, */
-/*  booktitle={25th IEEE International Parallel and Distributed Processing Symposium (IPDPS'11)}, */
-/*  address={Anchorage (Alaska) USA}, */
-/*  month=may, */
-/*  year={2011} */
-/*  } */
-void surf_network_model_init_SMPI()
-{
-  auto net_model = std::make_shared<simgrid::kernel::resource::NetworkSmpiModel>("Network_SMPI");
-  auto* engine   = simgrid::kernel::EngineImpl::get_instance();
-  engine->add_model(net_model);
-  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::kernel::resource {
-
-void NetworkSmpiModel::check_lat_factor_cb()
-{
-  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.");
-  }
-}
-
-void NetworkSmpiModel::check_bw_factor_cb()
-{
-  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.");
-  }
-}
-
-} // namespace simgrid::kernel::resource

diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp
deleted file mode 100644 (file)
index 2d69dc4..0000000
--- a/src/surf/network_smpi.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 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. */
-
-#ifndef SIMGRID_SURF_NETWORK_SMPI_HPP
-#define SIMGRID_SURF_NETWORK_SMPI_HPP
-
-#include <xbt/base.h>
-
-#include "network_cm02.hpp"
-
-namespace simgrid::kernel::resource {
-
-class XBT_PRIVATE NetworkSmpiModel : public NetworkCm02Model {
-public:
-  using NetworkCm02Model::NetworkCm02Model;
-
-protected:
-  void check_lat_factor_cb() override;
-  void check_bw_factor_cb() override;
-};
-} // namespace simgrid::kernel::resource
-
-#endif

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index d24edd9..f8003c9 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -41,7 +41,6 @@ set(EXTRA_DIST
   src/surf/network_constant.hpp
   src/surf/network_ib.hpp
   src/surf/network_ns3.hpp
-  src/surf/network_smpi.hpp
   src/surf/ns3/ns3_simulator.hpp
   src/surf/ptask_L07.hpp
   src/surf/surf_interface.hpp
@@ -247,7 +246,6 @@ set(SMPI_SRC
   src/smpi/plugins/ampi/instr_ampi.cpp
   src/smpi/plugins/ampi/instr_ampi.hpp
   src/surf/network_ib.cpp
-  src/surf/network_smpi.cpp
   )
 set(STHREAD_SRC
   src/sthread/sthread_impl.cpp