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

try fix windows compile error: atomic_flag

Browse source
This commit is contained in:
mqy 2023-04-17 18:20:54 +08:00
parent cba49ad48b
commit f57ff961fd
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ggml.c
View file

@ -32,6 +32,7 @@
typedef volatile LONG atomic_int; typedef volatile LONG atomic_int;
typedef atomic_int atomic_bool; typedef atomic_int atomic_bool;
typedef atomic_int atomic_flag;
static inline void atomic_store(atomic_int* ptr, LONG val) { static inline void atomic_store(atomic_int* ptr, LONG val) {
InterlockedExchange(ptr, val); InterlockedExchange(ptr, val);
@ -46,11 +47,11 @@ static inline LONG atomic_fetch_sub(atomic_int* ptr, LONG dec) {
return atomic_fetch_add(ptr, -(dec)); return atomic_fetch_add(ptr, -(dec));
} }
static inline LONG atomic_flag_test_and_set(atomic_int* ptr) { static inline LONG atomic_flag_test_and_set(atomic_flag* ptr) {
return InterlockedCompareExchange(ptr, 1, 0); return InterlockedCompareExchange(ptr, 1, 0);
} }
static inline LONG atomic_flag_test_clear(atomic_int* ptr) { static inline LONG atomic_flag_test_clear(atomic_flag* ptr) {
return InterlockedExchange(ptr, 0) return InterlockedExchange(ptr, 0)
} }
@ -10271,7 +10272,6 @@ void ggml_graph_compute(struct ggml_context * ctx, struct ggml_cgraph * cgraph)
} }
} }
#ifdef GGML_GLOBAL_THREADS #ifdef GGML_GLOBAL_THREADS
// wakeup threads. // wakeup threads.
pthread_mutex_lock(&state_shared->mutex); pthread_mutex_lock(&state_shared->mutex);