Skip to content

Commit 2472872

Browse files
grospelliergillesgrospelliergilles
authored
Merge pull request #1974 from arcaneframework/dev/gg-move-arccore-mpi-component-in-arcane-namespace
Move types from namespace `Arccore::MessagePassing::Mpi` to `Arcane::MessagePassing::Mpi`
2 parents a0c2c28 + 3bc1001 commit 2472872

31 files changed

+337
-301
lines changed

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

Lines changed: 7 additions & 12 deletions
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-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-
/* MpiParallelDispatch.cc (C) 2000-2018 */
8+
/* MpiParallelDispatch.cc (C) 2000-2025 */
99
/* */
1010
/* Gestionnaire de parallélisme utilisant MPI. */
1111
/*---------------------------------------------------------------------------*/
@@ -40,7 +40,8 @@
4040
/*---------------------------------------------------------------------------*/
4141
/*---------------------------------------------------------------------------*/
4242

43-
ARCANE_BEGIN_NAMESPACE
43+
namespace Arcane
44+
{
4445

4546
namespace MP = ::Arccore::MessagePassing;
4647

@@ -320,16 +321,12 @@ template class MpiParallelDispatchT<HPReal>;
320321
/*---------------------------------------------------------------------------*/
321322
/*---------------------------------------------------------------------------*/
322323

323-
ARCANE_END_NAMESPACE
324+
}
324325

325326
/*---------------------------------------------------------------------------*/
326327
/*---------------------------------------------------------------------------*/
327328

328-
namespace Arccore
329-
{
330-
namespace MessagePassing
331-
{
332-
namespace Mpi
329+
namespace Arcane::MessagePassing::Mpi
333330
{
334331
using namespace Arcane;
335332
template class MpiTypeDispatcher<APReal>;
@@ -338,9 +335,7 @@ template class MpiTypeDispatcher<Real3>;
338335
template class MpiTypeDispatcher<Real2x2>;
339336
template class MpiTypeDispatcher<Real3x3>;
340337
template class MpiTypeDispatcher<HPReal>;
341-
} // End namespace Mpi
342-
} // End namespace MessagePassing
343-
} // End namespace Arccore
338+
}
344339

345340
/*---------------------------------------------------------------------------*/
346341
/*---------------------------------------------------------------------------*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ arcaneCreateMpiLegacyVariableSynchronizerFactory(MpiParallelMng* mpi_pm);
8989
MpiParallelMngBuildInfo::
9090
MpiParallelMngBuildInfo(MPI_Comm comm)
9191
: is_parallel(false)
92-
, comm_rank(A_NULL_RANK)
92+
, comm_rank(MessagePassing::A_NULL_RANK)
9393
, comm_nb_rank(0)
9494
, stat(nullptr)
9595
, trace_mng(nullptr)

‎arccore/src/base/arccore/base/ArccoreGlobal.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,20 @@ using Float128 = Arccore::Float128;
714714

715715
//! Type représentant un entier sur 128 bits
716716
using Int128 = Arccore::Int128;
717+
718+
using Arccore::arccoreIsCheck;
719+
using Arccore::arccoreSetCheck;
720+
using Arccore::arccoreIsDebug;
721+
using Arccore::arccorePrintf;
722+
using Arccore::arccoreDebugPause;
723+
using Arccore::arccoreSetPauseOnError;
724+
using Arccore::arccoreNullPointerError;
725+
using Arccore::arccoreRangeError;
726+
using Arccore::arccoreCheckRange;
727+
using Arccore::arccoreCheckAt;
728+
using Arccore::arccoreThrowNullPointerError;
729+
using Arccore::arccoreThrowIfNull;
730+
717731
}
718732

719733
/*---------------------------------------------------------------------------*/

‎arccore/src/base/arccore/base/BaseTypes.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@ typedef Span<const Integer> IntegerConstSpan;
221221

222222
} // End namespace Arccore
223223

224+
/*---------------------------------------------------------------------------*/
225+
/*---------------------------------------------------------------------------*/
226+
224227
namespace Arcane
225228
{
226229
using Arccore::Array2View;

‎arccore/src/base/arccore/base/PlatformUtils.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,14 @@ getCompilerId();
362362
/*---------------------------------------------------------------------------*/
363363
/*---------------------------------------------------------------------------*/
364364

365+
namespace Arcane
366+
{
367+
namespace Platform = Arccore::Platform;
368+
}
369+
370+
/*---------------------------------------------------------------------------*/
371+
/*---------------------------------------------------------------------------*/
372+
365373
namespace Arcane::platform
366374
{
367375

‎arccore/src/message_passing/arccore/message_passing/MessagePassingGlobal.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class MessageRank;
7070
class MessageSourceInfo;
7171
class PointToPointMessageInfo;
7272
class IStat;
73+
class Stat;
7374
class IMessagePassingMng;
7475
class MessagePassingMng;
7576
class IDispatchers;
@@ -190,8 +191,24 @@ using Arccore::MessagePassing::MessageSourceInfo;
190191
using Arccore::MessagePassing::MessageTag;
191192
using Arccore::MessagePassing::PointToPointMessageInfo;
192193
using Arccore::MessagePassing::Request;
194+
using Arccore::MessagePassing::MessagePassingMng;
195+
using Arccore::MessagePassing::SubRequestCompletionInfo;
193196

194197
using Arccore::MessagePassing::Communicator;
198+
using Arccore::MessagePassing::IProfiler;
199+
using Arccore::MessagePassing::IStat;
200+
using Arccore::MessagePassing::Stat;
201+
using Arccore::MessagePassing::ISerializeDispatcher;
202+
using Arccore::MessagePassing::IDispatchers;
203+
using Arccore::MessagePassing::Dispatchers;
204+
205+
using Arccore::MessagePassing::A_NULL_RANK;
206+
using Arccore::MessagePassing::A_NULL_TAG_VALUE;
207+
using Arccore::MessagePassing::A_ANY_SOURCE_RANK;
208+
using Arccore::MessagePassing::A_PROC_NULL_RANK;
209+
210+
using Arccore::MessagePassing::GatherMessageInfoBase;
211+
using Arccore::MessagePassing::GatherMessageInfo;
195212
}
196213

197214
/*---------------------------------------------------------------------------*/

‎arccore/src/message_passing_mpi/arccore/message_passing_mpi/IMpiProfiling.h

Lines changed: 3 additions & 3 deletions
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-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-
/* IMpiProfiling.h (C) 2000-2020 */
8+
/* IMpiProfiling.h (C) 2000-2025 */
99
/* */
1010
/* Interface d'abstraction des operations MPI. */
1111
/*---------------------------------------------------------------------------*/
@@ -25,7 +25,7 @@
2525
/*---------------------------------------------------------------------------*/
2626
/*---------------------------------------------------------------------------*/
2727

28-
namespace Arccore::MessagePassing::Mpi
28+
namespace Arcane::MessagePassing::Mpi
2929
{
3030

3131
/*---------------------------------------------------------------------------*/

0 commit comments

Comments
 (0)