diff --git a/.github/workflows/kcpp-build-release-arm64.yaml b/.github/workflows/kcpp-build-release-arm64.yaml index db08fc8ca..5b1ef3baa 100644 --- a/.github/workflows/kcpp-build-release-arm64.yaml +++ b/.github/workflows/kcpp-build-release-arm64.yaml @@ -1,6 +1,13 @@ name: Koboldcpp Linux ARM64 -on: workflow_dispatch +on: + workflow_dispatch: + inputs: + commit_hash: + description: 'Optional commit hash to build from' + required: false + default: '' + env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} @@ -12,7 +19,11 @@ jobs: id: checkout uses: actions/checkout@v3 with: - ref: ${{ github.head_ref || github.ref_name }} + ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || github.head_ref || github.ref_name }} + + - name: Show Commit Used + run: | + echo "Building from ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || github.head_ref || github.ref_name }}" - name: Install Dependencies id: depends diff --git a/.github/workflows/kcpp-build-release-linux-cuda12.yaml b/.github/workflows/kcpp-build-release-linux-cuda12.yaml index 4ee4d6ae4..30e6e5ec5 100644 --- a/.github/workflows/kcpp-build-release-linux-cuda12.yaml +++ b/.github/workflows/kcpp-build-release-linux-cuda12.yaml @@ -1,6 +1,13 @@ name: Koboldcpp Linux CUDA12 -on: workflow_dispatch +on: + workflow_dispatch: + inputs: + commit_hash: + description: 'Optional commit hash to build from' + required: false + default: '' + env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} KCPP_CUDA: 12.1.0 @@ -16,7 +23,11 @@ jobs: id: checkout uses: actions/checkout@v3 with: - ref: ${{ github.head_ref || github.ref_name }} + ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || github.head_ref || github.ref_name }} + + - name: Show Commit Used + run: | + echo "Building from ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || github.head_ref || github.ref_name }}" - name: Dependencies id: depends diff --git a/.github/workflows/kcpp-build-release-linux.yaml b/.github/workflows/kcpp-build-release-linux.yaml index b480db6e4..cd6786177 100644 --- a/.github/workflows/kcpp-build-release-linux.yaml +++ b/.github/workflows/kcpp-build-release-linux.yaml @@ -1,6 +1,13 @@ name: Koboldcpp Linux -on: workflow_dispatch +on: + workflow_dispatch: + inputs: + commit_hash: + description: 'Optional commit hash to build from' + required: false + default: '' + env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} NOAVX2: 1 @@ -16,7 +23,11 @@ jobs: id: checkout uses: actions/checkout@v3 with: - ref: ${{ github.head_ref || github.ref_name }} + ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || github.head_ref || github.ref_name }} + + - name: Show Commit Used + run: | + echo "Building from ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || github.head_ref || github.ref_name }}" - name: Dependencies id: depends diff --git a/.github/workflows/kcpp-build-release-osx.yaml b/.github/workflows/kcpp-build-release-osx.yaml index f4a7588f6..6b74fb8e4 100644 --- a/.github/workflows/kcpp-build-release-osx.yaml +++ b/.github/workflows/kcpp-build-release-osx.yaml @@ -1,6 +1,13 @@ name: Koboldcpp Mac -on: workflow_dispatch +on: + workflow_dispatch: + inputs: + commit_hash: + description: 'Optional commit hash to build from' + required: false + default: '' + env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} @@ -12,7 +19,11 @@ jobs: id: checkout uses: actions/checkout@v3 with: - ref: ${{ github.head_ref || github.ref_name }} + ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || github.head_ref || github.ref_name }} + + - name: Show Commit Used + run: | + echo "Building from ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || github.head_ref || github.ref_name }}" - name: Dependencies id: depends diff --git a/.github/workflows/kcpp-build-release-win-full.yaml b/.github/workflows/kcpp-build-release-win-full.yaml index 5dfcb2868..327037378 100644 --- a/.github/workflows/kcpp-build-release-win-full.yaml +++ b/.github/workflows/kcpp-build-release-win-full.yaml @@ -1,6 +1,13 @@ name: Koboldcpp Windows Full Binaries -on: workflow_dispatch +on: + workflow_dispatch: + inputs: + commit_hash: + description: 'Optional commit hash to build from' + required: false + default: '' + env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} @@ -12,7 +19,11 @@ jobs: id: checkout uses: actions/checkout@v3 with: - ref: ${{ github.head_ref || github.ref_name }} + ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || github.head_ref || github.ref_name }} + + - name: Show Commit Used + run: | + echo "Building from ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || github.head_ref || github.ref_name }}" - name: Get Python uses: actions/setup-python@v2 diff --git a/.github/workflows/kcpp-build-release-win-oldcpu-full.yaml b/.github/workflows/kcpp-build-release-win-oldcpu-full.yaml index 34c6dab66..00b73a4cf 100644 --- a/.github/workflows/kcpp-build-release-win-oldcpu-full.yaml +++ b/.github/workflows/kcpp-build-release-win-oldcpu-full.yaml @@ -1,6 +1,13 @@ name: Koboldcpp Windows Full OldCPU Binaries -on: workflow_dispatch +on: + workflow_dispatch: + inputs: + commit_hash: + description: 'Optional commit hash to build from' + required: false + default: '' + env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} @@ -12,7 +19,11 @@ jobs: id: checkout uses: actions/checkout@v3 with: - ref: ${{ github.head_ref || github.ref_name }} + ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || github.head_ref || github.ref_name }} + + - name: Show Commit Used + run: | + echo "Building from ref: ${{ inputs.commit_hash != '' && inputs.commit_hash || github.head_ref || github.ref_name }}" - name: Get Python uses: actions/setup-python@v2 diff --git a/kcpp_adapters/AutoGuess.json b/kcpp_adapters/AutoGuess.json index 1d24f376c..6eada48ea 100644 --- a/kcpp_adapters/AutoGuess.json +++ b/kcpp_adapters/AutoGuess.json @@ -38,6 +38,8 @@ "search": ["System role not supported", ""], "name": "Google Gemma 2.", "adapter": { + "system_start": "\n", + "system_end": "\n", "user_start": "user\n", "user_end": "\n", "assistant_start": "model\n", @@ -47,6 +49,8 @@ "search": ["", "", ""], "name": "Google Gemma 3.", "adapter": { + "system_start": "\n", + "system_end": "\n", "user_start": "user\n", "user_end": "\n", "assistant_start": "model\n", diff --git a/kcpp_adapters/Gemma-2.json b/kcpp_adapters/Gemma-2.json index 836f4a10f..34f8558f1 100644 --- a/kcpp_adapters/Gemma-2.json +++ b/kcpp_adapters/Gemma-2.json @@ -1,6 +1,6 @@ { - "system_start": "user\n", - "system_end": "\n", + "system_start": "\n", + "system_end": "\n", "user_start": "user\n", "user_end": "\n", "assistant_start": "model\n",