augustin64/tipe
1
1
Fork 0
mirror of https://github.com/augustin64/projet-tipe synced 2025-02-02 19:39:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory_management not used in CUDA

Browse Source
This commit is contained in:
augustin64 2023-02-19 10:28:18 +01:00
parent 63ef37dc56
commit 2d46136609
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/memory_management.c
View File

@ -100,7 +100,7 @@ Memory* free_memory(void* ptr, Memory* mem) {
extern "C" extern "C"
#endif #endif
void* nalloc(size_t sz) { 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); pthread_mutex_lock(&memory_lock);
if (!memory) { if (!memory) {
// We allocate a new memory block // We allocate a new memory block
@ -122,7 +122,7 @@ void* nalloc(size_t sz) {
extern "C" extern "C"
#endif #endif
void gree(void* ptr) { void gree(void* ptr) {
#if defined(USE_CUDA) || defined(TEST_MEMORY_MANAGEMENT) #if defined(__CUDACC__) || defined(TEST_MEMORY_MANAGEMENT)
pthread_mutex_lock(&memory_lock); pthread_mutex_lock(&memory_lock);
memory = free_memory(ptr, memory); memory = free_memory(ptr, memory);
pthread_mutex_unlock(&memory_lock); pthread_mutex_unlock(&memory_lock);

4
src/memory_management.cu
View File

@ -100,7 +100,7 @@ Memory* free_memory(void* ptr, Memory* mem) {
extern "C" extern "C"
#endif #endif
void* nalloc(size_t sz) { 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); pthread_mutex_lock(&memory_lock);
if (!memory) { if (!memory) {
// We allocate a new memory block // We allocate a new memory block
@ -122,7 +122,7 @@ void* nalloc(size_t sz) {
extern "C" extern "C"
#endif #endif
void gree(void* ptr) { void gree(void* ptr) {
#if defined(USE_CUDA) || defined(TEST_MEMORY_MANAGEMENT) #if defined(__CUDACC__) || defined(TEST_MEMORY_MANAGEMENT)
pthread_mutex_lock(&memory_lock); pthread_mutex_lock(&memory_lock);
memory = free_memory(ptr, memory); memory = free_memory(ptr, memory);
pthread_mutex_unlock(&memory_lock); pthread_mutex_unlock(&memory_lock);