Merge pull request #343 from janhq/pump-version-and-hotfix

feat: minor fix for more correct condition
janhq · Jan 12, 2024 · f643013 · f643013
2 parents aa39a27 + ac73a76
commit f643013
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controllers/llamaCPP.h b/controllers/llamaCPP.h
@@ -1546,7 +1546,7 @@ struct llama_server_context {
       std::unique_lock<std::mutex> lock(mutex_tasks);
       condition_tasks.wait(lock, [&] {
         return (!queue_tasks.empty() && model_loaded_external) ||
-               (!model_loaded_external);
+               (queue_tasks.empty() && !model_loaded_external);
       });
     }
 

diff --git a/llama.cpp b/llama.cpp
+1 −1		.github/workflows/nix-flake-update.yml
+4 −1		Makefile
+1 −1		Package.swift
+1 −0		README.md
+8 −0		common/common.cpp
+1 −1		common/common.h
+675 −312		convert.py
+1 −0		examples/CMakeLists.txt
+5 −0		examples/imatrix/CMakeLists.txt
+380 −0		examples/imatrix/imatrix.cpp
+24 −38		examples/llava/clip.cpp
+3 −0		examples/llava/llava-cli.cpp
+5 −1		examples/main/main.cpp
+1 −0		examples/quantize/quantize.cpp
+40 −25		examples/server/README.md
+174 −107		examples/server/server.cpp
+228 −6		ggml-cuda.cu
+44 −6		ggml-metal.m
+382 −12		ggml-metal.metal
+351 −9		ggml-quants.c
+12 −0		ggml-quants.h
+51 −25		ggml.c
+11 −11		ggml.h
+29 −11		llama.cpp
+2 −0		llama.h
+356 −0		scripts/compare-llama-bench.py
+70 −0		scripts/get-pg.sh
+1 −1		scripts/sync-ggml.last
+0 −1		spm-headers/ggml.h
+3 −2		tests/test-quantize-fns.cpp