X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae9ecde63e23c708bffdf472ab4c8eb77576614c..8344f32ee2339f2b53a6e79ac0e9aa3a93384f58:/src/smpi/internals/smpi_deployment.cpp

diff --git a/src/smpi/internals/smpi_deployment.cpp b/src/smpi/internals/smpi_deployment.cpp
index 526ee28674..9c9d7c8bdf 100644
--- a/src/smpi/internals/smpi_deployment.cpp
+++ b/src/smpi/internals/smpi_deployment.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2021. The SimGrid Team.
+/* Copyright (c) 2004-2023. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -13,11 +13,7 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi);
 
-namespace simgrid {
-namespace smpi {
-namespace app {
-
-static int universe_size = 0;
+namespace simgrid::smpi::app {
 
 class Instance {
 public:
@@ -25,17 +21,14 @@ public:
   {
     auto* group = new simgrid::smpi::Group(size_);
     comm_world_ = new simgrid::smpi::Comm(group, nullptr, false, -1);
-    universe_size += max_no_processes;
-    bar_ = std::make_shared<s4u::Barrier>(size_);
+    bar_ = s4u::Barrier::create(size_);
   }
-  std::shared_ptr<s4u::Barrier> bar_;
+  s4u::BarrierPtr bar_;
   unsigned int size_;
   unsigned int finalized_ranks_ = 0;
   MPI_Comm comm_world_;
 };
-}
-}
-}
+} // namespace simgrid::smpi::app
 
 using simgrid::smpi::app::Instance;
 
@@ -56,9 +49,39 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
   if (code != nullptr) // When started with smpirun, we will not execute a function
     simgrid::s4u::Engine::get_instance()->register_function(name, code);
 
-  Instance instance(num_processes);
+  smpi_instances.try_emplace(name, num_processes);
+}
+void SMPI_app_instance_start(const char* name, const std::function<void()>& code,
+                             std::vector<simgrid::s4u::Host*> const& hosts)
+{
+  xbt_assert(not hosts.empty(), "Cannot start a SMPI instance on 0 hosts");
+
+  auto [_, inserted] = smpi_instances.try_emplace(name, hosts.size());
+  xbt_assert(inserted, "Cannot start two MPI applications of the same name '%s'", name);
+
+  int rank = 0;
+  for (auto* host : hosts) {
+    auto rank_str = std::to_string(rank);
+    auto actor    = simgrid::s4u::Actor::init(std::string(name) + "#" + rank_str, host);
+    actor->set_property("instance_id", name);
+    actor->set_property("rank", rank_str);
+    actor->start(code);
 
-  smpi_instances.insert(std::pair<std::string, Instance>(name, instance));
+    smpi_deployment_register_process(name, rank, actor.get());
+
+    rank++;
+  }
+}
+void SMPI_app_instance_join(const std::string& instance_id)
+{
+  std::vector<simgrid::s4u::ActorPtr> actors =
+      simgrid::s4u::Engine::get_instance()->get_filtered_actors([instance_id](simgrid::s4u::ActorPtr act) {
+        auto* actor_instance = act->get_property("instance_id");
+        return actor_instance != nullptr && strcmp(actor_instance, instance_id.c_str()) == 0;
+      });
+
+  for (auto& act : actors)
+    act->join();
 }
 
 void smpi_deployment_register_process(const std::string& instance_id, int rank, const simgrid::s4u::Actor* actor)
@@ -86,28 +109,18 @@ void smpi_deployment_unregister_process(const std::string& instance_id)
 
 MPI_Comm* smpi_deployment_comm_world(const std::string& instance_id)
 {
-  if (smpi_instances
-          .empty()) { // no instance registered, we probably used smpirun. (FIXME: I guess this never happens for real)
-    return nullptr;
-  }
   Instance& instance = smpi_instances.at(instance_id);
   return &instance.comm_world_;
 }
 
 void smpi_deployment_cleanup_instances(){
-  for (auto const& item : smpi_instances) {
-    XBT_INFO("Stalling SMPI instance: %s. Do all your MPI ranks call MPI_Finalize()?", item.first.c_str());
-    Instance instance = item.second;
+  for (auto const& [name, instance] : smpi_instances) {
+    XBT_INFO("Stalling SMPI instance: %s. Do all your MPI ranks call MPI_Finalize()?", name.c_str());
     simgrid::smpi::Comm::destroy(instance.comm_world_);
   }
   smpi_instances.clear();
 }
 
-int smpi_get_universe_size()
-{
-  return simgrid::smpi::app::universe_size;
-}
-
 /** @brief Auxiliary method to get list of hosts to deploy app */
 static std::vector<simgrid::s4u::Host*> smpi_get_hosts(const simgrid::s4u::Engine* e, const std::string& hostfile)
 {