finally compiles

This commit is contained in:
Brandon Thomas committed 2020-06-22 02:11:46 -04:00
1 parent c559fb74ae
commit afea8746e2
3 files changed
+6 -6

No files matched your search

+2 -2
View File
@@ -8,7 +8,7 @@ pub trait InferencePipelineStart {
type TtsModel;
type VocoderModel;
fn clean_text(self, text: &str)
fn clean_text(self: Box<Self>, text: &str)
-> AnyhowResult<Box<dyn InferencePipelineTextCleaningDone<TtsModel = Self::TtsModel, VocoderModel = Self::VocoderModel>>>;
}
@@ -17,7 +17,7 @@ pub trait InferencePipelineTextCleaningDone {
type TtsModel;
type VocoderModel;
fn infer_mel(self, speaker_id: i64)
fn infer_mel(self: Box<Self>, speaker_id: i64)
-> AnyhowResult<Box<dyn InferencePipelineMelDone<TtsModel = Self::TtsModel, VocoderModel = Self::VocoderModel>>>;
}
@@ -54,7 +54,7 @@ impl InferencePipelineStart for GlowTtsMelganPipeline {
type TtsModel = Arc<dyn TtsModelT>;
type VocoderModel = Arc<dyn VocoderModelT>;
fn clean_text(self, text: &str)
fn clean_text(self: Box<Self>, text: &str)
-> AnyhowResult<Box<dyn InferencePipelineTextCleaningDone<TtsModel=Self::TtsModel, VocoderModel=Self::VocoderModel>>>
{
let cleaned_text = clean_text(text);
@@ -71,7 +71,7 @@ impl InferencePipelineTextCleaningDone for GlowTtsMelganPipelineTextCleaningDone
type TtsModel = Arc<dyn TtsModelT>;
type VocoderModel = Arc<dyn VocoderModelT>;
fn infer_mel(self, _speaker_id: i64)
fn infer_mel(self: Box<Self>, _speaker_id: i64)
-> AnyhowResult<Box<dyn InferencePipelineMelDone<TtsModel = Self::TtsModel, VocoderModel = Self::VocoderModel>>>
{
// TODO: Creating arpabet instances every time is inefficient (even if lazy_static! under the hood).
@@ -56,7 +56,7 @@ impl InferencePipelineStart for GlowTtsMultiSpeakerMelganPipeline {
type TtsModel = Arc<dyn TtsModelT>;
type VocoderModel = Arc<dyn VocoderModelT>;
fn clean_text(self, text: &str)
fn clean_text(self: Box<Self>, text: &str)
-> AnyhowResult<Box<dyn InferencePipelineTextCleaningDone<TtsModel=Self::TtsModel, VocoderModel=Self::VocoderModel>>>
{
let cleaned_text = clean_text(text);
@@ -73,7 +73,7 @@ impl InferencePipelineTextCleaningDone for GlowTtsMultiSpeakerMelganPipelineTex
type TtsModel = Arc<dyn TtsModelT>;
type VocoderModel = Arc<dyn VocoderModelT>;
fn infer_mel(self, speaker_id: i64)
fn infer_mel(self: Box<Self>, speaker_id: i64)
-> AnyhowResult<Box<dyn InferencePipelineMelDone<TtsModel = Self::TtsModel, VocoderModel = Self::VocoderModel>>>
{
// TODO: Creating arpabet instances every time is inefficient (even if lazy_static! under the hood).