vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

threadpool: update threadpool resume/pause function names

Browse source
This commit is contained in:
Max Krasnyansky 2024-08-24 18:03:06 -07:00 • committed by fmz
parent 49ac51f2a3
commit 204377a0a8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ggml/src/ggml.c
View file

@ -18888,13 +18888,13 @@ void ggml_release_threadpool(struct ggml_compute_threadpool* threadpool) {
#ifndef GGML_USE_OPENMP #ifndef GGML_USE_OPENMP
// pause/resume must be called under mutex // pause/resume must be called under mutex
static void __ggml_pause_threadpool(struct ggml_compute_threadpool * threadpool) { static void ggml_pause_threadpool_locked(struct ggml_compute_threadpool * threadpool) {
GGML_PRINT_DEBUG("Pausing threadpool\n"); GGML_PRINT_DEBUG("Pausing threadpool\n");
threadpool->pause = true; threadpool->pause = true;
ggml_cond_broadcast(&threadpool->cond); ggml_cond_broadcast(&threadpool->cond);
} }
static void __ggml_resume_threadpool(struct ggml_compute_threadpool * threadpool) { static void ggml_resume_threadpool_locked(struct ggml_compute_threadpool * threadpool) {
GGML_PRINT_DEBUG("Resuming threadpool\n"); GGML_PRINT_DEBUG("Resuming threadpool\n");
threadpool->pause = false; threadpool->pause = false;
ggml_cond_broadcast(&threadpool->cond); ggml_cond_broadcast(&threadpool->cond);
@ -18905,7 +18905,7 @@ void ggml_pause_threadpool(struct ggml_compute_threadpool * threadpool) {
#ifndef GGML_USE_OPENMP #ifndef GGML_USE_OPENMP
ggml_mutex_lock(&threadpool->mutex); ggml_mutex_lock(&threadpool->mutex);
if (!threadpool->pause) { if (!threadpool->pause) {
__ggml_pause_threadpool(threadpool); ggml_pause_threadpool_locked(threadpool);
} }
ggml_mutex_unlock(&threadpool->mutex); ggml_mutex_unlock(&threadpool->mutex);
#else #else
@ -18917,7 +18917,7 @@ void ggml_resume_threadpool(struct ggml_compute_threadpool * threadpool) {
#ifndef GGML_USE_OPENMP #ifndef GGML_USE_OPENMP
ggml_mutex_lock(&threadpool->mutex); ggml_mutex_lock(&threadpool->mutex);
if (threadpool->pause) { if (threadpool->pause) {
__ggml_resume_threadpool(threadpool); ggml_resume_threadpool_locked(threadpool);
} }
ggml_mutex_unlock(&threadpool->mutex); ggml_mutex_unlock(&threadpool->mutex);
#else #else
@ -19238,7 +19238,7 @@ static void ggml_graph_compute_kickoff(struct ggml_compute_threadpool * threadpo
if (threadpool->pause) { if (threadpool->pause) {
// resume does cond broadcast // resume does cond broadcast
__ggml_resume_threadpool(threadpool); ggml_resume_threadpool_locked(threadpool);
} else { } else {
ggml_cond_broadcast(&threadpool->cond); ggml_cond_broadcast(&threadpool->cond);
} }