From 0035e31af87c6cc62cde5d6cd0f22d36131ff62e Mon Sep 17 00:00:00 2001
From: Daniel Hiltgen <daniel@ollama.com>
Date: Mon, 25 Mar 2024 06:04:17 -0700
Subject: [PATCH 1/2] Bump to b2581

---
 llm/llama.cpp              |  2 +-
 llm/patches/04-locale.diff | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 llm/patches/04-locale.diff

diff --git a/llm/llama.cpp b/llm/llama.cpp
index ad3a0505..37e7854c 160000
--- a/llm/llama.cpp
+++ b/llm/llama.cpp
@@ -1 +1 @@
-Subproject commit ad3a0505e3b6cd777259ee35e61d428357ffc565
+Subproject commit 37e7854c104301c5b5323ccc40e07699f3a62c3e
diff --git a/llm/patches/04-locale.diff b/llm/patches/04-locale.diff
deleted file mode 100644
index c01b2a2d..00000000
--- a/llm/patches/04-locale.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/llama.cpp b/llama.cpp
-index b27aa272..99372f9c 100644
---- a/llama.cpp
-+++ b/llama.cpp
-@@ -9360,7 +9360,7 @@ struct llm_tokenizer_wpm {
-     }
- 
-     uint32_t to_lower(uint32_t code) {
--        static const std::locale locale("en_US.UTF-8");
-+        static const std::locale locale("");
- #if defined(_WIN32)
-         if (code > 0xFFFF) {
-             return code;

From 841adda157209d6498d65a3d969b96f2fdd64300 Mon Sep 17 00:00:00 2001
From: Daniel Hiltgen <daniel@ollama.com>
Date: Tue, 2 Apr 2024 12:22:16 -0700
Subject: [PATCH 2/2] Fix windows lint CI flakiness

---
 .github/workflows/test.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 752c8ebf..cd5678e0 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -260,7 +260,9 @@ jobs:
           mkdir -p llm/build/windows/$ARCH/stub/stub/bin/
           touch llm/build/windows/$ARCH/stub/stub/bin/stub.dll
         if: ${{ startsWith(matrix.os, 'windows-') }}
-      - uses: golangci/golangci-lint-action@v3
+      - uses: golangci/golangci-lint-action@v4
+        with:
+          args: --timeout 8m0s
   test:
     strategy:
       matrix: