Skip to content

whisper : add submodule for ggml #3001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .github/workflows/bindings-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
with:
go-version: '^1.23'
- uses: actions/checkout@v4
with:
submodules: true
- run: |
cd bindings/go
make test
2 changes: 2 additions & 0 deletions .github/workflows/bindings-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,6 @@ jobs:
with:
ruby-version: '3.1'
- uses: actions/checkout@v4
with:
submodules: true
- run: rake test
51 changes: 51 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true

- name: Determine tag name
id: tag
Expand Down Expand Up @@ -91,6 +92,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down Expand Up @@ -119,6 +122,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down Expand Up @@ -147,6 +152,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down Expand Up @@ -175,6 +182,8 @@ jobs:
- name: Clone
id: checkout
uses: actions/checkout@v4
with:
submodules: true

- name: ccache
uses: hendrikmuhs/[email protected]
Expand Down Expand Up @@ -206,6 +215,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Build
uses: cross-platform-actions/[email protected]
Expand All @@ -232,6 +243,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down Expand Up @@ -262,6 +275,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down Expand Up @@ -292,6 +307,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down Expand Up @@ -325,6 +342,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down Expand Up @@ -355,6 +374,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down Expand Up @@ -391,6 +412,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: add oneAPI to apt
shell: bash
Expand All @@ -415,6 +438,8 @@ jobs:
- name: Clone
id: checkout
uses: actions/checkout@v4
with:
submodules: true

- name: Build
id: cmake_build
Expand Down Expand Up @@ -443,6 +468,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: add oneAPI to apt
shell: bash
Expand All @@ -467,6 +494,8 @@ jobs:
- name: Clone
id: checkout
uses: actions/checkout@v4
with:
submodules: true

- name: Build
id: cmake_build
Expand All @@ -492,6 +521,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Setup ${{ matrix.sys }}
uses: msys2/setup-msys2@v2
Expand Down Expand Up @@ -546,6 +577,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2
Expand Down Expand Up @@ -607,6 +640,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
Expand Down Expand Up @@ -678,6 +713,8 @@ jobs:
steps:
- name: Clone repository
uses: actions/checkout@v4
with:
submodules: true

- name: Install Ninja
id: install_ninja
Expand Down Expand Up @@ -866,6 +903,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Setup emsdk
uses: mymindstorm/setup-emsdk@v14
Expand All @@ -889,6 +928,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: true

- name: Configure
run: |
Expand Down Expand Up @@ -950,6 +991,7 @@ jobs:
uses: actions/checkout@v4
with:
path: whisper
submodules: true

- name: Install Java
uses: actions/setup-java@v4
Expand Down Expand Up @@ -977,6 +1019,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: set up JDK 11
uses: actions/setup-java@v4
Expand All @@ -1002,6 +1046,8 @@ jobs:
# runs-on: windows-latest
# steps:
# - uses: actions/checkout@v4
# with:
# submodules: true
#
# - name: Install Java
# uses: actions/setup-java@v4
Expand Down Expand Up @@ -1048,6 +1094,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v4
with:
submodules: true

- name: Test quantize
run: |
Expand All @@ -1071,6 +1119,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true

- name: ccache
uses: hendrikmuhs/[email protected]
Expand Down Expand Up @@ -1130,6 +1179,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: true

- name: Set environment variables
id: set_vars
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ jobs:
steps:
- name: Check out the repo
uses: actions/checkout@v3
with:
submodules: true

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true

- name: Setup Pages
uses: actions/configure-pages@v4
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
steps:
- name: Clone
uses: actions/checkout@v1
with:
submodules: true

- name: Dependencies
run: |
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "ggml"]
path = ggml
url = https://github.com/ggml-org/ggml
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,8 @@ tiny.en tiny base.en base small.en small medium.en medium large-v1 large-v2 larg
./build/bin/whisper-cli -m models/[email protected] -f $$f ; \
echo "" ; \
done

.PHONY: update-ggml
update-ggml:
echo "Updating ggml submodule..."
git submodule update --remote ggml
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ https://github.com/ggerganov/whisper.cpp/assets/1991296/c82e8f86-60dc-49f2-b048-
First clone the repository:

```bash
git clone https://github.com/ggerganov/whisper.cpp.git
git clone --recurse-submodules https://github.com/ggerganov/whisper.cpp.git
```

Navigate into the directory:
Expand Down
2 changes: 1 addition & 1 deletion bindings/go/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func main() {
In order to build, you need to have the Go compiler installed. You can get it from [here](https://golang.org/dl/). Run the tests with:

```bash
git clone https://github.com/ggerganov/whisper.cpp.git
git clone --recurse-submodules https://github.com/ggerganov/whisper.cpp.git
cd whisper.cpp/bindings/go
make test
```
Expand Down
2 changes: 1 addition & 1 deletion bindings/java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class Example {
In order to build, you need to have the JDK 8 or higher installed. Run the tests with:

```bash
git clone https://github.com/ggerganov/whisper.cpp.git
git clone --recurse-submodules https://github.com/ggerganov/whisper.cpp.git
cd whisper.cpp/bindings/java

./gradlew build
Expand Down
2 changes: 1 addition & 1 deletion bindings/javascript/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ For sample usage check [tests/test-whisper.js](/tests/test-whisper.js)
source /path/to/emsdk/emsdk_env.sh

# clone repo
git clone https://github.com/ggerganov/whisper.cpp
git clone https://github.com/ggerganov/whisper.cpp.git
cd whisper.cpp

# grab base.en model
Expand Down
2 changes: 1 addition & 1 deletion bindings/ruby/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ The second argument `samples` may be an array, an object with `length` and `each
Development
-----------

% git clone https://github.com/ggerganov/whisper.cpp.git
% git clone --recurse-submodules https://github.com/ggerganov/whisper.cpp.git
% cd whisper.cpp/bindings/ruby
% rake test

Expand Down
2 changes: 1 addition & 1 deletion bindings/ruby/extsources.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "yaml"

sources = `git ls-files -z ../..`.split("\x0")
sources = `git ls-files -z ../.. --recurse-submodules`.split("\x0")
paths = YAML.load_file("../../.github/workflows/bindings-ruby.yml")[true]["push"]["paths"]
paths.delete "bindings/ruby/**"
EXTSOURCES = (Dir.glob(paths, base: "../..").collect {|path| "../../#{path}"} << "../../LICENSE") & sources
2 changes: 1 addition & 1 deletion examples/bench.wasm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Terminal version: [examples/bench](/examples/bench)

```bash
# build using Emscripten (v3.1.2)
git clone https://github.com/ggerganov/whisper.cpp
git clone --recurse-submodules https://github.com/ggerganov/whisper.cpp.git
cd whisper.cpp
mkdir build-em && cd build-em
emcmake cmake ..
Expand Down
2 changes: 1 addition & 1 deletion examples/command.wasm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Terminal version: [examples/command](/examples/command)

```bash
# build using Emscripten (v3.1.2)
git clone https://github.com/ggerganov/whisper.cpp
git clone --recurse-submodules https://github.com/ggerganov/whisper.cpp.git
cd whisper.cpp
mkdir build-em && cd build-em
emcmake cmake ..
Expand Down
2 changes: 1 addition & 1 deletion examples/stream.wasm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Online demo: https://whisper.ggerganov.com/stream/

```bash
# build using Emscripten (v3.1.2)
git clone https://github.com/ggerganov/whisper.cpp
git clone --recurse-submodules https://github.com/ggerganov/whisper.cpp.git
cd whisper.cpp
mkdir build-em && cd build-em
emcmake cmake ..
Expand Down
2 changes: 1 addition & 1 deletion examples/whisper.nvim/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ https://user-images.githubusercontent.com/1991296/198382564-784e9663-2037-4d04-9
- Clone this repo and build the `stream` tool:

```
git clone https://github.com/ggerganov/whisper.cpp
git clone --recurse-submodules https://github.com/ggerganov/whisper.cpp.git
cd whisper.cpp
make stream
```
Expand Down
2 changes: 1 addition & 1 deletion examples/whisper.wasm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Link: https://ggerganov.github.io/whisper.cpp/

```bash (v3.1.2)
# build using Emscripten
git clone https://github.com/ggerganov/whisper.cpp
git clone --recurse-submodules https://github.com/ggerganov/whisper.cpp.git
cd whisper.cpp
mkdir build-em && cd build-em
emcmake cmake ..
Expand Down
1 change: 1 addition & 0 deletions ggml
Submodule ggml added at dddef7
1 change: 0 additions & 1 deletion ggml/.gitignore

This file was deleted.

Loading
Loading