diff --git a/Cargo.lock b/Cargo.lock index 955c0cb1b5..6e54892391 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2092,7 +2092,7 @@ dependencies = [ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", - "tch 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tch 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2118,7 +2118,7 @@ dependencies = [ [[package]] name = "tch" -version = "0.1.3" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2126,7 +2126,7 @@ dependencies = [ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "ndarray 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "torch-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "torch-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "zip 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2281,7 +2281,7 @@ dependencies = [ [[package]] name = "torch-sys" -version = "0.1.3" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2345,7 +2345,7 @@ dependencies = [ "sentence 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "tch 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tch 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2857,7 +2857,7 @@ dependencies = [ "checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8" "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" "checksum tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)" = "b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3" -"checksum tch 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9e671182d7da87754e8e84bd0f9bea020ceb240d7292ebecfd0334f0e6f71ca7" +"checksum tch 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c3da599d3cbdfc08755aec52bfc0c1360ebe6613c13434aef7eb56f05da0b2e5" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" "checksum tensorflow 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5334282bbf65c867731c9950dfdaecfb5f78055c2680df4ee130391d196b908" "checksum tensorflow-internal-macros 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f4b9e069af8bc28b249cbc4197211f285f8ea06de8aa9801fe218b18063a429" @@ -2872,7 +2872,7 @@ dependencies = [ "checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930" "checksum toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4" "checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -"checksum torch-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5baf9a7559875b8903e30e5ca0f69154a4f2359a6a8bd304e6d29ddea3a7e0cd" +"checksum torch-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f57908de000ae3932dff570eea87586bbf49d44efa81fb1a5580e79ef973da43" "checksum trust-dns-proto 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2a7f3a2ab8a919f5eca52a468866a67ed7d3efa265d48a652a9a3452272b413f" "checksum trust-dns-resolver 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6f90b1502b226f8b2514c6d5b37bafa8c200d7ca4102d57dc36ee0f3b7a04a2f" "checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" diff --git a/tacotron_melgan/wrap_tacotron2_model.py b/tacotron_melgan/wrap_tacotron2_model.py index 5243ef9880..fe65ee009b 100755 --- a/tacotron_melgan/wrap_tacotron2_model.py +++ b/tacotron_melgan/wrap_tacotron2_model.py @@ -16,12 +16,20 @@ tacotron_model_file = '/home/bt/models/tacotron2-nvidia/tacotron2_trump_txlearn_ # Starting again with new samples: tacotron_model_file = '/home/bt/models/tacotron2-nvidia/tacotron2_trump_txlearn_arpabet_2020-05-14_chkpt7000' tacotron_model_file = '/home/bt/models/tacotron2-nvidia/tacotron2_trump_txlearn_arpabet_2020-05-14_chkpt11500' +tacotron_model_file = '/home/bt/models/tacotron2-nvidia/tacotron2_trump_txlearn_arpabet_2020-05-14_chkpt17000' +tacotron_model_file = '/home/bt/models/tacotron2-nvidia/tacotron2_trump_txlearn_arpabet_2020-05-14_chkpt27000' +tacotron_model_file = '/home/bt/models/tacotron2-nvidia/tacotron2_trump_txlearn_arpabet_2020-05-14_chkpt27000-18000' +tacotron_model_file = '/home/bt/models/tacotron2-nvidia/tacotron2_trump_txlearn_arpabet_2020-05-14_chkpt53500' #output_filename = 'tacotron_arpabet_1.pt' output_filename = 'tacotron2_trump_txlearn_ljs_arpabet_ckpt30000_2020_02_06.jit' output_filename = 'tacotron2_trump_txlearn_ljs_arpabet_2020-05-14_ckpt7000.jit' output_filename = 'tacotron2_trump_txlearn_ljs_arpabet_2020-05-14_ckpt11500.jit' +output_filename = 'tacotron2_trump_txlearn_ljs_arpabet_2020-05-14_ckpt17000.jit' +output_filename = 'tacotron2_trump_txlearn_ljs_arpabet_2020-05-14_ckpt27000.jit' +output_filename = 'tacotron2_trump_txlearn_ljs_arpabet_2020-05-14_ckpt27000-18000.jit' +output_filename = 'tacotron2_trump_txlearn_ljs_arpabet_2020-05-14_ckpt53500.jit' # NB: Tacotron's original shape is [148, 512]. Arpabet encoding is [256, 512]. NUM_SYMBOLS_ENCODED = 256 # 148 by default, 256 with my custom Arpabet encoding diff --git a/tts_service/Cargo.toml b/tts_service/Cargo.toml index 3b246798c5..41ef07d723 100644 --- a/tts_service/Cargo.toml +++ b/tts_service/Cargo.toml @@ -22,7 +22,7 @@ anyhow = "1.0.30" hound = "3.4.0" # wav codec serde = "1.0.104" serde_derive = "1.0.104" -tch = "0.1.3" # libtorch bindings (pytorch) +tch = "0.1.7" # libtorch bindings (pytorch) toml = "0.5.6" # My libraries diff --git a/tts_service/models.toml b/tts_service/models.toml index 8e0ee63ca9..e605f585e1 100644 --- a/tts_service/models.toml +++ b/tts_service/models.toml @@ -15,7 +15,23 @@ file_path = "/home/bt/dev/voder/tacotron_melgan/tacotron2_trump_txlearn_ljs_arpa description = "Trump txlearn with Arpabet 2020-05-14" [[tacotron]] -#file_path = "/home/bt/dev/voder/tacotron_melgan/tacotron_arpabet_1.pt" +file_path = "/home/bt/dev/voder/tacotron_melgan/tacotron2_trump_txlearn_ljs_arpabet_2020-05-14_ckpt17000.jit" +description = "Trump txlearn with Arpabet 2020-05-14" + +[[tacotron]] +file_path = "/home/bt/dev/voder/tacotron_melgan/tacotron2_trump_txlearn_ljs_arpabet_2020-05-14_ckpt27000.jit" +description = "Trump txlearn with Arpabet 2020-05-14" + +[[tacotron]] +file_path = "/home/bt/dev/voder/tacotron_melgan/tacotron2_trump_txlearn_ljs_arpabet_2020-05-14_ckpt27000-18000.jit" +description = "Trump txlearn with Arpabet 2020-05-14" + +[[tacotron]] +file_path = "/home/bt/dev/voder/tacotron_melgan/tacotron2_trump_txlearn_ljs_arpabet_2020-05-14_ckpt53500.jit" +description = "Trump txlearn with Arpabet 2020-05-14" + +[[tacotron]] +# OLD NAME, perhaps I can get the epoch: file_path = "/home/bt/dev/voder/tacotron_melgan/tacotron_arpabet_1.pt" file_path = "/home/bt/dev/voder/tacotron_melgan/tacotron2_ljs_high_pitch_arpabet_2020-03-28.jit" description = "High-quality high-pitched LJS; arpabet encodings."