Skip to content

Commit 7d8873e

Browse files
committed
Merge remote-tracking branch 'ggerganov/master'
* ggerganov/master: (63 commits) authors : update sync : ggml cmake: Add ability to pass in GGML_BUILD_NUMBER (ggml/1096) readme : add maintenance roadmap ci : add stalebot node : add max_len params in node addon (ggml-org#2760) talk-llama : sync llama.cpp coreml : always convert to "neuralnetwork" (ggml-org#2770) ci : more git ci : install git ci : use ubuntu-22.04 instead of ubuntu-latest cmake : sync cmake scripts sync : ggml scripts : fix sync paths CUDA: fix Volta FlashAttention logic (llama/11615) HIP: fix flash_attn_stream_k_fixup warning (llama/11604) CUDA/HIP: add support for selectable warp size to mmv (llama/11519) HIP: add GGML_CUDA_CC_IS_* for amd familys as increasing cc archtectures for amd gpus are not supersets of eatch other (llama/11601) CUDA: use mma PTX instructions for FlashAttention (llama/11583) `ci`: use sccache on windows instead of ccache (llama/11545) ...
2 parents 7459077 + 33ea03f commit 7d8873e

File tree

148 files changed

+10569
-4800
lines changed

Some content is hidden

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

148 files changed

+10569
-4800
lines changed

.devops/cublas.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ FROM ${BASE_CUDA_DEV_CONTAINER} as build
1212
ARG CUDA_DOCKER_ARCH=all
1313

1414
RUN apt-get update && \
15-
apt-get install -y build-essential git cmake libsdl2-dev wget
15+
apt-get install -y build-essential git cmake libsdl2-dev wget git
1616

1717
WORKDIR /app
1818

.devops/main-cuda.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ENV CUDA_DOCKER_ARCH=${CUDA_DOCKER_ARCH}
1717
ENV GGML_CUDA=1
1818

1919
RUN apt-get update && \
20-
apt-get install -y build-essential libsdl2-dev wget cmake \
20+
apt-get install -y build-essential libsdl2-dev wget cmake git \
2121
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
2222

2323
# Ref: https://stackoverflow.com/a/53464012
@@ -33,7 +33,7 @@ ENV LD_LIBRARY_PATH /usr/local/cuda-${CUDA_MAIN_VERSION}/compat:$LD_LIBRARY_PATH
3333
WORKDIR /app
3434

3535
RUN apt-get update && \
36-
apt-get install -y curl ffmpeg wget cmake \
36+
apt-get install -y curl ffmpeg wget cmake git \
3737
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
3838

3939
COPY --from=build /app /app

.devops/main.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM ubuntu:22.04 AS build
22
WORKDIR /app
33

44
RUN apt-get update && \
5-
apt-get install -y build-essential wget cmake \
5+
apt-get install -y build-essential wget cmake git \
66
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
77

88
COPY .. .
@@ -12,7 +12,7 @@ FROM ubuntu:22.04 AS runtime
1212
WORKDIR /app
1313

1414
RUN apt-get update && \
15-
apt-get install -y curl ffmpeg libsdl2-dev wget cmake \
15+
apt-get install -y curl ffmpeg libsdl2-dev wget cmake git \
1616
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
1717

1818
COPY --from=build /app /app

.github/workflows/bindings-go.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ on:
1010
- whisper.h
1111

1212
jobs:
13-
ubuntu-latest:
14-
runs-on: ubuntu-latest
13+
ubuntu-22:
14+
runs-on: ubuntu-22.04
1515
steps:
1616
- uses: actions/setup-go@v5
1717
with:

.github/workflows/bindings-ruby.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ on:
4242
- examples/dr_wav.h
4343

4444
jobs:
45-
ubuntu-latest:
46-
runs-on: ubuntu-latest
45+
ubuntu-22:
46+
runs-on: ubuntu-22.04
4747
defaults:
4848
run:
4949
working-directory: bindings/ruby

.github/workflows/build.yml

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ env:
1616
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
1717

1818
jobs:
19-
ubuntu-latest:
20-
runs-on: ubuntu-latest
19+
ubuntu-22:
20+
runs-on: ubuntu-22.04
2121

2222
strategy:
2323
fail-fast: false
@@ -38,12 +38,12 @@ jobs:
3838
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
3939
set -e
4040
apt update
41-
apt install -y build-essential libsdl2-dev cmake
41+
apt install -y build-essential libsdl2-dev cmake git
4242
cmake -B build
4343
cmake --build build --config Release -j $(nproc)'
4444
45-
ubuntu-latest-arm64:
46-
runs-on: ubuntu-latest
45+
ubuntu-22-arm64:
46+
runs-on: ubuntu-22.04
4747

4848
strategy:
4949
fail-fast: false
@@ -64,12 +64,12 @@ jobs:
6464
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
6565
set -e
6666
apt update
67-
apt install -y build-essential libsdl2-dev cmake
67+
apt install -y build-essential libsdl2-dev cmake git
6868
cmake -B build -DGGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=armv8-a
6969
cmake --build build --config Release -j $(nproc)'
7070
71-
ubuntu-latest-arm-v7:
72-
runs-on: ubuntu-latest
71+
ubuntu-22-arm-v7:
72+
runs-on: ubuntu-22.04
7373

7474
strategy:
7575
fail-fast: false
@@ -90,7 +90,7 @@ jobs:
9090
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
9191
set -e
9292
apt update
93-
apt install -y build-essential libsdl2-dev cmake
93+
apt install -y build-essential libsdl2-dev cmake git
9494
cmake -B build -DGGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=armv7-a+fp
9595
cmake --build build --config Release -j $(nproc)'
9696
@@ -129,8 +129,8 @@ jobs:
129129
# cmake -B build
130130
# cmake --build build --config Release
131131

132-
ubuntu-latest-gcc:
133-
runs-on: ubuntu-latest
132+
ubuntu-22-gcc:
133+
runs-on: ubuntu-22.04
134134

135135
strategy:
136136
fail-fast: false
@@ -152,13 +152,13 @@ jobs:
152152
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
153153
set -e
154154
apt update
155-
apt install -y build-essential cmake libsdl2-dev
155+
apt install -y build-essential cmake libsdl2-dev git
156156
cmake . -DWHISPER_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }}
157157
make
158158
ctest -L gh --output-on-failure'
159159
160-
ubuntu-latest-gcc-arm64:
161-
runs-on: ubuntu-latest
160+
ubuntu-22-gcc-arm64:
161+
runs-on: ubuntu-22.04
162162

163163
strategy:
164164
fail-fast: false
@@ -180,13 +180,13 @@ jobs:
180180
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
181181
set -e
182182
apt update
183-
apt install -y build-essential cmake libsdl2-dev
183+
apt install -y build-essential cmake libsdl2-dev git
184184
cmake . -DWHISPER_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DGGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=armv8-a
185185
make
186186
ctest -L gh --output-on-failure'
187187
188-
ubuntu-latest-gcc-arm-v7:
189-
runs-on: ubuntu-latest
188+
ubuntu-22-gcc-arm-v7:
189+
runs-on: ubuntu-22.04
190190

191191
strategy:
192192
fail-fast: false
@@ -208,13 +208,13 @@ jobs:
208208
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
209209
set -e
210210
apt update
211-
apt install -y build-essential cmake libsdl2-dev
211+
apt install -y build-essential cmake libsdl2-dev git
212212
cmake . -DWHISPER_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DGGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=armv7-a+fp
213213
make
214214
ctest -L gh --output-on-failure'
215215
216-
ubuntu-latest-clang:
217-
runs-on: ubuntu-latest
216+
ubuntu-22-clang:
217+
runs-on: ubuntu-22.04
218218

219219
strategy:
220220
fail-fast: false
@@ -239,13 +239,13 @@ jobs:
239239
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
240240
set -e
241241
apt update
242-
apt install -y clang build-essential cmake libsdl2-dev
242+
apt install -y clang build-essential cmake libsdl2-dev git
243243
cmake . -DWHISPER_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
244244
make
245245
ctest -L gh --output-on-failure'
246246
247-
ubuntu-latest-gcc-sanitized:
248-
runs-on: ubuntu-latest
247+
ubuntu-22-gcc-sanitized:
248+
runs-on: ubuntu-22.04
249249

250250
strategy:
251251
fail-fast: false
@@ -267,7 +267,7 @@ jobs:
267267
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
268268
set -e
269269
apt update
270-
apt install -y build-essential cmake
270+
apt install -y build-essential cmake git
271271
cmake . -DCMAKE_BUILD_TYPE=Debug -DWHISPER_SANITIZE_${{ matrix.sanitizer }}=ON
272272
make
273273
ctest -L gh --output-on-failure'
@@ -302,12 +302,12 @@ jobs:
302302
shell: bash
303303
run: |
304304
sudo apt update
305-
sudo apt install intel-oneapi-compiler-dpcpp-cpp
305+
sudo apt install intel-oneapi-compiler-dpcpp-cpp git
306306
307307
- name: install oneAPI MKL library
308308
shell: bash
309309
run: |
310-
sudo apt install intel-oneapi-mkl-devel
310+
sudo apt install intel-oneapi-mkl-devel git
311311
312312
- name: Clone
313313
id: checkout
@@ -352,7 +352,7 @@ jobs:
352352
shell: bash
353353
run: |
354354
sudo apt update
355-
sudo apt install intel-oneapi-compiler-dpcpp-cpp
355+
sudo apt install intel-oneapi-compiler-dpcpp-cpp git
356356
357357
- name: install oneAPI MKL library
358358
shell: bash
@@ -393,6 +393,7 @@ jobs:
393393
msystem: ${{matrix.sys}}
394394
install: >-
395395
base-devel
396+
git
396397
mingw-w64-${{matrix.env}}-toolchain
397398
mingw-w64-${{matrix.env}}-cmake
398399
mingw-w64-${{matrix.env}}-SDL2
@@ -584,7 +585,7 @@ jobs:
584585
7z x sdl2.zip
585586
echo "SDL2_DIR=${{ github.workspace }}\SDL2-${{ matrix.sdl2_ver }}\cmake" | Out-File -FilePath $env:GITHUB_ENV -Append
586587
echo "${{ github.workspace }}\SDL2-${{ matrix.sdl2_ver }}\cmake" > SDL2_PATH.txt
587-
588+
588589
- name: Configure CMake
589590
shell: cmd
590591
run: |
@@ -594,16 +595,16 @@ jobs:
594595
-DCMAKE_CUDA_ARCHITECTURES=all ^
595596
-DWHISPER_SDL2=${{ matrix.sdl2 }} ^
596597
-DSDL2_DIR="%SDL2_DIR%"
597-
598+
598599
- name: Build Project
599600
shell: cmd
600601
run: |
601602
cd ./build
602-
cmake --build . --config ${{ matrix.build }}
603+
cmake --build . --config ${{ matrix.build }}
603604
604605
- name: Copy CUDA DLLs
605606
run: |
606-
Get-ChildItem "${{ steps.cuda-toolkit.outputs.CUDA_PATH }}/bin/" -Filter "*.dll" |
607+
Get-ChildItem "${{ steps.cuda-toolkit.outputs.CUDA_PATH }}/bin/" -Filter "*.dll" |
607608
Copy-Item -Destination "build/bin/${{ matrix.build }}"
608609
609610
- name: Copy SDL2.dll
@@ -617,7 +618,7 @@ jobs:
617618
path: build/bin/${{ matrix.build }}
618619

619620
emscripten:
620-
runs-on: ubuntu-latest
621+
runs-on: ubuntu-22.04
621622

622623
strategy:
623624
matrix:
@@ -684,7 +685,7 @@ jobs:
684685
run: xcodebuild -project examples/whisper.swiftui/whisper.swiftui.xcodeproj -scheme WhisperCppDemo -configuration ${{ matrix.build }} -sdk iphoneos CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= -destination 'generic/platform=iOS' build
685686

686687
android:
687-
runs-on: ubuntu-latest
688+
runs-on: ubuntu-22.04
688689

689690
steps:
690691
- name: Clone
@@ -714,7 +715,7 @@ jobs:
714715
715716
# TODO: disable because of following fail: https://github.com/ggerganov/whisper.cpp/actions/runs/11019444420/job/30627193602
716717
# android_java:
717-
# runs-on: ubuntu-latest
718+
# runs-on: ubuntu-22.04
718719
#
719720
# steps:
720721
# - name: Clone
@@ -783,7 +784,7 @@ jobs:
783784
# PGP_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
784785

785786
quantize:
786-
runs-on: ubuntu-latest
787+
runs-on: ubuntu-22.04
787788

788789
steps:
789790
- name: Clone

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Push Docker image to Docker Hub
1212
if: github.event.pull_request.draft == false
1313

14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-22.04
1515
env:
1616
COMMIT_SHA: ${{ github.sha }}
1717
strategy:

.github/workflows/examples.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ on:
1010
- whisper.h
1111

1212
jobs:
13-
addon_node-ubuntu-latest:
14-
runs-on: ubuntu-latest
13+
addon_node-ubuntu-22:
14+
runs-on: ubuntu-22.04
1515
strategy:
1616
matrix:
1717
node-version: [ 16.x, 18.x ]
@@ -22,7 +22,7 @@ jobs:
2222
- name: Dependencies
2323
run: |
2424
sudo apt-get update
25-
sudo apt-get install build-essential
25+
sudo apt-get install build-essential git
2626
sudo apt-get install cmake
2727
sudo apt-get install libsdl2-dev
2828

0 commit comments

Comments
 (0)