Minor refactor

VOICEVOX · Mar 10, 2024 · c272d3d · c272d3d
1 parent ad47904
commit c272d3d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 24 deletions.
diff --git a/crates/voicevox_core/src/infer.rs b/crates/voicevox_core/src/infer.rs
@@ -3,9 +3,7 @@ mod model_file;
 pub(crate) mod runtimes;
 pub(crate) mod status;
 
-use std::{
-    borrow::Cow, collections::BTreeSet, convert::Infallible, fmt::Debug, marker::PhantomData,
-};
+use std::{borrow::Cow, collections::BTreeSet, fmt::Debug};
 
 use derive_new::new;
 use duplicate::duplicate_item;
@@ -34,7 +32,7 @@ pub(crate) trait InferenceRuntime: 'static {
     fn run(ctx: Self::RunContext<'_>) -> anyhow::Result<Vec<OutputTensor>>;
 }
 
-pub(crate) trait InferenceDomainGroup {
+pub(crate) trait InferenceDomainGroup: Sized {
     type Map<A: InferenceDomainAssociation>: InferenceDomainMap<A, Group = Self>;
 }
 
@@ -64,7 +62,7 @@ pub(crate) trait InferenceDomainAssociationTargetPredicate {
 }
 
 pub(crate) trait ConvertInferenceDomainAssociationTarget<
-    G: InferenceDomainGroup + ?Sized,
+    G: InferenceDomainGroup,
     A1: InferenceDomainAssociation,
     A2: InferenceDomainAssociation,
     E,
@@ -80,9 +78,13 @@ pub(crate) trait InferenceDomainAssociation {
     type Target<D: InferenceDomain>;
 }
 
-pub(crate) struct Optional<A>(Infallible, PhantomData<fn() -> A>);
+impl<A1: InferenceDomainAssociation, A2: InferenceDomainAssociation> InferenceDomainAssociation
+    for (A1, A2)
+{
+    type Target<D: InferenceDomain> = (A1::Target<D>, A2::Target<D>);
+}
 
-impl<A: InferenceDomainAssociation> InferenceDomainAssociation for Optional<A> {
+impl<A: InferenceDomainAssociation> InferenceDomainAssociation for Option<A> {
     type Target<D: InferenceDomain> = Option<A::Target<D>>;
 }
 

diff --git a/crates/voicevox_core/src/infer/status.rs b/crates/voicevox_core/src/infer/status.rs
@@ -28,7 +28,7 @@ use crate::{
 use super::{
     model_file, InferenceDomain, InferenceDomainAssociationTargetPredicate,
     InferenceDomainMap as _, InferenceInputSignature, InferenceRuntime, InferenceSessionOptions,
-    InferenceSignature, Optional,
+    InferenceSignature,
 };
 
 pub(crate) struct Status<R: InferenceRuntime, G: InferenceDomainGroup> {
@@ -47,7 +47,7 @@ impl<R: InferenceRuntime, G: InferenceDomainGroup> Status<R, G> {
     pub(crate) fn insert_model(
         &self,
         model_header: &VoiceModelHeader,
-        model_bytes: &G::Map<Optional<ModelDataByInferenceDomain>>,
+        model_bytes: &G::Map<Option<ModelDataByInferenceDomain>>,
     ) -> Result<()> {
         self.loaded_models
             .lock()
@@ -79,16 +79,16 @@ impl<R: InferenceRuntime, G: InferenceDomainGroup> Status<R, G> {
         impl<R: InferenceRuntime, G: InferenceDomainGroup>
             ConvertInferenceDomainAssociationTarget<
                 G,
-                Optional<ModelDataByInferenceDomain>,
-                Optional<ModelInnerIdsAndSessionSetByDomain<R>>,
+                Option<ModelDataByInferenceDomain>,
+                Option<(ModelInnerIdsByDomain, SessionSetByDomain<R>)>,
                 anyhow::Error,
             > for CreateSessionSet<'_, R, G>
         {
             fn try_ref_map<D: InferenceDomain<Group = G>>(
                 &self,
-                model_data: &<Optional<ModelDataByInferenceDomain> as InferenceDomainAssociation>::Target<D>,
+                model_data: &<Option<ModelDataByInferenceDomain> as InferenceDomainAssociation>::Target<D>,
             ) -> anyhow::Result<
-                <Optional<ModelInnerIdsAndSessionSetByDomain<R>> as InferenceDomainAssociation>::Target<D>,
+                <Option<(ModelInnerIdsByDomain, SessionSetByDomain<R>)> as InferenceDomainAssociation>::Target<D>,
             >{
                 model_data
                     .as_ref()
@@ -174,7 +174,7 @@ struct LoadedModels<R: InferenceRuntime, G: InferenceDomainGroup>(
 
 struct LoadedModel<R: InferenceRuntime, G: InferenceDomainGroup> {
     metas: VoiceModelMeta,
-    by_domain: G::Map<Optional<ModelInnerIdsAndSessionSetByDomain<R>>>,
+    by_domain: G::Map<Option<(ModelInnerIdsByDomain, SessionSetByDomain<R>)>>,
 }
 
 impl<R: InferenceRuntime, G: InferenceDomainGroup> LoadedModels<R, G> {
@@ -254,7 +254,7 @@ impl<R: InferenceRuntime, G: InferenceDomainGroup> LoadedModels<R, G> {
     fn ensure_acceptable(
         &self,
         model_header: &VoiceModelHeader,
-        model_bytes_or_sessions: &G::Map<Optional<impl InferenceDomainAssociation>>,
+        model_bytes_or_sessions: &G::Map<Option<impl InferenceDomainAssociation>>,
     ) -> LoadModelResult<()> {
         let error = |context| LoadModelError {
             path: model_header.path.clone(),
@@ -312,7 +312,7 @@ impl<R: InferenceRuntime, G: InferenceDomainGroup> LoadedModels<R, G> {
         impl<A: InferenceDomainAssociation> InferenceDomainAssociationTargetPredicate
             for ContainsForStyleType<A>
         {
-            type Association = Optional<A>;
+            type Association = Option<A>;
 
             fn test<D: InferenceDomain>(
                 &self,
@@ -326,7 +326,7 @@ impl<R: InferenceRuntime, G: InferenceDomainGroup> LoadedModels<R, G> {
     fn insert(
         &mut self,
         model_header: &VoiceModelHeader,
-        session_sets: G::Map<Optional<ModelInnerIdsAndSessionSetByDomain<R>>>,
+        session_sets: G::Map<Option<(ModelInnerIdsByDomain, SessionSetByDomain<R>)>>,
     ) -> Result<()> {
         self.ensure_acceptable(model_header, &session_sets)?;
 
@@ -453,10 +453,16 @@ impl InferenceDomainAssociation for SessionOptionsByDomain {
     type Target<D: InferenceDomain> = EnumMap<D::Operation, InferenceSessionOptions>;
 }
 
-struct ModelInnerIdsAndSessionSetByDomain<R>(Infallible, PhantomData<fn() -> R>);
+enum ModelInnerIdsByDomain {}
 
-impl<R: InferenceRuntime> InferenceDomainAssociation for ModelInnerIdsAndSessionSetByDomain<R> {
-    type Target<D: InferenceDomain> = (BTreeMap<StyleId, ModelInnerId>, SessionSet<R, D>);
+impl InferenceDomainAssociation for ModelInnerIdsByDomain {
+    type Target<D: InferenceDomain> = BTreeMap<StyleId, ModelInnerId>;
+}
+
+struct SessionSetByDomain<R>(Infallible, PhantomData<fn() -> R>);
+
+impl<R: InferenceRuntime> InferenceDomainAssociation for SessionSetByDomain<R> {
+    type Target<D: InferenceDomain> = SessionSet<R, D>;
 }
 
 #[cfg(test)]

diff --git a/crates/voicevox_core/src/voice_model.rs b/crates/voicevox_core/src/voice_model.rs
@@ -72,7 +72,7 @@ pub(crate) mod blocking {
 
     use crate::{
         error::{LoadModelError, LoadModelErrorKind, LoadModelResult},
-        infer::{domains::InferenceDomainMapImpl, Optional},
+        infer::domains::InferenceDomainMapImpl,
         manifest::{Manifest, TalkManifest},
         VoiceModelMeta,
     };
@@ -90,7 +90,7 @@ pub(crate) mod blocking {
     impl self::VoiceModel {
         pub(crate) fn read_inference_models(
             &self,
-        ) -> LoadModelResult<InferenceDomainMapImpl<Optional<ModelDataByInferenceDomain>>> {
+        ) -> LoadModelResult<InferenceDomainMapImpl<Option<ModelDataByInferenceDomain>>> {
             let reader = BlockingVvmEntryReader::open(&self.header.path)?;
 
             let talk = self
@@ -221,7 +221,7 @@ pub(crate) mod tokio {
 
     use crate::{
         error::{LoadModelError, LoadModelErrorKind, LoadModelResult},
-        infer::{domains::InferenceDomainMapImpl, Optional},
+        infer::domains::InferenceDomainMapImpl,
         manifest::{Manifest, TalkManifest},
         Result, VoiceModelMeta,
     };
@@ -239,7 +239,7 @@ pub(crate) mod tokio {
     impl self::VoiceModel {
         pub(crate) async fn read_inference_models(
             &self,
-        ) -> LoadModelResult<InferenceDomainMapImpl<Optional<ModelDataByInferenceDomain>>> {
+        ) -> LoadModelResult<InferenceDomainMapImpl<Option<ModelDataByInferenceDomain>>> {
             let reader = AsyncVvmEntryReader::open(&self.header.path).await?;
 
             let talk = OptionFuture::from(self.header.manifest.talk().as_ref().map(