diff --git a/Cargo.lock b/Cargo.lock index 69b5d78ad..14a81dd30 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4438,7 +4438,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "voicevox-ort" version = "2.0.0-rc.4" -source = "git+https://github.com/VOICEVOX/ort.git?rev=09a9fe1619c1561efafc02f68f0bda4aad879771#09a9fe1619c1561efafc02f68f0bda4aad879771" +source = "git+https://github.com/qryxip/ort.git?rev=a44e2ae1b08a444b90f0aa66d1073edbe68ab2b0#a44e2ae1b08a444b90f0aa66d1073edbe68ab2b0" dependencies = [ "anyhow", "half", @@ -4455,7 +4455,7 @@ dependencies = [ [[package]] name = "voicevox-ort-sys" version = "2.0.0-rc.4" -source = "git+https://github.com/VOICEVOX/ort.git?rev=09a9fe1619c1561efafc02f68f0bda4aad879771#09a9fe1619c1561efafc02f68f0bda4aad879771" +source = "git+https://github.com/qryxip/ort.git?rev=a44e2ae1b08a444b90f0aa66d1073edbe68ab2b0#a44e2ae1b08a444b90f0aa66d1073edbe68ab2b0" dependencies = [ "flate2", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index d4b62869b..6324c25ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,8 +98,8 @@ windows = "0.43.0" zip = "0.6.3" [workspace.dependencies.voicevox-ort] -git = "https://github.com/VOICEVOX/ort.git" -rev = "09a9fe1619c1561efafc02f68f0bda4aad879771" +git = "https://github.com/qryxip/ort.git" +rev = "a44e2ae1b08a444b90f0aa66d1073edbe68ab2b0" [workspace.dependencies.open_jtalk] git = "https://github.com/VOICEVOX/open_jtalk-rs.git" diff --git a/crates/voicevox_core_python_api/python/test/test_asyncio_user_dict_load.py b/crates/voicevox_core_python_api/python/test/test_asyncio_user_dict_load.py index 135822ca7..e433a7442 100644 --- a/crates/voicevox_core_python_api/python/test/test_asyncio_user_dict_load.py +++ b/crates/voicevox_core_python_api/python/test/test_asyncio_user_dict_load.py @@ -6,7 +6,6 @@ # AudioQueryのkanaを比較して変化するかどうかで判断する。 -import multiprocessing from uuid import UUID import conftest # noqa: F401 @@ -21,13 +20,7 @@ async def test_user_dict_load() -> None: ) open_jtalk = await voicevox_core.asyncio.OpenJtalk.new(conftest.open_jtalk_dic_dir) model = await voicevox_core.asyncio.VoiceModelFile.open(conftest.model_dir) - synthesizer = voicevox_core.asyncio.Synthesizer( - onnxruntime, - open_jtalk, - cpu_num_threads=max( - multiprocessing.cpu_count(), 2 - ), # https://github.com/VOICEVOX/voicevox_core/issues/888 - ) + synthesizer = voicevox_core.asyncio.Synthesizer(onnxruntime, open_jtalk) await synthesizer.load_voice_model(model) diff --git a/example/python/run-asyncio.py b/example/python/run-asyncio.py index 3cb8a7e48..2f71ee848 100644 --- a/example/python/run-asyncio.py +++ b/example/python/run-asyncio.py @@ -92,12 +92,7 @@ async def main() -> None: logger.info("%s", f"Initializing ({args.mode=}, {args.dict_dir=})") synthesizer = Synthesizer( - onnxruntime, - await OpenJtalk.new(args.dict_dir), - acceleration_mode=args.mode, - cpu_num_threads=max( - multiprocessing.cpu_count(), 2 - ), # https://github.com/VOICEVOX/voicevox_core/issues/888 + onnxruntime, await OpenJtalk.new(args.dict_dir), acceleration_mode=args.mode ) logger.debug("%s", f"{synthesizer.metas=}") diff --git a/example/python/run.py b/example/python/run.py index 5970f5dff..1e5ddbf8c 100644 --- a/example/python/run.py +++ b/example/python/run.py @@ -96,12 +96,7 @@ def main() -> None: logger.info("%s", f"Initializing ({args.mode=}, {args.dict_dir=})") synthesizer = Synthesizer( - onnxruntime, - OpenJtalk(args.dict_dir), - acceleration_mode=args.mode, - cpu_num_threads=max( - multiprocessing.cpu_count(), 2 - ), # https://github.com/VOICEVOX/voicevox_core/issues/888 + onnxruntime, OpenJtalk(args.dict_dir), acceleration_mode=args.mode ) logger.debug("%s", f"{synthesizer.metas=}")