diff --git a/.github/workflows/beta-build.yml b/.github/workflows/beta-build.yml index 1d5480312..64d4e28e7 100644 --- a/.github/workflows/beta-build.yml +++ b/.github/workflows/beta-build.yml @@ -81,20 +81,20 @@ jobs: llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }} arch: amd64 - build-linux-arm64: - uses: ./.github/workflows/template-build-linux.yml - secrets: inherit - needs: [get-update-version, create-draft-release, get-llamacpp-latest-version] - with: - ref: ${{ github.ref }} - public_provider: github - new_version: ${{ needs.get-update-version.outputs.new_version }} - runs-on: ubuntu-2004-arm64 - 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" - channel: beta - upload_url: ${{ needs.create-draft-release.outputs.upload_url }} - llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }} - arch: arm64 + # build-linux-arm64: + # uses: ./.github/workflows/template-build-linux.yml + # secrets: inherit + # needs: [get-update-version, create-draft-release, get-llamacpp-latest-version] + # with: + # ref: ${{ github.ref }} + # public_provider: github + # new_version: ${{ needs.get-update-version.outputs.new_version }} + # runs-on: ubuntu-2004-arm64 + # 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" + # channel: beta + # upload_url: ${{ needs.create-draft-release.outputs.upload_url }} + # llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }} + # arch: arm64 build-docker-x64: uses: ./.github/workflows/template-build-docker-x64.yml @@ -127,7 +127,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} noti-discord: - needs: [get-update-version, create-draft-release, build-macos, build-windows-x64, build-linux-x64, build-linux-arm64, update_release] + needs: [get-update-version, create-draft-release, build-macos, build-windows-x64, build-linux-x64, update_release] runs-on: ubuntu-latest permissions: contents: write diff --git a/.github/workflows/cortex-cpp-quality-gate.yml b/.github/workflows/cortex-cpp-quality-gate.yml index fc2d52b63..02774d159 100644 --- a/.github/workflows/cortex-cpp-quality-gate.yml +++ b/.github/workflows/cortex-cpp-quality-gate.yml @@ -21,12 +21,12 @@ jobs: fail-fast: false matrix: include: - - os: "linux" - name: "arm64" - runs-on: "ubuntu-2004-arm64" - cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake" - build-deps-cmake-flags: "" - ccache-dir: "" + # - os: "linux" + # name: "arm64" + # runs-on: "ubuntu-2004-arm64" + # cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake" + # build-deps-cmake-flags: "" + # ccache-dir: "" - os: "linux" name: "amd64" runs-on: "ubuntu-20-04-cuda-12-0" @@ -354,12 +354,12 @@ jobs: fail-fast: false matrix: include: - - os: "linux" - name: "arm64" - runs-on: "ubuntu-2004-arm64" - cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake" - build-deps-cmake-flags: "" - ccache-dir: "" + # - os: "linux" + # name: "arm64" + # runs-on: "ubuntu-2004-arm64" + # cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DCMAKE_BUILD_TEST=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake" + # build-deps-cmake-flags: "" + # ccache-dir: "" - os: "linux" name: "amd64" runs-on: "ubuntu-20-04-cuda-12-0" diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index efdbfdf6f..f013a90e2 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -87,24 +87,24 @@ jobs: llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }} arch: amd64 - build-linux-arm64: - uses: ./.github/workflows/template-build-linux.yml - secrets: inherit - needs: [get-update-version, set-public-provider, get-llamacpp-latest-version] - with: - ref: ${{ needs.set-public-provider.outputs.ref }} - public_provider: ${{ needs.set-public-provider.outputs.public_provider }} - new_version: ${{ needs.get-update-version.outputs.new_version }} - runs-on: ubuntu-2004-arm64 - 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" - channel: nightly - llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }} - arch: arm64 + # build-linux-arm64: + # uses: ./.github/workflows/template-build-linux.yml + # secrets: inherit + # needs: [get-update-version, set-public-provider, get-llamacpp-latest-version] + # with: + # ref: ${{ needs.set-public-provider.outputs.ref }} + # public_provider: ${{ needs.set-public-provider.outputs.public_provider }} + # new_version: ${{ needs.get-update-version.outputs.new_version }} + # runs-on: ubuntu-2004-arm64 + # 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" + # channel: nightly + # llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }} + # arch: arm64 update-latest-version: runs-on: ubuntu-latest if: needs.set-public-provider.outputs.public_provider == 'aws-s3' - needs: [get-update-version, set-public-provider, build-linux-x64, build-linux-arm64, build-macos, build-windows-x64, get-llamacpp-latest-version] + needs: [get-update-version, set-public-provider, build-linux-x64, build-macos, build-windows-x64, get-llamacpp-latest-version] steps: - name: Update latest version id: update-latest-version diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml index c4b5f53f3..27e05f9ce 100644 --- a/.github/workflows/stable-build.yml +++ b/.github/workflows/stable-build.yml @@ -81,20 +81,20 @@ jobs: llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }} arch: amd64 - build-linux-arm64: - uses: ./.github/workflows/template-build-linux.yml - secrets: inherit - needs: [get-update-version, create-draft-release, get-llamacpp-latest-version] - with: - ref: ${{ github.ref }} - public_provider: github - new_version: ${{ needs.get-update-version.outputs.new_version }} - runs-on: ubuntu-2004-arm64 - 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" - channel: stable - upload_url: ${{ needs.create-draft-release.outputs.upload_url }} - llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }} - arch: arm64 + # build-linux-arm64: + # uses: ./.github/workflows/template-build-linux.yml + # secrets: inherit + # needs: [get-update-version, create-draft-release, get-llamacpp-latest-version] + # with: + # ref: ${{ github.ref }} + # public_provider: github + # new_version: ${{ needs.get-update-version.outputs.new_version }} + # runs-on: ubuntu-2004-arm64 + # 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" + # channel: stable + # upload_url: ${{ needs.create-draft-release.outputs.upload_url }} + # llamacpp-version: ${{ needs.get-llamacpp-latest-version.outputs.llamacpp_latest_version }} + # arch: arm64 build-docker-x64: uses: ./.github/workflows/template-build-docker-x64.yml diff --git a/engine/extensions/local-engine/local_engine.cc b/engine/extensions/local-engine/local_engine.cc index c4d296427..b769c5e8c 100644 --- a/engine/extensions/local-engine/local_engine.cc +++ b/engine/extensions/local-engine/local_engine.cc @@ -544,7 +544,6 @@ void LocalEngine::LoadModel(std::shared_ptr json_body, params.push_back("--pooling"); params.push_back("mean"); - params.push_back("--jinja"); std::vector v; v.reserve(params.size() + 1);