Skip to content

Commit ff6293c

Browse files
cebtenzzremounta11n
authored andcommitted
build : fix build info generation and cleanup Makefile (ggml-org#3920)
* cmake : fix joining of REAL_GIT_DIR * fix includes with help from include-what-you-use * make : remove unneeded deps and add test-rope target * fix C includes in C++ source files * Revert "fix includes with help from include-what-you-use" This reverts commit 635e9fa.
1 parent c2ebb38 commit ff6293c

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

.gitignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ poetry.lock
8989
poetry.toml
9090

9191
# Test binaries
92+
<<<<<<< HEAD
9293
tests/test-grammar-parser
9394
tests/test-llama-grammar
9495
tests/test-double-float
@@ -109,3 +110,18 @@ _.DS_Store
109110
workspace
110111
workspace/*
111112
examples/server/llama-OAI.sh
113+
=======
114+
/tests/test-grammar-parser
115+
/tests/test-llama-grammar
116+
/tests/test-double-float
117+
/tests/test-grad0
118+
/tests/test-opt
119+
/tests/test-quantize-fns
120+
/tests/test-quantize-perf
121+
/tests/test-sampling
122+
/tests/test-tokenizer-0-llama
123+
/tests/test-tokenizer-0-falcon
124+
/tests/test-tokenizer-1-llama
125+
/tests/test-tokenizer-1-bpe
126+
/tests/test-rope
127+
>>>>>>> 15f5d96 (build : fix build info generation and cleanup Makefile (#3920))

0 commit comments

Comments
 (0)