[arcane,utils] Ajoute function pour retourner le 'eMemoryResource' à partir de son nom.

Author: grospelliergilles

arcane/src/arcane/utils/MemoryUtils.cc

@@ -13,9 +13,10 @@
 
 #include "arcane/utils/MemoryUtils.h"
 
-#include "arcane/utils/PlatformUtils.h"
+#include "arcane/utils/FatalErrorException.h"
 #include "arcane/utils/MemoryAllocator.h"
 #include "arcane/utils/IMemoryRessourceMng.h"
+#include "arcane/utils/String.h"
 #include "arcane/utils/internal/IMemoryRessourceMngInternal.h"
 #include "arcane/utils/internal/MemoryUtilsInternal.h"
 #include "arcane/utils/internal/MemoryResourceMng.h"
@@ -55,6 +56,30 @@ setDefaultDataMemoryResource(eMemoryResource 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/src/arcane/utils/MemoryUtils.h

@@ -40,6 +40,20 @@ namespace Arcane::MemoryUtils
 extern "C++" ARCANE_UTILS_EXPORT eMemoryResource
 getDefaultDataMemoryResource();
 
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*!
+ * \brief Retourne la ressource mémoire par son nom.
+ *
+ * Le nom correspond au nom de la valeur de l'énumération (par exemple
+ * 'Device' pour eMemoryResource::Device.
+ *
+ * Si \a name est nul, retourn eMemoryResource::Unknown.
+ * Si \a name ne correspondant pas à une valeur valide, lève une exception.
+ */
+extern "C++" ARCANE_UTILS_EXPORT eMemoryResource
+getMemoryResourceFromName(const String& name);
+
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 /*!

arcane/src/arcane/utils/tests/TestMemory.cc

@@ -12,6 +12,7 @@
 #include "arcane/utils/Exception.h"
 #include "arcane/utils/MemoryUtils.h"
 #include "arcane/utils/NumericTypes.h"
+#include "arcane/utils/internal/MemoryUtilsInternal.h"
 
 #include <random>
 
@@ -173,6 +174,28 @@ TEST(Memory, Basic)
   }
 }
 
+/*---------------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+namespace
+{
+void _checkSetDataMemoryResource(const String& name, eMemoryResource expected_mem_resource)
+{
+  eMemoryResource v = MemoryUtils::getMemoryResourceFromName(name);
+  ASSERT_EQ(v, expected_mem_resource);
+  MemoryUtils::setDefaultDataMemoryResource(v);
+  eMemoryResource v2 = MemoryUtils::getDefaultDataMemoryResource();
+  ASSERT_EQ(v2, expected_mem_resource);
+}
+} // namespace
+
+TEST(Memory, Allocator)
+{
+  _checkSetDataMemoryResource("Device", eMemoryResource::Device);
+  _checkSetDataMemoryResource("HostPinned", eMemoryResource::HostPinned);
+  _checkSetDataMemoryResource("Host", eMemoryResource::Host);
+  _checkSetDataMemoryResource("UnifiedMemory", eMemoryResource::UnifiedMemory);
+}
+
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/