Skip to content

Commit df0edbb

Browse files
committed
test
1 parent 202b1e7 commit df0edbb

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

.github/workflows/build.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ env:
3131
LLAMA_LOG_COLORS: 1
3232
LLAMA_LOG_PREFIX: 1
3333
LLAMA_LOG_TIMESTAMPS: 1
34-
CREATE_RELEASE: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' || contains(github.event.head_commit.message, '[pack]') }}
34+
CREATE_ARTIFACTS: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' || contains(github.event.head_commit.message, '[pack]') }}
3535

3636
jobs:
3737
macOS-latest-cmake-arm64:
@@ -86,14 +86,14 @@ jobs:
8686
8787
- name: Pack artifacts
8888
id: pack_artifacts
89-
if: ${{ env.CREATE_RELEASE }}
89+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
9090
run: |
9191
cp LICENSE ./build/bin/
9292
cp examples/run/linenoise.cpp/LICENSE ./build/bin/LICENSE.linenoise.cpp
9393
zip -r llama-${{ steps.tag.outputs.name }}-bin-macos-arm64.zip ./build/bin/*
9494
9595
- name: Upload artifacts
96-
if: ${{ env.CREATE_RELEASE }}
96+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
9797
uses: actions/upload-artifact@v4
9898
with:
9999
path: llama-${{ steps.tag.outputs.name }}-bin-macos-arm64.zip
@@ -150,14 +150,14 @@ jobs:
150150
151151
- name: Pack artifacts
152152
id: pack_artifacts
153-
if: ${{ env.CREATE_RELEASE }}
153+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
154154
run: |
155155
cp LICENSE ./build/bin/
156156
cp examples/run/linenoise.cpp/LICENSE ./build/bin/LICENSE.linenoise.cpp
157157
zip -r llama-${{ steps.tag.outputs.name }}-bin-macos-x64.zip ./build/bin/*
158158
159159
- name: Upload artifacts
160-
if: ${{ env.CREATE_RELEASE }}
160+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
161161
uses: actions/upload-artifact@v4
162162
with:
163163
path: llama-${{ steps.tag.outputs.name }}-bin-macos-x64.zip
@@ -222,14 +222,14 @@ jobs:
222222
223223
- name: Pack artifacts
224224
id: pack_artifacts
225-
if: ${{ env.CREATE_RELEASE }}
225+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
226226
run: |
227227
cp LICENSE ./build/bin/
228228
cp examples/run/linenoise.cpp/LICENSE ./build/bin/LICENSE.linenoise.cpp
229229
zip -r llama-${{ steps.tag.outputs.name }}-bin-ubuntu-x64.zip ./build/bin/*
230230
231231
- name: Upload artifacts
232-
if: ${{ env.CREATE_RELEASE }}
232+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
233233
uses: actions/upload-artifact@v4
234234
with:
235235
path: llama-${{ steps.tag.outputs.name }}-bin-ubuntu-x64.zip
@@ -791,14 +791,14 @@ jobs:
791791
792792
- name: Pack artifacts
793793
id: pack_artifacts
794-
if: ${{ env.CREATE_RELEASE }}
794+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
795795
run: |
796796
Copy-Item LICENSE .\build\bin\Release\llama.cpp.txt
797797
Copy-Item .\examples\run\linenoise.cpp\LICENSE .\build\bin\Release\linenoise.cpp.txt
798798
7z a llama-${{ steps.tag.outputs.name }}-bin-win-${{ matrix.build }}.zip .\build\bin\Release\*
799799
800800
- name: Upload artifacts
801-
if: ${{ env.CREATE_RELEASE }}
801+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
802802
uses: actions/upload-artifact@v4
803803
with:
804804
path: llama-${{ steps.tag.outputs.name }}-bin-win-${{ matrix.build }}.zip
@@ -941,19 +941,19 @@ jobs:
941941
942942
- name: Pack artifacts
943943
id: pack_artifacts
944-
if: ${{ env.CREATE_RELEASE }}
944+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
945945
run: |
946946
7z a llama-${{ steps.tag.outputs.name }}-bin-win-${{ matrix.build }}-cu${{ matrix.cuda }}-x64.zip .\build\bin\Release\*
947947
948948
- name: Upload artifacts
949-
if: ${{ env.CREATE_RELEASE }}
949+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
950950
uses: actions/upload-artifact@v4
951951
with:
952952
path: llama-${{ steps.tag.outputs.name }}-bin-win-${{ matrix.build }}-cu${{ matrix.cuda }}-x64.zip
953953
name: llama-bin-win-cu${{ matrix.cuda }}-x64.zip
954954

955955
- name: Copy and pack Cuda runtime
956-
if: ${{ env.CREATE_RELEASE }}
956+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
957957
run: |
958958
echo "Cuda install location: ${{ env.CUDA_PATH }}"
959959
$dst='.\build\bin\cudart\'
@@ -962,7 +962,7 @@ jobs:
962962
7z a cudart-llama-bin-win-cu${{ matrix.cuda }}-x64.zip $dst\*
963963
964964
- name: Upload Cuda runtime
965-
if: ${{ env.CREATE_RELEASE }}
965+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
966966
uses: actions/upload-artifact@v4
967967
with:
968968
path: cudart-llama-bin-win-cu${{ matrix.cuda }}-x64.zip
@@ -1009,7 +1009,7 @@ jobs:
10091009
10101010
- name: Build the release package
10111011
id: pack_artifacts
1012-
if: ${{ env.CREATE_RELEASE }}
1012+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
10131013
run: |
10141014
echo "cp oneAPI running time dll files in ${{ env.ONEAPI_ROOT }} to ./build/bin"
10151015
@@ -1034,7 +1034,7 @@ jobs:
10341034
7z a llama-${{ steps.tag.outputs.name }}-bin-win-sycl-x64.zip ./build/bin/*
10351035
10361036
- name: Upload the release package
1037-
if: ${{ env.CREATE_RELEASE }}
1037+
if: ${{ env.CREATE_ARTIFACTS == 'true' }}
10381038
uses: actions/upload-artifact@v4
10391039
with:
10401040
path: llama-${{ steps.tag.outputs.name }}-bin-win-sycl-x64.zip
@@ -1078,7 +1078,7 @@ jobs:
10781078
cmake --build build -j ${env:NUMBER_OF_PROCESSORS}
10791079
10801080
windows-latest-cmake-hip-release:
1081-
if: ${{ env.CREATE_RELEASE }}
1081+
if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' || contains(github.event.head_commit.message, '[pack]') }}
10821082
runs-on: windows-latest
10831083

10841084
strategy:

src/llama.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10064,3 +10064,4 @@ void llama_perf_context_reset(struct llama_context * ctx) {
1006410064
ctx->t_eval_us = ctx->n_eval = 0;
1006510065
ctx->t_p_eval_us = ctx->n_p_eval = 0;
1006610066
}
10067+

0 commit comments

Comments
 (0)