Skip to content

Commit ee4e316

Browse files
[arccore+arcane] Supprime la classe 'MpiSerializeMessageList'.
Cette classe n'est plus utilisée depuis 1 ans et est remplacée par 'SerializeMessageList' qui est générique.
1 parent 7eb3674 commit ee4e316

File tree

8 files changed

+13
-573
lines changed

8 files changed

+13
-573
lines changed

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#include "arccore/message_passing_mpi/MpiMessagePassingMng.h"
4646
#include "arccore/message_passing_mpi/internal/MpiSerializeDispatcher.h"
4747
#include "arccore/message_passing_mpi/internal/MpiRequestList.h"
48-
#include "arccore/message_passing_mpi/internal/MpiSerializeMessageList.h"
4948
#include "arccore/message_passing_mpi/internal/MpiAdapter.h"
5049
#include "arccore/message_passing_mpi/internal/MpiLock.h"
5150
#include "arccore/message_passing/Dispatchers.h"
@@ -474,7 +473,7 @@ build()
474473
_setControlDispatcher(control_dispatcher);
475474

476475
// NOTE: cette instance sera détruite par le ParallelMngDispatcher
477-
auto* serialize_dispatcher = new MpiSerializeDispatcher(m_adapter);
476+
auto* serialize_dispatcher = new MpiSerializeDispatcher(m_adapter, mpm);
478477
m_mpi_serialize_dispatcher = serialize_dispatcher;
479478
_setSerializeDispatcher(serialize_dispatcher);
480479

@@ -487,13 +486,6 @@ build()
487486
m_non_blocking_collective->build();
488487
if (m_mpi_lock)
489488
m_trace->info() << "Using mpi with locks.";
490-
491-
// Utilise par défaut (janvier 2024) la nouvelle implémentation de la sérialisation,
492-
// mais on laisse l'ancienne accessible au cas où.
493-
if (platform::getEnvironmentVariable("ARCANE_SYNCHRONIZE_LIST_VERSION") == "1") {
494-
m_use_serialize_list_v2 = false;
495-
m_trace->info() << "Using MPI SerializeList version 1";
496-
}
497489
}
498490

499491
/*---------------------------------------------------------------------------*/
@@ -724,9 +716,7 @@ _waitSomeRequests(ArrayView<Request> requests, bool is_non_blocking)
724716
ISerializeMessageList* MpiParallelMng::
725717
_createSerializeMessageList()
726718
{
727-
if (m_use_serialize_list_v2)
728-
return new MP::internal::SerializeMessageList(messagePassingMng());
729-
return new MpiSerializeMessageList(serializeDispatcher());
719+
return new MP::internal::SerializeMessageList(messagePassingMng());
730720
}
731721

732722
/*---------------------------------------------------------------------------*/

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ class ARCANE_MPI_EXPORT MpiParallelMng
194194
IParallelNonBlockingCollective* m_non_blocking_collective = nullptr;
195195
MpiSerializeDispatcher* m_mpi_serialize_dispatcher = nullptr;
196196
Ref<IParallelMngUtilsFactory> m_utils_factory;
197-
bool m_use_serialize_list_v2 = true;
198197

199198
private:
200199

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ set(SOURCES
2626
MpiDatatype.cc
2727
MpiControlDispatcher.cc
2828
MpiRequestList.cc
29-
MpiSerializeMessageList.cc
3029
MpiSerializeDispatcher.cc
3130
MpiTypeDispatcher.cc
3231
MpiMessagePassingMng.cc
@@ -42,7 +41,6 @@ set(SOURCES
4241
internal/MpiLock.h
4342
internal/MpiRequest.h
4443
internal/MpiRequestList.h
45-
internal/MpiSerializeMessageList.h
4644
internal/MpiSerializeDispatcher.h
4745
internal/MpiTypeDispatcher.h
4846
internal/MpiTypeDispatcherImpl.h

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@
1515

1616
#include "arccore/message_passing_mpi/internal/MpiAdapter.h"
1717
#include "arccore/message_passing_mpi/MpiMessagePassingMng.h"
18-
#include "arccore/message_passing_mpi/internal/MpiSerializeMessageList.h"
1918
#include "arccore/message_passing_mpi/internal/MpiLock.h"
19+
2020
#include "arccore/message_passing/Request.h"
21+
#include "arccore/message_passing/SerializeMessageList.h"
2122
#include "arccore/message_passing/internal/SubRequestCompletionInfo.h"
23+
2224
#include "arccore/serialize/BasicSerializer.h"
25+
2326
#include "arccore/base/NotImplementedException.h"
2427
#include "arccore/base/FatalErrorException.h"
2528
#include "arccore/base/NotSupportedException.h"
@@ -202,8 +205,9 @@ class MpiSerializeDispatcher::ReceiveSerializerSubRequest
202205
/*---------------------------------------------------------------------------*/
203206

204207
MpiSerializeDispatcher::
205-
MpiSerializeDispatcher(MpiAdapter* adapter)
208+
MpiSerializeDispatcher(MpiAdapter* adapter, IMessagePassingMng* message_passing_mng)
206209
: m_adapter(adapter)
210+
, m_message_passing_mng(message_passing_mng)
207211
, m_trace(adapter->traceMng())
208212
, m_serialize_buffer_size(50000)
209213
//, m_serialize_buffer_size(20000000)
@@ -578,7 +582,8 @@ _castSerializer(ISerializer* serializer)
578582
Ref<ISerializeMessageList> MpiSerializeDispatcher::
579583
createSerializeMessageListRef()
580584
{
581-
ISerializeMessageList* x = new MpiSerializeMessageList(this);
585+
ISerializeMessageList* x = new internal::SerializeMessageList(m_message_passing_mng);
586+
//MpiSerializeMessageList(this);
582587
return makeRef(x);
583588
}
584589

0 commit comments

Comments
 (0)