CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory tracker with omp (#844)

Browse Source 
This PR fixes hypre memory tracker with OMP threading.
This commit is contained in:
Rui Peng Li 2023-03-22 16:01:24 -07:00 committed by GitHub
parent 1eabaf5f33
commit 2391e4703f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 57 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utilities/_hypre_utilities.h
View File

@ -914,6 +914,8 @@ typedef struct
hypre_MemoryTrackerQueue queue[HYPRE_MEMORY_NUM_EVENTS];
} hypre_MemoryTracker;
extern hypre_MemoryTracker *_hypre_memory_tracker;
#define hypre_TAlloc(type, count, location) \
( \
{ \

16
src/utilities/general.c
View File

@ -8,22 +8,6 @@
#include "_hypre_utilities.h"
#include "_hypre_utilities.hpp"
#ifdef HYPRE_USING_MEMORY_TRACKER
hypre_MemoryTracker *_hypre_memory_tracker = NULL;
/* accessor to the global ``_hypre_memory_tracker'' */
hypre_MemoryTracker*
hypre_memory_tracker(void)
{
if (!_hypre_memory_tracker)
{
_hypre_memory_tracker = hypre_MemoryTrackerCreate();
}
return _hypre_memory_tracker;
}
#endif
/* global variable _hypre_handle:
* Outside this file, do NOT access it directly,
* but use hypre_handle() instead (see handle.h) */

24
src/utilities/memory_tracker.c
View File

@ -16,6 +16,25 @@
#if defined(HYPRE_USING_MEMORY_TRACKER)
hypre_MemoryTracker *_hypre_memory_tracker = NULL;
/* accessor to the global ``_hypre_memory_tracker'' */
hypre_MemoryTracker*
hypre_memory_tracker(void)
{
#ifdef HYPRE_USING_OPENMP
#pragma omp critical
#endif
{
if (!_hypre_memory_tracker)
{
_hypre_memory_tracker = hypre_MemoryTrackerCreate();
}
}
return _hypre_memory_tracker;
}
size_t hypre_total_bytes[hypre_NUM_MEMORY_LOCATION];
size_t hypre_peak_bytes[hypre_NUM_MEMORY_LOCATION];
size_t hypre_current_bytes[hypre_NUM_MEMORY_LOCATION];
@ -252,6 +271,10 @@ hypre_MemoryTrackerInsert2(const char *action,
hypre_MemoryTrackerQueue *queue = &tracker->queue[q];
#ifdef HYPRE_USING_OPENMP
#pragma omp critical
#endif
{
/* resize if not enough space */
if (queue->alloced_size <= queue->actual_size)
@ -291,6 +314,7 @@ hypre_MemoryTrackerInsert2(const char *action,
/* increase the queue length by 1 */
queue->actual_size ++;
}
}
HYPRE_Int
hypre_PrintMemoryTracker( size_t *totl_bytes_o,

2
src/utilities/memory_tracker.h
View File

@ -69,6 +69,8 @@ typedef struct
hypre_MemoryTrackerQueue queue[HYPRE_MEMORY_NUM_EVENTS];
} hypre_MemoryTracker;
extern hypre_MemoryTracker *_hypre_memory_tracker;
#define hypre_TAlloc(type, count, location) \
( \
{ \