Merge pull request #1665 from arcaneframework/dev/gg-move-metis-heade…

…r-in-internal Move header files using Metis and ParMetis in the internal part of Arcane
arcaneframework · Oct 4, 2024 · 789489b · 789489b
2 parents 5dde7d5 + b4d7764
commit 789489b
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 20 deletions.
diff --git a/arcane/src/arcane/std/CMakeLists.txt b/arcane/src/arcane/std/CMakeLists.txt
@@ -77,10 +77,11 @@ if(Parmetis_FOUND)
     MetisGraphDigest.cc
     MetisGraphGather.cc
     MetisWrapper.cc
-    MetisGraph.h
-    MetisGraphDigest.h
-    MetisGraphGather.h
-    MetisWrapper.h
+    internal/MetisGraphDigest.h
+    internal/MetisGraphGather.h
+    internal/MetisGraph.h
+    internal/MetisWrapper.h
+
     )
 endif()
 if(ZOLTAN_FOUND)

diff --git a/arcane/src/arcane/std/MetisGraphDigest.cc b/arcane/src/arcane/std/MetisGraphDigest.cc
@@ -16,7 +16,7 @@
 
 #include "arcane/core/IParallelMng.h"
 
-#include "arcane/std/MetisGraphDigest.h"
+#include "arcane/std/internal/MetisGraphDigest.h"
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/

diff --git a/arcane/src/arcane/std/MetisGraphGather.cc b/arcane/src/arcane/std/MetisGraphGather.cc
@@ -11,9 +11,9 @@
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-#include "arcane/utils/CheckedConvert.h"
+#include "arcane/std/internal/MetisGraphGather.h"
 
-#include "arcane/std/MetisGraphGather.h"
+#include "arcane/utils/CheckedConvert.h"
 
 #include <algorithm>
 

diff --git a/arcane/src/arcane/std/MetisMeshPartitioner.cc b/arcane/src/arcane/std/MetisMeshPartitioner.cc
@@ -52,7 +52,7 @@ typedef idx_t idxtype;
 
 #include "arcane/std/PartitionConverter.h"
 #include "arcane/std/GraphDistributor.h"
-#include "arcane/std/MetisWrapper.h"
+#include "arcane/std/internal/MetisWrapper.h"
 
 #include <chrono>
 

diff --git a/arcane/src/arcane/std/MetisWrapper.cc b/arcane/src/arcane/std/MetisWrapper.cc
@@ -11,15 +11,15 @@
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-#include "arcane/std/MetisWrapper.h"
+#include "arcane/std/internal/MetisWrapper.h"
 
 #include "arcane/utils/CheckedConvert.h"
 
 #include "arcane/core/IParallelMng.h"
 
-#include "arcane/std/MetisGraph.h"
-#include "arcane/std/MetisGraphDigest.h"
-#include "arcane/std/MetisGraphGather.h"
+#include "arcane/std/internal/MetisGraph.h"
+#include "arcane/std/internal/MetisGraphDigest.h"
+#include "arcane/std/internal/MetisGraphGather.h"
 
 #include <functional>
 

diff --git a/arcane/src/arcane/std/MetisGraph.h → arcane/src/arcane/std/internal/MetisGraph.h b/arcane/src/arcane/std/MetisGraph.h → arcane/src/arcane/std/internal/MetisGraph.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-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0
 //-----------------------------------------------------------------------------
 /*---------------------------------------------------------------------------*/
-/* MetisGraph.h                                                (C) 2000-2019 */
+/* MetisGraph.h                                                (C) 2000-2024 */
 /*                                                                           */
 /* Gestion d'un graphe de Metis.                                             */
 /*---------------------------------------------------------------------------*/

diff --git a/arcane/src/arcane/std/MetisGraphDigest.h → ...rc/arcane/std/internal/MetisGraphDigest.h b/arcane/src/arcane/std/MetisGraphDigest.h → ...rc/arcane/std/internal/MetisGraphDigest.h
@@ -9,8 +9,8 @@
 /*                                                                           */
 /* Calcule une somme de contrôle globale des entrées/sorties Metis.          */
 /*---------------------------------------------------------------------------*/
-#ifndef ARCANE_STD_METISGRAPHDIGEST
-#define ARCANE_STD_METISGRAPHDIGEST
+#ifndef ARCANE_STD_INTERNAL_METISGRAPHDIGEST
+#define ARCANE_STD_INTERNAL_METISGRAPHDIGEST
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
@@ -19,7 +19,7 @@
 
 #include "arcane/core/ArcaneTypes.h"
 
-#include "arcane/std/MetisGraph.h"
+#include "arcane/std/internal/MetisGraph.h"
 
 #include <string>
 

diff --git a/arcane/src/arcane/std/MetisGraphGather.h → ...rc/arcane/std/internal/MetisGraphGather.h b/arcane/src/arcane/std/MetisGraphGather.h → ...rc/arcane/std/internal/MetisGraphGather.h
@@ -9,16 +9,16 @@
 /*                                                                           */
 /* Regroupement de graphes de 'Parmetis'.                                    */
 /*---------------------------------------------------------------------------*/
-#ifndef ARCANE_STD_METISGRAPHGATHER
-#define ARCANE_STD_METISGRAPHGATHER
+#ifndef ARCANE_STD_INTERNAL_METISGRAPHGATHER
+#define ARCANE_STD_INTERNAL_METISGRAPHGATHER
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
 #include "arcane/utils/Array.h"
 #include "arcane/utils/ArrayView.h"
 #include "arcane/utils/String.h"
 
-#include "arcane/std/MetisGraph.h"
+#include "arcane/std/internal/MetisGraph.h"
 
 #include <parmetis.h>
 #include <mpi.h>

diff --git a/arcane/src/arcane/std/MetisWrapper.h → ...ne/src/arcane/std/internal/MetisWrapper.h b/arcane/src/arcane/std/MetisWrapper.h → ...ne/src/arcane/std/internal/MetisWrapper.h