Merge remote-tracking branch 'upstream/main' into pr3702

920a4b07 · Daniel Hiltgen · c496967e · ee49844d · 920a4b07 · 920a4b07
Commit 920a4b07 authored May 08, 2024 by Daniel Hiltgen
20 changed files
--- a/integration/llm_test.go
+++ b/integration/llm_test.go
--- a/integration/max_queue_test.go
+++ b/integration/max_queue_test.go
--- a/integration/utils_test.go
+++ b/integration/utils_test.go
--- a/llm/ext_server/server.cpp
+++ b/llm/ext_server/server.cpp
--- a/llm/filetype.go
+++ b/llm/filetype.go
--- a/llm/generate/gen_common.sh
+++ b/llm/generate/gen_common.sh
--- a/llm/generate/gen_linux.sh
+++ b/llm/generate/gen_linux.sh
--- a/llm/generate/gen_windows.ps1
+++ b/llm/generate/gen_windows.ps1
--- a/llm/ggml.go
+++ b/llm/ggml.go
--- a/llm/gguf.go
+++ b/llm/gguf.go
--- a/llama.cpp @ 952d03db
+++ b/llama.cpp @ 952d03db
-Subproject commit 7593639ce335e8d7f89aa9a54d616951f273af60
+Subproject commit 952d03dbead16e4dbdd1d3458486340673cc2465
--- a/llm/llm.go
+++ b/llm/llm.go
--- a/llm/llm_windows.go
+++ b/llm/llm_windows.go
@@ -2,5 +2,5 @@ package llm
 import "embed"
-//go:embed build/windows/*/*/bin/*
+// unused on windows
 var libEmbed embed.FS
--- a/llm/memory.go
+++ b/llm/memory.go
--- a/llm/patches/02-clip-log.diff
+++ b/llm/patches/02-clip-log.diff
--- a/llm/patches/04-metal.diff
+++ b/llm/patches/04-metal.diff
--- a/llm/patches/05-clip-fix.diff
+++ b/llm/patches/05-clip-fix.diff
--- a/llm/payload.go
+++ b/llm/payload.go
--- a/llm/server.go
+++ b/llm/server.go
--- a/macapp/src/app.tsx
+++ b/macapp/src/app.tsx