Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to latest llama.cpp breaking API changes #254

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

update to latest llama.cpp breaking API changes #254

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
231a797
update to latest llama.cpp breaking API changes
mudler Oct 6, 2023
948fdec
update
mudler Oct 7, 2023
1d2ac38
tests
mudler Oct 7, 2023
425d18a
try another Q
mudler Oct 7, 2023
aecb7e2
try pipoint older llama.cpp
mudler Oct 7, 2023
82f8b0c
try more recent version
mudler Oct 9, 2023
340020f
sync: more adaptations needed
mudler Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
sync: more adaptations needed 
Signed-off-by: mudler <mudler@localai.io>
  • Loading branch information
@mudler
mudler committed Oct 9, 2023
commit 340020f69f4777ae13eede1903487c22262d4eca
9 changes: 6 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@ llama.cpp/grammar-parser.o:
llama.cpp/ggml-alloc.o:
cd build && cp -rf CMakeFiles/ggml.dir/ggml-alloc.c.o ../llama.cpp/ggml-alloc.o

llama.cpp/ggml-backend.o:
cd build && cp -rf CMakeFiles/ggml.dir/ggml-backend.c.o ../llama.cpp/ggml-backend.o

llama.cpp/ggml.o: prepare
mkdir -p build
cd build && CC="$(CC)" CXX="$(CXX)" cmake ../llama.cpp $(CMAKE_ARGS) && VERBOSE=1 cmake --build . --config Release && cp -rf CMakeFiles/ggml.dir/ggml.c.o ../llama.cpp/ggml.o
Expand All @@ -228,7 +231,7 @@ llama.cpp/common.o:
cd build && cp -rf common/CMakeFiles/common.dir/common.cpp.o ../llama.cpp/common.o


binding.o: prepare llama.cpp/ggml.o llama.cpp/llama.o llama.cpp/common.o llama.cpp/grammar-parser.o llama.cpp/ggml-alloc.o
binding.o: prepare llama.cpp/ggml.o llama.cpp/llama.o llama.cpp/common.o llama.cpp/grammar-parser.o llama.cpp/ggml-backend.o llama.cpp/ggml-alloc.o
$(CXX) $(CXXFLAGS) -I./llama.cpp -I./llama.cpp/common binding.cpp -o binding.o -c $(LDFLAGS)

## https://github.com/ggerganov/llama.cpp/pull/1902
Expand All @@ -237,8 +240,8 @@ prepare:
patch -p1 < ../patches/1902-cuda.patch
touch $@

libbinding.a: prepare binding.o llama.cpp/k_quants.o llama.cpp/grammar-parser.o llama.cpp/ggml-alloc.o $(EXTRA_TARGETS)
ar src libbinding.a llama.cpp/ggml.o llama.cpp/k_quants.o $(EXTRA_TARGETS) llama.cpp/ggml-alloc.o llama.cpp/common.o llama.cpp/grammar-parser.o llama.cpp/llama.o binding.o
libbinding.a: prepare binding.o llama.cpp/k_quants.o llama.cpp/grammar-parser.o llama.cpp/ggml-alloc.o llama.cpp/ggml-backend.o $(EXTRA_TARGETS)
ar src libbinding.a llama.cpp/ggml.o llama.cpp/k_quants.o $(EXTRA_TARGETS) llama.cpp/ggml-alloc.o llama.cpp/ggml-backend.o llama.cpp/common.o llama.cpp/grammar-parser.o llama.cpp/llama.o binding.o

clean:
rm -rf *.o
Expand Down