Revert "Merge pull request neonbjb#3 from osanseviero/main"

This reverts commit 1a41f7f, reversing changes made to cf7a4bc.
PyDeps · Apr 27, 2022 · 05e06de · 05e06de
1 parent cfbeb2d
commit 05e06de
Show file tree

Hide file tree

Showing 33 changed files with 22 additions and 53 deletions.
diff --git a/tortoise_tts/api.py → api.py b/tortoise_tts/api.py → api.py
@@ -8,18 +8,18 @@
 import progressbar
 import torchaudio
 
-from tortoise_tts.models.classifier import AudioMiniEncoderWithClassifierHead
-from tortoise_tts.models.cvvp import CVVP
-from tortoise_tts.models.diffusion_decoder import DiffusionTts
-from tortoise_tts.models.autoregressive import UnifiedVoice
+from models.classifier import AudioMiniEncoderWithClassifierHead
+from models.cvvp import CVVP
+from models.diffusion_decoder import DiffusionTts
+from models.autoregressive import UnifiedVoice
 from tqdm import tqdm
 
-from tortoise_tts.models.arch_util import TorchMelSpectrogram
-from tortoise_tts.models.clvp import CLVP
-from tortoise_tts.models.vocoder import UnivNetGenerator
-from tortoise_tts.utils.audio import load_audio, wav_to_univnet_mel, denormalize_tacotron_mel
-from tortoise_tts.utils.diffusion import SpacedDiffusion, space_timesteps, get_named_beta_schedule
-from tortoise_tts.utils.tokenizer import VoiceBpeTokenizer, lev_distance
+from models.arch_util import TorchMelSpectrogram
+from models.clvp import CLVP
+from models.vocoder import UnivNetGenerator
+from utils.audio import load_audio, wav_to_univnet_mel, denormalize_tacotron_mel
+from utils.diffusion import SpacedDiffusion, space_timesteps, get_named_beta_schedule
+from utils.tokenizer import VoiceBpeTokenizer, lev_distance
 
 
 pbar = None

diff --git a/tortoise_tts/data/riding_hood.txt → data/riding_hood.txt b/tortoise_tts/data/riding_hood.txt → data/riding_hood.txt
diff --git a/tortoise_tts/data/tokenizer.json → data/tokenizer.json b/tortoise_tts/data/tokenizer.json → data/tokenizer.json
diff --git a/tortoise_tts/do_tts.py → do_tts.py b/tortoise_tts/do_tts.py → do_tts.py
diff --git a/tortoise_tts/eval_multiple.py → eval_multiple.py b/tortoise_tts/eval_multiple.py → eval_multiple.py
diff --git a/tortoise_tts/is_this_from_tortoise.py → is_this_from_tortoise.py b/tortoise_tts/is_this_from_tortoise.py → is_this_from_tortoise.py
diff --git a/tortoise_tts/models/arch_util.py → models/arch_util.py b/tortoise_tts/models/arch_util.py → models/arch_util.py
@@ -5,7 +5,7 @@
 import torch.nn as nn
 import torch.nn.functional as F
 import torchaudio
-from tortoise_tts.models.xtransformers import ContinuousTransformerWrapper, RelativePositionBias
+from models.xtransformers import ContinuousTransformerWrapper, RelativePositionBias
 
 
 def zero_module(module):

diff --git a/tortoise_tts/models/autoregressive.py → models/autoregressive.py b/tortoise_tts/models/autoregressive.py → models/autoregressive.py
@@ -6,8 +6,8 @@
 from transformers import GPT2Config, GPT2PreTrainedModel, LogitsProcessorList
 from transformers.modeling_outputs import CausalLMOutputWithCrossAttentions
 from transformers.utils.model_parallel_utils import get_device_map, assert_device_map
-from tortoise_tts.models.arch_util import AttentionBlock
-from tortoise_tts.utils.typical_sampling import TypicalLogitsWarper
+from models.arch_util import AttentionBlock
+from utils.typical_sampling import TypicalLogitsWarper
 
 
 def null_position_embeddings(range, dim):

diff --git a/tortoise_tts/models/classifier.py → models/classifier.py b/tortoise_tts/models/classifier.py → models/classifier.py
@@ -3,7 +3,7 @@
 import torch.nn.functional as F
 from torch.utils.checkpoint import checkpoint
 
-from tortoise_tts.models.arch_util import Upsample, Downsample, normalization, zero_module, AttentionBlock
+from models.arch_util import Upsample, Downsample, normalization, zero_module, AttentionBlock
 
 
 class ResBlock(nn.Module):

diff --git a/tortoise_tts/models/clvp.py → models/clvp.py b/tortoise_tts/models/clvp.py → models/clvp.py
@@ -3,9 +3,9 @@
 import torch.nn.functional as F
 from torch import einsum
 
-from tortoise_tts.models.arch_util import CheckpointedXTransformerEncoder
-from tortoise_tts.models.transformer import Transformer
-from tortoise_tts.models.xtransformers import Encoder
+from models.arch_util import CheckpointedXTransformerEncoder
+from models.transformer import Transformer
+from models.xtransformers import Encoder
 
 
 def exists(val):

diff --git a/tortoise_tts/models/cvvp.py → models/cvvp.py b/tortoise_tts/models/cvvp.py → models/cvvp.py
@@ -4,8 +4,8 @@
 from torch import einsum
 from torch.utils.checkpoint import checkpoint
 
-from tortoise_tts.models.arch_util import AttentionBlock
-from tortoise_tts.models.xtransformers import ContinuousTransformerWrapper, Encoder
+from models.arch_util import AttentionBlock
+from models.xtransformers import ContinuousTransformerWrapper, Encoder
 
 
 def exists(val):

diff --git a/tortoise_tts/models/diffusion_decoder.py → models/diffusion_decoder.py b/tortoise_tts/models/diffusion_decoder.py → models/diffusion_decoder.py
@@ -7,7 +7,7 @@
 import torch.nn.functional as F
 from torch import autocast
 
-from tortoise_tts.models.arch_util import normalization, AttentionBlock
+from models.arch_util import normalization, AttentionBlock
 
 
 def is_latent(t):

diff --git a/tortoise_tts/models/transformer.py → models/transformer.py b/tortoise_tts/models/transformer.py → models/transformer.py
diff --git a/tortoise_tts/models/vocoder.py → models/vocoder.py b/tortoise_tts/models/vocoder.py → models/vocoder.py
diff --git a/tortoise_tts/models/xtransformers.py → models/xtransformers.py b/tortoise_tts/models/xtransformers.py → models/xtransformers.py
diff --git a/tortoise_tts/read.py → read.py b/tortoise_tts/read.py → read.py
diff --git a/requirements.txt b/requirements.txt
@@ -7,6 +7,4 @@ inflect
 progressbar
 einops
 unidecode
-entmax
-scipy
-librosa
+entmax
diff --git a/tortoise_tts/results/.gitattributes → results/.gitattributes b/tortoise_tts/results/.gitattributes → results/.gitattributes
diff --git a/tortoise_tts/results/various/desktop.ini → results/various/desktop.ini b/tortoise_tts/results/various/desktop.ini → results/various/desktop.ini
diff --git a/tortoise_tts/samples_generator.py → samples_generator.py b/tortoise_tts/samples_generator.py → samples_generator.py
diff --git a/setup.py b/setup.py
diff --git a/tortoise_tts/sweep.py → sweep.py b/tortoise_tts/sweep.py → sweep.py
diff --git a/tortoise_tts/__init__.py b/tortoise_tts/__init__.py
diff --git a/tortoise_tts/models/__init__.py b/tortoise_tts/models/__init__.py
diff --git a/tortoise_tts/results/__init__.py b/tortoise_tts/results/__init__.py
diff --git a/tortoise_tts/utils/__init__.py b/tortoise_tts/utils/__init__.py
diff --git a/tortoise_tts/voices/__init__.py b/tortoise_tts/voices/__init__.py
diff --git a/tortoise_tts/data/__init__.py → utils/__init__.py b/tortoise_tts/data/__init__.py → utils/__init__.py
diff --git a/tortoise_tts/utils/audio.py → utils/audio.py b/tortoise_tts/utils/audio.py → utils/audio.py
@@ -6,7 +6,7 @@
 import numpy as np
 from scipy.io.wavfile import read
 
-from tortoise_tts.utils.stft import STFT
+from utils.stft import STFT
 
 
 def load_wav_to_torch(full_path):

diff --git a/tortoise_tts/utils/diffusion.py → utils/diffusion.py b/tortoise_tts/utils/diffusion.py → utils/diffusion.py
diff --git a/tortoise_tts/utils/stft.py → utils/stft.py b/tortoise_tts/utils/stft.py → utils/stft.py
diff --git a/tortoise_tts/utils/tokenizer.py → utils/tokenizer.py b/tortoise_tts/utils/tokenizer.py → utils/tokenizer.py
@@ -3,7 +3,6 @@
 import inflect
 import torch
 from tokenizers import Tokenizer
-from pathlib import Path
 
 
 # Regular expression matching whitespace:
@@ -166,8 +165,6 @@ def lev_distance(s1, s2):
 
 class VoiceBpeTokenizer:
     def __init__(self, vocab_file='data/tokenizer.json'):
-        vocab_file = str(Path(__file__).parent.parent / Path(vocab_file))
-        print(vocab_file)
         if vocab_file is not None:
             self.tokenizer = Tokenizer.from_file(vocab_file)
 

diff --git a/tortoise_tts/utils/typical_sampling.py → utils/typical_sampling.py b/tortoise_tts/utils/typical_sampling.py → utils/typical_sampling.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,4 @@ inflect @@
     progressbar
     einops
     unidecode
-    entmax
-    scipy
-    librosa
+    entmax