From 6cb1fb07fda11bd61b7da3a59308ae8b9febe46e Mon Sep 17 00:00:00 2001 From: PickledChair Date: Sun, 24 Apr 2022 10:18:32 +0900 Subject: [PATCH 01/13] =?UTF-8?q?linux=E3=83=BBmac=E5=90=91=E3=81=91?= =?UTF-8?q?=E3=81=AE=E3=82=B5=E3=83=B3=E3=83=97=E3=83=AB=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/cpp/unix/CMakeLists.txt | 20 ++++++++++++ example/cpp/unix/simple_tts.cpp | 56 +++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 example/cpp/unix/CMakeLists.txt create mode 100644 example/cpp/unix/simple_tts.cpp diff --git a/example/cpp/unix/CMakeLists.txt b/example/cpp/unix/CMakeLists.txt new file mode 100644 index 000000000..df36d33d1 --- /dev/null +++ b/example/cpp/unix/CMakeLists.txt @@ -0,0 +1,20 @@ +cmake_minimum_required(VERSION 3.16) + +project(SimpleTTS) + +add_executable(simple_tts simple_tts.cpp) + +find_library( + CORE_LIB + NAMES core libcore + HINTS "${CMAKE_SOURCE_DIR}" + NO_DEFAULT_PATH +) + +message(STATUS "CORE_LIB: ${CORE_LIB}") +if(NOT CORE_LIB) + message(FATAL_ERROR "Unable to find VOICEVOX core library") +endif() + +target_link_libraries(simple_tts ${CORE_LIB}) +set_property(TARGET simple_tts PROPERTY CXX_STANDARD 11) diff --git a/example/cpp/unix/simple_tts.cpp b/example/cpp/unix/simple_tts.cpp new file mode 100644 index 000000000..9c3a3b86e --- /dev/null +++ b/example/cpp/unix/simple_tts.cpp @@ -0,0 +1,56 @@ +#include +#include +#include + +#include "../../../core/src/core.h" + +#define OUTPUT_WAV_NAME "audio.wav" + +int main(int argc, char *argv[]) { + if (argc != 2) { + std::cout << "使い方: ./simple_tts <文章>" << std::endl; + return 0; + } + + std::string open_jtalk_dict_path("open_jtalk_dic_utf_8-1.11"); + std::string text(argv[1]); + + std::cout << "coreの初期化中..." << std::endl; + + if (!initialize(false)) { + std::cout << "coreの初期化に失敗しました" << std::endl; + return 1; + } + + VoicevoxResultCode result; + + std::cout << "openjtalk辞書の読み込み中..." << std::endl; + + result = voicevox_load_openjtalk_dict(open_jtalk_dict_path.c_str()); + if (result != VOICEVOX_RESULT_SUCCEED) { + std::cout << voicevox_error_result_to_message(result) << std::endl; + return 1; + } + + std::cout << "音声生成中..." << std::endl; + + int64_t speaker_id = 0; + int output_binary_size = 0; + uint8_t *output_wav = nullptr; + + result = voicevox_tts(text.c_str(), speaker_id, &output_binary_size, &output_wav); + if (result != VOICEVOX_RESULT_SUCCEED) { + std::cout << voicevox_error_result_to_message(result) << std::endl; + return 1; + } + + std::cout << "音声ファイル保存中..." << std::endl; + + std::ofstream wav_file(OUTPUT_WAV_NAME, std::ios::binary); + wav_file.write(reinterpret_cast(output_wav), output_binary_size); + voicevox_wav_free(output_wav); + + std::cout << "音声ファイル保存完了 (" << OUTPUT_WAV_NAME << ")" << std::endl; + + return 0; +} From 268d6450626add5e469038392dffc5095f4bd228 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Tue, 26 Apr 2022 04:58:12 +0900 Subject: [PATCH 02/13] add .gitignore for unix cpp sample --- example/cpp/unix/.gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 example/cpp/unix/.gitignore diff --git a/example/cpp/unix/.gitignore b/example/cpp/unix/.gitignore new file mode 100644 index 000000000..c8cf6fb98 --- /dev/null +++ b/example/cpp/unix/.gitignore @@ -0,0 +1,9 @@ +# libraries +*.dylib +*.so + +# OpenJTalk-dictionary's dir +open_jtalk_dic_utf_8-* + +# executable +simple_tts From 2f7d397ca29f732f28b3356ec8727af31afabca0 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Tue, 26 Apr 2022 06:11:46 +0900 Subject: [PATCH 03/13] add README.md for unix cpp sample --- example/cpp/unix/README.md | 64 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 example/cpp/unix/README.md diff --git a/example/cpp/unix/README.md b/example/cpp/unix/README.md new file mode 100644 index 000000000..e65ba5d7a --- /dev/null +++ b/example/cpp/unix/README.md @@ -0,0 +1,64 @@ +# C++ サンプルコード（Linux・macOS 向け) + +voicevox_core ライブラリを C++ から使用するサンプルコード (`simple_tts.cpp`) です。ビルドするために C++ の開発環境（CMake 3.16 以上を含む）が必要です。 + + + +## 必要なファイルの準備 + +本ディレクトリに以下のファイル・フォルダを用意してください（あるいは、以下のファイル・フォルダへのシンボリックリンクでも良いです）： + +- バージョン 12 以降の voicevox_core ライブラリ（配布ページ: https://github.com/VOICEVOX/voicevox_core/releases ） + - Linux の場合：`voicevox_core-linux-{お使いのCPUアーキテクチャ}-cpu-{バージョン}.zip` 内の `libcore.so` + - macOS の場合：`voicevox_core-osx-universal2-cpu-{バージョン}.zip` 内の `libcore.dylib` +- ONNX Runtime v1.10.0 の共有ライブラリ（配布ページ: https://github.com/microsoft/onnxruntime/releases/tag/v1.10.0 ） + - Linux の場合：`onnxruntime-linux-{お使いのCPUアーキテクチャ}-1.10.0.tgz` 内の `lib/libonnxruntime.1.10.0.so` + - macOS の場合：`onnxruntime-osx-universal2-1.10.0.tgz` 内の `lib/libonnxruntime.1.10.0.dylib` +- Open JTalk の辞書（配布ページ: http://open-jtalk.sourceforge.net/ ） + - 配布ページの "Dictionary for Open JTalk" 欄にある "Binary Package (UTF-8)" からダウンロードしてください + - 解凍してできた `open_jtalk_dic_utf_8-1.11` フォルダをそのままこのディレクトリに配置してください + +以上の準備を終えると、本ディレクトリには以下のファイル・フォルダが存在することになります： + +``` +CMakeLists.txt +libcore.so または libcore.dylib +libonnxruntime.1.10.0.dylib +open_jtalk_dic_utf_8-1.11 +simple_tts.cpp +``` + + + +## ビルド + +以下のコマンドを実行すると、`build` ディレクトリが作成され、ビルド産物がその中に生成されます： + +```bash +cmake -S . -B build +cmake --build build +``` + + + +## 実行 + +`build` ディレクトリ以下にできた実行ファイル (`simple_tts`) をこのディレクトリにコピーしてから実行します： + +```bash +cp build/simple_tts . + +# ./simple_tts <読み上げさせたい文章> +./simple_tts これはテストです +``` + +正常に実行されれば `audio.wav` が生成されます。以下のコマンドですぐに聞くことができます： + +```bash +# Linux の場合 +aplay audio.wav + +# macOS の場合 +afplay audio.wav +``` + From 15fb5290b7453e811b4e192c4cfe12b775df1033 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Tue, 26 Apr 2022 06:19:05 +0900 Subject: [PATCH 04/13] fix example/cpp/unix/README.md --- example/cpp/unix/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/cpp/unix/README.md b/example/cpp/unix/README.md index e65ba5d7a..1d675aff9 100644 --- a/example/cpp/unix/README.md +++ b/example/cpp/unix/README.md @@ -23,7 +23,7 @@ voicevox_core ライブラリを C++ から使用するサンプルコード (`s ``` CMakeLists.txt libcore.so または libcore.dylib -libonnxruntime.1.10.0.dylib +libonnxruntime.1.10.0.so または libonnxruntime.1.10.0.dylib open_jtalk_dic_utf_8-1.11 simple_tts.cpp ``` From 27b1965870448fe183769380fff089e6aac43b2e Mon Sep 17 00:00:00 2001 From: PickledChair Date: Tue, 26 Apr 2022 06:23:52 +0900 Subject: [PATCH 05/13] fix README.md --- example/cpp/unix/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/cpp/unix/README.md b/example/cpp/unix/README.md index 1d675aff9..e939bf17d 100644 --- a/example/cpp/unix/README.md +++ b/example/cpp/unix/README.md @@ -8,7 +8,7 @@ voicevox_core ライブラリを C++ から使用するサンプルコード (`s 本ディレクトリに以下のファイル・フォルダを用意してください（あるいは、以下のファイル・フォルダへのシンボリックリンクでも良いです）： -- バージョン 12 以降の voicevox_core ライブラリ（配布ページ: https://github.com/VOICEVOX/voicevox_core/releases ） +- バージョン 0.12 以降の voicevox_core ライブラリ（配布ページ: https://github.com/VOICEVOX/voicevox_core/releases ） - Linux の場合：`voicevox_core-linux-{お使いのCPUアーキテクチャ}-cpu-{バージョン}.zip` 内の `libcore.so` - macOS の場合：`voicevox_core-osx-universal2-cpu-{バージョン}.zip` 内の `libcore.dylib` - ONNX Runtime v1.10.0 の共有ライブラリ（配布ページ: https://github.com/microsoft/onnxruntime/releases/tag/v1.10.0 ） From 9b56a797b015a5adb0985983b3a86640f711e0a9 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Tue, 26 Apr 2022 07:07:46 +0900 Subject: [PATCH 06/13] add build-unix-cpp-example workflow --- .github/workflows/build.yml | 49 ++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7cf647e95..07107131d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -320,7 +320,7 @@ jobs: for KND in "${MAPPINGS[@]}"; do cp core/src/core.h "artifacts/${KND}-cpp-shared" echo "${{ env.BUILD_IDENTIFIER }}" > "artifacts/${KND}-cpp-shared/VERSION" - + cd "artifacts/${KND}-cpp-shared" zip -r "../../release/${KND}-cpp-shared.zip" * cd - @@ -382,3 +382,50 @@ jobs: # Add additional options to the MSBuild command line here (like platform or verbosity level). # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} + + build-unix-cpp-example: + needs: [build-cpp-shared] + strategy: + matrix: + include: + - os: macos-latest + artifact_name: osx-universal2-cpu-cpp-shared + core_name: libcore.dylib + + - os: ubuntu-latest + artifact_name: linux-x64-cpu-cpp-shared + core_name: libcore.so + + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v3 + + - name: Download and extract artifact + uses: actions/download-artifact@v2 + id: download + with: + name: ${{ matrix.artifact_name }} + path: artifacts/ + + - name: Copy core library + shell: bash + run: | + cp ${{ steps.download.outputs.download-path }}/${{ matrix.core_name }} example/cpp/unix + + - if: startsWith(matrix.os, 'mac') + uses: jwlawson/actions-setup-cmake@v1.9 + + - name: Install build dependencies + if: startsWith(matrix.os, 'ubuntu') + shell: bash + run: | + sudo apt-get update + sudo apt-get install -y cmake + + - name: Build + shell: bash + run: | + cd example/cpp/unix + cmake -S . -B build + cmake --build build From 193100d096a65da7ad7de376db66abbdb5c8d646 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Tue, 26 Apr 2022 07:19:10 +0900 Subject: [PATCH 07/13] set fail-fast to false --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07107131d..e8f5681b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -386,6 +386,7 @@ jobs: build-unix-cpp-example: needs: [build-cpp-shared] strategy: + fail-fast: false matrix: include: - os: macos-latest From 72b4cca7a145d699bad0e96595464d2b00fbb80f Mon Sep 17 00:00:00 2001 From: PickledChair Date: Tue, 26 Apr 2022 07:28:55 +0900 Subject: [PATCH 08/13] download onnx runtime --- .github/workflows/build.yml | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8f5681b3..792ffa6e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -391,11 +391,13 @@ jobs: include: - os: macos-latest artifact_name: osx-universal2-cpu-cpp-shared - core_name: libcore.dylib + onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-osx-universal2-1.10.0.tgz + shared_lib_ext: dylib - os: ubuntu-latest artifact_name: linux-x64-cpu-cpp-shared - core_name: libcore.so + onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz + shared_lib_ext: so runs-on: ${{ matrix.os }} @@ -412,7 +414,35 @@ jobs: - name: Copy core library shell: bash run: | - cp ${{ steps.download.outputs.download-path }}/${{ matrix.core_name }} example/cpp/unix + cp ${{ steps.download.outputs.download-path }}/libcore.${{ matrix.shared_lib_ext }} example/cpp/unix + + # ONNX Runtime + - name: Export ONNX Runtime url to calc hash + shell: bash + run: echo "${{ matrix.onnxruntime_url }}" > download/onnxruntime_url.txt + + - name: Cache ONNX Runtime + uses: actions/cache@v2 + id: onnxruntime-cache + with: + key: onnxruntime-cache-v1-${{ hashFiles('download/onnxruntime_url.txt') }} + path: download/onnxruntime + + # download/onnxruntime/lib/libonnxruntime.so + # download/onnxruntime/lib/libonnxruntime.dylib + - name: Download ONNX Runtime (tgz) + if: steps.onnxruntime-cache.outputs.cache-hit != 'true' && endsWith(matrix.onnxruntime_url, '.tgz') + shell: bash + run: | + curl -L "${{ matrix.onnxruntime_url }}" > download/onnxruntime.tgz + mkdir -p download/onnxruntime + tar xf download/onnxruntime.tgz -C download/onnxruntime --strip-components 1 + rm download/onnxruntime.tgz + + - name: Copy ONNX Runtime + shell: bash + run: | + cp download/onnxruntime/lib/libonnxruntime.1.10.0.${{ matrix.shared_lib_ext }} example/cpp/unix - if: startsWith(matrix.os, 'mac') uses: jwlawson/actions-setup-cmake@v1.9 From a2cc625bd9e8d2dbe8594e1d9e900b93ceeaf6a7 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Tue, 26 Apr 2022 07:40:29 +0900 Subject: [PATCH 09/13] mkdir download --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 792ffa6e8..adf3ebab9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -416,6 +416,8 @@ jobs: run: | cp ${{ steps.download.outputs.download-path }}/libcore.${{ matrix.shared_lib_ext }} example/cpp/unix + - run: mkdir download + # ONNX Runtime - name: Export ONNX Runtime url to calc hash shell: bash From 2da5233227c71a9a3fb171d53d0b41b3bc158497 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Tue, 26 Apr 2022 07:40:59 +0900 Subject: [PATCH 10/13] remove extra condition --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index adf3ebab9..906ea173f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -433,7 +433,7 @@ jobs: # download/onnxruntime/lib/libonnxruntime.so # download/onnxruntime/lib/libonnxruntime.dylib - name: Download ONNX Runtime (tgz) - if: steps.onnxruntime-cache.outputs.cache-hit != 'true' && endsWith(matrix.onnxruntime_url, '.tgz') + if: steps.onnxruntime-cache.outputs.cache-hit != 'true' shell: bash run: | curl -L "${{ matrix.onnxruntime_url }}" > download/onnxruntime.tgz From 3f15fdd6e7c0bcc1d2bc93218c58288969afd22e Mon Sep 17 00:00:00 2001 From: PickledChair Date: Tue, 26 Apr 2022 07:55:27 +0900 Subject: [PATCH 11/13] define onnxruntime_lib_name and core_name --- .github/workflows/build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 906ea173f..235269950 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -392,12 +392,14 @@ jobs: - os: macos-latest artifact_name: osx-universal2-cpu-cpp-shared onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-osx-universal2-1.10.0.tgz - shared_lib_ext: dylib + onnxruntime_lib_name: libonnxruntime.1.10.0.dylib + core_name: libcore.dylib - os: ubuntu-latest artifact_name: linux-x64-cpu-cpp-shared onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz - shared_lib_ext: so + onnxruntime_lib_name: libonnxruntime.so.1.10.0 + core_name: libcore.so runs-on: ${{ matrix.os }} @@ -414,7 +416,7 @@ jobs: - name: Copy core library shell: bash run: | - cp ${{ steps.download.outputs.download-path }}/libcore.${{ matrix.shared_lib_ext }} example/cpp/unix + cp ${{ steps.download.outputs.download-path }}/${{ matrix.core_name }} example/cpp/unix - run: mkdir download @@ -444,7 +446,7 @@ jobs: - name: Copy ONNX Runtime shell: bash run: | - cp download/onnxruntime/lib/libonnxruntime.1.10.0.${{ matrix.shared_lib_ext }} example/cpp/unix + cp download/onnxruntime/lib/${{ matrix.onnxruntime_lib_name }} example/cpp/unix - if: startsWith(matrix.os, 'mac') uses: jwlawson/actions-setup-cmake@v1.9 From 6368991ca4674444ac36a471260c2d6a014bcfb1 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Tue, 26 Apr 2022 07:56:35 +0900 Subject: [PATCH 12/13] fix example/cpp/unix/README.md --- example/cpp/unix/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/cpp/unix/README.md b/example/cpp/unix/README.md index e939bf17d..1103e8dda 100644 --- a/example/cpp/unix/README.md +++ b/example/cpp/unix/README.md @@ -12,7 +12,7 @@ voicevox_core ライブラリを C++ から使用するサンプルコード (`s - Linux の場合：`voicevox_core-linux-{お使いのCPUアーキテクチャ}-cpu-{バージョン}.zip` 内の `libcore.so` - macOS の場合：`voicevox_core-osx-universal2-cpu-{バージョン}.zip` 内の `libcore.dylib` - ONNX Runtime v1.10.0 の共有ライブラリ（配布ページ: https://github.com/microsoft/onnxruntime/releases/tag/v1.10.0 ） - - Linux の場合：`onnxruntime-linux-{お使いのCPUアーキテクチャ}-1.10.0.tgz` 内の `lib/libonnxruntime.1.10.0.so` + - Linux の場合：`onnxruntime-linux-{お使いのCPUアーキテクチャ}-1.10.0.tgz` 内の `lib/libonnxruntime.so.1.10.0` - macOS の場合：`onnxruntime-osx-universal2-1.10.0.tgz` 内の `lib/libonnxruntime.1.10.0.dylib` - Open JTalk の辞書（配布ページ: http://open-jtalk.sourceforge.net/ ） - 配布ページの "Dictionary for Open JTalk" 欄にある "Binary Package (UTF-8)" からダウンロードしてください @@ -23,7 +23,7 @@ voicevox_core ライブラリを C++ から使用するサンプルコード (`s ``` CMakeLists.txt libcore.so または libcore.dylib -libonnxruntime.1.10.0.so または libonnxruntime.1.10.0.dylib +libonnxruntime.so.1.10.0 または libonnxruntime.1.10.0.dylib open_jtalk_dic_utf_8-1.11 simple_tts.cpp ``` From 2472bf89ab9b5d0c7514f9c8c68e910d11ffebb1 Mon Sep 17 00:00:00 2001 From: PickledChair Date: Tue, 26 Apr 2022 08:07:53 +0900 Subject: [PATCH 13/13] trivial change --- example/cpp/unix/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/cpp/unix/README.md b/example/cpp/unix/README.md index 1103e8dda..6211f2729 100644 --- a/example/cpp/unix/README.md +++ b/example/cpp/unix/README.md @@ -1,4 +1,4 @@ -# C++ サンプルコード（Linux・macOS 向け) +# C++ サンプルコード（Linux・macOS 向け） voicevox_core ライブラリを C++ から使用するサンプルコード (`simple_tts.cpp`) です。ビルドするために C++ の開発環境（CMake 3.16 以上を含む）が必要です。