Skip to content

Commit f192287

Browse files
vansangpfievsangjanai
vansangpfiev
and
sangjanai
authored
fix: remove jinja parameter (#2205)
* fix: remove jinja parameter * chore: disable linux arm CI --------- Co-authored-by: sangjanai <[email protected]>
1 parent 3d74607 commit f192287

File tree

5 files changed

+55
-56
lines changed

5 files changed

+55
-56
lines changed

‎.github/workflows/beta-build.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,20 @@ jobs:
8181
llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }}
8282
arch: amd64
8383

84-
build-linux-arm64:
85-
uses: ./.github/workflows/template-build-linux.yml
86-
secrets: inherit
87-
needs: [get-update-version, create-draft-release, get-llamacpp-latest-version]
88-
with:
89-
ref: ${{ github.ref }}
90-
public_provider: github
91-
new_version: ${{ needs.get-update-version.outputs.new_version }}
92-
runs-on: ubuntu-2004-arm64
93-
cmake-flags: "-DCORTEX_VARIANT=beta -DCORTEX_CPP_VERSION='v${{ needs.get-update-version.outputs.new_version }}' -DCMAKE_TOOLCHAIN_FILE=/home/runner/actions-runner/_work/cortex.cpp/cortex.cpp/engine/vcpkg/scripts/buildsystems/vcpkg.cmake"
94-
channel: beta
95-
upload_url: ${{ needs.create-draft-release.outputs.upload_url }}
96-
llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }}
97-
arch: arm64
84+
# build-linux-arm64:
85+
# uses: ./.github/workflows/template-build-linux.yml
86+
# secrets: inherit
87+
# needs: [get-update-version, create-draft-release, get-llamacpp-latest-version]
88+
# with:
89+
# ref: ${{ github.ref }}
90+
# public_provider: github
91+
# new_version: ${{ needs.get-update-version.outputs.new_version }}
92+
# runs-on: ubuntu-2004-arm64
93+
# cmake-flags: "-DCORTEX_VARIANT=beta -DCORTEX_CPP_VERSION='v${{ needs.get-update-version.outputs.new_version }}' -DCMAKE_TOOLCHAIN_FILE=/home/runner/actions-runner/_work/cortex.cpp/cortex.cpp/engine/vcpkg/scripts/buildsystems/vcpkg.cmake"
94+
# channel: beta
95+
# upload_url: ${{ needs.create-draft-release.outputs.upload_url }}
96+
# llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }}
97+
# arch: arm64
9898

9999
build-docker-x64:
100100
uses: ./.github/workflows/template-build-docker-x64.yml
@@ -127,7 +127,7 @@ jobs:
127127
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
128128

129129
noti-discord:
130-
needs: [get-update-version, create-draft-release, build-macos, build-windows-x64, build-linux-x64, build-linux-arm64, update_release]
130+
needs: [get-update-version, create-draft-release, build-macos, build-windows-x64, build-linux-x64, update_release]
131131
runs-on: ubuntu-latest
132132
permissions:
133133
contents: write

‎.github/workflows/cortex-cpp-quality-gate.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
include:
24-
- os: "linux"
25-
name: "arm64"
26-
runs-on: "ubuntu-2004-arm64"
27-
cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
28-
build-deps-cmake-flags: ""
29-
ccache-dir: ""
24+
# - os: "linux"
25+
# name: "arm64"
26+
# runs-on: "ubuntu-2004-arm64"
27+
# cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
28+
# build-deps-cmake-flags: ""
29+
# ccache-dir: ""
3030
- os: "linux"
3131
name: "amd64"
3232
runs-on: "ubuntu-20-04-cuda-12-0"
@@ -354,12 +354,12 @@ jobs:
354354
fail-fast: false
355355
matrix:
356356
include:
357-
- os: "linux"
358-
name: "arm64"
359-
runs-on: "ubuntu-2004-arm64"
360-
cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
361-
build-deps-cmake-flags: ""
362-
ccache-dir: ""
357+
# - os: "linux"
358+
# name: "arm64"
359+
# runs-on: "ubuntu-2004-arm64"
360+
# cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
361+
# build-deps-cmake-flags: ""
362+
# ccache-dir: ""
363363
- os: "linux"
364364
name: "amd64"
365365
runs-on: "ubuntu-20-04-cuda-12-0"

‎.github/workflows/nightly-build.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,24 +87,24 @@ jobs:
8787
llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }}
8888
arch: amd64
8989

90-
build-linux-arm64:
91-
uses: ./.github/workflows/template-build-linux.yml
92-
secrets: inherit
93-
needs: [get-update-version, set-public-provider, get-llamacpp-latest-version]
94-
with:
95-
ref: ${{ needs.set-public-provider.outputs.ref }}
96-
public_provider: ${{ needs.set-public-provider.outputs.public_provider }}
97-
new_version: ${{ needs.get-update-version.outputs.new_version }}
98-
runs-on: ubuntu-2004-arm64
99-
cmake-flags: "-DCORTEX_VARIANT=nightly -DCORTEX_CPP_VERSION='v${{ needs.get-update-version.outputs.new_version }}' -DCMAKE_TOOLCHAIN_FILE=/home/runner/actions-runner/_work/cortex.cpp/cortex.cpp/engine/vcpkg/scripts/buildsystems/vcpkg.cmake"
100-
channel: nightly
101-
llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }}
102-
arch: arm64
90+
# build-linux-arm64:
91+
# uses: ./.github/workflows/template-build-linux.yml
92+
# secrets: inherit
93+
# needs: [get-update-version, set-public-provider, get-llamacpp-latest-version]
94+
# with:
95+
# ref: ${{ needs.set-public-provider.outputs.ref }}
96+
# public_provider: ${{ needs.set-public-provider.outputs.public_provider }}
97+
# new_version: ${{ needs.get-update-version.outputs.new_version }}
98+
# runs-on: ubuntu-2004-arm64
99+
# cmake-flags: "-DCORTEX_VARIANT=nightly -DCORTEX_CPP_VERSION='v${{ needs.get-update-version.outputs.new_version }}' -DCMAKE_TOOLCHAIN_FILE=/home/runner/actions-runner/_work/cortex.cpp/cortex.cpp/engine/vcpkg/scripts/buildsystems/vcpkg.cmake"
100+
# channel: nightly
101+
# llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }}
102+
# arch: arm64
103103

104104
update-latest-version:
105105
runs-on: ubuntu-latest
106106
if: needs.set-public-provider.outputs.public_provider == 'aws-s3'
107-
needs: [get-update-version, set-public-provider, build-linux-x64, build-linux-arm64, build-macos, build-windows-x64, get-llamacpp-latest-version]
107+
needs: [get-update-version, set-public-provider, build-linux-x64, build-macos, build-windows-x64, get-llamacpp-latest-version]
108108
steps:
109109
- name: Update latest version
110110
id: update-latest-version

‎.github/workflows/stable-build.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,20 @@ jobs:
8181
llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }}
8282
arch: amd64
8383

84-
build-linux-arm64:
85-
uses: ./.github/workflows/template-build-linux.yml
86-
secrets: inherit
87-
needs: [get-update-version, create-draft-release, get-llamacpp-latest-version]
88-
with:
89-
ref: ${{ github.ref }}
90-
public_provider: github
91-
new_version: ${{ needs.get-update-version.outputs.new_version }}
92-
runs-on: ubuntu-2004-arm64
93-
cmake-flags: "-DCORTEX_VARIANT=prod -DCORTEX_CPP_VERSION='v${{ needs.get-update-version.outputs.new_version }}' -DCMAKE_TOOLCHAIN_FILE=/home/runner/actions-runner/_work/cortex.cpp/cortex.cpp/engine/vcpkg/scripts/buildsystems/vcpkg.cmake"
94-
channel: stable
95-
upload_url: ${{ needs.create-draft-release.outputs.upload_url }}
96-
llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }}
97-
arch: arm64
84+
# build-linux-arm64:
85+
# uses: ./.github/workflows/template-build-linux.yml
86+
# secrets: inherit
87+
# needs: [get-update-version, create-draft-release, get-llamacpp-latest-version]
88+
# with:
89+
# ref: ${{ github.ref }}
90+
# public_provider: github
91+
# new_version: ${{ needs.get-update-version.outputs.new_version }}
92+
# runs-on: ubuntu-2004-arm64
93+
# cmake-flags: "-DCORTEX_VARIANT=prod -DCORTEX_CPP_VERSION='v${{ needs.get-update-version.outputs.new_version }}' -DCMAKE_TOOLCHAIN_FILE=/home/runner/actions-runner/_work/cortex.cpp/cortex.cpp/engine/vcpkg/scripts/buildsystems/vcpkg.cmake"
94+
# channel: stable
95+
# upload_url: ${{ needs.create-draft-release.outputs.upload_url }}
96+
# llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }}
97+
# arch: arm64
9898

9999
build-docker-x64:
100100
uses: ./.github/workflows/template-build-docker-x64.yml

‎engine/extensions/local-engine/local_engine.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,6 @@ void LocalEngine::LoadModel(std::shared_ptr<Json::Value> json_body,
544544

545545
params.push_back("--pooling");
546546
params.push_back("mean");
547-
params.push_back("--jinja");
548547

549548
std::vector<std::string> v;
550549
v.reserve(params.size() + 1);

0 commit comments

Comments
 (0)