Merge branch 'ollama:main' into main

abdulrahman305 · Dec 20, 2024 · 0be69f1 · 0be69f1
2 parents 8f315a1 + 290cf20
commit 0be69f1
Show file tree

Hide file tree

Showing 467 changed files with 67,919 additions and 59,917 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,9 +3,7 @@ ollama
 app
 macapp
 dist
-llm/llama.cpp
 .env
 .cache
 test_data
-llm/build
 llama/build
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,3 @@
-llm/ext_server/* linguist-vendored
 llama/**/*.cpp linguist-vendored
 llama/**/*.hpp linguist-vendored
 llama/**/*.h linguist-vendored

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
diff --git a/.gitignore b/.gitignore
@@ -10,9 +10,6 @@ ollama
 .idea
 test_data
 *.crt
-llm/build
-build/*/*/*
-!build/**/placeholder
 llama/build
 __debug_bin*
 llama/vendor
diff --git a/.gitmodules b/.gitmodules
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -8,8 +8,6 @@ linters:
     - containedctx
     - contextcheck
     - errcheck
-    - exportloopref
-    - gci
     - gocheckcompilerdirectives
     - gofmt
     - gofumpt
@@ -30,8 +28,6 @@ linters:
     - wastedassign
     - whitespace
 linters-settings:
-  gci:
-    sections: [standard, default, localmodule]
   staticcheck:
     checks:
       - all