Skip to content

Commit eb79bd3

Browse files
grospelliergillesgrospelliergilles
authored
Merge pull request #1995 from arcaneframework/dev/gg-move-serializemessage-in-arcane-internal-api
Move `SerializeMessage` in internal API of Arcane
2 parents d6ed58c + d1c9e5d commit eb79bd3

20 files changed

+165
-185
lines changed

‎arcane/src/arcane/core/SerializeMessage.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/*---------------------------------------------------------------------------*/
1212
/*---------------------------------------------------------------------------*/
1313

14-
#include "arcane/core/SerializeMessage.h"
14+
#include "arcane/core/internal/SerializeMessage.h"
1515

1616
/*---------------------------------------------------------------------------*/
1717
/*---------------------------------------------------------------------------*/

‎arcane/src/arcane/core/SerializeMessage.h ‎arcane/src/arcane/core/internal/SerializeMessage.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
/* */
1010
/* Message utilisant un SerializeBuffer. */
1111
/*---------------------------------------------------------------------------*/
12-
#ifndef ARCANE_CORE_SERIALIZEMESSAGE_H
13-
#define ARCANE_CORE_SERIALIZEMESSAGE_H
12+
#ifndef ARCANE_CORE_INTERNAL_SERIALIZEMESSAGE_H
13+
#define ARCANE_CORE_INTERNAL_SERIALIZEMESSAGE_H
1414
/*---------------------------------------------------------------------------*/
1515
/*---------------------------------------------------------------------------*/
1616

‎arcane/src/arcane/core/srcs.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ set(ARCANE_INTERNAL_SOURCES
8080
internal/ITimeHistoryMngInternal.h
8181
internal/VariableUtilsInternal.h
8282
internal/IPolyhedralMeshModifier.h
83+
internal/SerializeMessage.h
8384
internal/VtkCellTypes.h
8485
)
8586

@@ -587,7 +588,6 @@ set(ARCANE_ORIGINAL_SOURCES
587588
SerializeBuffer.cc
588589
SerializeBuffer.h
589590
SerializeMessage.cc
590-
SerializeMessage.h
591591
SerializedData.cc
592592
Service.h
593593
ServiceBuildInfo.cc

‎arcane/src/arcane/corefinement/ParallelCorefinementService.cc

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
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
//-----------------------------------------------------------------------------
7-
#include "ParallelCorefinementService.h"
7+
#include "arcane/corefinement/ParallelCorefinementService.h"
88

9-
#include <arcane/IItemFamily.h>
10-
#include <arcane/IMesh.h>
11-
#include <arcane/IMeshModifier.h>
12-
#include <arcane/IMeshSubMeshTransition.h>
139
#include <arcane/utils/List.h>
1410
#include <arcane/utils/Limits.h>
1511
#include <arcane/utils/ITraceMng.h>
16-
#include <arcane/IParallelMng.h>
17-
#include <arcane/ISerializeMessageList.h>
18-
#include <arcane/SerializeMessage.h>
19-
#include <arcane/Timer.h>
20-
2112
#include <arcane/utils/ScopedPtr.h>
22-
#include <arcane/IParallelExchanger.h>
13+
14+
#include <arcane/core/IItemFamily.h>
15+
#include <arcane/core/IMesh.h>
16+
#include <arcane/core/IMeshModifier.h>
17+
#include <arcane/core/IMeshSubMeshTransition.h>
18+
#include <arcane/core/IParallelMng.h>
19+
#include <arcane/core/ISerializeMessageList.h>
20+
#include <arcane/core/Timer.h>
21+
#include <arcane/core/internal/SerializeMessage.h>
22+
23+
#include <arcane/core/IParallelExchanger.h>
2324

2425
#include <set>
2526
#include <list>

‎arcane/src/arcane/hdf5/Hdf5MpiReaderWriter.cc

+24-33
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-
/* Hdf5MpiReaderWriter.cc (C) 2000-2023 */
8+
/* Hdf5MpiReaderWriter.cc (C) 2000-2025 */
99
/* */
1010
/* Lecture/Ecriture au format HDF5. */
1111
/*---------------------------------------------------------------------------*/
@@ -16,39 +16,30 @@
1616
#include "arcane/utils/OStringStream.h"
1717
#include "arcane/utils/ScopedPtr.h"
1818
#include "arcane/utils/List.h"
19-
#include "arcane/utils/ArcanePrecomp.h"
2019
#include "arcane/utils/ITraceMng.h"
21-
#include "arcane/utils/PlatformUtils.h"
22-
#include "arcane/utils/StringBuilder.h"
2320

24-
#include "arcane/Item.h"
25-
#include "arcane/IDataReader.h"
26-
#include "arcane/IDataWriter.h"
27-
#include "arcane/ISubDomain.h"
28-
#include "arcane/StdNum.h"
29-
#include "arcane/IVariable.h"
30-
#include "arcane/CheckpointService.h"
31-
#include "arcane/Directory.h"
32-
#include "arcane/IParallelMng.h"
33-
#include "arcane/Service.h"
34-
#include "arcane/ArcaneException.h"
35-
#include "arcane/ItemGroup.h"
36-
#include "arcane/ItemEnumerator.h"
37-
#include "arcane/VerifierService.h"
38-
#include "arcane/IVariableMng.h"
39-
#include "arcane/FactoryService.h"
40-
#include "arcane/IData.h"
41-
#include "arcane/Timer.h"
42-
#include "arcane/ISerializedData.h"
43-
#include "arcane/IIOMng.h"
44-
#include "arcane/IXmlDocumentHolder.h"
45-
#include "arcane/VariableCollection.h"
46-
47-
#include "arcane/datatype/DataTypeTraits.h"
48-
49-
#include "arcane/SerializeBuffer.h"
50-
#include "arcane/ISerializeMessageList.h"
51-
#include "arcane/SerializeMessage.h"
21+
#include "arcane/core/Item.h"
22+
#include "arcane/core/IDataReader.h"
23+
#include "arcane/core/IDataWriter.h"
24+
#include "arcane/core/ISubDomain.h"
25+
#include "arcane/core/StdNum.h"
26+
#include "arcane/core/IVariable.h"
27+
#include "arcane/core/CheckpointService.h"
28+
#include "arcane/core/Directory.h"
29+
#include "arcane/core/IParallelMng.h"
30+
#include "arcane/core/ArcaneException.h"
31+
#include "arcane/core/VerifierService.h"
32+
#include "arcane/core/IVariableMng.h"
33+
#include "arcane/core/FactoryService.h"
34+
#include "arcane/core/IData.h"
35+
#include "arcane/core/Timer.h"
36+
#include "arcane/core/ISerializedData.h"
37+
#include "arcane/core/IIOMng.h"
38+
#include "arcane/core/IXmlDocumentHolder.h"
39+
#include "arcane/core/VariableCollection.h"
40+
#include "arcane/core/internal/SerializeMessage.h"
41+
#include "arcane/core/SerializeBuffer.h"
42+
#include "arcane/core/ISerializeMessageList.h"
5243

5344
#include "arcane/hdf5/Hdf5MpiReaderWriter.h"
5445

‎arcane/src/arcane/hdf5/Hdf5ReaderWriter.cc

+21-27
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-
/* Hdf5ReaderWriter.cc (C) 2000-2023 */
8+
/* Hdf5ReaderWriter.cc (C) 2000-2025 */
99
/* */
1010
/* Lecture/Ecriture au format HDF5. */
1111
/*---------------------------------------------------------------------------*/
@@ -16,38 +16,32 @@
1616
#include "arcane/utils/OStringStream.h"
1717
#include "arcane/utils/ScopedPtr.h"
1818
#include "arcane/utils/List.h"
19-
#include "arcane/utils/ArcanePrecomp.h"
2019
#include "arcane/utils/ITraceMng.h"
21-
#include "arcane/utils/PlatformUtils.h"
2220
#include "arcane/utils/CheckedConvert.h"
2321
#include "arcane/utils/ArrayShape.h"
2422

25-
#include "arcane/Item.h"
26-
#include "arcane/ISubDomain.h"
27-
#include "arcane/StdNum.h"
28-
#include "arcane/IVariable.h"
29-
#include "arcane/CheckpointService.h"
30-
#include "arcane/Directory.h"
31-
#include "arcane/IParallelMng.h"
32-
#include "arcane/IParallelReplication.h"
33-
#include "arcane/Service.h"
34-
#include "arcane/ArcaneException.h"
35-
#include "arcane/ItemGroup.h"
36-
#include "arcane/ItemEnumerator.h"
37-
#include "arcane/VerifierService.h"
38-
#include "arcane/IVariableMng.h"
39-
#include "arcane/FactoryService.h"
40-
#include "arcane/IData.h"
41-
#include "arcane/Timer.h"
42-
#include "arcane/ISerializedData.h"
43-
#include "arcane/IIOMng.h"
44-
#include "arcane/IXmlDocumentHolder.h"
23+
#include "arcane/core/ISubDomain.h"
24+
#include "arcane/core/StdNum.h"
25+
#include "arcane/core/IVariable.h"
26+
#include "arcane/core/CheckpointService.h"
27+
#include "arcane/core/Directory.h"
28+
#include "arcane/core/IParallelMng.h"
29+
#include "arcane/core/IParallelReplication.h"
30+
#include "arcane/core/ArcaneException.h"
31+
#include "arcane/core/VerifierService.h"
32+
#include "arcane/core/IVariableMng.h"
33+
#include "arcane/core/FactoryService.h"
34+
#include "arcane/core/IData.h"
35+
#include "arcane/core/Timer.h"
36+
#include "arcane/core/ISerializedData.h"
37+
#include "arcane/core/IIOMng.h"
38+
#include "arcane/core/IXmlDocumentHolder.h"
4539

4640
#include "arcane/datatype/DataTypeTraits.h"
4741

48-
#include "arcane/SerializeBuffer.h"
49-
#include "arcane/ISerializeMessageList.h"
50-
#include "arcane/SerializeMessage.h"
42+
#include "arcane/core/SerializeBuffer.h"
43+
#include "arcane/core/ISerializeMessageList.h"
44+
#include "arcane/core/internal/SerializeMessage.h"
5145

5246
#include "arcane/hdf5/Hdf5ReaderWriter.h"
5347

‎arcane/src/arcane/impl/GetVariablesValuesParallelOperation.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-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-
/* GetVariablesValuesParallelOperation.cc (C) 2000-2024 */
8+
/* GetVariablesValuesParallelOperation.cc (C) 2000-2025 */
99
/* */
1010
/* Opérations pour accéder aux valeurs de variables d'un autre sous-domaine. */
1111
/*---------------------------------------------------------------------------*/
@@ -18,8 +18,8 @@
1818
#include "arcane/core/VariableTypes.h"
1919
#include "arcane/core/IParallelMng.h"
2020
#include "arcane/core/ISerializer.h"
21-
#include "arcane/core/SerializeMessage.h"
2221
#include "arcane/core/IItemFamily.h"
22+
#include "arcane/core/internal/SerializeMessage.h"
2323

2424
#include "arcane/impl/GetVariablesValuesParallelOperation.h"
2525

‎arcane/src/arcane/impl/ParallelExchanger.cc

+8-8
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-
/* ParallelExchanger.cc (C) 2000-2022 */
8+
/* ParallelExchanger.cc (C) 2000-2025 */
99
/* */
1010
/* Echange d'informations entre processeurs. */
1111
/*---------------------------------------------------------------------------*/
@@ -17,12 +17,12 @@
1717
#include "arcane/utils/FatalErrorException.h"
1818
#include "arcane/utils/PlatformUtils.h"
1919

20-
#include "arcane/MathUtils.h"
21-
#include "arcane/IParallelMng.h"
22-
#include "arcane/SerializeBuffer.h"
23-
#include "arcane/SerializeMessage.h"
24-
#include "arcane/Timer.h"
25-
#include "arcane/ISerializeMessageList.h"
20+
#include "arcane/core/MathUtils.h"
21+
#include "arcane/core/IParallelMng.h"
22+
#include "arcane/core/SerializeBuffer.h"
23+
#include "arcane/core/Timer.h"
24+
#include "arcane/core/ISerializeMessageList.h"
25+
#include "arcane/core/internal/SerializeMessage.h"
2626

2727
#include <algorithm>
2828

‎arcane/src/arcane/impl/SequentialParallelMng.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
#include "arcane/core/Timer.h"
3939
#include "arcane/core/FactoryService.h"
4040
#include "arcane/core/AbstractService.h"
41-
#include "arcane/core/SerializeMessage.h"
41+
#include "arcane/core/ISerializer.h"
42+
#include "arcane/core/internal/SerializeMessage.h"
4243

4344
#include "arcane/parallel/IStat.h"
4445

‎arcane/src/arcane/impl/TransferValuesParallelOperation.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-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-
/* TransferValuesParallelOperation.cc (C) 2000-2024 */
8+
/* TransferValuesParallelOperation.cc (C) 2000-2025 */
99
/* */
1010
/* Transfert de valeurs sur différents processeurs. */
1111
/*---------------------------------------------------------------------------*/
@@ -21,7 +21,7 @@
2121
#include "arcane/core/IParallelMng.h"
2222
#include "arcane/core/Timer.h"
2323
#include "arcane/core/ISerializer.h"
24-
#include "arcane/core/SerializeMessage.h"
24+
#include "arcane/core/internal/SerializeMessage.h"
2525

2626
#include "arcane/impl/TransferValuesParallelOperation.h"
2727

‎arcane/src/arcane/mesh/AsyncParticleExchanger.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "arcane/mesh/AsyncParticleExchanger.h"
1515
#include "arcane/core/IParallelNonBlockingCollective.h"
1616

17-
#include "arccore/message_passing/BasicSerializeMessage.h"
17+
#include "arcane/core/internal/SerializeMessage.h"
1818

1919
/*---------------------------------------------------------------------------*/
2020
/*---------------------------------------------------------------------------*/

‎arcane/src/arcane/mesh/BasicParticleExchanger.cc

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
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-
/* BasicParticleExchanger.cc (C) 2000-2024 */
8+
/* BasicParticleExchanger.cc (C) 2000-2025 */
99
/* */
1010
/* Echangeur de particules. */
1111
/*---------------------------------------------------------------------------*/
1212
/*---------------------------------------------------------------------------*/
1313

1414
#include "arcane/mesh/BasicParticleExchanger.h"
1515

16+
#include "arcane/core/internal/SerializeMessage.h"
17+
1618
/*
17-
* NOTE:
19+
* NOTE :
1820
* Dans exchangeItems(), le tableau new_particle_local_ids
1921
* n'est valide que si le compactage n'est pas actif pour la famille de
2022
* particules (c'est toujours le cas avec l'implémentation actuelle).
2123
* Pour qu'il soit valide dans tous les cas, il faudrait lors
22-
* de la désérialisation des messages, créer toutes les entités
24+
* de la dé-sérialisation des messages, créer toutes les entités
2325
* en une fois, mettre à jour ce tableau \a new_particle_local_ids
2426
* et ensuite mettre à jour les variables.
2527
*/

0 commit comments

Comments
 (0)