Skip to content
This repository was archived by the owner on Jul 4, 2025. It is now read-only.

Commit 045c8e7

Browse files
jan-service-accountgithub-actions[bot]sangjanai
authored
Update llama.cpp submodule to latest release b5359 (#481)
* Update submodule to latest release b5359 * fix: build --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: sangjanai <sang@jan.ai>
1 parent 4d82f2e commit 045c8e7

File tree

7 files changed

+42
-42
lines changed

7 files changed

+42
-42
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ jobs:
6262
fail-fast: false
6363
matrix:
6464
include:
65-
- os: "linux"
66-
name: "arm64"
67-
runs-on: "ubuntu-2004-arm64"
68-
cmake-flags: "-DCORTEXLLAMA_VERSION=${{needs.create-draft-release.outputs.version}} -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_COMMON=ON -DLLAMA_CURL=OFF -DGGML_NATIVE=OFF -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
69-
run-e2e: true
70-
vulkan: false
71-
ccache: true
72-
ccache-dir: "/home/runner/.ccache"
65+
# - os: "linux"
66+
# name: "arm64"
67+
# runs-on: "ubuntu-2004-arm64"
68+
# cmake-flags: "-DCORTEXLLAMA_VERSION=${{needs.create-draft-release.outputs.version}} -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_COMMON=ON -DLLAMA_CURL=OFF -DGGML_NATIVE=OFF -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
69+
# run-e2e: true
70+
# vulkan: false
71+
# ccache: true
72+
# ccache-dir: "/home/runner/.ccache"
7373
- os: "linux"
7474
name: "amd64-avx2"
7575
runs-on: "ubuntu-20-04"

.github/workflows/nightly-build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ jobs:
6161
strategy:
6262
matrix:
6363
include:
64-
- os: "linux"
65-
name: "arm64"
66-
runs-on: "ubuntu-2004-arm64"
67-
cmake-flags: "-DCORTEXLLAMA_VERSION=${{needs.create-draft-release.outputs.version}} -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_COMMON=ON -DGGML_NATIVE=OFF -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
68-
run-e2e: true
69-
vulkan: false
70-
ccache: true
71-
ccache-dir: "/home/runner/.ccache"
64+
# - os: "linux"
65+
# name: "arm64"
66+
# runs-on: "ubuntu-2004-arm64"
67+
# cmake-flags: "-DCORTEXLLAMA_VERSION=${{needs.create-draft-release.outputs.version}} -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_COMMON=ON -DGGML_NATIVE=OFF -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
68+
# run-e2e: true
69+
# vulkan: false
70+
# ccache: true
71+
# ccache-dir: "/home/runner/.ccache"
7272
- os: "linux"
7373
name: "amd64-avx2"
7474
runs-on: "ubuntu-20-04"

.github/workflows/template-e2e-weekend-test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
include:
33-
- os: "linux"
34-
name: "arm64"
35-
runs-on: "ubuntu-2004-arm64"
36-
cmake-flags: "-DCORTEXLLAMA_VERSION=${{github.event.pull_request.head.sha}} -DGGML_NATIVE=OFF -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_COMMON=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
37-
run-e2e: true
38-
vulkan: false
39-
ccache: true
40-
ccache-dir: "/home/runner/.ccache"
33+
# - os: "linux"
34+
# name: "arm64"
35+
# runs-on: "ubuntu-2004-arm64"
36+
# cmake-flags: "-DCORTEXLLAMA_VERSION=${{github.event.pull_request.head.sha}} -DGGML_NATIVE=OFF -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_COMMON=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
37+
# run-e2e: true
38+
# vulkan: false
39+
# ccache: true
40+
# ccache-dir: "/home/runner/.ccache"
4141
- os: "linux"
4242
name: "amd64-avx2"
4343
runs-on: "ubuntu-20-04"

.github/workflows/template-quality-gate-pr.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- os: "linux"
32-
name: "arm64"
33-
runs-on: "ubuntu-2004-arm64"
34-
cmake-flags: "-DCORTEXLLAMA_VERSION=${{github.event.pull_request.head.sha}} -DLLAMA_CURL=OFF -DGGML_NATIVE=OFF -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_COMMON=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
35-
run-e2e: true
36-
vulkan: false
37-
ccache: true
38-
ccache-dir: "/home/runner/.ccache"
31+
# - os: "linux"
32+
# name: "arm64"
33+
# runs-on: "ubuntu-2004-arm64"
34+
# cmake-flags: "-DCORTEXLLAMA_VERSION=${{github.event.pull_request.head.sha}} -DLLAMA_CURL=OFF -DGGML_NATIVE=OFF -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_COMMON=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
35+
# run-e2e: true
36+
# vulkan: false
37+
# ccache: true
38+
# ccache-dir: "/home/runner/.ccache"
3939
- os: "linux"
4040
name: "amd64-avx2"
4141
runs-on: "ubuntu-20-04"

.github/workflows/template-quality-gate-submodule.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- os: "linux"
32-
name: "arm64"
33-
runs-on: "ubuntu-2004-arm64"
34-
cmake-flags: "-DCORTEXLLAMA_VERSION=${{github.event.pull_request.head.sha}} -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_COMMON=ON -DLLAMA_CURL=OFF -DGGML_NATIVE=OFF -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
35-
run-e2e: true
36-
vulkan: false
37-
ccache: true
38-
ccache-dir: "/home/runner/.ccache"
31+
# - os: "linux"
32+
# name: "arm64"
33+
# runs-on: "ubuntu-2004-arm64"
34+
# cmake-flags: "-DCORTEXLLAMA_VERSION=${{github.event.pull_request.head.sha}} -DBUILD_SHARED_LIBS=OFF -DLLAMA_BUILD_COMMON=ON -DLLAMA_CURL=OFF -DGGML_NATIVE=OFF -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE='Release' -GNinja"
35+
# run-e2e: true
36+
# vulkan: false
37+
# ccache: true
38+
# ccache-dir: "/home/runner/.ccache"
3939
- os: "linux"
4040
name: "amd64-avx2"
4141
runs-on: "ubuntu-20-04"

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if(CORTEXLLAMA_VERSION)
2727
add_compile_definitions(CORTEXLLAMA_VERSION="${CORTEXLLAMA_VERSION}")
2828
endif()
2929

30-
add_subdirectory(llama.cpp/examples/llava)
30+
add_subdirectory(llama.cpp/tools/mtmd)
3131
add_subdirectory(llama.cpp)
3232

3333
add_library(${TARGET} SHARED

llama.cpp

Submodule llama.cpp updated 392 files

0 commit comments

Comments
 (0)