Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 0 additions & 116 deletions .github/workflows/windows-x64-debug.yaml

This file was deleted.

74 changes: 32 additions & 42 deletions .github/workflows/windows-x64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ on:
- '.github/scripts/test-offline-ctc.sh'
- '.github/scripts/test-online-ctc.sh'
- '.github/scripts/test-offline-tts.sh'
- '.github/scripts/test-audio-tagging.sh'
- '.github/scripts/test-offline-punctuation.sh'
- '.github/scripts/test-online-punctuation.sh'
- '.github/scripts/test-speaker-diarization.sh'
- '.github/scripts/test-c-api.sh'
- '.github/scripts/test-cxx-api.sh'
- 'cmake/**'
- 'sherpa-onnx/csrc/*'

Expand All @@ -31,12 +25,13 @@ concurrency:

jobs:
windows_x64:
name: shared-${{ matrix.shared_lib }} tts-${{ matrix.with_tts }} static CRT ${{ matrix.use_static_crt }}
name: shared-${{ matrix.shared_lib }} tts-${{ matrix.with_tts }} static CRT ${{ matrix.use_static_crt }} ${{ matrix.build_type }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [windows-2022]
build_type: [Release, Debug, MinSizeRel, RelWithDebInfo]
shared_lib: [ON, OFF]
with_tts: [ON, OFF]
use_static_crt: [ON, OFF]
Expand All @@ -46,6 +41,12 @@ jobs:
with:
fetch-depth: 0

- name: Update version
shell: bash
run: |
./new-release.sh
git diff .

- name: Set up MSVC
uses: ilammy/msvc-dev-cmd@v1

Expand All @@ -54,27 +55,23 @@ jobs:
run: |
which dumpbin

- name: Update version
shell: bash
run: |
./new-release.sh
git diff .

- name: Configure CMake
shell: bash
run: |
mkdir build

cmake --version

cd build
cmake \
-A x64 \
-DSHERPA_ONNX_ENABLE_TTS=${{ matrix.with_tts }} \
-DSHERPA_ONNX_USE_STATIC_CRT=${{ matrix.use_static_crt }} \
-D CMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-D SHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-D CMAKE_BUILD_TYPE=Release \
-D BUILD_SHARED_LIBS=${{ matrix.shared_lib }} \
-DCMAKE_INSTALL_PREFIX=./install \
-D CMAKE_INSTALL_PREFIX=./install \
-D BUILD_ESPEAK_NG_EXE=OFF \
..

- name: Check 1
Expand All @@ -93,7 +90,7 @@ jobs:

- uses: actions/upload-artifact@v4
with:
name: sherpa-onnx-vcxproj-release-windows-x64-${{ matrix.shared_lib }}-${{ matrix.with_tts }}-static-crt-${{ matrix.use_static_crt }}
name: sherpa-onnx-vcxproj-release-windows-x64-${{ matrix.shared_lib }}-${{ matrix.with_tts }}-static-crt-${{ matrix.use_static_crt }}-${{ matrix.build_type }}
path: build/sherpa-onnx/csrc/sherpa-onnx.vcxproj

- name: Check 3
Expand All @@ -112,27 +109,34 @@ jobs:

- uses: actions/upload-artifact@v4
with:
name: vad-whisper-c-api-vcxproj-release-windows-x64-${{ matrix.shared_lib }}-${{ matrix.with_tts }}-static-crt-${{ matrix.use_static_crt }}
name: vad-whisper-c-api-vcxproj-release-windows-x64-${{ matrix.shared_lib }}-${{ matrix.with_tts }}-static-crt-${{ matrix.use_static_crt }}-${{ matrix.build_type }}
path: build/c-api-examples/vad-whisper-c-api.vcxproj

- name: Build sherpa-onnx for windows
shell: bash
run: |
cd build

cmake --version

cmake --build . --config Release -- -m:2
cmake --build . --config Release --target install -- -m:2
cmake --build . --config ${{ matrix.build_type }} -- -m:2
cmake --build . --config ${{ matrix.build_type }} --target install -- -m:2

ls -lh ./bin/${{ matrix.build_type }}/sherpa-onnx.exe

ls -lh ./bin/Release/sherpa-onnx.exe
- name: Show exe
shell: bash
run: |
ls -lh $PWD/build/bin/${{ matrix.build_type }}

# - name: Setup tmate session
# if: failure()
# uses: mxschmitt/action-tmate@v3
- name: Dump CRT dependencies
shell: cmd
run: |
dumpbin /dependents build\bin\${{ matrix.build_type }}\sherpa-onnx.exe

- uses: actions/upload-artifact@v4
with:
name: release-windows-x64-${{ matrix.shared_lib }}-${{ matrix.with_tts }}-static-crt-${{ matrix.use_static_crt }}
name: release-windows-x64-${{ matrix.shared_lib }}-${{ matrix.with_tts }}-static-crt-${{ matrix.use_static_crt }}-${{ matrix.build_type }}
path: build/install/*

- name: Copy files
Expand All @@ -144,15 +148,15 @@ jobs:
use_static_crt=${{ matrix.use_static_crt }}
if [[ $shared_lib == "ON" ]]; then
if [[ $use_static_crt == ON ]]; then
suffix=shared-MT
suffix=shared-MT-${{ matrix.build_type }}
else
suffix=shared-MD
suffix=shared-MD-${{ matrix.build_type }}
fi
else
if [[ $use_static_crt == ON ]]; then
suffix=static-MT
suffix=static-MT-${{ matrix.build_type }}
else
suffix=static-MD
suffix=static-MD-${{ matrix.build_type }}
fi
fi

Expand Down Expand Up @@ -231,20 +235,6 @@ jobs:
overwrite: true
file: sherpa-onnx-*-win-x64*.tar.bz2

- name: Show exe
shell: bash
run: |
ls -lh $PWD/build/bin/Release

- name: Dump CRT dependencies
shell: cmd
run: |
dumpbin /dependents build\bin\Release\sherpa-onnx.exe

# - name: Setup tmate session
# if: failure()
# uses: mxschmitt/action-tmate@v3

- name: Test offline Moonshine for windows x64
shell: bash
run: |
Expand Down
87 changes: 0 additions & 87 deletions cmake/onnxruntime-win-x64-static-debug.cmake

This file was deleted.

Loading
Loading