Skip to content

Commit

Permalink
Use static libraries for MFC examples (#210)
Browse files Browse the repository at this point in the history
  • Loading branch information
csukuangfj authored Jul 13, 2023
1 parent 10f132c commit bebc1f1
Show file tree
Hide file tree
Showing 18 changed files with 378 additions and 154 deletions.
115 changes: 115 additions & 0 deletions .github/workflows/mfc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
name: mfc

on:
push:
branches:
- master
tags:
- '*'
paths:
- '.github/workflows/mfc.yaml'
- 'CMakeLists.txt'
- 'cmake/**'
- 'mfc-examples/**'
- 'sherpa-onnx/csrc/*'
pull_request:
branches:
- master
paths:
- '.github/workflows/mfc.yaml'
- 'CMakeLists.txt'
- 'cmake/**'
- 'mfc-examples/**'
- 'sherpa-onnx/csrc/*'
release:
types:
- published

workflow_dispatch:
inputs:
release:
description: "Whether to release"
type: boolean

env:
RELEASE:
|- # Release if there is a release tag name or a release flag in workflow_dispatch
${{ github.event.release.tag_name != '' || github.event.inputs.release == 'true' }}

concurrency:
group: mfc-${{ github.ref }}
cancel-in-progress: true

jobs:
mfc:
name: MFC for ${{ matrix.arch }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [windows-latest]
# arch: [x64, Win32]
arch: [x64]

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Display MSBuild info
shell: cmd
run: |
set path="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
msbuild -help
- name: Configure CMake
shell: bash
run: |
mkdir build
cd build
cmake -A ${{ matrix.arch }} -D CMAKE_BUILD_TYPE=Release -D BUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=./install ..
- name: Build sherpa-onnx for windows
shell: bash
run: |
cd build
cmake --build . --config Release -- -m:2
cmake --build . --config Release --target install -- -m:2
ls -lh install/*
ls -lh install/lib
ls -lh install/bin
- name: Build MFC
shell: cmd
run: |
set path="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
cd mfc-examples
msbuild .\mfc-examples.sln /property:Configuration=Release /property:Platform=${{ matrix.arch }}
- name: Copy files
shell: bash
run: |
SHERPA_ONNX_VERSION=v$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt | cut -d " " -f 2 | cut -d '"' -f 2)
arch=${{ matrix.arch }}
cd mfc-examples/$arch/Release
cp StreamingSpeechRecognition.exe sherpa-onnx-streaming-${SHERPA_ONNX_VERSION}.exe
ls -lh
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: streaming-speech-recognition-${{ matrix.arch }}
path: ./mfc-examples/${{ matrix.arch }}/Release/StreamingSpeechRecognition.exe

- name: Release pre-compiled binaries and libs for macOS
if: env.RELEASE == 'true'
uses: svenstaro/upload-release-action@v2
with:
file_glob: true
overwrite: true
file: ./mfc-examples/${{ matrix.arch }}/Release/sherpa-onnx*.exe
26 changes: 6 additions & 20 deletions .github/workflows/windows-x64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,27 +46,13 @@ concurrency:

jobs:
windows_x64:
name: Windows x64
runs-on: ${{ matrix.os }}
name: ${{ matrix.vs-version }}
strategy:
fail-fast: false
matrix:
include:
- vs-version: vs2015
toolset-version: v140
os: windows-2019

- vs-version: vs2017
toolset-version: v141
os: windows-2019

- vs-version: vs2019
toolset-version: v142
os: windows-2022

- vs-version: vs2022
toolset-version: v143
os: windows-2022
os: [windows-latest]
shared_lib: [ON, OFF]

steps:
- uses: actions/checkout@v2
Expand All @@ -78,7 +64,7 @@ jobs:
run: |
mkdir build
cd build
cmake -T ${{ matrix.toolset-version}},host=x64 -A x64 -D CMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install ..
cmake -A x64 -D CMAKE_BUILD_TYPE=Release -D BUILD_SHARED_LIBS=${{ matrix.shared_lib }} -DCMAKE_INSTALL_PREFIX=./install ..
- name: Build sherpa-onnx for windows
shell: bash
Expand Down Expand Up @@ -122,7 +108,7 @@ jobs:
.github/scripts/test-online-transducer.sh
- name: Copy files
if: env.RELEASE == 'true' && matrix.vs-version == 'vs2015'
if: env.RELEASE == 'true'
shell: bash
run: |
SHERPA_ONNX_VERSION=v$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt | cut -d " " -f 2 | cut -d '"' -f 2)
Expand All @@ -137,7 +123,7 @@ jobs:
tar cjvf ${dst}.tar.bz2 $dst
- name: Release pre-compiled binaries and libs for macOS
if: env.RELEASE == 'true' && matrix.vs-version == 'vs2015'
if: env.RELEASE == 'true'
uses: svenstaro/upload-release-action@v2
with:
file_glob: true
Expand Down
23 changes: 4 additions & 19 deletions .github/workflows/windows-x86.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,13 @@ concurrency:

jobs:
windows_x86:
if: true # disable windows x86 CI for now
name: Windows x86
runs-on: ${{ matrix.os }}
name: ${{ matrix.vs-version }}
strategy:
fail-fast: false
matrix:
include:
- vs-version: vs2015
toolset-version: v140
os: windows-2019

- vs-version: vs2017
toolset-version: v141
os: windows-2019

- vs-version: vs2019
toolset-version: v142
os: windows-2022

- vs-version: vs2022
toolset-version: v143
os: windows-2022
os: [windows-latest]
shared_lib: [ON, OFF]

steps:
- uses: actions/checkout@v2
Expand All @@ -77,7 +62,7 @@ jobs:
run: |
mkdir build
cd build
cmake -T ${{ matrix.toolset-version}},host=x64 -A Win32 -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=./install ..
cmake -A Win32 -D CMAKE_BUILD_TYPE=Release -D BUILD_SHARED_LIBS=${{ matrix.shared_lib }} -D CMAKE_INSTALL_PREFIX=./install ..
- name: Build sherpa-onnx for windows
shell: bash
Expand Down
15 changes: 14 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
project(sherpa-onnx)

set(SHERPA_ONNX_VERSION "1.5.0")
set(SHERPA_ONNX_VERSION "1.5.1")

# Disable warning about
#
Expand Down Expand Up @@ -71,6 +71,18 @@ if(BUILD_SHARED_LIBS AND MSVC)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
endif()

if(NOT BUILD_SHARED_LIBS AND MSVC)
# see https://cmake.org/cmake/help/latest/prop_tgt/MSVC_RUNTIME_LIBRARY.html
# https://stackoverflow.com/questions/14172856/compile-with-mt-instead-of-md-using-cmake
if(MSVC)
add_compile_options(
$<$<CONFIG:>:/MT> #---------|
$<$<CONFIG:Debug>:/MTd> #---|-- Statically link the runtime libraries
$<$<CONFIG:Release>:/MT> #--|
)
endif()
endif()

message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
message(STATUS "BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}")
Expand Down Expand Up @@ -154,3 +166,4 @@ add_subdirectory(sherpa-onnx)
if(SHERPA_ONNX_ENABLE_C_API)
add_subdirectory(c-api-examples)
endif()
message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
1 change: 1 addition & 0 deletions CPPLINT.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
filter=-./mfc-examples
16 changes: 8 additions & 8 deletions cmake/kaldi-native-fbank.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
function(download_kaldi_native_fbank)
include(FetchContent)

set(kaldi_native_fbank_URL "https://github.com/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.14.tar.gz")
set(kaldi_native_fbank_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/kaldi-native-fbank-1.14.tar.gz")
set(kaldi_native_fbank_HASH "SHA256=6a66638a111d3ce21fe6f29cbf9ab3dbcae2331c77391bf825927df5cbf2babe")
set(kaldi_native_fbank_URL "https://github.com/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.17.tar.gz")
set(kaldi_native_fbank_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/kaldi-native-fbank-1.17.tar.gz")
set(kaldi_native_fbank_HASH "SHA256=300dc282d51d738e70f194ef13a50bf4cf8d54a3b2686d75f7fc2fb821f8c1e6")

set(KALDI_NATIVE_FBANK_BUILD_TESTS OFF CACHE BOOL "" FORCE)
set(KALDI_NATIVE_FBANK_BUILD_PYTHON OFF CACHE BOOL "" FORCE)
Expand All @@ -12,11 +12,11 @@ function(download_kaldi_native_fbank)
# If you don't have access to the Internet,
# please pre-download kaldi-native-fbank
set(possible_file_locations
$ENV{HOME}/Downloads/kaldi-native-fbank-1.14.tar.gz
${PROJECT_SOURCE_DIR}/kaldi-native-fbank-1.14.tar.gz
${PROJECT_BINARY_DIR}/kaldi-native-fbank-1.14.tar.gz
/tmp/kaldi-native-fbank-1.14.tar.gz
/star-fj/fangjun/download/github/kaldi-native-fbank-1.14.tar.gz
$ENV{HOME}/Downloads/kaldi-native-fbank-1.17.tar.gz
${PROJECT_SOURCE_DIR}/kaldi-native-fbank-1.17.tar.gz
${PROJECT_BINARY_DIR}/kaldi-native-fbank-1.17.tar.gz
/tmp/kaldi-native-fbank-1.17.tar.gz
/star-fj/fangjun/download/github/kaldi-native-fbank-1.17.tar.gz
)

foreach(f IN LISTS possible_file_locations)
Expand Down
Loading

0 comments on commit bebc1f1

Please sign in to comment.