From 01b79becf6681ec0ded01d6fb9783fb59be65a41 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Sat, 15 Feb 2025 10:45:29 +0100 Subject: [PATCH 1/6] =?UTF-8?q?[arccore,message=5Fpassing=5Fmpi]=20D=C3=A9?= =?UTF-8?q?place=20'MpiTypeDistpatcher'=20dans=20l'API=20interne=20de=20Ar?= =?UTF-8?q?ccore.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arcane/src/arcane/parallel/mpi/MpiParallelDispatch.cc | 2 +- arcane/src/arcane/parallel/mpi/MpiParallelDispatch.h | 2 +- .../arccore/message_passing_mpi/CMakeLists.txt | 4 ++-- .../arccore/message_passing_mpi/MpiTypeDispatcher.cc | 2 +- .../message_passing_mpi/StandaloneMpiMessagePassingMng.cc | 2 +- .../message_passing_mpi/{ => internal}/MpiTypeDispatcher.h | 4 ++-- .../{ => internal}/MpiTypeDispatcherImpl.h | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) rename arccore/src/message_passing_mpi/arccore/message_passing_mpi/{ => internal}/MpiTypeDispatcher.h (97%) rename arccore/src/message_passing_mpi/arccore/message_passing_mpi/{ => internal}/MpiTypeDispatcherImpl.h (98%) diff --git a/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.cc b/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.cc index 5d699a639a..325e67a805 100644 --- a/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.cc +++ b/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.cc @@ -33,7 +33,7 @@ #include "arccore/message_passing/Messages.h" -#include "arccore/message_passing_mpi/MpiTypeDispatcherImpl.h" +#include "arccore/message_passing_mpi/internal/MpiTypeDispatcherImpl.h" #include diff --git a/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.h b/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.h index eaabcf74c3..d1d47d8309 100644 --- a/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.h +++ b/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.h @@ -21,7 +21,7 @@ #include "arcane/parallel/mpi/ArcaneMpi.h" #include "arcane/parallel/mpi/MpiDatatypeList.h" -#include "arccore/message_passing_mpi/MpiTypeDispatcher.h" +#include "arccore/message_passing_mpi/internal/MpiTypeDispatcher.h" #include "arccore/message_passing/PointToPointMessageInfo.h" #include "arccore/base/ReferenceCounterImpl.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt index a289a6416a..5738c8e7ed 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt @@ -37,14 +37,14 @@ set(SOURCES MpiSerializeMessageList.cc MpiSerializeDispatcher.h MpiSerializeDispatcher.cc - MpiTypeDispatcher.h - MpiTypeDispatcherImpl.h MpiTypeDispatcher.cc MpiMessagePassingMng.cc MpiMessagePassingMng.h NoMpiProfiling.h StandaloneMpiMessagePassingMng.cc StandaloneMpiMessagePassingMng.h + internal/MpiTypeDispatcher.h + internal/MpiTypeDispatcherImpl.h ) arccore_add_component_library(message_passing_mpi diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiTypeDispatcher.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiTypeDispatcher.cc index 6cb847de24..07b2eef025 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiTypeDispatcher.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiTypeDispatcher.cc @@ -11,7 +11,7 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arccore/message_passing_mpi/MpiTypeDispatcherImpl.h" +#include "arccore/message_passing_mpi/internal/MpiTypeDispatcherImpl.h" #include "arccore/base/BFloat16.h" #include "arccore/base/Float16.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.cc index 0c8b0a6344..1ec59c0a1b 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.cc @@ -22,7 +22,7 @@ #include "arccore/message_passing_mpi/MpiAdapter.h" #include "arccore/message_passing_mpi/MpiDatatype.h" -#include "arccore/message_passing_mpi/MpiTypeDispatcher.h" +#include "arccore/message_passing_mpi/internal/MpiTypeDispatcher.h" #include "arccore/message_passing_mpi/MpiControlDispatcher.h" #include "arccore/message_passing_mpi/MpiSerializeDispatcher.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiTypeDispatcher.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiTypeDispatcher.h similarity index 97% rename from arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiTypeDispatcher.h rename to arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiTypeDispatcher.h index 41132dbc8b..b6efdbda0d 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiTypeDispatcher.h +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiTypeDispatcher.h @@ -9,8 +9,8 @@ /* */ /* Gestion des messages pour un type de données. */ /*---------------------------------------------------------------------------*/ -#ifndef ARCCORE_MESSAGEPASSINGMPI_MPITYPEDISPATCHER_H -#define ARCCORE_MESSAGEPASSINGMPI_MPITYPEDISPATCHER_H +#ifndef ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPITYPEDISPATCHER_H +#define ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPITYPEDISPATCHER_H /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiTypeDispatcherImpl.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiTypeDispatcherImpl.h similarity index 98% rename from arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiTypeDispatcherImpl.h rename to arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiTypeDispatcherImpl.h index 65c9cbaa49..adf6496fa0 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiTypeDispatcherImpl.h +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiTypeDispatcherImpl.h @@ -9,12 +9,12 @@ /* */ /* Implémentation de 'MpiTypeDispatcher'. */ /*---------------------------------------------------------------------------*/ -#ifndef ARCCORE_MESSAGEPASSINGMPI_MPITYPEDISPATCHERIMPL_H -#define ARCCORE_MESSAGEPASSINGMPI_MPITYPEDISPATCHERIMPL_H +#ifndef ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPITYPEDISPATCHERIMPL_H +#define ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPITYPEDISPATCHERIMPL_H /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arccore/message_passing_mpi/MpiTypeDispatcher.h" +#include "arccore/message_passing_mpi/internal/MpiTypeDispatcher.h" #include "arccore/message_passing_mpi/MpiDatatype.h" #include "arccore/message_passing_mpi/MpiAdapter.h" #include "arccore/message_passing_mpi/MpiLock.h" From 139080d1865b52faad99ebef8072453d17ee660c Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Sat, 15 Feb 2025 10:56:13 +0100 Subject: [PATCH 2/6] =?UTF-8?q?[arccore+arcane]=20D=C3=A9place=20'IMpiProf?= =?UTF-8?q?iling.h'=20et=20les=20classes=20d=C3=A9riv=C3=A9es=20dans=20l'A?= =?UTF-8?q?PI=20interne=20de=20Arccore/Arcane.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MpiLegacyVariableSynchronizeDispatcher.cc | 6 +- arcane/src/arcane/std/CMakeLists.txt | 3 + arcane/src/arcane/std/Otf2LibWrapper.cc | 6 +- .../std/Otf2MessagePassingProfilingService.h | 23 +++--- arcane/src/arcane/std/Otf2MpiProfiling.cc | 5 +- .../std/{ => internal}/Otf2LibWrapper.h | 0 .../Otf2MessagePassingProfilingService.h | 75 +++++++++++++++++++ .../std/{ => internal}/Otf2MpiProfiling.h | 15 ++-- .../message_passing_mpi/CMakeLists.txt | 6 +- .../arccore/message_passing_mpi/MpiAdapter.cc | 2 +- .../arccore/message_passing_mpi/MpiAdapter.h | 7 +- .../{ => internal}/IMpiProfiling.h | 0 .../{ => internal}/NoMpiProfiling.h | 6 +- 13 files changed, 118 insertions(+), 36 deletions(-) rename arcane/src/arcane/std/{ => internal}/Otf2LibWrapper.h (100%) create mode 100644 arcane/src/arcane/std/internal/Otf2MessagePassingProfilingService.h rename arcane/src/arcane/std/{ => internal}/Otf2MpiProfiling.h (94%) rename arccore/src/message_passing_mpi/arccore/message_passing_mpi/{ => internal}/IMpiProfiling.h (100%) rename arccore/src/message_passing_mpi/arccore/message_passing_mpi/{ => internal}/NoMpiProfiling.h (97%) diff --git a/arcane/src/arcane/parallel/mpi/MpiLegacyVariableSynchronizeDispatcher.cc b/arcane/src/arcane/parallel/mpi/MpiLegacyVariableSynchronizeDispatcher.cc index a1442a815e..e14157fc51 100644 --- a/arcane/src/arcane/parallel/mpi/MpiLegacyVariableSynchronizeDispatcher.cc +++ b/arcane/src/arcane/parallel/mpi/MpiLegacyVariableSynchronizeDispatcher.cc @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2023 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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* MpiVariableSynchronizeDispatcher.cc (C) 2000-2023 */ +/* MpiVariableSynchronizeDispatcher.cc (C) 2000-2025 */ /* */ /* Gestion spécifique MPI des synchronisations des variables. */ /*---------------------------------------------------------------------------*/ @@ -22,6 +22,8 @@ #include "arcane/impl/IDataSynchronizeBuffer.h" #include "arcane/impl/IDataSynchronizeImplementation.h" +#include "arccore/message_passing_mpi/internal/IMpiProfiling.h" + /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/std/CMakeLists.txt b/arcane/src/arcane/std/CMakeLists.txt index 86ec661873..ea5117c90a 100644 --- a/arcane/src/arcane/std/CMakeLists.txt +++ b/arcane/src/arcane/std/CMakeLists.txt @@ -114,6 +114,9 @@ if(OTF2_FOUND) Otf2MessagePassingProfilingService.cc Otf2MpiProfiling.cc Otf2LibWrapper.cc + internal/Otf2MessagePassingProfilingService.h + internal/Otf2MpiProfiling.h + internal/Otf2LibWrapper.h ) endif() endif() diff --git a/arcane/src/arcane/std/Otf2LibWrapper.cc b/arcane/src/arcane/std/Otf2LibWrapper.cc index 24c2950c1e..8a221affcc 100644 --- a/arcane/src/arcane/std/Otf2LibWrapper.cc +++ b/arcane/src/arcane/std/Otf2LibWrapper.cc @@ -1,17 +1,17 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2022 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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* Otf2LibWrapper.cc (C) 2000-2022 */ +/* Otf2LibWrapper.cc (C) 2000-2025 */ /* */ /* Classe qui encapsule les fonctions utiles de la lib Otf2. */ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arcane/std/Otf2LibWrapper.h" +#include "arcane/std/internal/Otf2LibWrapper.h" #include "arcane/utils/Collection.h" #include "arcane/utils/ITraceMng.h" diff --git a/arcane/src/arcane/std/Otf2MessagePassingProfilingService.h b/arcane/src/arcane/std/Otf2MessagePassingProfilingService.h index 0e2b08a988..d90cd6b797 100644 --- a/arcane/src/arcane/std/Otf2MessagePassingProfilingService.h +++ b/arcane/src/arcane/std/Otf2MessagePassingProfilingService.h @@ -1,28 +1,31 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2022 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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* Otf2MessagePassingProfilingService.h (C) 2000-2019 */ +/* Otf2MessagePassingProfilingService.h (C) 2000-2025 */ /* */ /* Informations de performances du "message passing" au format Otf2 */ /*---------------------------------------------------------------------------*/ -#ifndef ARCANE_STD_OTF2MESSAGEPASSINGPROFILINGSERVICE_H -#define ARCANE_STD_OTF2MESSAGEPASSINGPROFILINGSERVICE_H +#ifndef ARCANE_STD_INTERNAL_OTF2MESSAGEPASSINGPROFILINGSERVICE_H +#define ARCANE_STD_INTERNAL_OTF2MESSAGEPASSINGPROFILINGSERVICE_H /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arcane/AbstractService.h" -#include "arcane/ISubDomain.h" -#include "arcane/ObserverPool.h" -#include "arcane/VariableSynchronizerEventArgs.h" #include "arcane/utils/IMessagePassingProfilingService.h" #include "arcane/utils/String.h" + +#include "arcane/core/AbstractService.h" +#include "arcane/core/ISubDomain.h" +#include "arcane/core/ObserverPool.h" +#include "arcane/core/VariableSynchronizerEventArgs.h" + +#include "arcane/std/internal/Otf2LibWrapper.h" +#include "arcane/std/internal/Otf2MpiProfiling.h" + #include "arccore/message_passing/Stat.h" -#include "arcane/std/Otf2LibWrapper.h" -#include "arcane/std/Otf2MpiProfiling.h" /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/std/Otf2MpiProfiling.cc b/arcane/src/arcane/std/Otf2MpiProfiling.cc index 0912a66368..0507a6b0ed 100644 --- a/arcane/src/arcane/std/Otf2MpiProfiling.cc +++ b/arcane/src/arcane/std/Otf2MpiProfiling.cc @@ -12,16 +12,15 @@ /*---------------------------------------------------------------------------*/ #include "arccore/message_passing_mpi/MessagePassingMpiEnum.h" -#include "arcane/utils/ArcaneGlobal.h" #include "arcane/utils/FatalErrorException.h" -#include "arcane/std/Otf2MpiProfiling.h" +#include "arcane/std/internal/Otf2MpiProfiling.h" /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ namespace Arcane { -using namespace Arccore::MessagePassing::Mpi; +using namespace MessagePassing::Mpi; /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/std/Otf2LibWrapper.h b/arcane/src/arcane/std/internal/Otf2LibWrapper.h similarity index 100% rename from arcane/src/arcane/std/Otf2LibWrapper.h rename to arcane/src/arcane/std/internal/Otf2LibWrapper.h diff --git a/arcane/src/arcane/std/internal/Otf2MessagePassingProfilingService.h b/arcane/src/arcane/std/internal/Otf2MessagePassingProfilingService.h new file mode 100644 index 0000000000..1a41789d2d --- /dev/null +++ b/arcane/src/arcane/std/internal/Otf2MessagePassingProfilingService.h @@ -0,0 +1,75 @@ +// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- +//----------------------------------------------------------------------------- +// 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 +//----------------------------------------------------------------------------- +/*---------------------------------------------------------------------------*/ +/* Otf2MessagePassingProfilingService.h (C) 2000-2025 */ +/* */ +/* Informations de performances du "message passing" au format Otf2 */ +/*---------------------------------------------------------------------------*/ +#ifndef ARCANE_STD_INTERNAL_OTF2MESSAGEPASSINGPROFILINGSERVICE_H +#define ARCANE_STD_INTERNAL_OTF2MESSAGEPASSINGPROFILINGSERVICE_H +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ + +#include "arcane/AbstractService.h" +#include "arcane/ISubDomain.h" +#include "arcane/ObserverPool.h" +#include "arcane/VariableSynchronizerEventArgs.h" +#include "arcane/utils/IMessagePassingProfilingService.h" +#include "arcane/utils/String.h" +#include "arccore/message_passing/Stat.h" +#include "arcane/std/internal/Otf2LibWrapper.h" +#include "arcane/std/internal/Otf2MpiProfiling.h" + +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ + +namespace Arcane +{ +namespace MP = ::Arccore::MessagePassing; + +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ +/*! + * \brief Service de profiling du "message passing" au format JSON. + */ +class Otf2MessagePassingProfilingService +: public AbstractService +, public IMessagePassingProfilingService +{ + public: + explicit Otf2MessagePassingProfilingService(const ServiceBuildInfo& sbi); + ~Otf2MessagePassingProfilingService() noexcept override; + + void startProfiling() override; + void stopProfiling() override; + void printInfos(std::ostream& output) override; + String implName() override; + + private: + void _updateFromBeginEntryPointEvt(); + void _updateFromEndEntryPointEvt(); + void _updateFromSynchronizeEvt(const VariableSynchronizerEventArgs& arg); + + ISubDomain* m_sub_domain = nullptr; + Otf2LibWrapper m_otf2_wrapper; + Otf2MpiProfiling m_otf2_prof; + MP::IProfiler* m_prof_backup = nullptr; + ObserverPool m_observer; + EventObserverPool m_observer_pool; + String m_impl_name; + MP::IControlDispatcher* m_control_dispatcher = nullptr; +}; + +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ + +} // namespace Arcane + +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ + +#endif diff --git a/arcane/src/arcane/std/Otf2MpiProfiling.h b/arcane/src/arcane/std/internal/Otf2MpiProfiling.h similarity index 94% rename from arcane/src/arcane/std/Otf2MpiProfiling.h rename to arcane/src/arcane/std/internal/Otf2MpiProfiling.h index 199a27de8f..074840f69c 100644 --- a/arcane/src/arcane/std/Otf2MpiProfiling.h +++ b/arcane/src/arcane/std/internal/Otf2MpiProfiling.h @@ -1,34 +1,33 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2022 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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* Otf2MpiProfiling.h (C) 2000-2018 */ +/* Otf2MpiProfiling.h (C) 2000-2025 */ /* */ /* Implementation de l'interface IMpiProfiling permettant l'instrumentation */ /* au format OTF2 . */ /*---------------------------------------------------------------------------*/ -#ifndef ARCANE_STD_OTF2MPIPROFILING_H -#define ARCANE_STD_OTF2MPIPROFILING_H +#ifndef ARCANE_STD_INTERNAL_OTF2MPIPROFILING_H +#define ARCANE_STD_INTERNAL_OTF2MPIPROFILING_H /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ #include "arccore/base/BaseTypes.h" #include "arccore/collections/CollectionsGlobal.h" #include "arccore/message_passing/Request.h" -#include "arccore/message_passing_mpi/MessagePassingMpiGlobal.h" -#include "arccore/message_passing_mpi/IMpiProfiling.h" +#include "arccore/message_passing_mpi/internal/IMpiProfiling.h" #include "arccore/message_passing_mpi/MessagePassingMpiEnum.h" -#include "arcane/std/Otf2LibWrapper.h" +#include "arcane/std/internal/Otf2LibWrapper.h" /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ namespace Arcane { -using namespace Arccore::MessagePassing::Mpi; +using namespace MessagePassing::Mpi; /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt index 5738c8e7ed..71b4e596f1 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt @@ -18,7 +18,6 @@ if (NOT WIN32) endif() set(SOURCES - IMpiProfiling.h MessagePassingMpiGlobal.h MessagePassingMpiGlobal.cc MessagePassingMpiEnum.h @@ -40,9 +39,12 @@ set(SOURCES MpiTypeDispatcher.cc MpiMessagePassingMng.cc MpiMessagePassingMng.h - NoMpiProfiling.h + StandaloneMpiMessagePassingMng.cc StandaloneMpiMessagePassingMng.h + + internal/IMpiProfiling.h + internal/NoMpiProfiling.h internal/MpiTypeDispatcher.h internal/MpiTypeDispatcherImpl.h ) diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.cc index 288f19ac35..6f03b3454e 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.cc @@ -30,7 +30,7 @@ #include "arccore/base/TraceInfo.h" #include "arccore/message_passing_mpi/MpiLock.h" -#include "arccore/message_passing_mpi/NoMpiProfiling.h" +#include "arccore/message_passing_mpi/internal/NoMpiProfiling.h" #include "arccore/message_passing_mpi/MpiRequest.h" #include "arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.h index a914220919..3244f0cb0a 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.h +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.h @@ -18,7 +18,6 @@ #include "arccore/message_passing_mpi/MessagePassingMpiGlobal.h" #include "arccore/message_passing_mpi/MessagePassingMpiEnum.h" -#include "arccore/message_passing_mpi/IMpiProfiling.h" #include "arccore/message_passing/PointToPointMessageInfo.h" #include "arccore/message_passing/Request.h" #include "arccore/collections/CollectionsGlobal.h" @@ -210,9 +209,9 @@ class ARCCORE_MESSAGEPASSINGMPI_EXPORT MpiAdapter private: - IStat* m_stat; - MpiLock* m_mpi_lock; - IMpiProfiling* m_mpi_prof; + IStat* m_stat = nullptr; + MpiLock* m_mpi_lock = nullptr; + IMpiProfiling* m_mpi_prof = nullptr; ITimeMetricCollector* m_metric_collector = nullptr; MPI_Comm m_communicator; //!< Communicateur MPI int m_comm_rank = A_PROC_NULL_RANK; diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/IMpiProfiling.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/IMpiProfiling.h similarity index 100% rename from arccore/src/message_passing_mpi/arccore/message_passing_mpi/IMpiProfiling.h rename to arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/IMpiProfiling.h diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/NoMpiProfiling.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/NoMpiProfiling.h similarity index 97% rename from arccore/src/message_passing_mpi/arccore/message_passing_mpi/NoMpiProfiling.h rename to arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/NoMpiProfiling.h index c2c8f1e7c4..6ccfe6dfef 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/NoMpiProfiling.h +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/NoMpiProfiling.h @@ -9,13 +9,13 @@ /* */ /* Implementation de l'interface IMpiProfiling. */ /*---------------------------------------------------------------------------*/ -#ifndef ARCCORE_MESSAGEPASSINGMPI_NOMPIPROFILING_H -#define ARCCORE_MESSAGEPASSINGMPI_NOMPIPROFILING_H +#ifndef ARCCORE_MESSAGEPASSINGMPI_INTERNAL_NOMPIPROFILING_H +#define ARCCORE_MESSAGEPASSINGMPI_INTERNAL_NOMPIPROFILING_H /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ #include "arccore/message_passing_mpi/MessagePassingMpiGlobal.h" -#include "arccore/message_passing_mpi/IMpiProfiling.h" +#include "arccore/message_passing_mpi/internal/IMpiProfiling.h" #include "arccore/message_passing/Request.h" #include "arccore/collections/CollectionsGlobal.h" #include "arccore/base/BaseTypes.h" From 0afb2f1a04476182dbb265118462145e1682a0c4 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Sat, 15 Feb 2025 11:10:37 +0100 Subject: [PATCH 3/6] =?UTF-8?q?[arccore,message=5Fpassing=5Fmpi]=20D=C3=A9?= =?UTF-8?q?place=20la=20classe=20'MpiSerializeMessageList'=20dans=20l'API?= =?UTF-8?q?=20interne=20de=20'Arccore'.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arcane/src/arcane/parallel/mpi/MpiParallelMng.cc | 2 +- arcane/src/arcane/parallel/mpi/MpiSerializeMessageList.h | 2 +- .../arccore/message_passing_mpi/CMakeLists.txt | 2 +- .../arccore/message_passing_mpi/MpiSerializeDispatcher.cc | 2 +- .../arccore/message_passing_mpi/MpiSerializeMessageList.cc | 2 +- .../{ => internal}/MpiSerializeMessageList.h | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) rename arccore/src/message_passing_mpi/arccore/message_passing_mpi/{ => internal}/MpiSerializeMessageList.h (96%) diff --git a/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc b/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc index 83fe1b4678..943dcc63af 100644 --- a/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc +++ b/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc @@ -32,7 +32,6 @@ #include "arcane/parallel/mpi/MpiParallelMng.h" #include "arcane/parallel/mpi/MpiAdapter.h" #include "arcane/parallel/mpi/MpiParallelDispatch.h" -#include "arcane/parallel/mpi/MpiSerializeMessageList.h" #include "arcane/parallel/mpi/MpiTimerMng.h" #include "arcane/parallel/mpi/MpiLock.h" #include "arcane/parallel/mpi/MpiSerializeMessage.h" @@ -48,6 +47,7 @@ #include "arccore/message_passing_mpi/MpiMessagePassingMng.h" #include "arccore/message_passing_mpi/MpiRequestList.h" #include "arccore/message_passing_mpi/MpiSerializeDispatcher.h" +#include "arccore/message_passing_mpi/internal/MpiSerializeMessageList.h" #include "arccore/message_passing/Dispatchers.h" #include "arccore/message_passing/Messages.h" #include "arccore/message_passing/SerializeMessageList.h" diff --git a/arcane/src/arcane/parallel/mpi/MpiSerializeMessageList.h b/arcane/src/arcane/parallel/mpi/MpiSerializeMessageList.h index 9e1dc8c6f6..6b2f8be0ec 100644 --- a/arcane/src/arcane/parallel/mpi/MpiSerializeMessageList.h +++ b/arcane/src/arcane/parallel/mpi/MpiSerializeMessageList.h @@ -1 +1 @@ -#include "arccore/message_passing_mpi/MpiSerializeMessageList.h" +#include "arccore/message_passing/ISerializeMessageList.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt index 71b4e596f1..9ede901a4a 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt @@ -32,7 +32,6 @@ set(SOURCES MpiRequest.h MpiRequestList.h MpiRequestList.cc - MpiSerializeMessageList.h MpiSerializeMessageList.cc MpiSerializeDispatcher.h MpiSerializeDispatcher.cc @@ -45,6 +44,7 @@ set(SOURCES internal/IMpiProfiling.h internal/NoMpiProfiling.h + internal/MpiSerializeMessageList.h internal/MpiTypeDispatcher.h internal/MpiTypeDispatcherImpl.h ) diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc index 985738986c..6b275af0b8 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc @@ -15,7 +15,7 @@ #include "arccore/message_passing_mpi/MpiAdapter.h" #include "arccore/message_passing_mpi/MpiMessagePassingMng.h" -#include "arccore/message_passing_mpi/MpiSerializeMessageList.h" +#include "arccore/message_passing_mpi/internal/MpiSerializeMessageList.h" #include "arccore/message_passing_mpi/MpiLock.h" #include "arccore/message_passing/Request.h" #include "arccore/message_passing/internal/SubRequestCompletionInfo.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.cc index f98a91361d..f78aa61885 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.cc @@ -11,7 +11,7 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arccore/message_passing_mpi/MpiSerializeMessageList.h" +#include "arccore/message_passing_mpi/internal/MpiSerializeMessageList.h" #include "arccore/message_passing_mpi/MpiSerializeDispatcher.h" #include "arccore/message_passing_mpi/MpiAdapter.h" #include "arccore/message_passing/BasicSerializeMessage.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiSerializeMessageList.h similarity index 96% rename from arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.h rename to arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiSerializeMessageList.h index e19edb2e45..54f9bca7bb 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.h +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiSerializeMessageList.h @@ -9,8 +9,8 @@ /* */ /* Implémentation de ISerializeMessageList pour MPI. */ /*---------------------------------------------------------------------------*/ -#ifndef ARCCORE_MESSAGEPASSINGMPI_MPISERIALIZEMESSAGELIST_H -#define ARCCORE_MESSAGEPASSINGMPI_MPISERIALIZEMESSAGELIST_H +#ifndef ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPISERIALIZEMESSAGELIST_H +#define ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPISERIALIZEMESSAGELIST_H /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ From 3d35bacfa9caebd86469da5614a771f029ba4103 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Tue, 18 Feb 2025 18:37:50 +0100 Subject: [PATCH 4/6] =?UTF-8?q?[arccore,message=5Fpassing=5Fmpi]=20D=C3=A9?= =?UTF-8?q?place=20'MpiRequest'=20et=20'MpiRequestList'=20dans=20l'API=20i?= =?UTF-8?q?nterne=20de=20Arccore.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arcane/src/arcane/parallel/mpi/MpiParallelMng.cc | 2 +- .../arccore/message_passing_mpi/CMakeLists.txt | 6 +++--- .../arccore/message_passing_mpi/MpiAdapter.cc | 11 ++++++++--- .../arccore/message_passing_mpi/MpiRequestList.cc | 2 +- .../message_passing_mpi/{ => internal}/MpiRequest.h | 4 ++-- .../{ => internal}/MpiRequestList.h | 6 +++--- 6 files changed, 18 insertions(+), 13 deletions(-) rename arccore/src/message_passing_mpi/arccore/message_passing_mpi/{ => internal}/MpiRequest.h (94%) rename arccore/src/message_passing_mpi/arccore/message_passing_mpi/{ => internal}/MpiRequestList.h (91%) diff --git a/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc b/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc index 943dcc63af..8c6104ccc7 100644 --- a/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc +++ b/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc @@ -45,8 +45,8 @@ #include "arcane/impl/internal/VariableSynchronizer.h" #include "arccore/message_passing_mpi/MpiMessagePassingMng.h" -#include "arccore/message_passing_mpi/MpiRequestList.h" #include "arccore/message_passing_mpi/MpiSerializeDispatcher.h" +#include "arccore/message_passing_mpi/internal/MpiRequestList.h" #include "arccore/message_passing_mpi/internal/MpiSerializeMessageList.h" #include "arccore/message_passing/Dispatchers.h" #include "arccore/message_passing/Messages.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt index 9ede901a4a..4205b93f03 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt @@ -29,8 +29,6 @@ set(SOURCES MpiDatatype.cc MpiControlDispatcher.h MpiControlDispatcher.cc - MpiRequest.h - MpiRequestList.h MpiRequestList.cc MpiSerializeMessageList.cc MpiSerializeDispatcher.h @@ -43,10 +41,12 @@ set(SOURCES StandaloneMpiMessagePassingMng.h internal/IMpiProfiling.h - internal/NoMpiProfiling.h + internal/MpiRequest.h + internal/MpiRequestList.h internal/MpiSerializeMessageList.h internal/MpiTypeDispatcher.h internal/MpiTypeDispatcherImpl.h + internal/NoMpiProfiling.h ) arccore_add_component_library(message_passing_mpi diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.cc index 6f03b3454e..50f5108461 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.cc @@ -30,9 +30,9 @@ #include "arccore/base/TraceInfo.h" #include "arccore/message_passing_mpi/MpiLock.h" -#include "arccore/message_passing_mpi/internal/NoMpiProfiling.h" -#include "arccore/message_passing_mpi/MpiRequest.h" #include "arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.h" +#include "arccore/message_passing_mpi/internal/NoMpiProfiling.h" +#include "arccore/message_passing_mpi/internal/MpiRequest.h" #include @@ -42,6 +42,9 @@ namespace Arcane::MessagePassing::Mpi { +/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ + class MpiAdapter::RequestSet : public TraceAccessor { @@ -54,7 +57,9 @@ class MpiAdapter::RequestSet public: typedef std::map::iterator Iterator; public: - RequestSet(ITraceMng* tm) : TraceAccessor(tm) + + explicit RequestSet(ITraceMng* tm) + : TraceAccessor(tm) { m_trace_mng_ref = makeRef(tm); if (arccoreIsCheck()){ diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequestList.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequestList.cc index 11d2ea99ce..918ce93156 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequestList.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequestList.cc @@ -11,7 +11,7 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arccore/message_passing_mpi/MpiRequestList.h" +#include "arccore/message_passing_mpi/internal/MpiRequestList.h" #include "arccore/message_passing_mpi/MpiAdapter.h" /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequest.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiRequest.h similarity index 94% rename from arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequest.h rename to arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiRequest.h index 97f1e9db82..6fe6faae5d 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequest.h +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiRequest.h @@ -9,8 +9,8 @@ /* */ /* Spécialisation de 'Request' pour MPI. */ /*---------------------------------------------------------------------------*/ -#ifndef ARCCORE_MESSAGEPASSINGMPI_MPIREQUEST_H -#define ARCCORE_MESSAGEPASSINGMPI_MPIREQUEST_H +#ifndef ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPIREQUEST_H +#define ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPIREQUEST_H /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequestList.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiRequestList.h similarity index 91% rename from arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequestList.h rename to arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiRequestList.h index 3dbc2c194a..8f2c458763 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequestList.h +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiRequestList.h @@ -9,8 +9,8 @@ /* */ /* Liste de requêtes MPI. */ /*---------------------------------------------------------------------------*/ -#ifndef ARCCORE_MESSAGEPASSINGMPI_MPIREQUESTLIST_H -#define ARCCORE_MESSAGEPASSINGMPI_MPIREQUESTLIST_H +#ifndef ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPIREQUESTLIST_H +#define ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPIREQUESTLIST_H /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ @@ -30,7 +30,7 @@ class ARCCORE_MESSAGEPASSINGMPI_EXPORT MpiRequestList { public: - MpiRequestList(MpiAdapter* adapter) : m_adapter(adapter){} + explicit MpiRequestList(MpiAdapter* adapter) : m_adapter(adapter){} public: From 69875e52decd37adabc11ed612a1cadd3804ca24 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Tue, 18 Feb 2025 18:53:45 +0100 Subject: [PATCH 5/6] =?UTF-8?q?[arccore,message=5Fpassing=5Fmpi]=20D=C3=A9?= =?UTF-8?q?place=20'MpiSerializeDispatcher'=20et=20'MpiControlDispatcher'?= =?UTF-8?q?=20dans=20l'API=20interne=20de=20Arccore.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arcane/src/arcane/parallel/mpi/MpiParallelMng.cc | 2 +- .../arccore/message_passing_mpi/CMakeLists.txt | 4 ++-- .../arccore/message_passing_mpi/MpiControlDispatcher.cc | 2 +- .../arccore/message_passing_mpi/MpiSerializeDispatcher.cc | 2 +- .../arccore/message_passing_mpi/MpiSerializeMessageList.cc | 2 +- .../message_passing_mpi/StandaloneMpiMessagePassingMng.cc | 4 ++-- .../message_passing_mpi/{ => internal}/MpiControlDispatcher.h | 4 ++-- .../{ => internal}/MpiSerializeDispatcher.h | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) rename arccore/src/message_passing_mpi/arccore/message_passing_mpi/{ => internal}/MpiControlDispatcher.h (95%) rename arccore/src/message_passing_mpi/arccore/message_passing_mpi/{ => internal}/MpiSerializeDispatcher.h (96%) diff --git a/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc b/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc index 8c6104ccc7..a330c753a0 100644 --- a/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc +++ b/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc @@ -45,7 +45,7 @@ #include "arcane/impl/internal/VariableSynchronizer.h" #include "arccore/message_passing_mpi/MpiMessagePassingMng.h" -#include "arccore/message_passing_mpi/MpiSerializeDispatcher.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/Dispatchers.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt index 4205b93f03..4cb66c020c 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt @@ -27,11 +27,9 @@ set(SOURCES MpiLock.h MpiDatatype.h MpiDatatype.cc - MpiControlDispatcher.h MpiControlDispatcher.cc MpiRequestList.cc MpiSerializeMessageList.cc - MpiSerializeDispatcher.h MpiSerializeDispatcher.cc MpiTypeDispatcher.cc MpiMessagePassingMng.cc @@ -41,9 +39,11 @@ set(SOURCES StandaloneMpiMessagePassingMng.h internal/IMpiProfiling.h + internal/MpiControlDispatcher.h internal/MpiRequest.h internal/MpiRequestList.h internal/MpiSerializeMessageList.h + internal/MpiSerializeDispatcher.h internal/MpiTypeDispatcher.h internal/MpiTypeDispatcherImpl.h internal/NoMpiProfiling.h diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiControlDispatcher.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiControlDispatcher.cc index 7ffe1e2865..ceaa9c3487 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiControlDispatcher.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiControlDispatcher.cc @@ -11,9 +11,9 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arccore/message_passing_mpi/MpiControlDispatcher.h" #include "arccore/message_passing_mpi/MpiAdapter.h" #include "arccore/message_passing_mpi/MpiMessagePassingMng.h" +#include "arccore/message_passing_mpi/internal/MpiControlDispatcher.h" #include "arccore/message_passing/Request.h" #include "arccore/base/NotImplementedException.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc index 6b275af0b8..027a45e7b2 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc @@ -11,7 +11,7 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arccore/message_passing_mpi/MpiSerializeDispatcher.h" +#include "arccore/message_passing_mpi/internal/MpiSerializeDispatcher.h" #include "arccore/message_passing_mpi/MpiAdapter.h" #include "arccore/message_passing_mpi/MpiMessagePassingMng.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.cc index f78aa61885..573b559144 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.cc @@ -12,7 +12,7 @@ /*---------------------------------------------------------------------------*/ #include "arccore/message_passing_mpi/internal/MpiSerializeMessageList.h" -#include "arccore/message_passing_mpi/MpiSerializeDispatcher.h" +#include "arccore/message_passing_mpi/internal/MpiSerializeDispatcher.h" #include "arccore/message_passing_mpi/MpiAdapter.h" #include "arccore/message_passing/BasicSerializeMessage.h" #include "arccore/trace/ITraceMng.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.cc index 1ec59c0a1b..3c6bb1902f 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.cc @@ -23,8 +23,8 @@ #include "arccore/message_passing_mpi/MpiAdapter.h" #include "arccore/message_passing_mpi/MpiDatatype.h" #include "arccore/message_passing_mpi/internal/MpiTypeDispatcher.h" -#include "arccore/message_passing_mpi/MpiControlDispatcher.h" -#include "arccore/message_passing_mpi/MpiSerializeDispatcher.h" +#include "arccore/message_passing_mpi/internal/MpiControlDispatcher.h" +#include "arccore/message_passing_mpi/internal/MpiSerializeDispatcher.h" /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiControlDispatcher.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiControlDispatcher.h similarity index 95% rename from arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiControlDispatcher.h rename to arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiControlDispatcher.h index f887c13797..f0ee566d03 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiControlDispatcher.h +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiControlDispatcher.h @@ -9,8 +9,8 @@ /* */ /* Manage Control/Utility parallel messages for MPI. */ /*---------------------------------------------------------------------------*/ -#ifndef ARCCORE_MESSAGEPASSINGMPI_MPICONTROLDISPATCHER_H -#define ARCCORE_MESSAGEPASSINGMPI_MPICONTROLDISPATCHER_H +#ifndef ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPICONTROLDISPATCHER_H +#define ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPICONTROLDISPATCHER_H /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiSerializeDispatcher.h similarity index 96% rename from arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.h rename to arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiSerializeDispatcher.h index 76e087a716..8d76649d92 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.h +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiSerializeDispatcher.h @@ -9,8 +9,8 @@ /* */ /* Gestion des messages de sérialisation avec MPI. */ /*---------------------------------------------------------------------------*/ -#ifndef ARCCORE_MESSAGEPASSINGMPI_MPISERIALIZEDISPATCHER_H -#define ARCCORE_MESSAGEPASSINGMPI_MPISERIALIZEDISPATCHER_H +#ifndef ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPISERIALIZEDISPATCHER_H +#define ARCCORE_MESSAGEPASSINGMPI_INTERNAL_MPISERIALIZEDISPATCHER_H /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ From c9a846cb9ce01b21d7db16979dc09f08bfaf9bcb Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Tue, 18 Feb 2025 19:06:18 +0100 Subject: [PATCH 6/6] =?UTF-8?q?[arccore+arcane]=20D=C3=A9place=20'MpiLock'?= =?UTF-8?q?,=20'MpiAdapter'=20et=20'MessagePassingMpiEnum'=20dans=20l'API?= =?UTF-8?q?=20interne=20de=20Arccore.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arcane/src/arcane/parallel/mpi/MpiAdapter.h | 2 - .../MpiBlockVariableSynchronizeDispatcher.cc | 6 +- ...ctSendrecvVariableSynchronizeDispatcher.cc | 7 +- .../MpiLegacyVariableSynchronizeDispatcher.cc | 2 +- arcane/src/arcane/parallel/mpi/MpiLock.h | 2 - ...piNeighborVariableSynchronizeDispatcher.cc | 7 +- .../parallel/mpi/MpiParallelDispatch.cc | 6 +- .../arcane/parallel/mpi/MpiParallelDispatch.h | 4 +- .../src/arcane/parallel/mpi/MpiParallelMng.cc | 4 +- .../mpi/MpiParallelNonBlockingCollective.cc | 58 ++++++------- ...piParallelNonBlockingCollectiveDispatch.cc | 87 +++++++++---------- .../parallel/mpi/MpiParallelSuperMng.cc | 6 +- .../mpi/MpiVariableSynchronizeDispatcher.cc | 6 +- arcane/src/arcane/parallel/mpi/srcs.cmake | 2 - .../parallel/mpithread/HybridMessageQueue.cc | 7 +- .../mpithread/HybridParallelSuperMng.cc | 9 +- arcane/src/arcane/std/Otf2LibWrapper.cc | 2 +- arcane/src/arcane/std/Otf2MpiProfiling.cc | 6 +- .../src/arcane/std/internal/Otf2LibWrapper.h | 17 ++-- .../arcane/std/internal/Otf2MpiProfiling.h | 2 +- .../message_passing_mpi/CMakeLists.txt | 6 +- .../MessagePassingMpiEnum.cc | 4 +- .../arccore/message_passing_mpi/MpiAdapter.cc | 4 +- .../MpiControlDispatcher.cc | 5 +- .../message_passing_mpi/MpiRequestList.cc | 2 +- .../MpiSerializeDispatcher.cc | 4 +- .../MpiSerializeMessageList.cc | 2 +- .../StandaloneMpiMessagePassingMng.cc | 2 +- .../{ => internal}/MessagePassingMpiEnum.h | 0 .../{ => internal}/MpiAdapter.h | 2 +- .../{ => internal}/MpiLock.h | 0 .../internal/MpiTypeDispatcherImpl.h | 5 +- 32 files changed, 140 insertions(+), 138 deletions(-) delete mode 100644 arcane/src/arcane/parallel/mpi/MpiAdapter.h delete mode 100644 arcane/src/arcane/parallel/mpi/MpiLock.h rename arccore/src/message_passing_mpi/arccore/message_passing_mpi/{ => internal}/MessagePassingMpiEnum.h (100%) rename arccore/src/message_passing_mpi/arccore/message_passing_mpi/{ => internal}/MpiAdapter.h (99%) rename arccore/src/message_passing_mpi/arccore/message_passing_mpi/{ => internal}/MpiLock.h (100%) diff --git a/arcane/src/arcane/parallel/mpi/MpiAdapter.h b/arcane/src/arcane/parallel/mpi/MpiAdapter.h deleted file mode 100644 index 33a479ea36..0000000000 --- a/arcane/src/arcane/parallel/mpi/MpiAdapter.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "arccore/message_passing_mpi/MpiAdapter.h" -#include "arcane/parallel/mpi/ArcaneMpi.h" diff --git a/arcane/src/arcane/parallel/mpi/MpiBlockVariableSynchronizeDispatcher.cc b/arcane/src/arcane/parallel/mpi/MpiBlockVariableSynchronizeDispatcher.cc index 594936fd64..34c29047f6 100644 --- a/arcane/src/arcane/parallel/mpi/MpiBlockVariableSynchronizeDispatcher.cc +++ b/arcane/src/arcane/parallel/mpi/MpiBlockVariableSynchronizeDispatcher.cc @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2023 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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* MpiBlockVariableSynchronizeDispatcher.cc (C) 2000-2023 */ +/* MpiBlockVariableSynchronizeDispatcher.cc (C) 2000-2025 */ /* */ /* Gestion spécifique MPI des synchronisations des variables. */ /*---------------------------------------------------------------------------*/ @@ -15,7 +15,6 @@ #include "arcane/utils/MemoryView.h" #include "arcane/parallel/mpi/MpiParallelMng.h" -#include "arcane/parallel/mpi/MpiAdapter.h" #include "arcane/parallel/mpi/MpiTimeInterval.h" #include "arcane/parallel/IStat.h" @@ -23,6 +22,7 @@ #include "arcane/impl/IDataSynchronizeImplementation.h" #include "arccore/message_passing/IRequestList.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/parallel/mpi/MpiDirectSendrecvVariableSynchronizeDispatcher.cc b/arcane/src/arcane/parallel/mpi/MpiDirectSendrecvVariableSynchronizeDispatcher.cc index 7d428c353b..6c80282b25 100644 --- a/arcane/src/arcane/parallel/mpi/MpiDirectSendrecvVariableSynchronizeDispatcher.cc +++ b/arcane/src/arcane/parallel/mpi/MpiDirectSendrecvVariableSynchronizeDispatcher.cc @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2023 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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* MpiDirectSendrecvVariableSynchronizeDispatcher.cc (C) 2000-2023 */ +/* MpiDirectSendrecvVariableSynchronizeDispatcher.cc (C) 2000-2025 */ /* */ /* Gestion spécifique MPI des synchronisations des variables. */ /*---------------------------------------------------------------------------*/ @@ -14,7 +14,6 @@ #include "arcane/utils/MemoryView.h" #include "arcane/parallel/mpi/MpiParallelMng.h" -#include "arcane/parallel/mpi/MpiAdapter.h" #include "arcane/parallel/mpi/MpiDatatypeList.h" #include "arcane/parallel/mpi/MpiDatatype.h" #include "arcane/parallel/mpi/MpiTimeInterval.h" @@ -23,6 +22,8 @@ #include "arcane/impl/IDataSynchronizeBuffer.h" #include "arcane/impl/IDataSynchronizeImplementation.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" + /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/parallel/mpi/MpiLegacyVariableSynchronizeDispatcher.cc b/arcane/src/arcane/parallel/mpi/MpiLegacyVariableSynchronizeDispatcher.cc index e14157fc51..7f653c540c 100644 --- a/arcane/src/arcane/parallel/mpi/MpiLegacyVariableSynchronizeDispatcher.cc +++ b/arcane/src/arcane/parallel/mpi/MpiLegacyVariableSynchronizeDispatcher.cc @@ -14,7 +14,6 @@ #include "arcane/utils/MemoryView.h" #include "arcane/parallel/mpi/MpiParallelMng.h" -#include "arcane/parallel/mpi/MpiAdapter.h" #include "arcane/parallel/mpi/MpiDatatypeList.h" #include "arcane/parallel/mpi/MpiDatatype.h" #include "arcane/parallel/IStat.h" @@ -23,6 +22,7 @@ #include "arcane/impl/IDataSynchronizeImplementation.h" #include "arccore/message_passing_mpi/internal/IMpiProfiling.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/parallel/mpi/MpiLock.h b/arcane/src/arcane/parallel/mpi/MpiLock.h deleted file mode 100644 index 805c1bf34c..0000000000 --- a/arcane/src/arcane/parallel/mpi/MpiLock.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "arccore/message_passing_mpi/MpiLock.h" -#include "arcane/parallel/mpi/ArcaneMpi.h" diff --git a/arcane/src/arcane/parallel/mpi/MpiNeighborVariableSynchronizeDispatcher.cc b/arcane/src/arcane/parallel/mpi/MpiNeighborVariableSynchronizeDispatcher.cc index 2a3a86137a..a15bb34a86 100644 --- a/arcane/src/arcane/parallel/mpi/MpiNeighborVariableSynchronizeDispatcher.cc +++ b/arcane/src/arcane/parallel/mpi/MpiNeighborVariableSynchronizeDispatcher.cc @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2023 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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* MpiNeighborVariableSynchronizeDispatcher.cc (C) 2000-2023 */ +/* MpiNeighborVariableSynchronizeDispatcher.cc (C) 2000-2025 */ /* */ /* Synchronisations des variables via MPI_Neighbor_alltoallv. */ /*---------------------------------------------------------------------------*/ @@ -17,7 +17,6 @@ #include "arcane/utils/MemoryView.h" #include "arcane/parallel/mpi/MpiParallelMng.h" -#include "arcane/parallel/mpi/MpiAdapter.h" #include "arcane/parallel/mpi/MpiTimeInterval.h" #include "arcane/parallel/mpi/IVariableSynchronizerMpiCommunicator.h" #include "arcane/parallel/IStat.h" @@ -26,6 +25,8 @@ #include "arcane/impl/IDataSynchronizeImplementation.h" #include "arcane/impl/DataSynchronizeInfo.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" + /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ /* diff --git a/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.cc b/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.cc index 325e67a805..768de6869e 100644 --- a/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.cc +++ b/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.cc @@ -27,15 +27,13 @@ #include "arcane/IParallelMng.h" #include "arcane/parallel/mpi/MpiDatatype.h" -#include "arcane/parallel/mpi/MpiAdapter.h" #include "arcane/parallel/mpi/MpiParallelDispatch.h" -#include "arcane/parallel/mpi/MpiLock.h" #include "arccore/message_passing/Messages.h" #include "arccore/message_passing_mpi/internal/MpiTypeDispatcherImpl.h" - -#include +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" +#include "arccore/message_passing_mpi/internal/MpiLock.h" /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.h b/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.h index d1d47d8309..2bf71db08c 100644 --- a/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.h +++ b/arcane/src/arcane/parallel/mpi/MpiParallelDispatch.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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* MpiParallelDispatch.h (C) 2000-2024 */ +/* MpiParallelDispatch.h (C) 2000-2025 */ /* */ /* Implémentation des messages avec MPI. */ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc b/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc index a330c753a0..ceb8e1e0c7 100644 --- a/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc +++ b/arcane/src/arcane/parallel/mpi/MpiParallelMng.cc @@ -30,10 +30,8 @@ #include "arcane/core/parallel/IStat.h" #include "arcane/parallel/mpi/MpiParallelMng.h" -#include "arcane/parallel/mpi/MpiAdapter.h" #include "arcane/parallel/mpi/MpiParallelDispatch.h" #include "arcane/parallel/mpi/MpiTimerMng.h" -#include "arcane/parallel/mpi/MpiLock.h" #include "arcane/parallel/mpi/MpiSerializeMessage.h" #include "arcane/parallel/mpi/MpiParallelNonBlockingCollective.h" #include "arcane/parallel/mpi/MpiDatatype.h" @@ -48,6 +46,8 @@ #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" #include "arccore/message_passing/Messages.h" #include "arccore/message_passing/SerializeMessageList.h" diff --git a/arcane/src/arcane/parallel/mpi/MpiParallelNonBlockingCollective.cc b/arcane/src/arcane/parallel/mpi/MpiParallelNonBlockingCollective.cc index 23418a94f4..791419b40c 100644 --- a/arcane/src/arcane/parallel/mpi/MpiParallelNonBlockingCollective.cc +++ b/arcane/src/arcane/parallel/mpi/MpiParallelNonBlockingCollective.cc @@ -1,33 +1,33 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2022 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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* MpiParallelNonBlockingCollective.cc (C) 2000-2016 */ +/* MpiParallelNonBlockingCollective.cc (C) 2000-2025 */ /* */ /* Implémentation des collectives non bloquantes avec MPI. */ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arcane/utils/ArcanePrecomp.h" - #include "arcane/parallel/mpi/MpiParallelMng.h" #include "arcane/parallel/mpi/MpiParallelNonBlockingCollectiveDispatch.h" #include "arcane/parallel/mpi/MpiParallelNonBlockingCollective.h" -#include "arcane/parallel/mpi/MpiAdapter.h" + +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -ARCANE_BEGIN_NAMESPACE +namespace Arcane +{ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ MpiParallelNonBlockingCollective:: -MpiParallelNonBlockingCollective(ITraceMng* tm,IParallelMng* pm,MpiAdapter* adapter) +MpiParallelNonBlockingCollective(ITraceMng* tm, IParallelMng* pm, MpiAdapter* adapter) : ParallelNonBlockingCollectiveDispatcher(pm) , m_trace_mng(tm) , m_adapter(adapter) @@ -50,27 +50,27 @@ build() { MpiAdapter* adapter = m_adapter; ITraceMng* tm = m_trace_mng; - auto c = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto sc = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto uc = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto s = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto us = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto i = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto ui = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto l = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto ul = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto ll = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto ull = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto f = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto d = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto ld = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto r2 = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto r3 = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto r22 = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto r33 = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - auto hpr = new MpiParallelNonBlockingCollectiveDispatchT(tm,this,adapter); - _setDispatchers(c,sc,uc,s,us,i,ui,l,ul,ll,ull, - f,d,ld,r2,r3,r22,r33,hpr); + auto c = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto sc = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto uc = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto s = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto us = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto i = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto ui = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto l = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto ul = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto ll = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto ull = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto f = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto d = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto ld = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto r2 = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto r3 = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto r22 = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto r33 = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + auto hpr = new MpiParallelNonBlockingCollectiveDispatchT(tm, this, adapter); + _setDispatchers(c, sc, uc, s, us, i, ui, l, ul, ll, ull, + f, d, ld, r2, r3, r22, r33, hpr); } /*---------------------------------------------------------------------------*/ @@ -102,7 +102,7 @@ hasValidReduceForDerivedType() const /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -ARCANE_END_NAMESPACE +} // namespace Arcane /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/parallel/mpi/MpiParallelNonBlockingCollectiveDispatch.cc b/arcane/src/arcane/parallel/mpi/MpiParallelNonBlockingCollectiveDispatch.cc index 3e6e535951..34757e0e60 100644 --- a/arcane/src/arcane/parallel/mpi/MpiParallelNonBlockingCollectiveDispatch.cc +++ b/arcane/src/arcane/parallel/mpi/MpiParallelNonBlockingCollectiveDispatch.cc @@ -1,18 +1,16 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2022 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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* MpiParallelNonBlockingCollectiveDispatch.cc (C) 2000-2018 */ +/* MpiParallelNonBlockingCollectiveDispatch.cc (C) 2000-2025 */ /* */ /* Implémentation MPI des collectives non bloquantes pour un type donné. */ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arcane/utils/ArcanePrecomp.h" - #include "arcane/utils/Array.h" #include "arcane/utils/NotImplementedException.h" #include "arcane/utils/Real2.h" @@ -22,25 +20,27 @@ #include "arcane/utils/HPReal.h" #include "arcane/utils/FatalErrorException.h" -#include "arcane/IParallelNonBlockingCollective.h" -#include "arcane/ParallelMngDispatcher.h" +#include "arcane/core/IParallelNonBlockingCollective.h" +#include "arcane/core/ParallelMngDispatcher.h" #include "arcane/parallel/mpi/MpiParallelNonBlockingCollectiveDispatch.h" -#include "arcane/parallel/mpi/MpiAdapter.h" -#include "arcane/parallel/mpi/MpiLock.h" #include "arcane/parallel/mpi/MpiDatatype.h" #include "arcane/parallel/mpi/MpiParallelDispatch.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" +#include "arccore/message_passing_mpi/internal/MpiLock.h" + /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -ARCANE_BEGIN_NAMESPACE +namespace Arcane +{ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -template MpiParallelNonBlockingCollectiveDispatchT:: -MpiParallelNonBlockingCollectiveDispatchT(ITraceMng* tm,IParallelNonBlockingCollective* collective_mng, +template MpiParallelNonBlockingCollectiveDispatchT:: +MpiParallelNonBlockingCollectiveDispatchT(ITraceMng* tm, IParallelNonBlockingCollective* collective_mng, MpiAdapter* adapter) : TraceAccessor(tm) , m_parallel_mng(collective_mng->parallelMng()) @@ -54,7 +54,7 @@ MpiParallelNonBlockingCollectiveDispatchT(ITraceMng* tm,IParallelNonBlockingColl ARCANE_FATAL("Bad parallelMng()"); Type* xtype = nullptr; auto dispatcher = pmd->dispatcher(xtype); - auto true_dispatcher = dynamic_cast< MpiParallelDispatchT* >(dispatcher); + auto true_dispatcher = dynamic_cast*>(dispatcher); if (!true_dispatcher) ARCANE_FATAL("Bad dispatcher. should have type MpiParallelDispatcher"); m_datatype = true_dispatcher->datatype(); @@ -63,7 +63,7 @@ MpiParallelNonBlockingCollectiveDispatchT(ITraceMng* tm,IParallelNonBlockingColl /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -template MpiParallelNonBlockingCollectiveDispatchT:: +template MpiParallelNonBlockingCollectiveDispatchT:: ~MpiParallelNonBlockingCollectiveDispatchT() { // NOTE: m_datatype est géré par MpiParallelDispatch et ne doit pas être @@ -72,9 +72,9 @@ template MpiParallelNonBlockingCollectiveDispatchT:: } /*---------------------------------------------------------------------------*/ -/*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ -template void MpiParallelNonBlockingCollectiveDispatchT:: +template void MpiParallelNonBlockingCollectiveDispatchT:: finalize() { } @@ -82,38 +82,38 @@ finalize() /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: -broadcast(ArrayView send_buf,Integer sub_domain) +template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: +broadcast(ArrayView send_buf, Integer sub_domain) { MPI_Datatype type = m_datatype->datatype(); - return m_adapter->nonBlockingBroadcast(send_buf.data(),send_buf.size(),sub_domain,type); + return m_adapter->nonBlockingBroadcast(send_buf.data(), send_buf.size(), sub_domain, type); } /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: -allGather(ConstArrayView send_buf,ArrayView recv_buf) +template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: +allGather(ConstArrayView send_buf, ArrayView recv_buf) { MPI_Datatype type = m_datatype->datatype(); - return m_adapter->nonBlockingAllGather(send_buf.data(),recv_buf.data(),send_buf.size(),type); + return m_adapter->nonBlockingAllGather(send_buf.data(), recv_buf.data(), send_buf.size(), type); } /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: -gather(ConstArrayView send_buf,ArrayView recv_buf,Integer rank) +template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: +gather(ConstArrayView send_buf, ArrayView recv_buf, Integer rank) { MPI_Datatype type = m_datatype->datatype(); - return m_adapter->nonBlockingGather(send_buf.data(),recv_buf.data(),send_buf.size(),rank,type); + return m_adapter->nonBlockingGather(send_buf.data(), recv_buf.data(), send_buf.size(), rank, type); } /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: -allGatherVariable(ConstArrayView send_buf,Array& recv_buf) +template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: +allGatherVariable(ConstArrayView send_buf, Array& recv_buf) { ARCANE_UNUSED(send_buf); ARCANE_UNUSED(recv_buf); @@ -126,8 +126,8 @@ allGatherVariable(ConstArrayView send_buf,Array& recv_buf) /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: -gatherVariable(ConstArrayView send_buf,Array& recv_buf,Integer rank) +template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: +gatherVariable(ConstArrayView send_buf, Array& recv_buf, Integer rank) { ARCANE_UNUSED(send_buf); ARCANE_UNUSED(recv_buf); @@ -141,8 +141,8 @@ gatherVariable(ConstArrayView send_buf,Array& recv_buf,Integer rank) /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: -scatterVariable(ConstArrayView send_buf,ArrayView recv_buf,Integer root) +template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: +scatterVariable(ConstArrayView send_buf, ArrayView recv_buf, Integer root) { ARCANE_UNUSED(send_buf); ARCANE_UNUSED(recv_buf); @@ -177,38 +177,37 @@ scatterVariable(ConstArrayView send_buf,ArrayView recv_buf,Integer r /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: -allToAll(ConstArrayView send_buf,ArrayView recv_buf,Integer count) +template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: +allToAll(ConstArrayView send_buf, ArrayView recv_buf, Integer count) { MPI_Datatype type = m_datatype->datatype(); - return m_adapter->nonBlockingAllToAll(send_buf.data(),recv_buf.data(),count,type); + return m_adapter->nonBlockingAllToAll(send_buf.data(), recv_buf.data(), count, type); } /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: +template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: allToAllVariable(ConstArrayView send_buf, Int32ConstArrayView send_count, Int32ConstArrayView send_index, ArrayView recv_buf, Int32ConstArrayView recv_count, - Int32ConstArrayView recv_index - ) + Int32ConstArrayView recv_index) { MPI_Datatype type = m_datatype->datatype(); - return m_adapter->nonBlockingAllToAllVariable(send_buf.data(),send_count.data(), - send_index.data(),recv_buf.data(), + return m_adapter->nonBlockingAllToAllVariable(send_buf.data(), send_count.data(), + send_index.data(), recv_buf.data(), recv_count.data(), - recv_index.data(),type); + recv_index.data(), type); } /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: -allReduce(eReduceType op,ConstArrayView send_buf,ArrayView recv_buf) +template Parallel::Request MpiParallelNonBlockingCollectiveDispatchT:: +allReduce(eReduceType op, ConstArrayView send_buf, ArrayView recv_buf) { MPI_Datatype type = m_datatype->datatype(); Integer s = send_buf.size(); @@ -217,8 +216,8 @@ allReduce(eReduceType op,ConstArrayView send_buf,ArrayView recv_buf) Request request; { MpiLock::Section mls(m_adapter->mpiLock()); - request = m_adapter->nonBlockingAllReduce(send_buf.data(),recv_buf.data(), - s,type,operation); + request = m_adapter->nonBlockingAllReduce(send_buf.data(), recv_buf.data(), + s, type, operation); } return request; } @@ -249,7 +248,7 @@ template class MpiParallelNonBlockingCollectiveDispatchT; /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -ARCANE_END_NAMESPACE +} // namespace Arcane /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/parallel/mpi/MpiParallelSuperMng.cc b/arcane/src/arcane/parallel/mpi/MpiParallelSuperMng.cc index 21232b76c4..93da758491 100644 --- a/arcane/src/arcane/parallel/mpi/MpiParallelSuperMng.cc +++ b/arcane/src/arcane/parallel/mpi/MpiParallelSuperMng.cc @@ -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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* MpiParallelSuperMng.cc (C) 2000-2024 */ +/* MpiParallelSuperMng.cc (C) 2000-2025 */ /* */ /* Gestionnaire de parallélisme utilisant MPI. */ /*---------------------------------------------------------------------------*/ @@ -23,7 +23,7 @@ #include "arcane/parallel/IStat.h" -#include "arcane/parallel/mpi/MpiAdapter.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" #include "arcane/parallel/mpi/MpiParallelMng.h" #include "arcane/parallel/mpi/MpiParallelDispatch.h" #include "arcane/parallel/mpi/MpiErrorHandler.h" diff --git a/arcane/src/arcane/parallel/mpi/MpiVariableSynchronizeDispatcher.cc b/arcane/src/arcane/parallel/mpi/MpiVariableSynchronizeDispatcher.cc index 74e5f346c5..0228695275 100644 --- a/arcane/src/arcane/parallel/mpi/MpiVariableSynchronizeDispatcher.cc +++ b/arcane/src/arcane/parallel/mpi/MpiVariableSynchronizeDispatcher.cc @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2023 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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* MpiVariableSynchronizeDispatcher.cc (C) 2000-2023 */ +/* MpiVariableSynchronizeDispatcher.cc (C) 2000-2025 */ /* */ /* Gestion spécifique MPI des synchronisations des variables. */ /*---------------------------------------------------------------------------*/ @@ -15,7 +15,6 @@ #include "arcane/utils/MemoryView.h" #include "arcane/parallel/mpi/MpiParallelMng.h" -#include "arcane/parallel/mpi/MpiAdapter.h" #include "arcane/parallel/mpi/MpiTimeInterval.h" #include "arcane/parallel/IStat.h" @@ -23,6 +22,7 @@ #include "arcane/impl/IDataSynchronizeImplementation.h" #include "arccore/message_passing/IRequestList.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/parallel/mpi/srcs.cmake b/arcane/src/arcane/parallel/mpi/srcs.cmake index e9ce6d5dda..d80752dff2 100644 --- a/arcane/src/arcane/parallel/mpi/srcs.cmake +++ b/arcane/src/arcane/parallel/mpi/srcs.cmake @@ -35,8 +35,6 @@ set( ARCANE_SOURCES MpiSerializeMessageList.h MpiTimerMng.h MpiBatchMainFactory.h - MpiAdapter.h MpiDatatype.h - MpiLock.h MpiTimeInterval.h ) diff --git a/arcane/src/arcane/parallel/mpithread/HybridMessageQueue.cc b/arcane/src/arcane/parallel/mpithread/HybridMessageQueue.cc index 3b0e8268c5..07a6c95086 100644 --- a/arcane/src/arcane/parallel/mpithread/HybridMessageQueue.cc +++ b/arcane/src/arcane/parallel/mpithread/HybridMessageQueue.cc @@ -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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* HybridMessageQueue.cc (C) 2000-2024 */ +/* HybridMessageQueue.cc (C) 2000-2025 */ /* */ /* File de messages pour une implémentation MPI/Thread. */ /*---------------------------------------------------------------------------*/ @@ -23,9 +23,10 @@ #include "arcane/utils/ValueConvert.h" #include "arcane/parallel/mpithread/HybridMessageQueue.h" -#include "arcane/parallel/mpi/MpiAdapter.h" #include "arcane/parallel/mpi/MpiParallelMng.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" + /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/parallel/mpithread/HybridParallelSuperMng.cc b/arcane/src/arcane/parallel/mpithread/HybridParallelSuperMng.cc index 898c2fe539..a557e528d1 100644 --- a/arcane/src/arcane/parallel/mpithread/HybridParallelSuperMng.cc +++ b/arcane/src/arcane/parallel/mpithread/HybridParallelSuperMng.cc @@ -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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* HybridParallelSuperMng.cc (C) 2000-2024 */ +/* HybridParallelSuperMng.cc (C) 2000-2025 */ /* */ /* Gestionnaire de parallélisme utilisant MPI et mémoire partagée. */ /*---------------------------------------------------------------------------*/ @@ -23,12 +23,13 @@ #include "arcane/parallel/IStat.h" -#include "arcane/parallel/mpi/MpiAdapter.h" #include "arcane/parallel/mpi/MpiParallelMng.h" #include "arcane/parallel/mpi/MpiParallelDispatch.h" -#include "arcane/parallel/mpi/MpiLock.h" #include "arcane/parallel/mpi/MpiErrorHandler.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" +#include "arccore/message_passing_mpi/internal/MpiLock.h" + #include "arcane/parallel/thread/SharedMemoryMessageQueue.h" #include "arcane/parallel/thread/SharedMemoryParallelMng.h" #include "arcane/parallel/thread/SharedMemoryParallelSuperMng.h" diff --git a/arcane/src/arcane/std/Otf2LibWrapper.cc b/arcane/src/arcane/std/Otf2LibWrapper.cc index 8a221affcc..5a6586d69c 100644 --- a/arcane/src/arcane/std/Otf2LibWrapper.cc +++ b/arcane/src/arcane/std/Otf2LibWrapper.cc @@ -24,7 +24,7 @@ #include "arcane/IApplication.h" #include "arccore/message_passing_mpi/MessagePassingMpiGlobal.h" -#include "arccore/message_passing_mpi/MessagePassingMpiEnum.h" +#include "arccore/message_passing_mpi/internal/MessagePassingMpiEnum.h" #include "arccore/base/PlatformUtils.h" #include diff --git a/arcane/src/arcane/std/Otf2MpiProfiling.cc b/arcane/src/arcane/std/Otf2MpiProfiling.cc index 0507a6b0ed..4b6b25fdfb 100644 --- a/arcane/src/arcane/std/Otf2MpiProfiling.cc +++ b/arcane/src/arcane/std/Otf2MpiProfiling.cc @@ -1,17 +1,17 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2022 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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* Otf2MpiProfiling.cc (C) 2000-2020 */ +/* Otf2MpiProfiling.cc (C) 2000-2025 */ /* */ /* Implementation de l'interface IMpiProfiling permettant l'instrumentation */ /* au format OTF2 . */ /*---------------------------------------------------------------------------*/ -#include "arccore/message_passing_mpi/MessagePassingMpiEnum.h" +#include "arccore/message_passing_mpi/internal/MessagePassingMpiEnum.h" #include "arcane/utils/FatalErrorException.h" #include "arcane/std/internal/Otf2MpiProfiling.h" diff --git a/arcane/src/arcane/std/internal/Otf2LibWrapper.h b/arcane/src/arcane/std/internal/Otf2LibWrapper.h index b7d0838486..878c705143 100644 --- a/arcane/src/arcane/std/internal/Otf2LibWrapper.h +++ b/arcane/src/arcane/std/internal/Otf2LibWrapper.h @@ -1,11 +1,11 @@ // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*- //----------------------------------------------------------------------------- -// Copyright 2000-2022 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 //----------------------------------------------------------------------------- /*---------------------------------------------------------------------------*/ -/* Otf2LibWrapper.h (C) 2000-2018 */ +/* Otf2LibWrapper.h (C) 2000-2025 */ /* */ /* Classe qui encapsule les fonctions utiles de la lib Otf2. */ /*---------------------------------------------------------------------------*/ @@ -14,17 +14,22 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include -#include -#include "arcane/ISubDomain.h" #include "arccore/base/BaseTypes.h" + #include "arcane/utils/String.h" + +#include "arcane/core/ISubDomain.h" + #include "otf2/otf2.h" +#include +#include + /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -namespace Arcane { +namespace Arcane +{ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arcane/src/arcane/std/internal/Otf2MpiProfiling.h b/arcane/src/arcane/std/internal/Otf2MpiProfiling.h index 074840f69c..7f10804c53 100644 --- a/arcane/src/arcane/std/internal/Otf2MpiProfiling.h +++ b/arcane/src/arcane/std/internal/Otf2MpiProfiling.h @@ -19,7 +19,7 @@ #include "arccore/collections/CollectionsGlobal.h" #include "arccore/message_passing/Request.h" #include "arccore/message_passing_mpi/internal/IMpiProfiling.h" -#include "arccore/message_passing_mpi/MessagePassingMpiEnum.h" +#include "arccore/message_passing_mpi/internal/MessagePassingMpiEnum.h" #include "arcane/std/internal/Otf2LibWrapper.h" /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt index 4cb66c020c..f5239b09c0 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt @@ -20,11 +20,8 @@ endif() set(SOURCES MessagePassingMpiGlobal.h MessagePassingMpiGlobal.cc - MessagePassingMpiEnum.h MessagePassingMpiEnum.cc - MpiAdapter.h MpiAdapter.cc - MpiLock.h MpiDatatype.h MpiDatatype.cc MpiControlDispatcher.cc @@ -39,7 +36,10 @@ set(SOURCES StandaloneMpiMessagePassingMng.h internal/IMpiProfiling.h + internal/MessagePassingMpiEnum.h + internal/MpiAdapter.h internal/MpiControlDispatcher.h + internal/MpiLock.h internal/MpiRequest.h internal/MpiRequestList.h internal/MpiSerializeMessageList.h diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MessagePassingMpiEnum.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MessagePassingMpiEnum.cc index ef734baeb8..5857c6d9eb 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MessagePassingMpiEnum.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MessagePassingMpiEnum.cc @@ -7,11 +7,11 @@ /*---------------------------------------------------------------------------*/ /* MessagePassingMpiEnum.cc (C) 2000-2025 */ /* */ -/* Enumeration des differentes operations MPI. */ +/* Enumeration des différentes operations MPI. */ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arccore/message_passing_mpi/MessagePassingMpiEnum.h" +#include "arccore/message_passing_mpi/internal/MessagePassingMpiEnum.h" /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.cc index 50f5108461..300403cdf6 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.cc @@ -11,7 +11,7 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arccore/message_passing_mpi/MpiAdapter.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" #include "arccore/trace/ITraceMng.h" @@ -29,8 +29,8 @@ #include "arccore/base/FatalErrorException.h" #include "arccore/base/TraceInfo.h" -#include "arccore/message_passing_mpi/MpiLock.h" #include "arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.h" +#include "arccore/message_passing_mpi/internal/MpiLock.h" #include "arccore/message_passing_mpi/internal/NoMpiProfiling.h" #include "arccore/message_passing_mpi/internal/MpiRequest.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiControlDispatcher.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiControlDispatcher.cc index ceaa9c3487..ce2d296064 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiControlDispatcher.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiControlDispatcher.cc @@ -11,9 +11,10 @@ /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ -#include "arccore/message_passing_mpi/MpiAdapter.h" -#include "arccore/message_passing_mpi/MpiMessagePassingMng.h" #include "arccore/message_passing_mpi/internal/MpiControlDispatcher.h" + +#include "arccore/message_passing_mpi/MpiMessagePassingMng.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" #include "arccore/message_passing/Request.h" #include "arccore/base/NotImplementedException.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequestList.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequestList.cc index 918ce93156..fb218d7bfe 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequestList.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiRequestList.cc @@ -12,7 +12,7 @@ /*---------------------------------------------------------------------------*/ #include "arccore/message_passing_mpi/internal/MpiRequestList.h" -#include "arccore/message_passing_mpi/MpiAdapter.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc index 027a45e7b2..9f09cba218 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeDispatcher.cc @@ -13,10 +13,10 @@ #include "arccore/message_passing_mpi/internal/MpiSerializeDispatcher.h" -#include "arccore/message_passing_mpi/MpiAdapter.h" +#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/MpiLock.h" +#include "arccore/message_passing_mpi/internal/MpiLock.h" #include "arccore/message_passing/Request.h" #include "arccore/message_passing/internal/SubRequestCompletionInfo.h" #include "arccore/serialize/BasicSerializer.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.cc index 573b559144..c08f75b343 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiSerializeMessageList.cc @@ -13,7 +13,7 @@ #include "arccore/message_passing_mpi/internal/MpiSerializeMessageList.h" #include "arccore/message_passing_mpi/internal/MpiSerializeDispatcher.h" -#include "arccore/message_passing_mpi/MpiAdapter.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" #include "arccore/message_passing/BasicSerializeMessage.h" #include "arccore/trace/ITraceMng.h" #include "arccore/base/FatalErrorException.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.cc b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.cc index 3c6bb1902f..fb264949a8 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.cc +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/StandaloneMpiMessagePassingMng.cc @@ -20,8 +20,8 @@ #include "arccore/base/BFloat16.h" #include "arccore/base/Float16.h" -#include "arccore/message_passing_mpi/MpiAdapter.h" #include "arccore/message_passing_mpi/MpiDatatype.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" #include "arccore/message_passing_mpi/internal/MpiTypeDispatcher.h" #include "arccore/message_passing_mpi/internal/MpiControlDispatcher.h" #include "arccore/message_passing_mpi/internal/MpiSerializeDispatcher.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MessagePassingMpiEnum.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MessagePassingMpiEnum.h similarity index 100% rename from arccore/src/message_passing_mpi/arccore/message_passing_mpi/MessagePassingMpiEnum.h rename to arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MessagePassingMpiEnum.h diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiAdapter.h similarity index 99% rename from arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.h rename to arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiAdapter.h index 3244f0cb0a..3dcbf1ed0f 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiAdapter.h +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiAdapter.h @@ -17,7 +17,7 @@ #include "arccore/trace/TraceAccessor.h" #include "arccore/message_passing_mpi/MessagePassingMpiGlobal.h" -#include "arccore/message_passing_mpi/MessagePassingMpiEnum.h" +#include "arccore/message_passing_mpi/internal/MessagePassingMpiEnum.h" #include "arccore/message_passing/PointToPointMessageInfo.h" #include "arccore/message_passing/Request.h" #include "arccore/collections/CollectionsGlobal.h" diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiLock.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiLock.h similarity index 100% rename from arccore/src/message_passing_mpi/arccore/message_passing_mpi/MpiLock.h rename to arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiLock.h diff --git a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiTypeDispatcherImpl.h b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiTypeDispatcherImpl.h index adf6496fa0..a5a1da9cdc 100644 --- a/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiTypeDispatcherImpl.h +++ b/arccore/src/message_passing_mpi/arccore/message_passing_mpi/internal/MpiTypeDispatcherImpl.h @@ -15,9 +15,10 @@ /*---------------------------------------------------------------------------*/ #include "arccore/message_passing_mpi/internal/MpiTypeDispatcher.h" + #include "arccore/message_passing_mpi/MpiDatatype.h" -#include "arccore/message_passing_mpi/MpiAdapter.h" -#include "arccore/message_passing_mpi/MpiLock.h" +#include "arccore/message_passing_mpi/internal/MpiAdapter.h" +#include "arccore/message_passing_mpi/internal/MpiLock.h" #include "arccore/message_passing/Messages.h" #include "arccore/message_passing/Request.h"