Merge pull request #2000 from arcaneframework/dev/gg-remove-class-mpiserializemessagelist

Remove class `MpiSerializeMessageList`

Author: grospelliergilles

arcane/src/arcane/parallel/mpi/MpiParallelMng.cc

@@ -45,7 +45,6 @@
 #include "arccore/message_passing_mpi/MpiMessagePassingMng.h"
 #include "arccore/message_passing_mpi/internal/MpiSerializeDispatcher.h"
 #include "arccore/message_passing_mpi/internal/MpiRequestList.h"
-#include "arccore/message_passing_mpi/internal/MpiSerializeMessageList.h"
 #include "arccore/message_passing_mpi/internal/MpiAdapter.h"
 #include "arccore/message_passing_mpi/internal/MpiLock.h"
 #include "arccore/message_passing/Dispatchers.h"
@@ -474,7 +473,7 @@ build()
   _setControlDispatcher(control_dispatcher);
 
   // NOTE: cette instance sera détruite par le ParallelMngDispatcher
-  auto* serialize_dispatcher = new MpiSerializeDispatcher(m_adapter);
+  auto* serialize_dispatcher = new MpiSerializeDispatcher(m_adapter, mpm);
   m_mpi_serialize_dispatcher = serialize_dispatcher;
   _setSerializeDispatcher(serialize_dispatcher);
 
@@ -487,13 +486,6 @@ build()
   m_non_blocking_collective->build();
   if (m_mpi_lock)
     m_trace->info() << "Using mpi with locks.";
-
-  // Utilise par défaut (janvier 2024) la nouvelle implémentation de la sérialisation,
-  // mais on laisse l'ancienne accessible au cas où.
-  if (platform::getEnvironmentVariable("ARCANE_SYNCHRONIZE_LIST_VERSION") == "1") {
-    m_use_serialize_list_v2 = false;
-    m_trace->info() << "Using MPI SerializeList version 1";
-  }
 }
 
 /*---------------------------------------------------------------------------*/
@@ -724,9 +716,7 @@ _waitSomeRequests(ArrayView<Request> requests, bool is_non_blocking)
 ISerializeMessageList* MpiParallelMng::
 _createSerializeMessageList()
 {
-  if (m_use_serialize_list_v2)
-    return new MP::internal::SerializeMessageList(messagePassingMng());
-  return new MpiSerializeMessageList(serializeDispatcher());
+  return new MP::internal::SerializeMessageList(messagePassingMng());
 }
 
 /*---------------------------------------------------------------------------*/

arcane/src/arcane/parallel/mpi/MpiParallelMng.h

@@ -1,11 +1,11 @@
 // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
 //-----------------------------------------------------------------------------
-// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
+// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0
 //-----------------------------------------------------------------------------
 /*---------------------------------------------------------------------------*/
-/* MpiParallelMng.h                                            (C) 2000-2024 */
+/* MpiParallelMng.h                                            (C) 2000-2025 */
 /*                                                                           */
 /* Implémentation des messages avec MPI.                                     */
 /*---------------------------------------------------------------------------*/
@@ -194,7 +194,6 @@ class ARCANE_MPI_EXPORT MpiParallelMng
   IParallelNonBlockingCollective* m_non_blocking_collective = nullptr;
   MpiSerializeDispatcher* m_mpi_serialize_dispatcher = nullptr;
   Ref<IParallelMngUtilsFactory> m_utils_factory;
-  bool m_use_serialize_list_v2 = true;
 
  private:
 

arcane/src/arcane/tests/CMakeLists.txt

@@ -532,12 +532,6 @@ add_test_message_passing(sub_all)
 arcane_add_test_message_passing_hybrid(parallelmng_all NB_MPI 2 NB_SHM 2 ARGS -We,MESSAGE_PASSING_TEST,all -arcane_opt direct_test ParallelMngTest null)
 arcane_add_test_message_passing_hybrid(parallelmng_sub_all NB_MPI 2 NB_SHM 2 ARGS -We,MESSAGE_PASSING_TEST,all -arcane_opt direct_test ParallelMngTest null)
 
-add_test(serialize_message_list_v1_4proc
-  ${ARCANE_TEST_DRIVER} launch -n 4
-  -We,MESSAGE_PASSING_TEST,serialize_message_list
-  -We,ARCANE_SYNCHRONIZE_LIST_VERSION,1
-  -arcane_opt direct_test ParallelMngTest null)
-
 # ----------------------------------------------------------------------------
 
 ARCANE_ADD_TEST_PARALLEL(parallel testParallel-1.arc 4)

arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt

@@ -26,7 +26,6 @@ set(SOURCES
   MpiDatatype.cc
   MpiControlDispatcher.cc
   MpiRequestList.cc
-  MpiSerializeMessageList.cc
   MpiSerializeDispatcher.cc
   MpiTypeDispatcher.cc
   MpiMessagePassingMng.cc
@@ -42,7 +41,6 @@ set(SOURCES
   internal/MpiLock.h
   internal/MpiRequest.h
   internal/MpiRequestList.h
-  internal/MpiSerializeMessageList.h
   internal/MpiSerializeDispatcher.h
   internal/MpiTypeDispatcher.h
   internal/MpiTypeDispatcherImpl.h

arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiControlDispatcher.cc

@@ -15,8 +15,11 @@
 
 #include "arccore/message_passing_mpi/MpiMessagePassingMng.h"
 #include "arccore/message_passing_mpi/internal/MpiAdapter.h"
+#include "arccore/message_passing_mpi/internal/MpiRequestList.h"
+
 #include "arccore/message_passing/Request.h"
-#include "arccore/base/NotImplementedException.h"
+#include "arccore/message_passing/IMessagePassingMng.h"
+#include "arccore/message_passing/Messages.h"
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
@@ -27,8 +30,9 @@ namespace Arcane::MessagePassing::Mpi
 /*---------------------------------------------------------------------------*/
 
 MpiControlDispatcher::
-MpiControlDispatcher(MpiAdapter* adapter)
+MpiControlDispatcher(MpiAdapter* adapter, IMessagePassingMng* mpm)
 : m_adapter(adapter)
+, m_message_passing_mng(mpm)
 {
 }
 
@@ -118,6 +122,15 @@ setProfiler(IProfiler* p)
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
+Ref<IRequestList> MpiControlDispatcher::
+createRequestListRef()
+{
+  return createRef<MpiRequestList>(m_adapter);
+}
+
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+
 } // namespace Arccore::MessagePassing::Mpi
 
 /*---------------------------------------------------------------------------*/

arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc

@@ -15,11 +15,14 @@
 
 #include "arccore/message_passing_mpi/internal/MpiAdapter.h"
 #include "arccore/message_passing_mpi/MpiMessagePassingMng.h"
-#include "arccore/message_passing_mpi/internal/MpiSerializeMessageList.h"
 #include "arccore/message_passing_mpi/internal/MpiLock.h"
+
 #include "arccore/message_passing/Request.h"
+#include "arccore/message_passing/SerializeMessageList.h"
 #include "arccore/message_passing/internal/SubRequestCompletionInfo.h"
+
 #include "arccore/serialize/BasicSerializer.h"
+
 #include "arccore/base/NotImplementedException.h"
 #include "arccore/base/FatalErrorException.h"
 #include "arccore/base/NotSupportedException.h"
@@ -202,8 +205,9 @@ class MpiSerializeDispatcher::ReceiveSerializerSubRequest
 /*---------------------------------------------------------------------------*/
 
 MpiSerializeDispatcher::
-MpiSerializeDispatcher(MpiAdapter* adapter)
+MpiSerializeDispatcher(MpiAdapter* adapter, IMessagePassingMng* message_passing_mng)
 : m_adapter(adapter)
+, m_message_passing_mng(message_passing_mng)
 , m_trace(adapter->traceMng())
 , m_serialize_buffer_size(50000)
 //, m_serialize_buffer_size(20000000)
@@ -578,7 +582,7 @@ _castSerializer(ISerializer* serializer)
 Ref<ISerializeMessageList> MpiSerializeDispatcher::
 createSerializeMessageListRef()
 {
-  ISerializeMessageList* x = new MpiSerializeMessageList(this);
+  ISerializeMessageList* x = new internal::SerializeMessageList(m_message_passing_mng);
   return makeRef(x);
 }