Merge pull request #1805 from arcaneframework/dev/gg-use-memory-resource-from-arccore

Remove 'eMemoryResource' from Arcane and use that from Arccore

Author: grospelliergilles

Diff for: arcane/CMakeLists.txt

@@ -364,7 +364,7 @@ if (ARCANE_WANT_CHECK)
   set(ARCCORE_CHECK TRUE)
 endif()
 
-set(ARCANE_ARCCORE_NEEDED_VERSION "2.7.1")
+set(ARCANE_ARCCORE_NEEDED_VERSION "2.8.0")
 if (NOT Arccore_FOUND)
   find_package(Arccore ${ARCANE_ARCCORE_NEEDED_VERSION} REQUIRED)
 endif ()

Diff for: arcane/src/arcane/utils/MemoryRessource.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
 //-----------------------------------------------------------------------------
 /*---------------------------------------------------------------------------*/
-/* MemoryRessource.h                                           (C) 2000-2022 */
+/* MemoryRessource.h                                           (C) 2000-2024 */
 /*                                                                           */
 /* Gestion des ressources mémoire pour les CPU et accélérateurs.             */
 /*---------------------------------------------------------------------------*/
@@ -14,9 +14,7 @@
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-#include "arcane/utils/ArcaneGlobal.h"
-
-#include <iosfwd>
+#include "arcane/utils/UtilsTypes.h"
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
@@ -27,29 +25,8 @@ namespace Arcane
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-//! Liste des ressources mémoire disponibles
-enum class eMemoryRessource
-{
-  //! Valeur inconnue ou non initialisée
-  Unknown = 0,
-  //! Alloue sur l'hôte.
-  Host,
-  //! Alloue sur l'hôte.
-  HostPinned,
-  //! Alloue sur le device
-  Device,
-  //! Alloue en utilisant la mémoire unifiée.
-  UnifiedMemory
-};
-
-//! Nombre de valeurs valides pour eMemoryRessource
-static constexpr int NB_MEMORY_RESSOURCE = 5;
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-extern "C++" ARCANE_UTILS_EXPORT std::ostream&
-operator<<(std::ostream& o,eMemoryRessource r);
+//! TODO: à rendre obsolète (juin 2025)
+static constexpr int NB_MEMORY_RESSOURCE = Arccore::ARCCORE_NB_MEMORY_RESOURCE;
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/

Diff for: arcane/src/arcane/utils/UtilsTypes.h

@@ -257,7 +257,11 @@ inline constexpr Int32 DynExtent = -1;
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-enum class eMemoryRessource;
+using Arccore::eMemoryResource;
+//! Typedef pour la version Arcane historique (avec 2's')
+// TODO: A rendre obsolète (juin 2025)
+using eMemoryRessource = Arccore::eMemoryResource;
+
 class DefaultLayout;
 template<int RankValue> class RightLayoutN;
 template<int RankValue> class LeftLayoutN;