Merge branch 'main' into feat-downloader-mkdir-for-c-api-and-addition…

…al-libraries
qryxip · Jan 27, 2025 · 578a1b3 · 578a1b3
2 parents 0c832b3 + 142aa42
commit 578a1b3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/crates/voicevox_core/LICENSE b/crates/voicevox_core/LICENSE
@@ -0,0 +1 @@
+../../LICENSE
diff --git a/crates/voicevox_core/README.md b/crates/voicevox_core/README.md
@@ -0,0 +1 @@
+../../README.md
diff --git a/crates/voicevox_core_python_api/pyproject.toml b/crates/voicevox_core_python_api/pyproject.toml
@@ -4,6 +4,8 @@ version = "0.0.0"
 requires-python = ">=3.10"
 dependencies = ["pydantic>=2.5.2,<3"]
 description = "VOICEVOX CORE の Python バインディングです。"
+license = { file = "../../LICENSE" }
+readme = "../../README.md"
 authors = [{ name = "Hiroshiba", email = "[email protected]" }]
 classifiers = [
     "Programming Language :: Python",
@@ -13,8 +15,6 @@ classifiers = [
     "Operating System :: MacOS :: MacOS X",
     "Environment :: GPU :: NVIDIA CUDA",
 ]
-# TODO：ユーザー用のREADMEを作る
-# readme = "README.md"
 
 [build-system]
 requires = ["maturin>=1.3.1,<2"]

diff --git a/example/cpp/windows/README.md b/example/cpp/windows/README.md
@@ -22,9 +22,8 @@ Visual Studio Installerを使用しインストールしてください。
 
 - simple_tts\bin\x64\Debug に配置
   - voicevox_core.dll
-  - onnxruntime.dll (TODO: 要らないはず)
-  - onnxruntime_providers_shared.dll (TODO: 要らないはず)
-  - modelフォルダ (TODO: 要らないはず)
+  - voicevox_onnxruntime.dll
+  - modelsフォルダ
 
 - simple_tts\lib\x64 に配置
   - voicevox_core.lib
@@ -50,13 +49,14 @@ simple_tts
  ├─bin
  │  └─x64
  │      └─Debug
- │         │  onnxruntime.dll
- │         │  onnxruntime_providers_shared.dll
  │         │  simple_tts.exe
  │         │  simple_tts.pdb
  │         │  voicevox_core.dll
+ │         │  voicevox_onnxruntime.dll
+ │         │
+ │         ├─models
+ │         │     vvms
  │         │
- │         ├─model
  │         └─open_jtalk_dic_utf_8-1.11
  │
  └─lib

diff --git a/example/cpp/windows/simple_tts/simple_tts.cpp b/example/cpp/windows/simple_tts/simple_tts.cpp
@@ -18,7 +18,7 @@
 #include "voicevox_core.h"
 
 #define OPENJTALK_DICT_NAME L"open_jtalk_dic_utf_8-1.11"
-#define MODEL_DIR_NAME L"model"
+#define MODEL_DIR_NAME L"models\\vvms"
 
 int main() {
   std::wcout.imbue(std::locale(""));

diff --git a/example/python/run-asyncio.py b/example/python/run-asyncio.py
@@ -38,7 +38,7 @@ def parse_args() -> "Args":
         )
         argparser.add_argument(
             "--onnxruntime",
-            default=Onnxruntime.LIB_VERSIONED_FILENAME,
+            default=f"./onnxruntime/lib/{Onnxruntime.LIB_VERSIONED_FILENAME}",
             help="ONNX Runtimeのライブラリのfilename",
         )
         argparser.add_argument(