fix: add patches

mybigday · Jan 25, 2025 · 8e22f9b · 8e22f9b
1 parent 17ecfd3
commit 8e22f9b
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 12 deletions.
diff --git a/cpp/chat-template.hpp b/cpp/chat-template.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "minja.hpp"
-#include <json.hpp>
+#include "json.hpp"
 #include <string>
 #include <vector>
 

diff --git a/cpp/minja.hpp b/cpp/minja.hpp
@@ -16,7 +16,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <unordered_set>
-#include <json.hpp>
+#include "json.hpp"
 
 using json = nlohmann::ordered_json;
 

diff --git a/example/ios/.xcode.env.local b/example/ios/.xcode.env.local
@@ -1 +1 @@
-export NODE_BINARY=/var/folders/4z/1d45cfts3936kdm7v9jl349r0000gn/T/yarn--1737787553955-0.8188421900057399/node
+export NODE_BINARY=/var/folders/4z/1d45cfts3936kdm7v9jl349r0000gn/T/yarn--1737801432926-0.7078017911215826/node
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1270,7 +1270,7 @@ SPEC CHECKSUMS:
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   hermes-engine: 10fbd3f62405c41ea07e71973ea61e1878d07322
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  llama-rn: d53a6d8cc2f432695c69fb5e40531e58484a83ea
+  llama-rn: 5def0bccde9a291f760b6091d93f193083455c99
   RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
   RCTRequired: a2faf4bad4e438ca37b2040cb8f7799baa065c18
   RCTTypeSafety: cb09f3e4747b6d18331a15eb05271de7441ca0b3

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -220,14 +220,17 @@ echo "Replacement completed successfully!"
 yarn example
 
 # Apply patch
-patch -p0 -d ./cpp < ./scripts/common.h.patch
-patch -p0 -d ./cpp < ./scripts/common.cpp.patch
-patch -p0 -d ./cpp < ./scripts/log.cpp.patch
-patch -p0 -d ./cpp < ./scripts/ggml-metal.m.patch
-patch -p0 -d ./cpp < ./scripts/ggml-backend-reg.cpp.patch
-patch -p0 -d ./cpp < ./scripts/ggml.c.patch
-patch -p0 -d ./cpp < ./scripts/ggml-quants.c.patch
-patch -p0 -d ./cpp < ./scripts/llama-mmap.cpp.patch
+patch -p0 -d ./cpp < ./scripts/patches/common.h.patch
+patch -p0 -d ./cpp < ./scripts/patches/common.cpp.patch
+patch -p0 -d ./cpp < ./scripts/patches/log.cpp.patch
+patch -p0 -d ./cpp < ./scripts/patches/ggml-metal.m.patch
+patch -p0 -d ./cpp < ./scripts/patches/ggml-backend-reg.cpp.patch
+patch -p0 -d ./cpp < ./scripts/patches/ggml.c.patch
+patch -p0 -d ./cpp < ./scripts/patches/ggml-quants.c.patch
+patch -p0 -d ./cpp < ./scripts/patches/llama-mmap.cpp.patch
+patch -p0 -d ./cpp < ./scripts/patches/chat-template.hpp.patch
+patch -p0 -d ./cpp < ./scripts/patches/minja.hpp.patch
+rm -rf ./cpp/*.orig
 
 if [ "$OS" = "Darwin" ]; then
   # Build metallib (~2.6MB)

diff --git a/scripts/patches/chat-template.hpp.patch b/scripts/patches/chat-template.hpp.patch
@@ -0,0 +1,11 @@
+--- chat-template.hpp.orig	2025-01-25 18:28:48
++++ chat-template.hpp	2025-01-25 18:29:02
+@@ -9,7 +9,7 @@
+ #pragma once
+
+ #include "minja.hpp"
+-#include <json.hpp>
++#include "json.hpp"
+ #include <string>
+ #include <vector>
+
diff --git a/scripts/common.cpp.patch → scripts/patches/common.cpp.patch b/scripts/common.cpp.patch → scripts/patches/common.cpp.patch
diff --git a/scripts/common.h.patch → scripts/patches/common.h.patch b/scripts/common.h.patch → scripts/patches/common.h.patch
diff --git a/scripts/ggml-backend-reg.cpp.patch → scripts/patches/ggml-backend-reg.cpp.patch b/scripts/ggml-backend-reg.cpp.patch → scripts/patches/ggml-backend-reg.cpp.patch
diff --git a/scripts/ggml-metal.m.patch → scripts/patches/ggml-metal.m.patch b/scripts/ggml-metal.m.patch → scripts/patches/ggml-metal.m.patch
diff --git a/scripts/ggml-quants.c.patch → scripts/patches/ggml-quants.c.patch b/scripts/ggml-quants.c.patch → scripts/patches/ggml-quants.c.patch
diff --git a/scripts/ggml.c.patch → scripts/patches/ggml.c.patch b/scripts/ggml.c.patch → scripts/patches/ggml.c.patch
diff --git a/scripts/llama-mmap.cpp.patch → scripts/patches/llama-mmap.cpp.patch b/scripts/llama-mmap.cpp.patch → scripts/patches/llama-mmap.cpp.patch
diff --git a/scripts/log.cpp.patch → scripts/patches/log.cpp.patch b/scripts/log.cpp.patch → scripts/patches/log.cpp.patch
diff --git a/scripts/patches/minja.hpp.patch b/scripts/patches/minja.hpp.patch
@@ -0,0 +1,11 @@
+--- minja.hpp.orig	2025-01-25 18:29:13
++++ minja.hpp	2025-01-25 18:29:25
+@@ -16,7 +16,7 @@
+ #include <stdexcept>
+ #include <sstream>
+ #include <unordered_set>
+-#include <json.hpp>
++#include "json.hpp"
+
+ using json = nlohmann::ordered_json;
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export NODE_BINARY=/var/folders/4z/1d45cfts3936kdm7v9jl349r0000gn/T/yarn--1737787553955-0.8188421900057399/node
		export NODE_BINARY=/var/folders/4z/1d45cfts3936kdm7v9jl349r0000gn/T/yarn--1737801432926-0.7078017911215826/node