Skip to content

Commit

Permalink
fix: bump ort and remove workarounds
Browse files Browse the repository at this point in the history
  • Loading branch information
qryxip committed Dec 28, 2024
1 parent 0248b7a commit 6c25ce3
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 24 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

# AudioQueryのkanaを比較して変化するかどうかで判断する。

import multiprocessing
from uuid import UUID

import conftest # noqa: F401
Expand All @@ -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)

Expand Down
7 changes: 1 addition & 6 deletions example/python/run-asyncio.py
Original file line number Diff line number Diff line change
Expand Up @@ -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=}")
Expand Down
7 changes: 1 addition & 6 deletions example/python/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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=}")
Expand Down

0 comments on commit 6c25ce3

Please sign in to comment.