From 4fbca301bfc523476e07a6ca5e8113b156cd45f7 Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Tue, 26 Nov 2024 22:52:16 +0900 Subject: [PATCH] chore(deps)!: bump ort (#876) Refs: #859, VOICEVOX/ort#8, VOICEVOX/ort#9, VOICEVOX/ort#10 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- crates/voicevox_core_c_api/src/lib.rs | 2 +- .../voicevox_core_c_api/tests/e2e/snapshots.toml | 14 +------------- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dfb585fb2..2c987cab4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4272,7 +4272,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "voicevox-ort" version = "2.0.0-rc.4" -source = "git+https://github.com/VOICEVOX/ort.git?rev=8627833456a69e7841ae2a29fd184752df8de8d9#8627833456a69e7841ae2a29fd184752df8de8d9" +source = "git+https://github.com/VOICEVOX/ort.git?rev=17f741301db0bb08da0eafe8a338e5efd8a4b5df#17f741301db0bb08da0eafe8a338e5efd8a4b5df" dependencies = [ "anyhow", "half", @@ -4289,7 +4289,7 @@ dependencies = [ [[package]] name = "voicevox-ort-sys" version = "2.0.0-rc.4" -source = "git+https://github.com/VOICEVOX/ort.git?rev=8627833456a69e7841ae2a29fd184752df8de8d9#8627833456a69e7841ae2a29fd184752df8de8d9" +source = "git+https://github.com/VOICEVOX/ort.git?rev=17f741301db0bb08da0eafe8a338e5efd8a4b5df#17f741301db0bb08da0eafe8a338e5efd8a4b5df" dependencies = [ "flate2", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index e3461156c..744121194 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -99,7 +99,7 @@ zip = "0.6.3" [workspace.dependencies.voicevox-ort] git = "https://github.com/VOICEVOX/ort.git" -rev = "8627833456a69e7841ae2a29fd184752df8de8d9" +rev = "17f741301db0bb08da0eafe8a338e5efd8a4b5df" [workspace.dependencies.open_jtalk] git = "https://github.com/VOICEVOX/open_jtalk-rs.git" diff --git a/crates/voicevox_core_c_api/src/lib.rs b/crates/voicevox_core_c_api/src/lib.rs index 883103c81..7efb1e9e3 100644 --- a/crates/voicevox_core_c_api/src/lib.rs +++ b/crates/voicevox_core_c_api/src/lib.rs @@ -66,7 +66,7 @@ fn init_logger_once() { .with_env_filter(if env::var_os(EnvFilter::DEFAULT_ENV).is_some() { EnvFilter::from_default_env() } else { - "error,voicevox_core=info,voicevox_core_c_api=info,ort=info".into() + "error,voicevox_core=info,voicevox_core_c_api=info,ort=warn".into() }) .with_timer(local_time as fn(&mut Writer<'_>) -> _) .with_ansi(ansi) diff --git a/crates/voicevox_core_c_api/tests/e2e/snapshots.toml b/crates/voicevox_core_c_api/tests/e2e/snapshots.toml index d5168b3c5..218ec2a7b 100644 --- a/crates/voicevox_core_c_api/tests/e2e/snapshots.toml +++ b/crates/voicevox_core_c_api/tests/e2e/snapshots.toml @@ -51,12 +51,10 @@ metas = ''' } ]''' stderr.windows = ''' -{timestamp} INFO ort: Loaded ONNX Runtime dylib with version '{onnxruntime_version}' {windows-video-cards} {timestamp} INFO voicevox_core::synthesizer::inner: CPUを利用します ''' stderr.unix = ''' -{timestamp} INFO ort: Loaded ONNX Runtime dylib with version '{onnxruntime_version}' {timestamp} INFO voicevox_core::synthesizer::inner: CPUを利用します ''' @@ -114,19 +112,15 @@ result_messages.24 = "ユーザー辞書の単語のバリデーションに失 result_messages.25 = "UUIDの変換に失敗しました" result_messages.28 = "モデルの形式が不正です" result_messages.29 = "推論ライブラリのロードまたは初期化ができませんでした" -stderr = ''' -{timestamp} INFO ort: Loaded ONNX Runtime dylib with version '{onnxruntime_version}' -''' +stderr = '' [simple_tts] output."こんにちは、音声合成の世界へようこそ".wav_length = 176172 stderr.windows = ''' -{timestamp} INFO ort: Loaded ONNX Runtime dylib with version '{onnxruntime_version}' {windows-video-cards} {timestamp} INFO voicevox_core::synthesizer::inner: CPUを利用します ''' stderr.unix = ''' -{timestamp} INFO ort: Loaded ONNX Runtime dylib with version '{onnxruntime_version}' {timestamp} INFO voicevox_core::synthesizer::inner: CPUを利用します ''' @@ -183,35 +177,29 @@ metas = ''' } ]''' stderr.windows = ''' -{timestamp} INFO ort: Loaded ONNX Runtime dylib with version '{onnxruntime_version}' {windows-video-cards} {timestamp} INFO voicevox_core::synthesizer::inner: CPUを利用します ''' stderr.unix = ''' -{timestamp} INFO ort: Loaded ONNX Runtime dylib with version '{onnxruntime_version}' {timestamp} INFO voicevox_core::synthesizer::inner: CPUを利用します ''' [tts_via_audio_query] output."こんにちは、音声合成の世界へようこそ".wav_length = 176172 stderr.windows = ''' -{timestamp} INFO ort: Loaded ONNX Runtime dylib with version '{onnxruntime_version}' {windows-video-cards} {timestamp} INFO voicevox_core::synthesizer::inner: CPUを利用します ''' stderr.unix = ''' -{timestamp} INFO ort: Loaded ONNX Runtime dylib with version '{onnxruntime_version}' {timestamp} INFO voicevox_core::synthesizer::inner: CPUを利用します ''' [user_dict_load] stderr.windows = ''' -{timestamp} INFO ort: Loaded ONNX Runtime dylib with version '{onnxruntime_version}' {windows-video-cards} {timestamp} INFO voicevox_core::synthesizer::inner: CPUを利用します ''' stderr.unix = ''' -{timestamp} INFO ort: Loaded ONNX Runtime dylib with version '{onnxruntime_version}' {timestamp} INFO voicevox_core::synthesizer::inner: CPUを利用します '''