From 840b6ba66c098545a9c836a0bc048949df2ced87 Mon Sep 17 00:00:00 2001 From: Michael de Gans Date: Tue, 18 Jun 2024 14:53:54 -0700 Subject: [PATCH 1/5] un-ignore `build-info.cmake` and `build-info.sh` I am assuming that ignoring them was unintentional. If they are ignored, some tools, like cargo, will consider the files inexistent, even if they're comitted, for the purpose of publishing. This leads to the build failing in such cases. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 5296594952c4a..3c629d542bb95 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,8 @@ gcovr-report/ tags build* +!build-info.cmake +!build-info.sh !build.zig cmake-build-* android-ndk-* From 22eedc76772c7545c7ae555aaa5c1a8812c8dfa8 Mon Sep 17 00:00:00 2001 From: Michael de Gans Date: Tue, 18 Jun 2024 15:04:35 -0700 Subject: [PATCH 2/5] un-ignore `build-info.cpp.in` For the same reason as the previous two files. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3c629d542bb95..951f6105e5013 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ gcovr-report/ tags build* !build-info.cmake +!build-info.cpp.in !build-info.sh !build.zig cmake-build-* From 7f38c03f9b7546c4f2c50dda46dd167354a7a5ca Mon Sep 17 00:00:00 2001 From: Michael de Gans Date: Wed, 19 Jun 2024 12:06:29 -0700 Subject: [PATCH 3/5] Reorganize `.gitignore` * Add exceptions for files mentioned by @slaren I did leave .clang-tidy since it was explicitly ignored before. * Add comments for organization * Sort some lines for pretty * Test with `make` and `cmake` builds to ensure no build artifacts might be comitted --- .gitignore | 108 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 951f6105e5013..5de70d76707ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,93 +1,125 @@ -*.o +# Extensions + *.a -*.so -*.gguf -*.gguf.json +*.bat *.bin -*.exe *.dll -*.log -*.gcov -*.gcno -*.gcda *.dot -*.bat -*.tmp -*.metallib *.etag +*.exe +*.gcda +*.gcno +*.gcov +*.gguf +*.gguf.json *.lastModified -.DS_Store -.build/ +*.log +*.metallib +*.o +*.so +*.tmp + +# IDE / OS + .cache/ .ccls-cache/ +.clang-tidy .direnv/ +.DS_Store .envrc +.idea/ .swiftpm -.venv -.clang-tidy .vs/ .vscode/ -.idea/ +nppBackup -ggml-metal-embed.metal -lcov-report/ +# Coverage + gcovr-report/ +lcov-report/ + +# Build Artifacts tags +.build/ build* !build-info.cmake !build-info.cpp.in !build-info.sh !build.zig -cmake-build-* +/libllama.so +/llama-* android-ndk-* +arm_neon.h +cmake-build-* +CMakeSettings.json +compile_commands.json +ggml-metal-embed.metal +llama-batched-swift out/ tmp/ +# CI + +!.github/workflows/*.yml + +# Models + models/* models-mnt +!models/.editorconfig +!models/ggml-vocab-*.gguf* -/Pipfile -/libllama.so -/llama-* -llama-batched-swift -/common/build-info.cpp -arm_neon.h -compile_commands.json -CMakeSettings.json - -__pycache__ -dist +# Zig zig-out/ zig-cache/ +# Logs + ppl-*.txt qnt-*.txt perf-*.txt +# Examples + examples/jeopardy/results.txt +examples/server/*.css.hpp examples/server/*.html.hpp examples/server/*.js.hpp examples/server/*.mjs.hpp -examples/server/*.css.hpp +!build_64.sh +!examples/*.bat +!examples/*/*.kts +!examples/*/*/*.kts +!examples/sycl/*.bat +!examples/sycl/*.sh +!IDEWorkspaceChecks.plist + +# Python +__pycache__ +.venv +/Pipfile +dist poetry.lock poetry.toml -nppBackup # Test binaries -/tests/test-grammar-parser -/tests/test-llama-grammar +/tests/test-backend-ops /tests/test-double-float /tests/test-grad0 +/tests/test-grammar-parser +/tests/test-llama-grammar /tests/test-opt /tests/test-quantize-fns /tests/test-quantize-perf +/tests/test-rope /tests/test-sampling /tests/test-tokenizer-0 -/tests/test-tokenizer-1-spm /tests/test-tokenizer-1-bpe -/tests/test-rope -/tests/test-backend-ops +/tests/test-tokenizer-1-spm + +# Scripts +!/scripts/install-oneapi.bat From 35f2a4609091c278dc8f0d4ad9a9ca09c9b60a91 Mon Sep 17 00:00:00 2001 From: Michael de Gans Date: Wed, 19 Jun 2024 12:26:39 -0700 Subject: [PATCH 4/5] Remove `.clang-tidy` from `.gitignore` Per comment by @ggerganov --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5de70d76707ca..bf2de8aeb1efe 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,6 @@ .cache/ .ccls-cache/ -.clang-tidy .direnv/ .DS_Store .envrc From 80d447994d98828d3953366a505dd74f3cee32e6 Mon Sep 17 00:00:00 2001 From: Michael de Gans Date: Wed, 19 Jun 2024 12:47:28 -0700 Subject: [PATCH 5/5] Remove `IDEWorkspaceChecks.plist` from root-level `.gitignore` --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index bf2de8aeb1efe..a0c16e880b719 100644 --- a/.gitignore +++ b/.gitignore @@ -94,7 +94,6 @@ examples/server/*.mjs.hpp !examples/*/*/*.kts !examples/sycl/*.bat !examples/sycl/*.sh -!IDEWorkspaceChecks.plist # Python