Skip to content

Commit f114b14

Browse files
committed
Merge remote-tracking branch 'ggerganov/master'
* ggerganov/master: (44 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 5f9729d + 021eef1 commit f114b14

File tree

222 files changed

+26023
-24525
lines changed

Some content is hidden

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

222 files changed

+26023
-24525
lines changed

.github/workflows/bindings-ruby.yml

+31-51
Original file line numberDiff line numberDiff line change
@@ -3,61 +3,41 @@ on:
33
push:
44
paths:
55
- bindings/ruby/**
6-
- src/whisper.cpp
7-
- include/whisper.h
8-
- ggml/src/ggml.c
9-
- ggml/src/ggml-impl.h
10-
- ggml/src/ggml-aarch64.h
11-
- ggml/src/ggml-aarch64.c
12-
- ggml/src/ggml-alloc.c
13-
- ggml/src/ggml-backend-impl.h
14-
- ggml/src/ggml-backend.cpp
15-
- ggml/src/ggml-common.h
16-
- ggml/src/ggml-quants.h
17-
- ggml/src/ggml-quants.c
18-
- ggml/src/ggml-cpu-impl.h
19-
- ggml/src/ggml-metal.m
20-
- ggml/src/ggml-metal.metal
21-
- ggml/src/ggml-blas.cpp
22-
- ggml/include/ggml.h
23-
- ggml/include/ggml-alloc.h
24-
- ggml/include/ggml-backend.h
25-
- ggml/include/ggml-cuda.h
26-
- ggml/include/ggml-kompute.h
27-
- ggml/include/ggml-metal.h
28-
- ggml/include/ggml-sycl.h
29-
- ggml/include/ggml-vulkan.h
30-
- ggml/include/ggml-blas.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
3121
- scripts/get-flags.mk
3222
- examples/dr_wav.h
3323
pull_request:
3424
paths:
3525
- bindings/ruby/**
36-
- src/whisper.cpp
37-
- include/whisper.h
38-
- ggml/src/ggml.c
39-
- ggml/src/ggml-impl.h
40-
- ggml/src/ggml-aarch64.h
41-
- ggml/src/ggml-aarch64.c
42-
- ggml/src/ggml-alloc.c
43-
- ggml/src/ggml-backend-impl.h
44-
- ggml/src/ggml-backend.cpp
45-
- ggml/src/ggml-common.h
46-
- ggml/src/ggml-quants.h
47-
- ggml/src/ggml-quants.c
48-
- ggml/src/ggml-cpu-impl.h
49-
- ggml/src/ggml-metal.m
50-
- ggml/src/ggml-metal.metal
51-
- ggml/src/ggml-blas.cpp
52-
- ggml/include/ggml.h
53-
- ggml/include/ggml-alloc.h
54-
- ggml/include/ggml-backend.h
55-
- ggml/include/ggml-cuda.h
56-
- ggml/include/ggml-kompute.h
57-
- ggml/include/ggml-metal.h
58-
- ggml/include/ggml-sycl.h
59-
- ggml/include/ggml-vulkan.h
60-
- ggml/include/ggml-blas.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
6141
- scripts/get-flags.mk
6242
- examples/dr_wav.h
6343

@@ -70,6 +50,6 @@ jobs:
7050
steps:
7151
- uses: ruby/setup-ruby@v1
7252
with:
73-
ruby-version: '3.0'
53+
ruby-version: '3.1'
7454
- uses: actions/checkout@v4
7555
- run: rake test

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
*.o
22
*.a
3+
*.d
34
.cache/
45
.coreml/
56
.test/
@@ -19,6 +20,9 @@ build-*/
1920
.swiftpm
2021
*.metallib
2122

23+
ggml-metal-embed.metal
24+
ggml-metal-embed.metal.tmp
25+
2226
/main
2327
/stream
2428
/command

0 commit comments

Comments
 (0)