Skip to content

Commit f0d3bb9

Browse files
bygreencnbygreencn
committed
Merge tag 'v1.7.1' into fix_decoding
# By Georgi Gerganov (18) and others # Via Georgi Gerganov * tag 'v1.7.1': (43 commits) release : v1.7.1 vulkan : retry allocation with fallback flags (ggml-org#2451) release : v1.7.0 scripts : bench v3-turbo whisper : remove mel leftover constants (396089f) whisper : zero-out the KV cache upon clear (ggml-org#2445) objc : fix build metal : zero-init buffer contexts (#0) whisper : revert mel-related changes (#0) whisper : adapt to latest ggml (skip) (#0) ggml : fix typo in example usage ggml_gallocr_new (ggml/984) ggml : fixes after sync (ggml/983) ggml-backend : add device and backend reg interfaces (llama/9707) Fixed dequant precision issues in Q4_1 and Q5_1 (llama/9711) ggml-backend : add device and backend reg interfaces (llama/9707) Initial cmake support of SYCL for AMD GPUs (llama/9658) vulkan : do not use tensor->extra (llama/9407) ggml/ex: calculate accuracy in graph, adapt MNIST (ggml/980) ggml: refactor cross entropy loss CPU impl. (ggml/976) scripts : sync ggml-backend.cpp ... # Conflicts: # bindings/javascript/package.json
2 parents 3591ac2 + ebca09a commit f0d3bb9

Some content is hidden

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

81 files changed

+11073
-10991
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
.cache/
44
.coreml/
55
.test/
6+
.venv/
67
.vs/
78
.vscode/
89
.DS_Store
910
.vimspector.json
1011
/CMakeSettings.json
12+
/talk-llama.dSYM/
1113

1214
build/
1315
build-*/

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.5) # for add_link_options and implicit target directories.
22
project("whisper.cpp" C CXX)
3-
project("whisper.cpp" VERSION 1.6.2)
3+
project("whisper.cpp" VERSION 1.7.1)
44
include(CheckIncludeFileCXX)
55

66
set(SOVERSION 1)

‎Makefile

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ BUILD_TARGETS = \
33
main \
44
bench \
55
quantize \
6-
server \
7-
tests/test-c.o
6+
server
87

98
# Binaries only useful for tests
109
TEST_TARGETS = \
11-
tests/test-backend-ops
10+
tests/test-c.o
1211

1312
# Deprecation aliases
1413
ifdef WHISPER_CUBLAS
@@ -513,9 +512,6 @@ ifdef GGML_CUDA
513512
OBJ_GGML += ggml/src/ggml-cuda.o
514513
OBJ_GGML += $(patsubst %.cu,%.o,$(wildcard ggml/src/ggml-cuda/*.cu))
515514
OBJ_GGML += $(OBJ_CUDA_TMPL)
516-
517-
#OBJ_WHISPER += src/whisper-mel-cuda.o
518-
519515
ifdef WHISPER_FATAL_WARNINGS
520516
MK_NVCCFLAGS += -Werror all-warnings
521517
endif # WHISPER_FATAL_WARNINGS
@@ -624,10 +620,6 @@ ggml/src/ggml-cuda.o: \
624620
ggml/src/ggml-common.h \
625621
$(wildcard ggml/src/ggml-cuda/*.cuh)
626622
$(NVCC_COMPILE)
627-
628-
#src/whisper-mel-cuda.o: src/whisper-mel-cuda.cu src/whisper-mel-cuda.hpp
629-
# $(NVCC) $(NVCCFLAGS) $(CPPFLAGS) -Xcompiler "$(CUDA_CXXFLAGS)" -c $< -o $@
630-
631623
endif # GGML_CUDA
632624

633625
ifdef GGML_VULKAN
@@ -905,10 +897,10 @@ ggml/src/ggml-alloc.o: \
905897
$(CC) $(CFLAGS) -c $< -o $@
906898

907899
ggml/src/ggml-backend.o: \
908-
ggml/src/ggml-backend.c \
900+
ggml/src/ggml-backend.cpp \
909901
ggml/include/ggml.h \
910902
ggml/include/ggml-backend.h
911-
$(CC) $(CFLAGS) -c $< -o $@
903+
$(CXX) $(CXXFLAGS) -c $< -o $@
912904

913905
ggml/src/ggml-quants.o: \
914906
ggml/src/ggml-quants.c \
@@ -956,7 +948,6 @@ $(LIB_GGML_S): \
956948

957949
src/whisper.o: \
958950
src/whisper.cpp \
959-
src/whisper-mel.hpp \
960951
include/whisper.h \
961952
ggml/include/ggml.h \
962953
ggml/include/ggml-alloc.h \
@@ -1101,11 +1092,6 @@ tests: $(TEST_TARGETS)
11011092
tests/test-c.o: tests/test-c.c include/whisper.h
11021093
$(CC) $(CFLAGS) -c $(filter-out %.h,$^) -o $@
11031094

1104-
tests/test-backend-ops: tests/test-backend-ops.cpp \
1105-
$(OBJ_GGML)
1106-
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
1107-
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
1108-
11091095
#
11101096
# Audio samples
11111097
#
@@ -1151,8 +1137,9 @@ samples:
11511137
.PHONY: large-v1
11521138
.PHONY: large-v2
11531139
.PHONY: large-v3
1140+
.PHONY: large-v3-turbo
11541141

1155-
tiny.en tiny base.en base small.en small medium.en medium large-v1 large-v2 large-v3: main
1142+
tiny.en tiny base.en base small.en small medium.en medium large-v1 large-v2 large-v3 large-v3-turbo: main
11561143
bash ./models/download-ggml-model.sh $@
11571144
@echo ""
11581145
@echo "==============================================="

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ let package = Package(
3434
"src/whisper.cpp",
3535
"ggml/src/ggml-aarch64.c",
3636
"ggml/src/ggml-alloc.c",
37-
"ggml/src/ggml-backend.c",
37+
"ggml/src/ggml-backend.cpp",
3838
"ggml/src/ggml-quants.c",
3939
"ggml/src/ggml-metal.m"
4040
],

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[![Conan Center](https://shields.io/conan/v/whisper-cpp)](https://conan.io/center/whisper-cpp)
88
[![npm](https://img.shields.io/npm/v/whisper.cpp.svg)](https://www.npmjs.com/package/whisper.cpp/)
99

10-
Stable: [v1.6.2](https://github.com/ggerganov/whisper.cpp/releases/tag/v1.6.0) / [Roadmap | F.A.Q.](https://github.com/ggerganov/whisper.cpp/discussions/126)
10+
Stable: [v1.7.1](https://github.com/ggerganov/whisper.cpp/releases/tag/v1.7.1) / [Roadmap | F.A.Q.](https://github.com/ggerganov/whisper.cpp/discussions/126)
1111

1212
High-performance inference of [OpenAI's Whisper](https://github.com/openai/whisper) automatic speech recognition (ASR) model:
1313

@@ -236,6 +236,7 @@ make medium
236236
make large-v1
237237
make large-v2
238238
make large-v3
239+
make large-v3-turbo
239240
```
240241

241242
## Memory usage

‎bindings/go/examples/go-model-download/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const (
2424

2525
var (
2626
// The models which will be downloaded, if no model is specified as an argument
27-
modelNames = []string{"ggml-tiny.en", "ggml-tiny", "ggml-base.en", "ggml-base", "ggml-small.en", "ggml-small", "ggml-medium.en", "ggml-medium", "ggml-large-v1", "ggml-large-v2", "ggml-large-v3"}
27+
modelNames = []string{"ggml-tiny.en", "ggml-tiny", "ggml-base.en", "ggml-base", "ggml-small.en", "ggml-small", "ggml-medium.en", "ggml-medium", "ggml-large-v1", "ggml-large-v2", "ggml-large-v3", "large-v3-turbo"}
2828
)
2929

3030
var (

‎bindings/javascript/package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
{
2-
"name": "whisper.cpp",
3-
"version": "1.6.2",
4-
"description": "Whisper speech recognition",
5-
"main": "whisper.js",
6-
"scripts": {
7-
"test": "echo \"todo: add tests\" && exit 0"
8-
},
9-
"repository": {
10-
"type": "git",
11-
"url": "git+https://github.com/ggerganov/whisper.cpp"
12-
},
13-
"keywords": [
14-
"openai",
15-
"whisper",
16-
"speech-to-text",
17-
"speech-recognition",
18-
"transformer"
19-
],
20-
"author": "Georgi Gerganov",
21-
"license": "MIT",
22-
"bugs": {
23-
"url": "https://github.com/ggerganov/whisper.cpp/issues"
24-
},
25-
"homepage": "https://github.com/ggerganov/whisper.cpp#readme"
26-
}
1+
{
2+
"name": "whisper.cpp",
3+
"version": "1.7.1",
4+
"description": "Whisper speech recognition",
5+
"main": "whisper.js",
6+
"scripts": {
7+
"test": "echo \"todo: add tests\" && exit 0"
8+
},
9+
"repository": {
10+
"type": "git",
11+
"url": "git+https://github.com/ggerganov/whisper.cpp"
12+
},
13+
"keywords": [
14+
"openai",
15+
"whisper",
16+
"speech-to-text",
17+
"speech-recognition",
18+
"transformer"
19+
],
20+
"author": "Georgi Gerganov",
21+
"license": "MIT",
22+
"bugs": {
23+
"url": "https://github.com/ggerganov/whisper.cpp/issues"
24+
},
25+
"homepage": "https://github.com/ggerganov/whisper.cpp#readme"
26+
}

‎bindings/ruby/ext/extconf.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
require 'mkmf'
22
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','whisper.cpp')} .")
33
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','whisper.h')} .")
4-
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','whisper-mel.hpp')} .")
54
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml.h')} .")
65
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml.c')} .")
76
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-impl.h')} .")
@@ -11,7 +10,7 @@
1110
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-alloc.c')} .")
1211
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-backend-impl.h')} .")
1312
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-backend.h')} .")
14-
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-backend.c')} .")
13+
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-backend.cpp')} .")
1514
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-common.h')} .")
1615
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-quants.h')} .")
1716
system("cp #{File.join(File.dirname(__FILE__),'..','..','..','ggml-quants.c')} .")

0 commit comments

Comments
 (0)