resolve ambiguous symbol

ginkgo-project · Jul 20, 2023 · 33e29c3 · 33e29c3
1 parent 54ccdaf
commit 33e29c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/cuda/base/executor.cpp b/cuda/base/executor.cpp
@@ -60,8 +60,8 @@ namespace gko {
 #include "common/cuda_hip/base/executor.hpp.inc"
 
 
-std::unique_ptr<CudaAllocatorBase> allocator_from_mode(int device_id,
-                                                       allocation_mode mode)
+std::unique_ptr<CudaAllocatorBase> cuda_allocator_from_mode(
+    int device_id, allocation_mode mode)
 {
     switch (mode) {
     case allocation_mode::device:
@@ -82,8 +82,8 @@ std::shared_ptr<CudaExecutor> CudaExecutor::create(
     int device_id, std::shared_ptr<Executor> master, bool device_reset,
     allocation_mode alloc_mode, cudaStream_t stream)
 {
-    return create(device_id, master, allocator_from_mode(device_id, alloc_mode),
-                  stream);
+    return create(device_id, master,
+                  cuda_allocator_from_mode(device_id, alloc_mode), stream);
 }
 
 

diff --git a/hip/base/executor.hip.cpp b/hip/base/executor.hip.cpp
@@ -56,8 +56,8 @@ namespace gko {
 #include "common/cuda_hip/base/executor.hpp.inc"
 
 
-std::unique_ptr<HipAllocatorBase> allocator_from_mode(int device_id,
-                                                      allocation_mode mode)
+std::unique_ptr<HipAllocatorBase> hip_allocator_from_mode(int device_id,
+                                                          allocation_mode mode)
 {
     switch (mode) {
     case allocation_mode::device:
@@ -79,7 +79,7 @@ std::shared_ptr<HipExecutor> HipExecutor::create(
     allocation_mode alloc_mode, hipStream_t stream)
 {
     return create(device_id, std::move(master),
-                  allocator_from_mode(device_id, alloc_mode), stream);
+                  hip_allocator_from_mode(device_id, alloc_mode), stream);
 }