From 84bf0009b72816863e2ae712a94d17ff04a4d79c Mon Sep 17 00:00:00 2001 From: Wei Zhang Date: Sat, 9 Nov 2024 01:18:49 +0800 Subject: [PATCH] chore(llama.cpp): auto detech llama.cpp version and bump to b3995 for win --- .github/workflows/release.yml | 4 ++-- ci/package-win.sh | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 289be3f3e347..1f64c49e851e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -249,14 +249,14 @@ jobs: package-win-cuda: runs-on: ubuntu-latest - env: - LLAMA_CPP_VERSION: b3571 needs: [release-binary] permissions: contents: write steps: - name: Checkout uses: actions/checkout@v3 + with: + submodules: recursive - name: Download all artifacts uses: actions/download-artifact@v3 diff --git a/ci/package-win.sh b/ci/package-win.sh index 3c438adfa551..ad73a606ea2c 100755 --- a/ci/package-win.sh +++ b/ci/package-win.sh @@ -1,8 +1,12 @@ #!/bin/bash +# get current bash file directory +PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +LLAMA_CPP_PATH="${PROJECT_ROOT}/crates/llama-cpp-server/llama.cpp" + # Input variables -TABBY_VERSION=${TABBY_VERSION:-dev} -LLAMA_CPP_VERSION=${LLAMA_CPP_VERSION:-b3571} +LLAMA_CPP_VERSION=${LLAMA_CPP_VERSION:-$(cd ${LLAMA_CPP_PATH} && git describe --tags --abbrev=0)} +echo "LLAMA_CPP_VERSION=${LLAMA_CPP_VERSION}" LLAMA_CPP_PLATFORM=${LLAMA_CPP_PLATFORM:-cuda-cu11.7.1-x64} OUTPUT_NAME=${OUTPUT_NAME:-tabby_x86_64-windows-msvc-cuda117}