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

Merge branch 'master' into concedo_experimental

Browse source
This commit is contained in:
Concedo 2023-05-10 18:35:53 +08:00
commit 19dbb3b2a5
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
examples/common.cpp
View file

@ -520,8 +520,9 @@ void console_init(console_state & con_st) {
if (con_st.tty != nullptr) {
con_st.out = con_st.tty;
}
#endif
setlocale(LC_ALL, "");
#endif
}
void console_cleanup(console_state & con_st) {

4
ggml.c
View file

@ -11890,7 +11890,11 @@ typedef int ggml_lock_t;
#define ggml_lock_init(x) UNUSED(x)
#define ggml_lock_destroy(x) UNUSED(x)
#if defined(__x86_64__) || (defined(_MSC_VER) && defined(_M_AMD64))
#define ggml_lock_lock(x) _mm_pause()
#else
#define ggml_lock_lock(x) UNUSED(x)
#endif
#define ggml_lock_unlock(x) UNUSED(x)
#define GGML_LOCK_INITIALIZER 0