Move Tacotron2 out of prototype (#1714)

docs/source/index.rst

@@ -40,7 +40,6 @@ The :mod:`torchaudio` package consists of I/O, popular datasets and common audio
    kaldi_io
    utils
    rnnt_loss
-   tacotron2
 
 
 .. toctree::

docs/source/models.rst

@@ -25,6 +25,24 @@ DeepSpeech
   .. automethod:: forward
 
 
+Tacotron2
+~~~~~~~~~
+
+.. autoclass:: Tacotron2
+
+  .. automethod:: forward
+
+  .. automethod:: infer
+
+Factory Functions
+-----------------
+
+tacotron2
+---------
+
+.. autofunction:: tacotron2
+
+
 Wav2Letter
 ~~~~~~~~~~
 

docs/source/tacotron2.rst

-.. role:: hidden
-    :class: hidden-section
-
-torchaudio.prototype.tacotron2
-==============================
-
-.. currentmodule:: torchaudio.prototype.tacotron2
-
-.. note::
-
-    The Tacotron2 model is a prototype feature, see `here <https://pytorch.org/audio>`_ to learn more about the nomenclature.
-    It is only available within the nightlies, and also needs to be imported
-    explicitly using: :code:`from torchaudio.prototype.Tacotron2 import Tacotron2, tacotron2`.
-
-
-Tacotron2
-~~~~~~~~~
-
-.. autoclass:: Tacotron2
-
-  .. automethod:: forward
-
-  .. automethod:: infer
-
-Factory Functions
------------------
-
-tacotron2
----------
-
-.. autofunction:: tacotron2
-
-
-References
-~~~~~~~~~~
-
-.. footbibliography::

examples/pipeline_tacotron2/inference.py

@@ -11,8 +11,8 @@ import sys
 import torch
 import torchaudio
 import numpy as np
-from torchaudio.prototype.tacotron2 import Tacotron2
-from torchaudio.prototype.tacotron2 import tacotron2 as pretrained_tacotron2
+from torchaudio.models import Tacotron2
+from torchaudio.models import tacotron2 as pretrained_tacotron2
 
 from utils import prepare_input_sequence
 from datasets import InverseSpectralNormalization
@@ -28,7 +28,7 @@ def parse_args():
     r"""
     Parse commandline arguments.
     """
-    from torchaudio.prototype.tacotron2 import _MODEL_CONFIG_AND_URLS as tacotron2_config_and_urls
+    from torchaudio.models.tacotron2 import _MODEL_CONFIG_AND_URLS as tacotron2_config_and_urls
     from torchaudio.models.wavernn import _MODEL_CONFIG_AND_URLS as wavernn_config_and_urls
 
     parser = argparse.ArgumentParser(description=__doc__)

examples/pipeline_tacotron2/train.py

@@ -44,7 +44,7 @@ import torch.distributed as dist
 from torch.utils.tensorboard import SummaryWriter
 from torch.utils.data import DataLoader
 from torch.optim import Adam
-from torchaudio.prototype.tacotron2 import Tacotron2
+from torchaudio.models import Tacotron2
 from tqdm import tqdm
 import matplotlib.pyplot as plt
 plt.switch_backend('agg')

test/torchaudio_unittest/models/tacotron2/model_test_impl.py

 from typing import Tuple
 import torch
 from torch import Tensor
-from torchaudio.prototype.tacotron2 import Tacotron2, _Encoder, _Decoder
+from torchaudio.models import Tacotron2
+from torchaudio.models.tacotron2 import _Encoder, _Decoder
 from torchaudio_unittest.common_utils import (
     TestBaseMixin,
     TempDirMixin,

torchaudio/models/__init__.py

@@ -2,6 +2,7 @@ from .wav2letter import Wav2Letter
 from .wavernn import WaveRNN, wavernn
 from .conv_tasnet import ConvTasNet
 from .deepspeech import DeepSpeech
+from .tacotron2 import Tacotron2, tacotron2
 from .wav2vec2 import (
     Wav2Vec2Model,
     wav2vec2_base,
@@ -20,4 +21,6 @@ __all__ = [
     'wav2vec2_base',
     'wav2vec2_large',
     'wav2vec2_large_lv60k',
+    'Tacotron2',
+    'tacotron2',
 ]