1
0
Эх сурвалжийг харах

un-ignore `build-info.cmake` and `build-info.sh` (#7996)

* 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.

* un-ignore `build-info.cpp.in`

For the same reason as the previous two files.

* 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

* Remove `.clang-tidy` from `.gitignore`

Per comment by @ggerganov

* Remove `IDEWorkspaceChecks.plist` from root-level `.gitignore`
Michael de Gans 1 жил өмнө
parent
commit
a7854743c5
1 өөрчлөгдсөн 71 нэмэгдсэн , 38 устгасан
  1. 71 38
      .gitignore

+ 71 - 38
.gitignore

@@ -1,90 +1,123 @@
-*.o
+# Extensions
+
 *.a
 *.a
-*.so
-*.gguf
-*.gguf.json
+*.bat
 *.bin
 *.bin
-*.exe
 *.dll
 *.dll
-*.log
-*.gcov
-*.gcno
-*.gcda
 *.dot
 *.dot
-*.bat
-*.tmp
-*.metallib
 *.etag
 *.etag
+*.exe
+*.gcda
+*.gcno
+*.gcov
+*.gguf
+*.gguf.json
 *.lastModified
 *.lastModified
-.DS_Store
-.build/
+*.log
+*.metallib
+*.o
+*.so
+*.tmp
+
+# IDE / OS
+
 .cache/
 .cache/
 .ccls-cache/
 .ccls-cache/
 .direnv/
 .direnv/
+.DS_Store
 .envrc
 .envrc
+.idea/
 .swiftpm
 .swiftpm
-.venv
-.clang-tidy
 .vs/
 .vs/
 .vscode/
 .vscode/
-.idea/
+nppBackup
 
 
-ggml-metal-embed.metal
 
 
-lcov-report/
+# Coverage
+
 gcovr-report/
 gcovr-report/
+lcov-report/
+
+# Build Artifacts
 
 
 tags
 tags
+.build/
 build*
 build*
+!build-info.cmake
+!build-info.cpp.in
+!build-info.sh
 !build.zig
 !build.zig
-cmake-build-*
+/libllama.so
+/llama-*
 android-ndk-*
 android-ndk-*
+arm_neon.h
+cmake-build-*
+CMakeSettings.json
+compile_commands.json
+ggml-metal-embed.metal
+llama-batched-swift
 out/
 out/
 tmp/
 tmp/
 
 
+# CI
+
+!.github/workflows/*.yml
+
+# Models
+
 models/*
 models/*
 models-mnt
 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-out/
 zig-cache/
 zig-cache/
 
 
+# Logs
+
 ppl-*.txt
 ppl-*.txt
 qnt-*.txt
 qnt-*.txt
 perf-*.txt
 perf-*.txt
 
 
+# Examples
+
 examples/jeopardy/results.txt
 examples/jeopardy/results.txt
+examples/server/*.css.hpp
 examples/server/*.html.hpp
 examples/server/*.html.hpp
 examples/server/*.js.hpp
 examples/server/*.js.hpp
 examples/server/*.mjs.hpp
 examples/server/*.mjs.hpp
-examples/server/*.css.hpp
+!build_64.sh
+!examples/*.bat
+!examples/*/*.kts
+!examples/*/*/*.kts
+!examples/sycl/*.bat
+!examples/sycl/*.sh
 
 
+# Python
+
+__pycache__
+.venv
+/Pipfile
+dist
 poetry.lock
 poetry.lock
 poetry.toml
 poetry.toml
-nppBackup
 
 
 # Test binaries
 # Test binaries
-/tests/test-grammar-parser
-/tests/test-llama-grammar
+/tests/test-backend-ops
 /tests/test-double-float
 /tests/test-double-float
 /tests/test-grad0
 /tests/test-grad0
+/tests/test-grammar-parser
+/tests/test-llama-grammar
 /tests/test-opt
 /tests/test-opt
 /tests/test-quantize-fns
 /tests/test-quantize-fns
 /tests/test-quantize-perf
 /tests/test-quantize-perf
+/tests/test-rope
 /tests/test-sampling
 /tests/test-sampling
 /tests/test-tokenizer-0
 /tests/test-tokenizer-0
-/tests/test-tokenizer-1-spm
 /tests/test-tokenizer-1-bpe
 /tests/test-tokenizer-1-bpe
-/tests/test-rope
-/tests/test-backend-ops
+/tests/test-tokenizer-1-spm
+
+# Scripts
+!/scripts/install-oneapi.bat