Skip to content

Commit 0d7c567

Browse files
committed
Merge remote-tracking branch 'ggerganov/master' into fix_decoding
* ggerganov/master: (447 commits) ruby : Add low-level methods to transcribe (ggml-org#2585) models : add `q8_0` models to `download-ggml-model.sh` (ggml-org#2589) ruby : Follow source tree change (ggml-org#2580) whisper : use backend registry (#0) ggml/sched : do not skip views in pre-assignments whisper : adapt to new ggml (wip) talk-llama : sync llama.cpp sync : ggml ggml : sync resolve (skip) (#0) Add required ggml-base and backend libs to cmake pkg (llama/10407) cuda : fix CUDA_FLAGS not being applied (llama/10403) sycl : Add option to set the SYCL architecture for all targets (llama/10266) vulkan: Optimize soft_max (llama/10301) sycl: Revert MUL_MAT_OP support changes (llama/10385) cuda : only use native when supported by cmake (llama/10389) vulkan: remove use of null initializer (llama/10372) metal : fox offset integer overflows in im2col (ggml/1015) Vulkan: Fix device info output format specifiers (llama/10366) metal : add `GGML_UNARY_OP_ELU` kernel (ggml/1018) CUDA: fix MMV kernel being used for FP16 src1 (llama/10357) ...
2 parents 3e301b9 + 021eef1 commit 0d7c567

File tree

597 files changed

+128644
-94137
lines changed

Some content is hidden

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

597 files changed

+128644
-94137
lines changed

.devops/cublas.Dockerfile

+2-2
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
15+
apt-get install -y build-essential git cmake libsdl2-dev
1616

1717
WORKDIR /app
1818

@@ -21,7 +21,7 @@ COPY . .
2121
# Set nvcc architecture
2222
ENV CUDA_DOCKER_ARCH=${CUDA_DOCKER_ARCH}
2323
# Enable cuBLAS
24-
ENV WHISPER_CUBLAS=1
24+
ENV GGML_CUDA=1
2525

2626
RUN make
2727

.devops/main-cuda.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ ARG CUDA_DOCKER_ARCH=all
1414
# Set nvcc architecture
1515
ENV CUDA_DOCKER_ARCH=${CUDA_DOCKER_ARCH}
1616
# Enable cuBLAS
17-
ENV WHISPER_CUBLAS=1
17+
ENV GGML_CUDA=1
1818

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

2323
# Ref: https://stackoverflow.com/a/53464012

.devops/main.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -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 \
15+
apt-get install -y curl ffmpeg libsdl2-dev \
1616
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
1717

1818
COPY --from=build /app /app

.github/workflows/bindings-go.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
ubuntu-latest:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/setup-go@v3
16+
- uses: actions/setup-go@v5
1717
with:
18-
go-version: '^1.19'
19-
- uses: actions/checkout@v1
18+
go-version: '^1.23'
19+
- uses: actions/checkout@v4
2020
- run: |
2121
cd bindings/go
2222
make test

.github/workflows/bindings-ruby.yml

+40-7
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,53 @@ on:
33
push:
44
paths:
55
- bindings/ruby/**
6-
- whisper.h
6+
- src/**/*.c
7+
- src/**/*.cpp
8+
- src/**/*.h
9+
- src/**/*.m
10+
- src/**/*.metal
11+
- include/**/*.c
12+
- include/**/*.cpp
13+
- include/**/*.h
14+
- include/**/*.m
15+
- include/**/*.metal
16+
- ggml/**/*.c
17+
- ggml/**/*.cpp
18+
- ggml/**/*.h
19+
- ggml/**/*.m
20+
- ggml/**/*.metal
21+
- scripts/get-flags.mk
22+
- examples/dr_wav.h
723
pull_request:
824
paths:
925
- bindings/ruby/**
10-
- whisper.h
26+
- src/**/*.c
27+
- src/**/*.cpp
28+
- src/**/*.h
29+
- src/**/*.m
30+
- src/**/*.metal
31+
- include/**/*.c
32+
- include/**/*.cpp
33+
- include/**/*.h
34+
- include/**/*.m
35+
- include/**/*.metal
36+
- ggml/**/*.c
37+
- ggml/**/*.cpp
38+
- ggml/**/*.h
39+
- ggml/**/*.m
40+
- ggml/**/*.metal
41+
- scripts/get-flags.mk
42+
- examples/dr_wav.h
1143

1244
jobs:
1345
ubuntu-latest:
1446
runs-on: ubuntu-latest
47+
defaults:
48+
run:
49+
working-directory: bindings/ruby
1550
steps:
1651
- uses: ruby/setup-ruby@v1
1752
with:
18-
ruby-version: '3.0'
19-
- uses: actions/checkout@v1
20-
- run: |
21-
cd bindings/ruby/ext
22-
ruby extconf.rb && make
53+
ruby-version: '3.1'
54+
- uses: actions/checkout@v4
55+
- run: rake test

0 commit comments

Comments
 (0)