Skip to content

Commit 482718f

Browse files
bygreencnbygreencn
committed
Merge tag 'fix-decoding-base-tag'
* tag 'fix-decoding-base-tag': (143 commits) whisper : optimize fft() function (ggml-org#2242) talk-llama : sync llama.cpp whisper : use ggml_backend_sched (ggml-org#2239) fix : remove extra files scripts : sync ggml-blas build : update make / cmake sync : ggml move BLAS to a separate backend (cont) (llama/6210) Vulkan Shader Refactor, Memory Debugging Option (llama/7947) scripts : stop sync whisper example from ggml cmake : fix sycl build (#0) ggml : remove OpenCL (#0) sycl : sync (#0) cuda : enable CUDA graphs (#0) talk-llama : sync llama.cpp cmake : fix CUDA build (#0) sync : ggml ggml : fix and optimize ppc64le (ggml/849) ggml : remove duplicate include of ggml-common.h (ggml/853) remove global variables (llama/7710) ...
2 parents d545d74 + bf4cb4a commit 482718f

File tree

225 files changed

+43445
-27700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+43445
-27700
lines changed

‎.github/workflows/build.yml

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515

1616
steps:
1717
- name: Clone
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919

2020
- name: Set up QEMU
21-
uses: docker/setup-qemu-action@v2
21+
uses: docker/setup-qemu-action@v3
2222

2323
- name: Build ${{ matrix.arch }}
2424
run: |
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Clone
39-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
4040

4141
- name: Dependencies
4242
run: |
@@ -53,10 +53,10 @@ jobs:
5353

5454
steps:
5555
- name: Clone
56-
uses: actions/checkout@v3
56+
uses: actions/checkout@v4
5757

5858
- name: Build
59-
uses: cross-platform-actions/action@v0.15.0
59+
uses: cross-platform-actions/action@v0.24.0
6060
with:
6161
operating_system: freebsd
6262
version: '13.2'
@@ -77,10 +77,10 @@ jobs:
7777

7878
steps:
7979
- name: Clone
80-
uses: actions/checkout@v3
80+
uses: actions/checkout@v4
8181

8282
- name: Set up QEMU
83-
uses: docker/setup-qemu-action@v2
83+
uses: docker/setup-qemu-action@v3
8484

8585
- name: Build ${{ matrix.arch }}
8686
run: |
@@ -105,10 +105,10 @@ jobs:
105105

106106
steps:
107107
- name: Clone
108-
uses: actions/checkout@v3
108+
uses: actions/checkout@v4
109109

110110
- name: Set up QEMU
111-
uses: docker/setup-qemu-action@v2
111+
uses: docker/setup-qemu-action@v3
112112

113113
- name: Build ${{ matrix.arch }}
114114
run: |
@@ -133,10 +133,10 @@ jobs:
133133

134134
steps:
135135
- name: Clone
136-
uses: actions/checkout@v3
136+
uses: actions/checkout@v4
137137

138138
- name: Set up QEMU
139-
uses: docker/setup-qemu-action@v2
139+
uses: docker/setup-qemu-action@v3
140140

141141
- name: Build ${{ matrix.arch }}
142142
run: |
@@ -165,7 +165,7 @@ jobs:
165165

166166
steps:
167167
- name: Clone
168-
uses: actions/checkout@v3
168+
uses: actions/checkout@v4
169169

170170
- name: add oneAPI to apt
171171
shell: bash
@@ -189,7 +189,7 @@ jobs:
189189
190190
- name: Clone
191191
id: checkout
192-
uses: actions/checkout@v3
192+
uses: actions/checkout@v4
193193

194194
- name: Build
195195
id: cmake_build
@@ -215,7 +215,7 @@ jobs:
215215

216216
steps:
217217
- name: Clone
218-
uses: actions/checkout@v3
218+
uses: actions/checkout@v4
219219

220220
- name: add oneAPI to apt
221221
shell: bash
@@ -239,7 +239,7 @@ jobs:
239239
240240
- name: Clone
241241
id: checkout
242-
uses: actions/checkout@v3
242+
uses: actions/checkout@v4
243243

244244
- name: Build
245245
id: cmake_build
@@ -262,7 +262,7 @@ jobs:
262262

263263
steps:
264264
- name: Clone
265-
uses: actions/checkout@v3
265+
uses: actions/checkout@v4
266266

267267
- name: Setup ${{ matrix.sys }}
268268
uses: msys2/setup-msys2@v2
@@ -328,10 +328,10 @@ jobs:
328328

329329
steps:
330330
- name: Clone
331-
uses: actions/checkout@v3
331+
uses: actions/checkout@v4
332332

333333
- name: Add msbuild to PATH
334-
uses: microsoft/setup-msbuild@v1
334+
uses: microsoft/setup-msbuild@v2
335335

336336
- name: Fetch SDL2 and set SDL2_DIR
337337
if: matrix.sdl2 == 'ON'
@@ -356,14 +356,14 @@ jobs:
356356
run: copy "$env:SDL2_DIR/../lib/${{ matrix.s2arc }}/SDL2.dll" build/bin/${{ matrix.build }}
357357

358358
- name: Upload dll
359-
uses: actions/upload-artifact@v3
359+
uses: actions/upload-artifact@v4
360360
with:
361361
name: ${{ matrix.jnaPath }}_whisper.dll
362362
path: build/bin/${{ matrix.build }}/whisper.dll
363363

364364
- name: Upload binaries
365365
if: matrix.sdl2 == 'ON'
366-
uses: actions/upload-artifact@v1
366+
uses: actions/upload-artifact@v4
367367
with:
368368
name: whisper-bin-${{ matrix.arch }}
369369
path: build/bin/${{ matrix.build }}
@@ -392,10 +392,10 @@ jobs:
392392

393393
steps:
394394
- name: Clone
395-
uses: actions/checkout@v3
395+
uses: actions/checkout@v4
396396

397397
- name: Add msbuild to PATH
398-
uses: microsoft/setup-msbuild@v1
398+
uses: microsoft/setup-msbuild@v2
399399

400400
- name: Fetch OpenBLAS
401401
if: matrix.blas == 'ON'
@@ -453,13 +453,13 @@ jobs:
453453

454454
- name: Upload binaries
455455
if: matrix.blas == 'ON' && matrix.sdl2 == 'ON'
456-
uses: actions/upload-artifact@v1
456+
uses: actions/upload-artifact@v4
457457
with:
458458
name: whisper-blas${{ matrix.clblast == 'ON' && '-clblast' || ''}}-bin-${{ matrix.arch }}
459459
path: build/bin/${{ matrix.build }}
460460

461461
windows-cublas:
462-
runs-on: windows-latest
462+
runs-on: windows-2019
463463

464464
strategy:
465465
matrix:
@@ -476,14 +476,14 @@ jobs:
476476

477477
steps:
478478
- name: Clone
479-
uses: actions/checkout@v3
479+
uses: actions/checkout@v4
480480

481481
- name: Add msbuild to PATH
482-
uses: microsoft/setup-msbuild@v1
482+
uses: microsoft/setup-msbuild@v2
483483

484484
- name: Install CUDA Toolkit
485485
id: cuda-toolkit
486-
uses: Jimver/cuda-toolkit@v0.2.11
486+
uses: Jimver/cuda-toolkit@v0.2.15
487487
with:
488488
cuda: '${{ matrix.cuda-toolkit }}'
489489

@@ -498,7 +498,7 @@ jobs:
498498
run: >
499499
cmake -S . -B ./build -A ${{ matrix.arch }}
500500
-DCMAKE_BUILD_TYPE=${{ matrix.build }}
501-
-DWHISPER_CUBLAS=${{ matrix.cublas }}
501+
-DWHISPER_CUDA=${{ matrix.cublas }}
502502
-DWHISPER_SDL2=${{ matrix.sdl2 }}
503503
504504
- name: Build ${{ matrix.cuda-toolkit }}
@@ -519,7 +519,7 @@ jobs:
519519

520520
- name: Upload binaries
521521
if: matrix.sdl2 == 'ON'
522-
uses: actions/upload-artifact@v1
522+
uses: actions/upload-artifact@v4
523523
with:
524524
name: whisper-cublas-${{ matrix.cuda-toolkit }}-bin-${{ matrix.arch }}
525525
path: build/bin/${{ matrix.build }}
@@ -533,10 +533,10 @@ jobs:
533533

534534
steps:
535535
- name: Clone
536-
uses: actions/checkout@v3
536+
uses: actions/checkout@v4
537537

538538
- name: Setup emsdk
539-
uses: mymindstorm/setup-emsdk@v12
539+
uses: mymindstorm/setup-emsdk@v14
540540

541541
- name: Verify
542542
run: emcc -v
@@ -555,7 +555,7 @@ jobs:
555555

556556
steps:
557557
- name: Clone
558-
uses: actions/checkout@v3
558+
uses: actions/checkout@v4
559559

560560
- name: Configure
561561
run: |
@@ -573,24 +573,24 @@ jobs:
573573

574574
steps:
575575
- name: Clone
576-
uses: actions/checkout@v3
576+
uses: actions/checkout@v4
577577
with:
578578
path: whisper
579579

580580
- name: Clone
581-
uses: actions/checkout@v3
581+
uses: actions/checkout@v4
582582
with:
583583
repository: ggerganov/ggml
584584
path: ggml
585585

586586
- name: Install Java
587-
uses: actions/setup-java@v3
587+
uses: actions/setup-java@v4
588588
with:
589589
distribution: zulu
590-
java-version: 17
590+
java-version: 21
591591

592592
- name: Setup Android SDK
593-
uses: android-actions/setup-android@v2
593+
uses: android-actions/setup-android@v3
594594

595595
- name: Build
596596
run: |
@@ -608,20 +608,19 @@ jobs:
608608

609609
steps:
610610
- name: Clone
611-
uses: actions/checkout@v3
611+
uses: actions/checkout@v4
612612

613613
- name: set up JDK 11
614-
uses: actions/setup-java@v3
614+
uses: actions/setup-java@v4
615615
with:
616616
java-version: '11'
617617
distribution: 'temurin'
618618
cache: gradle
619619

620620
- name: Setup Android SDK
621-
uses: android-actions/setup-android@v2
621+
uses: android-actions/setup-android@v3
622622
with:
623-
api-level: 30
624-
build-tools-version: 30.0.3
623+
cmdline-tools-version: 9.0
625624

626625
- name: Build
627626
run: |
@@ -633,15 +632,16 @@ jobs:
633632
needs: [ 'windows' ]
634633
runs-on: windows-latest
635634
steps:
636-
- uses: actions/checkout@v3
635+
- uses: actions/checkout@v4
637636

638637
- name: Install Java
639-
uses: actions/setup-java@v1
638+
uses: actions/setup-java@v4
640639
with:
641-
java-version: 17
640+
distribution: zulu
641+
java-version: 20
642642

643643
- name: Download Windows lib
644-
uses: actions/download-artifact@v3
644+
uses: actions/download-artifact@v4
645645
with:
646646
name: win32-x86-64_whisper.dll
647647
path: bindings/java/build/generated/resources/main/win32-x86-64
@@ -654,7 +654,7 @@ jobs:
654654
./gradlew build
655655
656656
- name: Upload jar
657-
uses: actions/upload-artifact@v3
657+
uses: actions/upload-artifact@v4
658658
with:
659659
name: whispercpp.jar
660660
path: bindings/java/build/libs/whispercpp-*.jar
@@ -676,7 +676,7 @@ jobs:
676676

677677
steps:
678678
- name: Clone
679-
uses: actions/checkout@v3
679+
uses: actions/checkout@v4
680680

681681
- name: Test quantize
682682
run: |

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
/CMakeSettings.json
1111

1212
build/
13+
build-blas/
1314
build-coreml/
1415
build-em/
1516
build-debug/

0 commit comments

Comments
 (0)