version up onnxruntime-rs to 0.0.17

VOICEVOX · May 18, 2022 · a53b00b · a53b00b
1 parent 3c8b004
commit a53b00b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/crates/voicevox_core/Cargo.toml b/crates/voicevox_core/Cargo.toml
@@ -18,7 +18,7 @@ cfg-if = "1.0.0"
 derive-getters = "0.2.0"
 derive-new = "0.5.9"
 once_cell = "1.10.0"
-onnxruntime = { git = "https://github.com/qwerty2501/onnxruntime-rs.git", version = "0.0.16" }
+onnxruntime = { git = "https://github.com/qwerty2501/onnxruntime-rs.git", version = "0.0.17" }
 thiserror = "1.0.31"
 
 [dev-dependencies]

diff --git a/crates/voicevox_core/src/status.rs b/crates/voicevox_core/src/status.rs
@@ -9,10 +9,9 @@ cfg_if! {
     }
 }
 use std::collections::BTreeMap;
-use std::sync::Mutex;
 
 pub struct Status {
-    models: Mutex<StatusModels>,
+    models: StatusModels,
     session_options: SessionOptions,
 }
 
@@ -110,11 +109,11 @@ impl Status {
 
     pub fn new(use_gpu: bool, cpu_num_threads: usize) -> Self {
         Self {
-            models: Mutex::new(StatusModels {
+            models: StatusModels {
                 yukarin_s: BTreeMap::new(),
                 yukarin_sa: BTreeMap::new(),
                 decode: BTreeMap::new(),
-            }),
+            },
             session_options: SessionOptions::new(cpu_num_threads, use_gpu),
         }
     }
@@ -131,11 +130,12 @@ impl Status {
             .new_session(model.decode_model)
             .map_err(Error::LoadModel)?;
 
-        let mut models = self.models.lock().unwrap();
-        models.yukarin_s.insert(model_index, yukarin_s_session);
-        models.yukarin_sa.insert(model_index, yukarin_sa_session);
+        self.models.yukarin_s.insert(model_index, yukarin_s_session);
+        self.models
+            .yukarin_sa
+            .insert(model_index, yukarin_sa_session);
 
-        models.decode.insert(model_index, decode_model);
+        self.models.decode.insert(model_index, decode_model);
 
         Ok(())
     }