Skip to content

Commit e00b52a

Browse files
[arcane] Supprime utilisation de la méthode obsolète 'getAcceleratorHostMemoryAllocator()'.
1 parent da319d9 commit e00b52a

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

arcane/src/arcane/materials/MeshMaterialVariableIndexer.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ MeshMaterialVariableIndexer::
4040
MeshMaterialVariableIndexer(ITraceMng* tm, const String& name)
4141
: TraceAccessor(tm)
4242
, m_name(name)
43-
, m_matvar_indexes(platform::getAcceleratorHostMemoryAllocator())
44-
, m_local_ids(platform::getAcceleratorHostMemoryAllocator())
43+
, m_matvar_indexes(MemoryUtils::getDefaultDataAllocator())
44+
, m_local_ids(MemoryUtils::getDefaultDataAllocator())
4545
{
4646
_init();
4747
m_matvar_indexes.setDebugName(String("VariableIndexerMatVarIndexes")+name);

arcane/src/arcane/tests/accelerator/SimpleHydroAcceleratorService.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ SimpleHydroAcceleratorService(const ServiceBuildInfo& sbi)
246246
, m_delta_t_f(VariableBuildInfo(sbi.mesh(),"SplitDeltaT"))
247247
, m_old_dt_f(VariableBuildInfo(sbi.mesh(),"OldDTf"))
248248
, m_module(nullptr)
249-
, m_node_index_in_cells(platform::getAcceleratorHostMemoryAllocator())
249+
, m_node_index_in_cells(MemoryUtils::getDefaultDataAllocator())
250250
, m_runner(sbi.subDomain()->acceleratorMng()->defaultRunner())
251251
, m_default_queue(sbi.subDomain()->acceleratorMng()->defaultQueue())
252252
{

arcane/src/arcane/utils/MemoryResourceMng.cc

+5-4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "arcane/utils/Array.h"
1919
#include "arcane/utils/MemoryView.h"
2020
#include "arcane/utils/MemoryAllocator.h"
21+
#include "arcane/utils/MemoryUtils.h"
2122
#include "arcane/utils/internal/MemoryUtilsInternal.h"
2223

2324
/*---------------------------------------------------------------------------*/
@@ -109,15 +110,15 @@ getAllocator(eMemoryResource r, bool throw_if_not_found)
109110
// Si pas d'allocateur spécifique et qu'on n'est pas sur accélérateur,
110111
// utilise platform::getAcceleratorHostMemoryAllocator().
111112
if (!a && !m_is_accelerator) {
112-
if (r == eMemoryRessource::UnifiedMemory || r == eMemoryRessource::HostPinned) {
113-
a = platform::getAcceleratorHostMemoryAllocator();
113+
if (r == eMemoryResource::UnifiedMemory || r == eMemoryResource::HostPinned) {
114+
a = MemoryUtils::getDefaultDataAllocator();
114115
if (!a)
115-
a = m_allocators[(int)eMemoryRessource::Host];
116+
a = m_allocators[(int)eMemoryResource::Host];
116117
}
117118
}
118119

119120
if (!a && throw_if_not_found)
120-
ARCANE_FATAL("Allocator for ressource '{0}' is not available", r);
121+
ARCANE_FATAL("Allocator for resource '{0}' is not available", r);
121122

122123
return a;
123124
}

0 commit comments

Comments
 (0)