Skip to content
This repository was archived by the owner on Jul 4, 2025. It is now read-only.

Commit e8e1100

Browse files
vansangpfievvansangpfiev
committed
refactor: remove audio
1 parent 95ec19a commit e8e1100

File tree

12 files changed

+13
-1632
lines changed

12 files changed

+13
-1632
lines changed

‎.github/scripts/e2e-test-whisper-linux-and-mac.sh‎

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎.github/scripts/e2e-test-whisper-windows.bat‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ on:
4848
env:
4949
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
5050
LLM_MODEL_URL: https://delta.jan.ai/tinyllama-1.1b-chat-v0.3.Q2_K.gguf
51-
WHISPER_MODEL_URL: https://delta.jan.ai/ggml-tiny-q5_1.bin
5251
EMBEDDING_MODEL_URL: https://catalog.jan.ai/dist/models/embeds/nomic-embed-text-v1.5.f16.gguf
5352

5453
jobs:
@@ -193,15 +192,6 @@ jobs:
193192
chmod +x ../../.github/scripts/e2e-test-llama-linux-and-mac.sh && ../../.github/scripts/e2e-test-llama-linux-and-mac.sh ./nitro ${{ env.LLM_MODEL_URL }} ${{ env.EMBEDDING_MODEL_URL }}
194193
rm -rf uploads/
195194
196-
- name: Run e2e testing - Whisper.CPP
197-
shell: bash
198-
if: ${{ matrix.build != 'arm64' && matrix.build != 'amd64-vulkan' && matrix.build != 'amd64-avx512' && matrix.build != 'amd64-avx' }}
199-
run: |
200-
# run e2e testing
201-
cd cortex-cpp/nitro
202-
chmod +x ../../.github/scripts/e2e-test-whisper-linux-and-mac.sh && ../../.github/scripts/e2e-test-whisper-linux-and-mac.sh ./nitro ${{ env.WHISPER_MODEL_URL }}
203-
rm -rf uploads/
204-
205195
- uses: actions/upload-release-asset@v1.0.1
206196
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
207197
env:
@@ -240,7 +230,7 @@ jobs:
240230
cd cortex-cpp
241231
./install_deps.sh
242232
mkdir build && cd build
243-
cmake ${{matrix.flags}} -DLLAMA_NATIVE=OFF -DLLAMA_CUDA=ON -DWHISPER_CUDA=ON -DNITRO_VERSION=${{ needs.set-nitro-version.outputs.version }} ..
233+
cmake ${{matrix.flags}} -DLLAMA_NATIVE=OFF -DLLAMA_CUDA=ON -DNITRO_VERSION=${{ needs.set-nitro-version.outputs.version }} ..
244234
make -j $(nproc)
245235
ls -la
246236
@@ -294,13 +284,6 @@ jobs:
294284
with:
295285
submodules: recursive
296286

297-
- name: Dependencies
298-
id: depends
299-
continue-on-error: true
300-
run: |
301-
brew update
302-
brew install cmake sdl2
303-
304287
- name: Build
305288
id: cmake_build
306289
run: |
@@ -333,22 +316,6 @@ jobs:
333316
chmod +x ../../.github/scripts/e2e-test-llama-linux-and-mac.sh && ../../.github/scripts/e2e-test-llama-linux-and-mac.sh ./nitro ${{ env.LLM_MODEL_URL }} ${{ env.EMBEDDING_MODEL_URL }}
334317
rm -rf uploads/
335318
336-
- name: Run e2e testing - Whisper.CPP
337-
run: |
338-
cd cortex-cpp
339-
# To test with CoreML
340-
if [[ ! -f "/tmp/testwhisper-encoder.mlmodelc" ]]; then
341-
curl -LO https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-tiny-encoder.mlmodelc.zip
342-
unzip ggml-tiny-encoder.mlmodelc.zip
343-
rm ggml-tiny-encoder.mlmodelc.zip
344-
rm -rf /tmp/testwhisper-encoder.mlmodelc
345-
mv ggml-tiny-encoder.mlmodelc /tmp/testwhisper-encoder.mlmodelc
346-
fi
347-
# run e2e testing
348-
cd nitro
349-
chmod +x ../../.github/scripts/e2e-test-whisper-linux-and-mac.sh && ../../.github/scripts/e2e-test-whisper-linux-and-mac.sh ./nitro ${{ env.WHISPER_MODEL_URL }}
350-
rm -rf uploads/
351-
352319
macOS-amd64-build:
353320
runs-on: macos-13
354321
needs: [create-draft-release, set-nitro-version]
@@ -404,15 +371,6 @@ jobs:
404371
chmod +x ../../.github/scripts/e2e-test-llama-linux-and-mac.sh && ../../.github/scripts/e2e-test-llama-linux-and-mac.sh ./nitro ${{ env.LLM_MODEL_URL }} ${{ env.EMBEDDING_MODEL_URL }}
405372
rm -rf uploads/
406373
407-
- name: Run e2e testing - Whisper.CPP
408-
shell: bash
409-
run: |
410-
# run e2e testing
411-
cd cortex-cpp
412-
cd nitro
413-
chmod +x ../../.github/scripts/e2e-test-whisper-linux-and-mac.sh && ../../.github/scripts/e2e-test-whisper-linux-and-mac.sh ./nitro ${{ env.WHISPER_MODEL_URL }}
414-
rm -rf uploads/
415-
416374
universal-nitro-artifact-macos:
417375
runs-on: macos-latest
418376
needs: [create-draft-release, set-nitro-version, macOS-silicon-build, macOS-amd64-build]
@@ -469,13 +427,13 @@ jobs:
469427
matrix:
470428
include:
471429
- build: "amd64-avx2"
472-
defines: "-DLLAMA_AVX2=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON"
430+
defines: "-DLLAMA_AVX2=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
473431
- build: "amd64-avx"
474-
defines: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON"
432+
defines: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
475433
- build: "amd64-avx512"
476-
defines: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON"
434+
defines: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
477435
- build: "amd64-vulkan"
478-
defines: "-DLLAMA_VULKAN=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON"
436+
defines: "-DLLAMA_VULKAN=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
479437
# - build: "arm64"
480438
# defines: "-A ARM64 -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DBUILD_SHARED_LIBS=ON"
481439

@@ -501,12 +459,6 @@ jobs:
501459
- name: Add msbuild to PATH
502460
uses: microsoft/setup-msbuild@v1
503461

504-
- name: Fetch SDL2 and set SDL2_DIR version 2.28.5
505-
run: |
506-
C:/msys64/usr/bin/wget.exe -qO sdl2.zip https://github.com/libsdl-org/SDL/releases/download/release-2.28.5/SDL2-devel-2.28.5-VC.zip
507-
7z x sdl2.zip -aoa
508-
echo "SDL2_DIR=$env:GITHUB_WORKSPACE/SDL2-2.28.5/cmake" >> $env:GITHUB_ENV
509-
510462
- name: actions-setup-cmake
511463
uses: jwlawson/actions-setup-cmake@v1.14.1
512464

@@ -539,11 +491,9 @@ jobs:
539491
robocopy .\build\engines\cortex.llamacpp\ .\build\Release\engines\cortex.llamacpp\ engine.dll
540492
robocopy build_deps\_install\bin\ .\build\Release\ zlib.dll
541493
robocopy build\bin\Release\ .\build\Release\ llama.dll
542-
robocopy build\bin\Release\ .\build\Release\ whisper.dll
543494
robocopy ..\.github\patches\windows\ .\build\Release\ msvcp140.dll
544495
robocopy ..\.github\patches\windows\ .\build\Release\ vcruntime140_1.dll
545496
robocopy ..\.github\patches\windows\ .\build\Release\ vcruntime140.dll
546-
robocopy "$env:SDL2_DIR\..\lib\2.28.5\" .\build\Release\ SDL2.dll
547497
dotnet tool install --global AzureSignTool
548498
azuresigntool.exe sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.globalsign.com/tsa/r6advanced1 -v ".\build\Release\nitro.exe"
549499
7z a -ttar temp.tar .\build\Release\*
@@ -558,15 +508,6 @@ jobs:
558508
..\..\..\.github\scripts\e2e-test-llama-windows.bat nitro.exe ${{ env.LLM_MODEL_URL }} ${{ env.EMBEDDING_MODEL_URL }}
559509
rmdir /S /Q .\build\Release\uploads
560510
561-
- name: Run e2e testing - Whisper.cpp
562-
shell: cmd
563-
if: ${{ matrix.build != 'arm64' && matrix.build != 'amd64-vulkan' && matrix.build != 'amd64-avx512' }}
564-
run: |
565-
cd cortex-cpp
566-
cd build\Release
567-
..\..\..\.github\scripts\e2e-test-whisper-windows.bat nitro.exe ${{ env.WHISPER_MODEL_URL }}
568-
rmdir /S /Q .\build\Release\uploads
569-
570511
- name: Upload Artifact
571512
uses: actions/upload-artifact@v2
572513
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
@@ -598,35 +539,29 @@ jobs:
598539
- cuda: "12-0"
599540
instructions: "amd64-avx2"
600541
inst-flags: "-DLLAMA_AVX2=ON -DLLAMA_NATIVE=OFF"
601-
cmake-flags: "-DCUDA_12_0=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DWHISPER_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON"
542+
cmake-flags: "-DCUDA_12_0=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
602543
- cuda: "12-0"
603544
instructions: "amd64-avx"
604545
inst-flags: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF"
605-
cmake-flags: "-DCUDA_12_0=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DWHISPER_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON"
546+
cmake-flags: "-DCUDA_12_0=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
606547
- cuda: "12-0"
607548
instructions: "amd64-avx512"
608549
inst-flags: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF"
609-
cmake-flags: "-DCUDA_12_0=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DWHISPER_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON"
550+
cmake-flags: "-DCUDA_12_0=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
610551
- cuda: "11-7"
611552
instructions: "amd64-avx2"
612553
inst-flags: "-DLLAMA_AVX2=ON -DLLAMA_NATIVE=OFF"
613-
cmake-flags: "-DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DWHISPER_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON"
554+
cmake-flags: "-DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
614555
- cuda: "11-7"
615556
instructions: "amd64-avx"
616557
inst-flags: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF"
617-
cmake-flags: "-DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DWHISPER_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON"
558+
cmake-flags: "-DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
618559
- cuda: "11-7"
619560
instructions: "amd64-avx512"
620561
inst-flags: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF"
621-
cmake-flags: "-DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DWHISPER_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON"
562+
cmake-flags: "-DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
622563

623564
steps:
624-
- name: Fetch SDL2 and set SDL2_DIR version 2.28.5
625-
run: |
626-
curl -L -o sdl2.zip https://github.com/libsdl-org/SDL/releases/download/release-2.28.5/SDL2-devel-2.28.5-VC.zip
627-
7z x sdl2.zip -aoa
628-
echo "SDL2_DIR=$env:GITHUB_WORKSPACE/SDL2-2.28.5/cmake" >> $env:GITHUB_ENV
629-
630565
- name: Clone
631566
id: checkout
632567
uses: actions/checkout@v3
@@ -659,11 +594,9 @@ jobs:
659594
robocopy .\build\engines\cortex.llamacpp\ .\build\Release\engines\cortex.llamacpp\ engine.dll
660595
robocopy build_deps\_install\bin\ .\build\Release\ zlib.dll
661596
robocopy build\bin\Release\ .\build\Release\ llama.dll
662-
robocopy build\bin\Release\ .\build\Release\ whisper.dll
663597
robocopy ..\.github\patches\windows\ .\build\Release\ msvcp140.dll
664598
robocopy ..\.github\patches\windows\ .\build\Release\ vcruntime140_1.dll
665599
robocopy ..\.github\patches\windows\ .\build\Release\ vcruntime140.dll
666-
robocopy "$env:SDL2_DIR\..\lib\2.28.5\" .\build\Release\ SDL2.dll
667600
dotnet tool install --global AzureSignTool
668601
%USERPROFILE%\.dotnet\tools\azuresigntool.exe sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.globalsign.com/tsa/r6advanced1 -v ".\build\Release\nitro.exe"
669602
7z a -ttar temp.tar .\build\Release\*

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "cortex-cpp/whisper.cpp"]
2-
path = cortex-cpp/whisper.cpp
3-
url = https://github.com/ggerganov/whisper.cpp.git

0 commit comments

Comments
 (0)