[arccore+arcane] Move classes related to 'MemoryResourceMng' from 'arcane_utils' to 'arccore_common'.

grospelliergilles · grospelliergilles · commit da1b82e24c23 · 2025-11-28T20:55:04.000+01:00
diff --git a/arcane/src/arcane/accelerator/cuda/runtime/CudaAcceleratorRuntime.cc b/arcane/src/arcane/accelerator/cuda/runtime/CudaAcceleratorRuntime.cc
@@ -27,7 +27,7 @@
 #include "arcane/utils/OStringStream.h"
 #include "arcane/utils/ValueConvert.h"
 #include "arcane/utils/CheckedConvert.h"
-#include "arcane/utils/internal/MemoryUtilsInternal.h"
+#include "arccore/common/internal/MemoryUtilsInternal.h"
 
 #include "arcane/accelerator/core/RunQueueBuildInfo.h"
 #include "arcane/accelerator/core/Memory.h"
diff --git a/arcane/src/arcane/accelerator/hip/runtime/HipAcceleratorRuntime.cc b/arcane/src/arcane/accelerator/hip/runtime/HipAcceleratorRuntime.cc
@@ -26,7 +26,7 @@
 #include "arcane/utils/Array.h"
 #include "arcane/utils/MemoryUtils.h"
 #include "arcane/utils/OStringStream.h"
-#include "arcane/utils/internal/MemoryUtilsInternal.h"
+#include "arccore/common/internal/MemoryUtilsInternal.h"
 
 #include "arcane/accelerator/core/RunQueueBuildInfo.h"
 #include "arcane/accelerator/core/Memory.h"
diff --git a/arcane/src/arcane/accelerator/sycl/runtime/SyclAcceleratorRuntime.cc b/arcane/src/arcane/accelerator/sycl/runtime/SyclAcceleratorRuntime.cc
@@ -21,8 +21,7 @@
 
 #include "arccore/common/IMemoryResourceMng.h"
 #include "arccore/common/internal/IMemoryResourceMngInternal.h"
-
-#include "arcane/utils/internal/MemoryUtilsInternal.h"
+#include "arccore/common/internal/MemoryUtilsInternal.h"
 
 #include "arcane/accelerator/core/RunQueueBuildInfo.h"
 #include "arcane/accelerator/core/Memory.h"
diff --git a/arcane/src/arcane/impl/ArcaneMain.cc b/arcane/src/arcane/impl/ArcaneMain.cc
@@ -34,7 +34,7 @@
 #include "arcane/utils/CommandLineArguments.h"
 #include "arcane/utils/TestLogger.h"
 #include "arcane/utils/MemoryUtils.h"
-#include "arcane/utils/internal/MemoryUtilsInternal.h"
+#include "arccore/common/internal/MemoryUtilsInternal.h"
 #include "arccore/base/internal/ConvertInternal.h"
 
 #include "arcane/core/IMainFactory.h"
diff --git a/arcane/src/arcane/parallel/thread/SharedMemoryMessageQueue.cc b/arcane/src/arcane/parallel/thread/SharedMemoryMessageQueue.cc
@@ -18,7 +18,7 @@
 #include "arcane/utils/ITraceMng.h"
 #include "arcane/utils/ValueConvert.h"
 
-#include "arcane/utils/internal/MemoryResourceMng.h"
+#include "arccore/common/internal/MemoryResourceMng.h"
 
 #include "arcane/parallel/thread/SharedMemoryMessageQueue.h"
 #include "arcane/parallel/thread/IAsyncQueue.h"
diff --git a/arcane/src/arcane/utils/MemoryUtils.cc b/arcane/src/arcane/utils/MemoryUtils.cc
@@ -18,8 +18,6 @@
 #include "arcane/utils/IMemoryRessourceMng.h"
 #include "arcane/utils/String.h"
 #include "arccore/common/internal/IMemoryResourceMngInternal.h"
-#include "arcane/utils/internal/MemoryUtilsInternal.h"
-#include "arcane/utils/internal/MemoryResourceMng.h"
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
@@ -40,161 +38,6 @@ namespace Arcane
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-namespace
-{
-  IMemoryAllocator* global_accelerator_host_memory_allocator = nullptr;
-  MemoryResourceMng global_default_data_memory_resource_mng;
-  IMemoryRessourceMng* global_data_memory_resource_mng = nullptr;
-  eMemoryResource global_data_memory_resource = eMemoryResource::Host;
-} // namespace
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-eMemoryResource MemoryUtils::
-getDefaultDataMemoryResource()
-{
-  return global_data_memory_resource;
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-void MemoryUtils::
-setDefaultDataMemoryResource(eMemoryResource v)
-{
-  global_data_memory_resource = v;
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-eMemoryResource MemoryUtils::
-getMemoryResourceFromName(const String& name)
-{
-  eMemoryResource v = eMemoryResource::Unknown;
-  if (name.null())
-    return v;
-  if (name == "Device")
-    v = eMemoryResource::Device;
-  else if (name == "Host")
-    v = eMemoryResource::Host;
-  else if (name == "HostPinned")
-    v = eMemoryResource::HostPinned;
-  else if (name == "UnifiedMemory")
-    v = eMemoryResource::UnifiedMemory;
-  else
-    ARCANE_FATAL("Invalid name '{0}' for memory resource. Valid names are "
-                 "'Device', 'Host', 'HostPinned' or 'UnifieMemory'.",
-                 name);
-  return v;
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-IMemoryRessourceMng* MemoryUtils::
-setDataMemoryResourceMng(IMemoryRessourceMng* mng)
-{
-  ARCANE_CHECK_POINTER(mng);
-  IMemoryRessourceMng* old = global_data_memory_resource_mng;
-  global_data_memory_resource_mng = mng;
-  return old;
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-IMemoryRessourceMng* MemoryUtils::
-getDataMemoryResourceMng()
-{
-  IMemoryRessourceMng* a = global_data_memory_resource_mng;
-  if (!a)
-    return &global_default_data_memory_resource_mng;
-  return a;
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-IMemoryAllocator* MemoryUtils::
-getDefaultDataAllocator()
-{
-  return getDataMemoryResourceMng()->getAllocator(getDefaultDataMemoryResource());
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-IMemoryAllocator* MemoryUtils::
-getDeviceOrHostAllocator()
-{
-  IMemoryRessourceMng* mrm = getDataMemoryResourceMng();
-  IMemoryAllocator* a = mrm->getAllocator(eMemoryResource::Device, false);
-  if (a)
-    return a;
-  return mrm->getAllocator(eMemoryResource::Host);
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-MemoryAllocationOptions MemoryUtils::
-getDefaultDataAllocator(eMemoryLocationHint hint)
-{
-  return MemoryAllocationOptions(getDefaultDataAllocator(), hint);
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-IMemoryAllocator* MemoryUtils::
-getAllocator(eMemoryRessource mem_resource)
-{
-  return getDataMemoryResourceMng()->getAllocator(mem_resource);
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-MemoryAllocationOptions MemoryUtils::
-getAllocationOptions(eMemoryRessource mem_resource)
-{
-  return MemoryAllocationOptions(getAllocator(mem_resource));
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-MemoryAllocationOptions MemoryUtils::
-getAllocatorForMostlyReadOnlyData()
-{
-  return getDefaultDataAllocator(eMemoryLocationHint::HostAndDeviceMostlyRead);
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-IMemoryAllocator* MemoryUtils::
-getAcceleratorHostMemoryAllocator()
-{
-  return global_accelerator_host_memory_allocator;
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
-IMemoryAllocator* MemoryUtils::
-setAcceleratorHostMemoryAllocator(IMemoryAllocator* a)
-{
-  IMemoryAllocator* old = global_accelerator_host_memory_allocator;
-  global_accelerator_host_memory_allocator = a;
-  return old;
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
 Int64 MemoryUtils::impl::
 computeCapacity(Int64 size)
 {
@@ -210,17 +53,6 @@ computeCapacity(Int64 size)
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-void MemoryUtils::
-copy(MutableMemoryView destination, eMemoryRessource destination_mem,
-     ConstMemoryView source, eMemoryRessource source_mem, const RunQueue* queue)
-{
-  IMemoryRessourceMng* mrm = getDataMemoryResourceMng();
-  mrm->_internal()->copy(source, destination_mem, destination, source_mem, queue);
-}
-
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-
 } // End namespace Arcane
 
 /*---------------------------------------------------------------------------*/
diff --git a/arcane/src/arcane/utils/MemoryUtils.h b/arcane/src/arcane/utils/MemoryUtils.h
@@ -25,17 +25,6 @@
 namespace Arcane::MemoryUtils
 {
 
-/*---------------------------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-/*!
- * \brief Allocateur spécifique pour les accélérateurs.
- *
- * \deprecated Use MemoryUtils::getDefaultDataAllocator() instead.
- */
-extern "C++" ARCANE_DEPRECATED_REASON("Y2024: Use getDefaultDataAllocator() instead.")
-ARCANE_UTILS_EXPORT IMemoryAllocator*
-getAcceleratorHostMemoryAllocator();
-
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
diff --git a/arcane/src/arcane/utils/PlatformUtils.cc b/arcane/src/arcane/utils/PlatformUtils.cc
@@ -26,7 +26,7 @@
 #include "arcane/utils/StringList.h"
 #include "arcane/utils/MemoryUtils.h"
 #include "arcane/utils/CheckedConvert.h"
-#include "arcane/utils/internal/MemoryUtilsInternal.h"
+#include "arccore/common/internal/MemoryUtilsInternal.h"
 
 #include "arccore/base/StringUtils.h"
 
diff --git a/arcane/src/arcane/utils/srcs.cmake b/arcane/src/arcane/utils/srcs.cmake
@@ -89,7 +89,6 @@ set(ARCANE_SOURCES
   MemoryInfo.cc
   MemoryInfo.h
   MemoryRessource.h
-  MemoryResourceMng.cc
   MemoryUtils.h
   MemoryUtils.cc
   Numeric.cc
@@ -333,8 +332,6 @@ set(ARCANE_SOURCES
   DirectedAcyclicGraphT.h
 
   internal/ApplicationInfoProperties.h
-  internal/MemoryResourceMng.h
-  internal/MemoryUtilsInternal.h
   internal/ParameterOption.h
   internal/ParameterOption.cc
   internal/ValueConvertInternal.h
diff --git a/arcane/src/arcane/utils/tests/TestMemory.cc b/arcane/src/arcane/utils/tests/TestMemory.cc
@@ -12,7 +12,7 @@
 #include "arcane/utils/Exception.h"
 #include "arcane/utils/MemoryUtils.h"
 #include "arcane/utils/NumericTypes.h"
-#include "arcane/utils/internal/MemoryUtilsInternal.h"
+#include "arccore/common/internal/MemoryUtilsInternal.h"
 
 #include <random>
 
diff --git a/arccore/src/common/arccore/common/MemoryResourceMng.cc b/arccore/src/common/arccore/common/MemoryResourceMng.cc
@@ -11,15 +11,15 @@
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
-#include "arcane/utils/internal/MemoryResourceMng.h"
+#include "arccore/common/internal/MemoryResourceMng.h"
 
-#include "arcane/utils/FatalErrorException.h"
-#include "arcane/utils/PlatformUtils.h"
-#include "arcane/utils/Array.h"
-#include "arcane/utils/MemoryView.h"
-#include "arcane/utils/MemoryAllocator.h"
-#include "arcane/utils/MemoryUtils.h"
-#include "arcane/utils/internal/MemoryUtilsInternal.h"
+#include "arccore/base/FatalErrorException.h"
+#include "arccore/base/PlatformUtils.h"
+#include "arccore/base/MemoryView.h"
+#include "arccore/common/Array.h"
+#include "arccore/common/AlignedMemoryAllocator.h"
+#include "arccore/common/MemoryUtils.h"
+#include "arccore/common/internal/MemoryUtilsInternal.h"
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
@@ -32,7 +32,7 @@ namespace Arcane
 
 namespace
 {
-  inline bool _isHost(eMemoryRessource r)
+  inline bool _isHost(eMemoryResource r)
   {
     // Si on sait pas, considère qu'on est accessible de puis l'hôte.
     if (r == eMemoryResource::Unknown)
@@ -60,12 +60,12 @@ class DefaultHostMemoryCopier
     // est accessible depuis le CPU
 
     if (!_isHost(from_mem))
-      ARCANE_FATAL("Source buffer is not accessible from host and no copier provided (location={0})",
-                   from_mem);
+      ARCCORE_FATAL("Source buffer is not accessible from host and no copier provided (location={0})",
+                    from_mem);
 
     if (!_isHost(to_mem))
-      ARCANE_FATAL("Destination buffer is not accessible from host and no copier provided (location={0})",
-                   to_mem);
+      ARCCORE_FATAL("Destination buffer is not accessible from host and no copier provided (location={0})",
+                    to_mem);
 
     MemoryUtils::copyHost(to, from);
   }
@@ -83,7 +83,7 @@ MemoryResourceMng()
   // les accélérateurs seront positionnés lorsqu'on aura choisi le runtime
   // accélérateur
   IMemoryAllocator* a = AlignedMemoryAllocator::Simd();
-  setAllocator(eMemoryRessource::Host, a);
+  setAllocator(eMemoryResource::Host, a);
 }
 
 /*---------------------------------------------------------------------------*/
@@ -93,8 +93,8 @@ int MemoryResourceMng::
 _checkValidResource(eMemoryResource r)
 {
   int x = (int)r;
-  if (x <= 0 || x >= Arccore::ARCCORE_NB_MEMORY_RESOURCE)
-    ARCANE_FATAL("Invalid value '{0}'. Valid range is '1' to '{1}'", x, Arccore::ARCCORE_NB_MEMORY_RESOURCE - 1);
+  if (x <= 0 || x >= ARCCORE_NB_MEMORY_RESOURCE)
+    ARCCORE_FATAL("Invalid value '{0}'. Valid range is '1' to '{1}'", x, ARCCORE_NB_MEMORY_RESOURCE - 1);
   return x;
 }
 
@@ -119,7 +119,7 @@ getAllocator(eMemoryResource r, bool throw_if_not_found)
   }
 
   if (!a && throw_if_not_found)
-    ARCANE_FATAL("Allocator for resource '{0}' is not available", r);
+    ARCCORE_FATAL("Allocator for resource '{0}' is not available", r);
 
   return a;
 }
@@ -153,7 +153,7 @@ copy(ConstMemoryView from, eMemoryResource from_mem,
   Int64 from_size = from.bytes().size();
   Int64 to_size = to.bytes().size();
   if (from_size > to_size)
-    ARCANE_FATAL("Destination copy is too small (to_size={0} from_size={1})", to_size, from_size);
+    ARCCORE_FATAL("Destination copy is too small (to_size={0} from_size={1})", to_size, from_size);
 
   m_copier->copy(from, from_mem, to, to_mem, queue);
 }
diff --git a/arccore/src/common/arccore/common/MemoryUtils.cc b/arccore/src/common/arccore/common/MemoryUtils.cc
diff --git a/arccore/src/common/arccore/common/MemoryUtils.h b/arccore/src/common/arccore/common/MemoryUtils.h
diff --git a/arccore/src/common/arccore/common/internal/MemoryResourceMng.h b/arccore/src/common/arccore/common/internal/MemoryResourceMng.h
diff --git a/arccore/src/common/arccore/common/internal/MemoryUtilsInternal.h b/arccore/src/common/arccore/common/internal/MemoryUtilsInternal.h
diff --git a/arccore/src/common/arccore/common/srcs.cmake b/arccore/src/common/arccore/common/srcs.cmake
