From b4d77648c52ec0773d79bfdfc56be2ec3224d242 Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Fri, 4 Oct 2024 13:12:41 +0200 Subject: [PATCH] =?UTF-8?q?[arcane,std]=20D=C3=A9place=20les=20fichiers=20?= =?UTF-8?q?d'en-t=C3=AAte=20li=C3=A9s=20=C3=A0=20'Metis'=20dans=20la=20par?= =?UTF-8?q?tie=20interne.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ces fichiers font parties de l'API interne à Arcane et ne doivent pas être utilisés ailleurs. --- arcane/src/arcane/std/CMakeLists.txt | 9 +++++---- arcane/src/arcane/std/MetisGraphDigest.cc | 2 +- arcane/src/arcane/std/MetisGraphGather.cc | 4 ++-- arcane/src/arcane/std/MetisMeshPartitioner.cc | 2 +- arcane/src/arcane/std/MetisWrapper.cc | 8 ++++---- arcane/src/arcane/std/{ => internal}/MetisGraph.h | 4 ++-- arcane/src/arcane/std/{ => internal}/MetisGraphDigest.h | 6 +++--- arcane/src/arcane/std/{ => internal}/MetisGraphGather.h | 6 +++--- arcane/src/arcane/std/{ => internal}/MetisWrapper.h | 0 9 files changed, 21 insertions(+), 20 deletions(-) rename arcane/src/arcane/std/{ => internal}/MetisGraph.h (97%) rename arcane/src/arcane/std/{ => internal}/MetisGraphDigest.h (96%) rename arcane/src/arcane/std/{ => internal}/MetisGraphGather.h (95%) rename arcane/src/arcane/std/{ => internal}/MetisWrapper.h (100%) diff --git a/arcane/src/arcane/std/CMakeLists.txt b/arcane/src/arcane/std/CMakeLists.txt index 32c072b10..2fbca75b1 100644 --- 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 index d374bce90..9f15e4ba2 100644 --- 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 index d3a3a30ac..f16594e72 100644 --- 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 diff --git a/arcane/src/arcane/std/MetisMeshPartitioner.cc b/arcane/src/arcane/std/MetisMeshPartitioner.cc index 350255a77..b3908af39 100644 --- 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 diff --git a/arcane/src/arcane/std/MetisWrapper.cc b/arcane/src/arcane/std/MetisWrapper.cc index 3715dcebd..edbf0dd57 100644 --- 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 diff --git a/arcane/src/arcane/std/MetisGraph.h b/arcane/src/arcane/std/internal/MetisGraph.h similarity index 97% rename from arcane/src/arcane/std/MetisGraph.h rename to arcane/src/arcane/std/internal/MetisGraph.h index eeb384d80..8b1f1d9ec 100644 --- a/arcane/src/arcane/std/MetisGraph.h +++ b/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 b/arcane/src/arcane/std/internal/MetisGraphDigest.h similarity index 96% rename from arcane/src/arcane/std/MetisGraphDigest.h rename to arcane/src/arcane/std/internal/MetisGraphDigest.h index 35bf1c99b..49f159b92 100644 --- a/arcane/src/arcane/std/MetisGraphDigest.h +++ b/arcane/src/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 diff --git a/arcane/src/arcane/std/MetisGraphGather.h b/arcane/src/arcane/std/internal/MetisGraphGather.h similarity index 95% rename from arcane/src/arcane/std/MetisGraphGather.h rename to arcane/src/arcane/std/internal/MetisGraphGather.h index 13dd05ca6..b0e7f452c 100644 --- a/arcane/src/arcane/std/MetisGraphGather.h +++ b/arcane/src/arcane/std/internal/MetisGraphGather.h @@ -9,8 +9,8 @@ /* */ /* Regroupement de graphes de 'Parmetis'. */ /*---------------------------------------------------------------------------*/ -#ifndef ARCANE_STD_METISGRAPHGATHER -#define ARCANE_STD_METISGRAPHGATHER +#ifndef ARCANE_STD_INTERNAL_METISGRAPHGATHER +#define ARCANE_STD_INTERNAL_METISGRAPHGATHER /*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/ @@ -18,7 +18,7 @@ #include "arcane/utils/ArrayView.h" #include "arcane/utils/String.h" -#include "arcane/std/MetisGraph.h" +#include "arcane/std/internal/MetisGraph.h" #include #include diff --git a/arcane/src/arcane/std/MetisWrapper.h b/arcane/src/arcane/std/internal/MetisWrapper.h similarity index 100% rename from arcane/src/arcane/std/MetisWrapper.h rename to arcane/src/arcane/std/internal/MetisWrapper.h