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

Commit a705dba

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

File tree

12 files changed

+13
-1613
lines changed

12 files changed

+13
-1613
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 & 59 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
@@ -333,22 +323,6 @@ jobs:
333323
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 }}
334324
rm -rf uploads/
335325
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-
352326
macOS-amd64-build:
353327
runs-on: macos-13
354328
needs: [create-draft-release, set-nitro-version]
@@ -404,15 +378,6 @@ jobs:
404378
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 }}
405379
rm -rf uploads/
406380
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-
416381
universal-nitro-artifact-macos:
417382
runs-on: macos-latest
418383
needs: [create-draft-release, set-nitro-version, macOS-silicon-build, macOS-amd64-build]
@@ -469,13 +434,13 @@ jobs:
469434
matrix:
470435
include:
471436
- 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"
437+
defines: "-DLLAMA_AVX2=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
473438
- 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"
439+
defines: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
475440
- 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"
441+
defines: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
477442
- 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"
443+
defines: "-DLLAMA_VULKAN=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
479444
# - build: "arm64"
480445
# defines: "-A ARM64 -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DBUILD_SHARED_LIBS=ON"
481446

@@ -539,11 +504,9 @@ jobs:
539504
robocopy .\build\engines\cortex.llamacpp\ .\build\Release\engines\cortex.llamacpp\ engine.dll
540505
robocopy build_deps\_install\bin\ .\build\Release\ zlib.dll
541506
robocopy build\bin\Release\ .\build\Release\ llama.dll
542-
robocopy build\bin\Release\ .\build\Release\ whisper.dll
543507
robocopy ..\.github\patches\windows\ .\build\Release\ msvcp140.dll
544508
robocopy ..\.github\patches\windows\ .\build\Release\ vcruntime140_1.dll
545509
robocopy ..\.github\patches\windows\ .\build\Release\ vcruntime140.dll
546-
robocopy "$env:SDL2_DIR\..\lib\2.28.5\" .\build\Release\ SDL2.dll
547510
dotnet tool install --global AzureSignTool
548511
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"
549512
7z a -ttar temp.tar .\build\Release\*
@@ -558,15 +521,6 @@ jobs:
558521
..\..\..\.github\scripts\e2e-test-llama-windows.bat nitro.exe ${{ env.LLM_MODEL_URL }} ${{ env.EMBEDDING_MODEL_URL }}
559522
rmdir /S /Q .\build\Release\uploads
560523
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-
570524
- name: Upload Artifact
571525
uses: actions/upload-artifact@v2
572526
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
@@ -598,27 +552,27 @@ jobs:
598552
- cuda: "12-0"
599553
instructions: "amd64-avx2"
600554
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"
555+
cmake-flags: "-DCUDA_12_0=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
602556
- cuda: "12-0"
603557
instructions: "amd64-avx"
604558
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"
559+
cmake-flags: "-DCUDA_12_0=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
606560
- cuda: "12-0"
607561
instructions: "amd64-avx512"
608562
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"
563+
cmake-flags: "-DCUDA_12_0=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
610564
- cuda: "11-7"
611565
instructions: "amd64-avx2"
612566
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"
567+
cmake-flags: "-DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
614568
- cuda: "11-7"
615569
instructions: "amd64-avx"
616570
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"
571+
cmake-flags: "-DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
618572
- cuda: "11-7"
619573
instructions: "amd64-avx512"
620574
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"
575+
cmake-flags: "-DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE"
622576

623577
steps:
624578
- name: Fetch SDL2 and set SDL2_DIR version 2.28.5
@@ -659,11 +613,9 @@ jobs:
659613
robocopy .\build\engines\cortex.llamacpp\ .\build\Release\engines\cortex.llamacpp\ engine.dll
660614
robocopy build_deps\_install\bin\ .\build\Release\ zlib.dll
661615
robocopy build\bin\Release\ .\build\Release\ llama.dll
662-
robocopy build\bin\Release\ .\build\Release\ whisper.dll
663616
robocopy ..\.github\patches\windows\ .\build\Release\ msvcp140.dll
664617
robocopy ..\.github\patches\windows\ .\build\Release\ vcruntime140_1.dll
665618
robocopy ..\.github\patches\windows\ .\build\Release\ vcruntime140.dll
666-
robocopy "$env:SDL2_DIR\..\lib\2.28.5\" .\build\Release\ SDL2.dll
667619
dotnet tool install --global AzureSignTool
668620
%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"
669621
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

‎cortex-cpp/CMakeLists.txt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ endif()
5656

5757
add_compile_definitions(NITRO_VERSION="${NITRO_VERSION}")
5858

59-
add_subdirectory(whisper.cpp)
6059
add_subdirectory(test)
6160

6261
add_executable(${PROJECT_NAME} main.cc)
@@ -69,7 +68,7 @@ add_executable(${PROJECT_NAME} main.cc)
6968
# and comment out the following lines
7069

7170
find_package(Drogon CONFIG REQUIRED)
72-
target_link_libraries(${PROJECT_NAME} PRIVATE Drogon::Drogon whisper
71+
target_link_libraries(${PROJECT_NAME} PRIVATE Drogon::Drogon
7372
${CMAKE_THREAD_LIBS_INIT})
7473

7574
# ##############################################################################
@@ -87,7 +86,6 @@ endif()
8786

8887
aux_source_directory(controllers CTL_SRC)
8988
aux_source_directory(common COMMON_SRC)
90-
aux_source_directory(context CONTEXT_SRC)
9189
aux_source_directory(models MODEL_SRC)
9290
aux_source_directory(cortex-common CORTEX_COMMON)
9391
# aux_source_directory(filters FILTER_SRC) aux_source_directory(plugins
@@ -100,7 +98,7 @@ aux_source_directory(cortex-common CORTEX_COMMON)
10098

10199
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} )
102100
# ${CMAKE_CURRENT_SOURCE_DIR}/models)
103-
target_sources(${PROJECT_NAME} PRIVATE ${CTL_SRC} ${COMMON_SRC} ${CONTEXT_SRC})
101+
target_sources(${PROJECT_NAME} PRIVATE ${CTL_SRC} ${COMMON_SRC})
104102
# ${FILTER_SRC} ${PLUGIN_SRC} ${MODEL_SRC})
105103
# ##############################################################################
106104
# uncomment the following line for dynamically loading views set_property(TARGET

‎cortex-cpp/common/base.cc‎

Whitespace-only changes.

0 commit comments

Comments
 (0)