From 9807666aa85b033edbc9ddfbbe2f1f6706057220 Mon Sep 17 00:00:00 2001
From: Ryo Yamashita <qryxip@gmail.com>
Date: Sat, 17 Aug 2024 22:34:25 +0900
Subject: [PATCH] =?UTF-8?q?update:=20ort=E3=82=92=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.lock                                    | 25 ++++++++++++++-----
 Cargo.toml                                    |  2 +-
 .../src/infer/runtimes/onnxruntime.rs         |  4 +--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3da1581da..7d70c15b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2649,9 +2649,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.25"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "plist"
@@ -3550,6 +3550,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "socks"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b"
+dependencies = [
+ "byteorder",
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -4147,6 +4158,7 @@ dependencies = [
  "once_cell",
  "rustls 0.21.7",
  "rustls-webpki",
+ "socks",
  "url",
  "webpki-roots 0.25.4",
 ]
@@ -4199,8 +4211,8 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "voicevox-ort"
-version = "2.0.0-rc.2"
-source = "git+https://github.com/VOICEVOX/ort.git?rev=07c047c449b959d8f76593046e139bae520d59c3#07c047c449b959d8f76593046e139bae520d59c3"
+version = "2.0.0-rc.4"
+source = "git+https://github.com/VOICEVOX/ort.git?rev=8627833456a69e7841ae2a29fd184752df8de8d9#8627833456a69e7841ae2a29fd184752df8de8d9"
 dependencies = [
  "anyhow",
  "half",
@@ -4216,10 +4228,11 @@ dependencies = [
 
 [[package]]
 name = "voicevox-ort-sys"
-version = "2.0.0-rc.2"
-source = "git+https://github.com/VOICEVOX/ort.git?rev=07c047c449b959d8f76593046e139bae520d59c3#07c047c449b959d8f76593046e139bae520d59c3"
+version = "2.0.0-rc.4"
+source = "git+https://github.com/VOICEVOX/ort.git?rev=8627833456a69e7841ae2a29fd184752df8de8d9#8627833456a69e7841ae2a29fd184752df8de8d9"
 dependencies = [
  "flate2",
+ "pkg-config",
  "sha2",
  "tar",
  "ureq",
diff --git a/Cargo.toml b/Cargo.toml
index 2ada5cbb5..d72625c5f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -92,7 +92,7 @@ zip = "0.6.3"
 
 [workspace.dependencies.voicevox-ort]
 git = "https://github.com/VOICEVOX/ort.git"
-rev = "07c047c449b959d8f76593046e139bae520d59c3"
+rev = "8627833456a69e7841ae2a29fd184752df8de8d9"
 
 [workspace.dependencies.open_jtalk]
 git = "https://github.com/VOICEVOX/open_jtalk-rs.git"
diff --git a/crates/voicevox_core/src/infer/runtimes/onnxruntime.rs b/crates/voicevox_core/src/infer/runtimes/onnxruntime.rs
index 15ba963eb..7d975f7f7 100644
--- a/crates/voicevox_core/src/infer/runtimes/onnxruntime.rs
+++ b/crates/voicevox_core/src/infer/runtimes/onnxruntime.rs
@@ -5,7 +5,7 @@ use duplicate::duplicate_item;
 use ndarray::{Array, Dimension};
 use ort::{
     CPUExecutionProvider, CUDAExecutionProvider, DirectMLExecutionProvider, ExecutionProvider as _,
-    GraphOptimizationLevel, IntoTensorElementType, TensorElementType, ValueType,
+    GraphOptimizationLevel, PrimitiveTensorElementType, TensorElementType, ValueType,
 };
 
 use crate::{
@@ -209,7 +209,7 @@ impl OnnxruntimeRunContext<'_> {
     fn push_input(
         &mut self,
         input: Array<
-            impl IntoTensorElementType + Debug + Clone + 'static,
+            impl PrimitiveTensorElementType + Debug + Clone + 'static,
             impl Dimension + 'static,
         >,
     ) -> anyhow::Result<()> {