Update llama.cpp submodule to latest release b3567 (#184)

* Update submodule to latest release b3567 * fix: increase timeout for CIs --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: vansangpfiev <[email protected]>
janhq · Aug 13, 2024 · a66f0b4 · a66f0b4
1 parent 26f7b83
commit a66f0b4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ jobs:
   build-and-test:
     runs-on: ${{ matrix.runs-on }}
     needs: [create-draft-release]
-    timeout-minutes: 60
+    timeout-minutes: 90
     strategy:
       fail-fast: false
       matrix:
@@ -192,7 +192,7 @@ jobs:
           - os: "windows"
             name: "amd64-noavx"
             runs-on: "windows-2019"
-            cmake-flags: "-DCORTEXLLAMA_VERSION=${{github.event.pull_request.head.sha}} -DBUILD_SHARED_LIBS=OFF -DGGML_AVX=OFF -DGGML_AVX2=OFF -DGGML_FMA=OFF -DGGML_NATIVE=OFF -DCMAKE_BUILD_TYPE='Release' -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -GNinja"
+            cmake-flags: "-DCORTEXLLAMA_VERSION=${{needs.create-draft-release.outputs.version}} -DBUILD_SHARED_LIBS=OFF -DGGML_AVX=OFF -DGGML_AVX2=OFF -DGGML_FMA=OFF -DGGML_NATIVE=OFF -DCMAKE_BUILD_TYPE='Release' -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -GNinja"
             run-e2e: false
             vulkan: false
             sccache: false

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -57,7 +57,7 @@ jobs:
   build-and-test:
     runs-on: ${{ matrix.runs-on }}
     needs: [create-draft-release]
-    timeout-minutes: 60
+    timeout-minutes: 90
     strategy:
       matrix:
         include:
@@ -192,7 +192,7 @@ jobs:
           - os: "windows"
             name: "amd64-noavx"
             runs-on: "windows-2019"
-            cmake-flags: "-DCORTEXLLAMA_VERSION=${{github.event.pull_request.head.sha}} -DBUILD_SHARED_LIBS=OFF -DGGML_AVX=OFF -DGGML_AVX2=OFF -DGGML_FMA=OFF -DGGML_NATIVE=OFF -DCMAKE_BUILD_TYPE='Release' -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -GNinja"
+            cmake-flags: "-DCORTEXLLAMA_VERSION=${{needs.create-draft-release.outputs.version}} -DBUILD_SHARED_LIBS=OFF -DGGML_AVX=OFF -DGGML_AVX2=OFF -DGGML_FMA=OFF -DGGML_NATIVE=OFF -DCMAKE_BUILD_TYPE='Release' -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -GNinja"
             run-e2e: false
             vulkan: false
             sccache: false

diff --git a/.github/workflows/template-quality-gate-pr.yml b/.github/workflows/template-quality-gate-pr.yml
@@ -23,7 +23,7 @@ jobs:
   build-and-test:
     runs-on: ${{ matrix.runs-on }}
     if: ${{ ! startsWith(github.head_ref, 'update-submodule') }}
-    timeout-minutes: 60
+    timeout-minutes: 90
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/template-quality-gate-submodule.yml b/.github/workflows/template-quality-gate-submodule.yml
@@ -23,7 +23,7 @@ jobs:
   build-and-test:
     runs-on: ${{ matrix.runs-on }}
     if: startsWith(github.head_ref, 'update-submodule')
-    timeout-minutes: 60
+    timeout-minutes: 90
     strategy:
       fail-fast: false
       matrix:

diff --git a/llama.cpp b/llama.cpp
+0 −1		.gitignore
+23 −15		Makefile
+14 −1		common/common.cpp
+2 −0		common/common.h
+184 −54		convert_hf_to_gguf.py
+4 −4		examples/embedding/README.md
+98 −42		examples/embedding/embedding.cpp
+0 −14		examples/export-lora/export-lora.cpp
+7 −0		examples/llava/CMakeLists.txt
+99 −0		examples/llava/README-minicpmv2.5.md
+551 −78		examples/llava/clip.cpp
+11 −2		examples/llava/clip.h
+72 −3		examples/llava/llava.cpp
+2 −3		examples/llava/llava.h
+309 −0		examples/llava/minicpmv-cli.cpp
+382 −0		examples/llava/minicpmv-convert-image-encoder-to-gguf.py
+47 −0		examples/llava/minicpmv-surgery.py
+1 −0		examples/llava/requirements.txt
+4 −0		examples/rpc/README.md
+12 −1		examples/rpc/rpc-server.cpp
+2 −0		examples/server/server.cpp
+2 −0		ggml/include/ggml-metal.h
+2 −0		ggml/src/ggml-aarch64.c
+52 −17		ggml/src/ggml-metal.m
+35 −1		ggml/src/ggml-rpc.cpp
+35 −32		ggml/src/ggml-vulkan.cpp
+5 −1		ggml/src/ggml.c
+0 −1		gguf-py/examples/writer.py
+27 −1		gguf-py/gguf/constants.py
+2 −0		gguf-py/gguf/lazy.py
+163 −71		gguf-py/gguf/quants.py
+3 −0		include/llama.h
+13 −6		scripts/sync-ggml-am.sh
+1 −1		scripts/sync-ggml.last
+3 −0		scripts/sync-ggml.sh
+15 −0		src/llama-impl.h
+0 −14		src/llama-vocab.cpp
+442 −268		src/llama.cpp