From 2f6fedc22cd39f8f2d05083c3fe559ab84eac024 Mon Sep 17 00:00:00 2001 From: sevenc-nanashi Date: Sun, 17 Sep 2023 08:57:33 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20branch=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 4 ++-- crates/voicevox_core/Cargo.toml | 1 + crates/voicevox_core/src/status.rs | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 871df23ea..8ab470f00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2386,7 +2386,7 @@ checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "onnxruntime" version = "0.1.0" -source = "git+https://github.com/VOICEVOX/onnxruntime-rs.git?rev=ebb9dcb9b26ee681889b52b6db3b4f642b04a250#ebb9dcb9b26ee681889b52b6db3b4f642b04a250" +source = "git+https://github.com/sevenc-nanashi/onnxruntime-rs.git#cbdacfbfdaad07247bca26d4403439d943a9c716" dependencies = [ "lazy_static", "ndarray", @@ -2398,7 +2398,7 @@ dependencies = [ [[package]] name = "onnxruntime-sys" version = "0.0.25" -source = "git+https://github.com/VOICEVOX/onnxruntime-rs.git?rev=ebb9dcb9b26ee681889b52b6db3b4f642b04a250#ebb9dcb9b26ee681889b52b6db3b4f642b04a250" +source = "git+https://github.com/sevenc-nanashi/onnxruntime-rs.git#cbdacfbfdaad07247bca26d4403439d943a9c716" dependencies = [ "flate2", "once_cell", diff --git a/crates/voicevox_core/Cargo.toml b/crates/voicevox_core/Cargo.toml index 6e9e1e5a6..eac5c8ece 100644 --- a/crates/voicevox_core/Cargo.toml +++ b/crates/voicevox_core/Cargo.toml @@ -37,6 +37,7 @@ uuid.workspace = true [dependencies.onnxruntime] git = "https://github.com/sevenc-nanashi/onnxruntime-rs.git" +branch = "add/coreml" # rev = "ebb9dcb9b26ee681889b52b6db3b4f642b04a250" [dependencies.open_jtalk] diff --git a/crates/voicevox_core/src/status.rs b/crates/voicevox_core/src/status.rs index cade34b94..6bed209a1 100644 --- a/crates/voicevox_core/src/status.rs +++ b/crates/voicevox_core/src/status.rs @@ -14,10 +14,10 @@ use tracing::error; mod model_file; cfg_if! { - if #[cfg(not(feature="directml"))] && #[cfg(not(feature="coreml"))] { + if #[cfg(feature="coreml")] { + use onnxruntime::CoreMlProviderOptions; + } else if #[cfg(not(feature="directml"))] { use onnxruntime::CudaProviderOptions; - } else if #[cfg(feature="coreml")] { - use onnxruntime::CoreMLProviderOptions; } }