Skip to content

Commit 424682d

Browse files
grospelliergillesgrospelliergilles
committed
[arccore+arcane] Déplace 'MpiLock', 'MpiAdapter' et 'MessagePassingMpiEnum' dans l'API interne de Arccore.
1 parent 69875e5 commit 424682d

30 files changed

+128
-131
lines changed

‎arcane/src/arcane/parallel/mpi/MpiAdapter.h

-2
This file was deleted.

‎arcane/src/arcane/parallel/mpi/MpiBlockVariableSynchronizeDispatcher.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* MpiBlockVariableSynchronizeDispatcher.cc (C) 2000-2023 */
8+
/* MpiBlockVariableSynchronizeDispatcher.cc (C) 2000-2025 */
99
/* */
1010
/* Gestion spécifique MPI des synchronisations des variables. */
1111
/*---------------------------------------------------------------------------*/
@@ -15,14 +15,14 @@
1515
#include "arcane/utils/MemoryView.h"
1616

1717
#include "arcane/parallel/mpi/MpiParallelMng.h"
18-
#include "arcane/parallel/mpi/MpiAdapter.h"
1918
#include "arcane/parallel/mpi/MpiTimeInterval.h"
2019
#include "arcane/parallel/IStat.h"
2120

2221
#include "arcane/impl/IDataSynchronizeBuffer.h"
2322
#include "arcane/impl/IDataSynchronizeImplementation.h"
2423

2524
#include "arccore/message_passing/IRequestList.h"
25+
#include "arccore/message_passing_mpi/internal/MpiAdapter.h"
2626

2727
/*---------------------------------------------------------------------------*/
2828
/*---------------------------------------------------------------------------*/

‎arcane/src/arcane/parallel/mpi/MpiDirectSendrecvVariableSynchronizeDispatcher.cc

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* MpiDirectSendrecvVariableSynchronizeDispatcher.cc (C) 2000-2023 */
8+
/* MpiDirectSendrecvVariableSynchronizeDispatcher.cc (C) 2000-2025 */
99
/* */
1010
/* Gestion spécifique MPI des synchronisations des variables. */
1111
/*---------------------------------------------------------------------------*/
@@ -14,7 +14,6 @@
1414
#include "arcane/utils/MemoryView.h"
1515

1616
#include "arcane/parallel/mpi/MpiParallelMng.h"
17-
#include "arcane/parallel/mpi/MpiAdapter.h"
1817
#include "arcane/parallel/mpi/MpiDatatypeList.h"
1918
#include "arcane/parallel/mpi/MpiDatatype.h"
2019
#include "arcane/parallel/mpi/MpiTimeInterval.h"
@@ -23,6 +22,8 @@
2322
#include "arcane/impl/IDataSynchronizeBuffer.h"
2423
#include "arcane/impl/IDataSynchronizeImplementation.h"
2524

25+
#include "arccore/message_passing_mpi/internal/MpiAdapter.h"
26+
2627
/*---------------------------------------------------------------------------*/
2728
/*---------------------------------------------------------------------------*/
2829

‎arcane/src/arcane/parallel/mpi/MpiLegacyVariableSynchronizeDispatcher.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "arcane/utils/MemoryView.h"
1515

1616
#include "arcane/parallel/mpi/MpiParallelMng.h"
17-
#include "arcane/parallel/mpi/MpiAdapter.h"
1817
#include "arcane/parallel/mpi/MpiDatatypeList.h"
1918
#include "arcane/parallel/mpi/MpiDatatype.h"
2019
#include "arcane/parallel/IStat.h"
@@ -23,6 +22,7 @@
2322
#include "arcane/impl/IDataSynchronizeImplementation.h"
2423

2524
#include "arccore/message_passing_mpi/internal/IMpiProfiling.h"
25+
#include "arccore/message_passing_mpi/internal/MpiAdapter.h"
2626

2727
/*---------------------------------------------------------------------------*/
2828
/*---------------------------------------------------------------------------*/

‎arcane/src/arcane/parallel/mpi/MpiLock.h

-2
This file was deleted.

‎arcane/src/arcane/parallel/mpi/MpiNeighborVariableSynchronizeDispatcher.cc

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* MpiNeighborVariableSynchronizeDispatcher.cc (C) 2000-2023 */
8+
/* MpiNeighborVariableSynchronizeDispatcher.cc (C) 2000-2025 */
99
/* */
1010
/* Synchronisations des variables via MPI_Neighbor_alltoallv. */
1111
/*---------------------------------------------------------------------------*/
@@ -17,7 +17,6 @@
1717
#include "arcane/utils/MemoryView.h"
1818

1919
#include "arcane/parallel/mpi/MpiParallelMng.h"
20-
#include "arcane/parallel/mpi/MpiAdapter.h"
2120
#include "arcane/parallel/mpi/MpiTimeInterval.h"
2221
#include "arcane/parallel/mpi/IVariableSynchronizerMpiCommunicator.h"
2322
#include "arcane/parallel/IStat.h"
@@ -26,6 +25,8 @@
2625
#include "arcane/impl/IDataSynchronizeImplementation.h"
2726
#include "arcane/impl/DataSynchronizeInfo.h"
2827

28+
#include "arccore/message_passing_mpi/internal/MpiAdapter.h"
29+
2930
/*---------------------------------------------------------------------------*/
3031
/*---------------------------------------------------------------------------*/
3132
/*

‎arcane/src/arcane/parallel/mpi/MpiParallelDispatch.cc

+2-4
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,13 @@
2727
#include "arcane/IParallelMng.h"
2828

2929
#include "arcane/parallel/mpi/MpiDatatype.h"
30-
#include "arcane/parallel/mpi/MpiAdapter.h"
3130
#include "arcane/parallel/mpi/MpiParallelDispatch.h"
32-
#include "arcane/parallel/mpi/MpiLock.h"
3331

3432
#include "arccore/message_passing/Messages.h"
3533

3634
#include "arccore/message_passing_mpi/internal/MpiTypeDispatcherImpl.h"
37-
38-
#include <limits>
35+
#include "arccore/message_passing_mpi/internal/MpiAdapter.h"
36+
#include "arccore/message_passing_mpi/internal/MpiLock.h"
3937

4038
/*---------------------------------------------------------------------------*/
4139
/*---------------------------------------------------------------------------*/

‎arcane/src/arcane/parallel/mpi/MpiParallelDispatch.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* MpiParallelDispatch.h (C) 2000-2024 */
8+
/* MpiParallelDispatch.h (C) 2000-2025 */
99
/* */
1010
/* Implémentation des messages avec MPI. */
1111
/*---------------------------------------------------------------------------*/

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@
3030
#include "arcane/core/parallel/IStat.h"
3131

3232
#include "arcane/parallel/mpi/MpiParallelMng.h"
33-
#include "arcane/parallel/mpi/MpiAdapter.h"
3433
#include "arcane/parallel/mpi/MpiParallelDispatch.h"
3534
#include "arcane/parallel/mpi/MpiTimerMng.h"
36-
#include "arcane/parallel/mpi/MpiLock.h"
3735
#include "arcane/parallel/mpi/MpiSerializeMessage.h"
3836
#include "arcane/parallel/mpi/MpiParallelNonBlockingCollective.h"
3937
#include "arcane/parallel/mpi/MpiDatatype.h"
@@ -48,6 +46,8 @@
4846
#include "arccore/message_passing_mpi/internal/MpiSerializeDispatcher.h"
4947
#include "arccore/message_passing_mpi/internal/MpiRequestList.h"
5048
#include "arccore/message_passing_mpi/internal/MpiSerializeMessageList.h"
49+
#include "arccore/message_passing_mpi/internal/MpiAdapter.h"
50+
#include "arccore/message_passing_mpi/internal/MpiLock.h"
5151
#include "arccore/message_passing/Dispatchers.h"
5252
#include "arccore/message_passing/Messages.h"
5353
#include "arccore/message_passing/SerializeMessageList.h"

‎arcane/src/arcane/parallel/mpi/MpiParallelNonBlockingCollective.cc

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2025 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* MpiParallelNonBlockingCollective.cc (C) 2000-2016 */
8+
/* MpiParallelNonBlockingCollective.cc (C) 2000-2025 */
99
/* */
1010
/* Implémentation des collectives non bloquantes avec MPI. */
1111
/*---------------------------------------------------------------------------*/
1212
/*---------------------------------------------------------------------------*/
1313

14-
#include "arcane/utils/ArcanePrecomp.h"
15-
1614
#include "arcane/parallel/mpi/MpiParallelMng.h"
1715
#include "arcane/parallel/mpi/MpiParallelNonBlockingCollectiveDispatch.h"
1816
#include "arcane/parallel/mpi/MpiParallelNonBlockingCollective.h"
19-
#include "arcane/parallel/mpi/MpiAdapter.h"
17+
18+
#include "arccore/message_passing_mpi/internal/MpiAdapter.h"
2019

2120
/*---------------------------------------------------------------------------*/
2221
/*---------------------------------------------------------------------------*/
2322

24-
ARCANE_BEGIN_NAMESPACE
23+
namespace Arcane
24+
{
2525

2626
/*---------------------------------------------------------------------------*/
2727
/*---------------------------------------------------------------------------*/
2828

2929
MpiParallelNonBlockingCollective::
30-
MpiParallelNonBlockingCollective(ITraceMng* tm,IParallelMng* pm,MpiAdapter* adapter)
30+
MpiParallelNonBlockingCollective(ITraceMng* tm, IParallelMng* pm, MpiAdapter* adapter)
3131
: ParallelNonBlockingCollectiveDispatcher(pm)
3232
, m_trace_mng(tm)
3333
, m_adapter(adapter)
@@ -50,27 +50,27 @@ build()
5050
{
5151
MpiAdapter* adapter = m_adapter;
5252
ITraceMng* tm = m_trace_mng;
53-
auto c = new MpiParallelNonBlockingCollectiveDispatchT<char>(tm,this,adapter);
54-
auto sc = new MpiParallelNonBlockingCollectiveDispatchT<signed char>(tm,this,adapter);
55-
auto uc = new MpiParallelNonBlockingCollectiveDispatchT<unsigned char>(tm,this,adapter);
56-
auto s = new MpiParallelNonBlockingCollectiveDispatchT<short>(tm,this,adapter);
57-
auto us = new MpiParallelNonBlockingCollectiveDispatchT<unsigned short>(tm,this,adapter);
58-
auto i = new MpiParallelNonBlockingCollectiveDispatchT<int>(tm,this,adapter);
59-
auto ui = new MpiParallelNonBlockingCollectiveDispatchT<unsigned int>(tm,this,adapter);
60-
auto l = new MpiParallelNonBlockingCollectiveDispatchT<long>(tm,this,adapter);
61-
auto ul = new MpiParallelNonBlockingCollectiveDispatchT<unsigned long>(tm,this,adapter);
62-
auto ll = new MpiParallelNonBlockingCollectiveDispatchT<long long>(tm,this,adapter);
63-
auto ull = new MpiParallelNonBlockingCollectiveDispatchT<unsigned long long>(tm,this,adapter);
64-
auto f = new MpiParallelNonBlockingCollectiveDispatchT<float>(tm,this,adapter);
65-
auto d = new MpiParallelNonBlockingCollectiveDispatchT<double>(tm,this,adapter);
66-
auto ld = new MpiParallelNonBlockingCollectiveDispatchT<long double>(tm,this,adapter);
67-
auto r2 = new MpiParallelNonBlockingCollectiveDispatchT<Real2>(tm,this,adapter);
68-
auto r3 = new MpiParallelNonBlockingCollectiveDispatchT<Real3>(tm,this,adapter);
69-
auto r22 = new MpiParallelNonBlockingCollectiveDispatchT<Real2x2>(tm,this,adapter);
70-
auto r33 = new MpiParallelNonBlockingCollectiveDispatchT<Real3x3>(tm,this,adapter);
71-
auto hpr = new MpiParallelNonBlockingCollectiveDispatchT<HPReal>(tm,this,adapter);
72-
_setDispatchers(c,sc,uc,s,us,i,ui,l,ul,ll,ull,
73-
f,d,ld,r2,r3,r22,r33,hpr);
53+
auto c = new MpiParallelNonBlockingCollectiveDispatchT<char>(tm, this, adapter);
54+
auto sc = new MpiParallelNonBlockingCollectiveDispatchT<signed char>(tm, this, adapter);
55+
auto uc = new MpiParallelNonBlockingCollectiveDispatchT<unsigned char>(tm, this, adapter);
56+
auto s = new MpiParallelNonBlockingCollectiveDispatchT<short>(tm, this, adapter);
57+
auto us = new MpiParallelNonBlockingCollectiveDispatchT<unsigned short>(tm, this, adapter);
58+
auto i = new MpiParallelNonBlockingCollectiveDispatchT<int>(tm, this, adapter);
59+
auto ui = new MpiParallelNonBlockingCollectiveDispatchT<unsigned int>(tm, this, adapter);
60+
auto l = new MpiParallelNonBlockingCollectiveDispatchT<long>(tm, this, adapter);
61+
auto ul = new MpiParallelNonBlockingCollectiveDispatchT<unsigned long>(tm, this, adapter);
62+
auto ll = new MpiParallelNonBlockingCollectiveDispatchT<long long>(tm, this, adapter);
63+
auto ull = new MpiParallelNonBlockingCollectiveDispatchT<unsigned long long>(tm, this, adapter);
64+
auto f = new MpiParallelNonBlockingCollectiveDispatchT<float>(tm, this, adapter);
65+
auto d = new MpiParallelNonBlockingCollectiveDispatchT<double>(tm, this, adapter);
66+
auto ld = new MpiParallelNonBlockingCollectiveDispatchT<long double>(tm, this, adapter);
67+
auto r2 = new MpiParallelNonBlockingCollectiveDispatchT<Real2>(tm, this, adapter);
68+
auto r3 = new MpiParallelNonBlockingCollectiveDispatchT<Real3>(tm, this, adapter);
69+
auto r22 = new MpiParallelNonBlockingCollectiveDispatchT<Real2x2>(tm, this, adapter);
70+
auto r33 = new MpiParallelNonBlockingCollectiveDispatchT<Real3x3>(tm, this, adapter);
71+
auto hpr = new MpiParallelNonBlockingCollectiveDispatchT<HPReal>(tm, this, adapter);
72+
_setDispatchers(c, sc, uc, s, us, i, ui, l, ul, ll, ull,
73+
f, d, ld, r2, r3, r22, r33, hpr);
7474
}
7575

7676
/*---------------------------------------------------------------------------*/
@@ -102,7 +102,7 @@ hasValidReduceForDerivedType() const
102102
/*---------------------------------------------------------------------------*/
103103
/*---------------------------------------------------------------------------*/
104104

105-
ARCANE_END_NAMESPACE
105+
} // namespace Arcane
106106

107107
/*---------------------------------------------------------------------------*/
108108
/*---------------------------------------------------------------------------*/

0 commit comments

Comments
 (0)