Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move several classes of 'arccore/message_passing_mpi' in internal Arccore API #1992

Merged
merged 6 commits into from
Feb 18, 2025
Merged

Move several classes of 'arccore/message_passing_mpi' in internal Arccore API #1992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01b79be
[arccore,message_passing_mpi] Déplace 'MpiTypeDistpatcher' dans l'API…
grospelliergilles Feb 15, 2025
139080d
[arccore+arcane] Déplace 'IMpiProfiling.h' et les classes dérivées da…
grospelliergilles Feb 15, 2025
0afb2f1
[arccore,message_passing_mpi] Déplace la classe 'MpiSerializeMessageL…
grospelliergilles Feb 15, 2025
3d35bac
[arccore,message_passing_mpi] Déplace 'MpiRequest' et 'MpiRequestList…
grospelliergilles Feb 18, 2025
69875e5
[arccore,message_passing_mpi] Déplace 'MpiSerializeDispatcher' et 'Mp…
grospelliergilles Feb 18, 2025
c9a846c
[arccore+arcane] Déplace 'MpiLock', 'MpiAdapter' et 'MessagePassingMp…
grospelliergilles Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions arcane/src/arcane/parallel/mpi/MpiAdapter.h
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions arcane/src/arcane/parallel/mpi/MpiBlockVariableSynchronizeDispatcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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. */
/*---------------------------------------------------------------------------*/
Expand All @@ -15,14 +15,14 @@
#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"

#include "arcane/impl/IDataSynchronizeBuffer.h"
#include "arcane/impl/IDataSynchronizeImplementation.h"

#include "arccore/message_passing/IRequestList.h"
#include "arccore/message_passing_mpi/internal/MpiAdapter.h"

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
Expand Down
7 changes: 4 additions & 3 deletions arcane/src/arcane/parallel/mpi/MpiDirectSendrecvVariableSynchronizeDispatcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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. */
/*---------------------------------------------------------------------------*/
Expand All @@ -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"
Expand All @@ -23,6 +22,8 @@
#include "arcane/impl/IDataSynchronizeBuffer.h"
#include "arcane/impl/IDataSynchronizeImplementation.h"

#include "arccore/message_passing_mpi/internal/MpiAdapter.h"

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

Expand Down
8 changes: 5 additions & 3 deletions arcane/src/arcane/parallel/mpi/MpiLegacyVariableSynchronizeDispatcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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. */
/*---------------------------------------------------------------------------*/
Expand All @@ -14,14 +14,16 @@
#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"

#include "arcane/impl/IDataSynchronizeBuffer.h"
#include "arcane/impl/IDataSynchronizeImplementation.h"

#include "arccore/message_passing_mpi/internal/IMpiProfiling.h"
#include "arccore/message_passing_mpi/internal/MpiAdapter.h"

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

Expand Down
2 changes: 0 additions & 2 deletions arcane/src/arcane/parallel/mpi/MpiLock.h
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions arcane/src/arcane/parallel/mpi/MpiNeighborVariableSynchronizeDispatcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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. */
/*---------------------------------------------------------------------------*/
Expand All @@ -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"
Expand All @@ -26,6 +25,8 @@
#include "arcane/impl/IDataSynchronizeImplementation.h"
#include "arcane/impl/DataSynchronizeInfo.h"

#include "arccore/message_passing_mpi/internal/MpiAdapter.h"

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
/*
Expand Down
8 changes: 3 additions & 5 deletions arcane/src/arcane/parallel/mpi/MpiParallelDispatch.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/MpiTypeDispatcherImpl.h"

#include <limits>
#include "arccore/message_passing_mpi/internal/MpiTypeDispatcherImpl.h"
#include "arccore/message_passing_mpi/internal/MpiAdapter.h"
#include "arccore/message_passing_mpi/internal/MpiLock.h"

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
Expand Down
6 changes: 3 additions & 3 deletions arcane/src/arcane/parallel/mpi/MpiParallelDispatch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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. */
/*---------------------------------------------------------------------------*/
Expand All @@ -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"

Expand Down
10 changes: 5 additions & 5 deletions arcane/src/arcane/parallel/mpi/MpiParallelMng.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +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/MpiSerializeMessageList.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"
Expand All @@ -46,8 +43,11 @@
#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/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"
Expand Down
58 changes: 29 additions & 29 deletions arcane/src/arcane/parallel/mpi/MpiParallelNonBlockingCollective.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -50,27 +50,27 @@ build()
{
MpiAdapter* adapter = m_adapter;
ITraceMng* tm = m_trace_mng;
auto c = new MpiParallelNonBlockingCollectiveDispatchT<char>(tm,this,adapter);
auto sc = new MpiParallelNonBlockingCollectiveDispatchT<signed char>(tm,this,adapter);
auto uc = new MpiParallelNonBlockingCollectiveDispatchT<unsigned char>(tm,this,adapter);
auto s = new MpiParallelNonBlockingCollectiveDispatchT<short>(tm,this,adapter);
auto us = new MpiParallelNonBlockingCollectiveDispatchT<unsigned short>(tm,this,adapter);
auto i = new MpiParallelNonBlockingCollectiveDispatchT<int>(tm,this,adapter);
auto ui = new MpiParallelNonBlockingCollectiveDispatchT<unsigned int>(tm,this,adapter);
auto l = new MpiParallelNonBlockingCollectiveDispatchT<long>(tm,this,adapter);
auto ul = new MpiParallelNonBlockingCollectiveDispatchT<unsigned long>(tm,this,adapter);
auto ll = new MpiParallelNonBlockingCollectiveDispatchT<long long>(tm,this,adapter);
auto ull = new MpiParallelNonBlockingCollectiveDispatchT<unsigned long long>(tm,this,adapter);
auto f = new MpiParallelNonBlockingCollectiveDispatchT<float>(tm,this,adapter);
auto d = new MpiParallelNonBlockingCollectiveDispatchT<double>(tm,this,adapter);
auto ld = new MpiParallelNonBlockingCollectiveDispatchT<long double>(tm,this,adapter);
auto r2 = new MpiParallelNonBlockingCollectiveDispatchT<Real2>(tm,this,adapter);
auto r3 = new MpiParallelNonBlockingCollectiveDispatchT<Real3>(tm,this,adapter);
auto r22 = new MpiParallelNonBlockingCollectiveDispatchT<Real2x2>(tm,this,adapter);
auto r33 = new MpiParallelNonBlockingCollectiveDispatchT<Real3x3>(tm,this,adapter);
auto hpr = new MpiParallelNonBlockingCollectiveDispatchT<HPReal>(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<char>(tm, this, adapter);
auto sc = new MpiParallelNonBlockingCollectiveDispatchT<signed char>(tm, this, adapter);
auto uc = new MpiParallelNonBlockingCollectiveDispatchT<unsigned char>(tm, this, adapter);
auto s = new MpiParallelNonBlockingCollectiveDispatchT<short>(tm, this, adapter);
auto us = new MpiParallelNonBlockingCollectiveDispatchT<unsigned short>(tm, this, adapter);
auto i = new MpiParallelNonBlockingCollectiveDispatchT<int>(tm, this, adapter);
auto ui = new MpiParallelNonBlockingCollectiveDispatchT<unsigned int>(tm, this, adapter);
auto l = new MpiParallelNonBlockingCollectiveDispatchT<long>(tm, this, adapter);
auto ul = new MpiParallelNonBlockingCollectiveDispatchT<unsigned long>(tm, this, adapter);
auto ll = new MpiParallelNonBlockingCollectiveDispatchT<long long>(tm, this, adapter);
auto ull = new MpiParallelNonBlockingCollectiveDispatchT<unsigned long long>(tm, this, adapter);
auto f = new MpiParallelNonBlockingCollectiveDispatchT<float>(tm, this, adapter);
auto d = new MpiParallelNonBlockingCollectiveDispatchT<double>(tm, this, adapter);
auto ld = new MpiParallelNonBlockingCollectiveDispatchT<long double>(tm, this, adapter);
auto r2 = new MpiParallelNonBlockingCollectiveDispatchT<Real2>(tm, this, adapter);
auto r3 = new MpiParallelNonBlockingCollectiveDispatchT<Real3>(tm, this, adapter);
auto r22 = new MpiParallelNonBlockingCollectiveDispatchT<Real2x2>(tm, this, adapter);
auto r33 = new MpiParallelNonBlockingCollectiveDispatchT<Real3x3>(tm, this, adapter);
auto hpr = new MpiParallelNonBlockingCollectiveDispatchT<HPReal>(tm, this, adapter);
_setDispatchers(c, sc, uc, s, us, i, ui, l, ul, ll, ull,
f, d, ld, r2, r3, r22, r33, hpr);
}

/*---------------------------------------------------------------------------*/
Expand Down Expand Up @@ -102,7 +102,7 @@ hasValidReduceForDerivedType() const
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

ARCANE_END_NAMESPACE
} // namespace Arcane

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
Loading
Loading