Use static libraries for MFC examples (#210)
This commit is contained in:
115
.github/workflows/mfc.yaml
vendored
Normal file
115
.github/workflows/mfc.yaml
vendored
Normal file
@@ -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
.github/workflows/windows-x64.yaml
vendored
26
.github/workflows/windows-x64.yaml
vendored
@@ -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
|
||||
@@ -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
|
||||
@@ -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)
|
||||
@@ -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
|
||||
|
||||
23
.github/workflows/windows-x86.yaml
vendored
23
.github/workflows/windows-x86.yaml
vendored
@@ -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
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user