Merge branch 'master' into concedo_experimental

# Conflicts:
#	.gitignore
#	Makefile
#	ggml-opencl.cpp
#	llama.cpp
This commit is contained in:
Concedo 2023-06-29 17:35:28 +08:00
commit dff5575647
19 changed files with 923 additions and 244 deletions

3
ggml.c
View file

@ -16684,7 +16684,8 @@ typedef pthread_t ggml_thread_t;
#endif
#ifdef __linux__
// Android's libc implementation "bionic" does not support setting affinity
#if defined(__linux__) && !defined(__BIONIC__)
void set_numa_thread_affinity(int thread_n, int n_threads) {
if (!ggml_is_numa()) {
return;