From 2d46136609da6d0aebb12b94916a368602f3d896 Mon Sep 17 00:00:00 2001 From: augustin64 Date: Sun, 19 Feb 2023 10:28:18 +0100 Subject: [PATCH] Fix memory_management not used in CUDA --- src/memory_management.c | 4 ++-- src/memory_management.cu | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/memory_management.c b/src/memory_management.c index 3bbca9c..4852722 100644 --- a/src/memory_management.c +++ b/src/memory_management.c @@ -100,7 +100,7 @@ Memory* free_memory(void* ptr, Memory* mem) { extern "C" #endif void* nalloc(size_t sz) { - #if defined(USE_CUDA) || defined(TEST_MEMORY_MANAGEMENT) + #if defined(__CUDACC__) || defined(TEST_MEMORY_MANAGEMENT) pthread_mutex_lock(&memory_lock); if (!memory) { // We allocate a new memory block @@ -122,7 +122,7 @@ void* nalloc(size_t sz) { extern "C" #endif void gree(void* ptr) { - #if defined(USE_CUDA) || defined(TEST_MEMORY_MANAGEMENT) + #if defined(__CUDACC__) || defined(TEST_MEMORY_MANAGEMENT) pthread_mutex_lock(&memory_lock); memory = free_memory(ptr, memory); pthread_mutex_unlock(&memory_lock); diff --git a/src/memory_management.cu b/src/memory_management.cu index 3bbca9c..4852722 100644 --- a/src/memory_management.cu +++ b/src/memory_management.cu @@ -100,7 +100,7 @@ Memory* free_memory(void* ptr, Memory* mem) { extern "C" #endif void* nalloc(size_t sz) { - #if defined(USE_CUDA) || defined(TEST_MEMORY_MANAGEMENT) + #if defined(__CUDACC__) || defined(TEST_MEMORY_MANAGEMENT) pthread_mutex_lock(&memory_lock); if (!memory) { // We allocate a new memory block @@ -122,7 +122,7 @@ void* nalloc(size_t sz) { extern "C" #endif void gree(void* ptr) { - #if defined(USE_CUDA) || defined(TEST_MEMORY_MANAGEMENT) + #if defined(__CUDACC__) || defined(TEST_MEMORY_MANAGEMENT) pthread_mutex_lock(&memory_lock); memory = free_memory(ptr, memory); pthread_mutex_unlock(&memory_lock);