diff --git a/tacotron_melgan/src/main.rs b/tacotron_melgan/src/main.rs index 2fc64c0b33..0b5fa31c58 100644 --- a/tacotron_melgan/src/main.rs +++ b/tacotron_melgan/src/main.rs @@ -33,11 +33,11 @@ pub fn main() { fn run_end_to_end() { println!("Load Tacotron Model"); let tacotron_model = - model::load_model_file("/home/bt/dev/voder/tacotron_melgan/tacotron_container.pt"); + model::load_model_file("/home/bt/dev/voder/tacotron_melgan/tacotron_jit_model_voder_c0cac635.pt"); println!("Load Melgan Model"); let melgan_model = - model::load_model_file("/home/bt/dev/voder/tacotron_melgan/container2.pt"); + model::load_model_file("/home/bt/dev/voder/tacotron_melgan/melgan_jit_model_voder_c0cac635.pt"); println!("Load Text Sequence Tensor"); let text_sequence = diff --git a/tacotron_melgan/src/melgan.rs b/tacotron_melgan/src/melgan.rs index 3eb2f48cba..6473578a4c 100644 --- a/tacotron_melgan/src/melgan.rs +++ b/tacotron_melgan/src/melgan.rs @@ -10,7 +10,7 @@ use model::{ load_wrapped_tensor_file, }; -const WRAPPED_MODEL_PATH : &'static str = "/home/bt/dev/voder/tacotron_melgan/container2.pt"; +const WRAPPED_MODEL_PATH : &'static str = "/home/bt/dev/voder/tacotron_melgan/melgan_jit_model_voder_c0cac635.pt"; const EXAMPLE_MEL_1: &'static str = "/home/bt/dev/voder/data/mels/LJ002-0320.mel.containerized.pt"; const EXAMPLE_MEL_2 : &'static str = "/home/bt/dev/voder/data/mels/trump_2018_02_15-001.mel.containerized.pt"; diff --git a/tacotron_melgan/src/model.rs b/tacotron_melgan/src/model.rs index a5e4c9c2a6..2b7c8f11c9 100644 --- a/tacotron_melgan/src/model.rs +++ b/tacotron_melgan/src/model.rs @@ -47,10 +47,10 @@ impl TacoMelModel { pub fn create(tacotron_filename: &str, melgan_filename: &str) -> Self { let tacotron_model = - load_model_file("/home/bt/dev/voder/tacotron_melgan/tacotron_container.pt"); + load_model_file("/home/bt/dev/voder/tacotron_melgan/tacotron_jit_model_voder_c0cac635.pt"); let melgan_model = - load_model_file("/home/bt/dev/voder/tacotron_melgan/container2.pt"); + load_model_file("/home/bt/dev/voder/tacotron_melgan/melgan_jit_model_voder_c0cac635.pt"); Self { tacotron_model, @@ -80,6 +80,16 @@ impl TacoMelModel { text_buffer.push(v); } + /*let mut text_buffer4: Vec = Vec::new(); + text_buffer.push(45); + text_buffer.push(46); + text_buffer.push(11); + text_buffer.push(62); + text_buffer.push(52); + text_buffer.push(58);*/ + + println!("Text buffer: {:?}", text_buffer); + let text_tensor = Tensor::of_slice(text_buffer.as_slice()); println!("Text tensor: {:?}", text_tensor); diff --git a/tacotron_melgan/src/server.rs b/tacotron_melgan/src/server.rs index f839cd9f1d..6fd60ccf7f 100644 --- a/tacotron_melgan/src/server.rs +++ b/tacotron_melgan/src/server.rs @@ -40,8 +40,8 @@ pub fn run_server() { .mount("/pub", StaticFiles::new("/www/public", options).rank(-1))*/ let model = TacoMelModel::create( - "/home/bt/dev/voder/tacotron_melgan/tacotron_container.pt", - "/home/bt/dev/voder/tacotron_melgan/container2.pt"); + "/home/bt/dev/voder/tacotron_melgan/tacotron_jit_model_voder_c0cac635.pt", + "/home/bt/dev/voder/tacotron_melgan/melgan_jit_model_voder_c0cac635.pt"); rocket::ignite() .mount("/", routes![ diff --git a/tacotron_melgan/src/tacotron.rs b/tacotron_melgan/src/tacotron.rs index e8f1d703ec..dd1f69d0ca 100644 --- a/tacotron_melgan/src/tacotron.rs +++ b/tacotron_melgan/src/tacotron.rs @@ -4,7 +4,7 @@ use tch; use tch::nn::Module; -const WRAPPED_MODEL_PATH : &'static str = "/home/bt/dev/voder/tacotron_melgan/tacotron_container.pt"; +const WRAPPED_MODEL_PATH : &'static str = "/home/bt/dev/voder/tacotron_melgan/tacotron_jit_model_voder_c0cac635.pt"; //const EXAMPLE_TEXT_SEQUENCE : &'static str = "/home/bt/dev/voder/data/text/tacotron_text_sequence.pt"; const EXAMPLE_TEXT_SEQUENCE : &'static str = "/home/bt/dev/voder/data/text/tacotron_text_sequence.pt.containerized.pt";