Merge branch 'master' into 'master'

fix for compatability of python2 and lower versions of numpy

See merge request !42

examples/clarinet/synthesis.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import os
 import sys
 import argparse

examples/clarinet/train.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import os
 import sys
 import argparse

examples/clarinet/utils.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import os
 import soundfile as sf
 from tensorboardX import SummaryWriter

examples/deepvoice3/data.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import os
 import csv
 from pathlib import Path
@@ -19,6 +20,7 @@ import numpy as np
 import pandas as pd
 import librosa
 from scipy import signal, io
+import six
 
 from parakeet.data import DatasetMixin, TransformDataset, FilterDataset
 from parakeet.g2p.en import text_to_sequence, sequence_to_text
@@ -32,6 +34,7 @@ class LJSpeechMetaData(DatasetMixin):
         self._table = pd.read_csv(
             csv_path,
             sep="|",
+            encoding="utf-8",
             header=None,
             quoting=csv.QUOTE_NONE,
             names=["fname", "raw_text", "normalized_text"])
@@ -122,7 +125,6 @@ class Transform(object):
 
         # num_frames
         n_frames = S_mel_norm.shape[-1]  # CAUTION: original number of frames
-
         return (mix_grapheme_phonemes, text_length, speaker_id, S_norm,
                 S_mel_norm, n_frames)
 
@@ -161,17 +163,21 @@ class DataCollector(object):
              S_mel_norm, num_frames) = example
             text_sequences.append(
                 np.pad(mix_grapheme_phonemes, (0, max_text_length - text_length
-                                               )))
+                                               ),
+                       mode="constant"))
             lin_specs.append(
                 np.pad(S_norm, ((0, 0), (self._pad_begin, max_frames -
-                                         self._pad_begin - num_frames))))
+                                         self._pad_begin - num_frames)),
+                       mode="constant"))
             mel_specs.append(
                 np.pad(S_mel_norm, ((0, 0), (self._pad_begin, max_frames -
-                                             self._pad_begin - num_frames))))
+                                             self._pad_begin - num_frames)),
+                       mode="constant"))
             done_flags.append(
                 np.pad(np.zeros((int(np.ceil(num_frames // self._factor)), )),
                        (0, max_decoder_length - int(
                            np.ceil(num_frames // self._factor))),
+                       mode="constant",
                        constant_values=1))
         text_sequences = np.array(text_sequences).astype(np.int64)
         lin_specs = np.transpose(np.array(lin_specs),

examples/deepvoice3/synthesis.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import os
 import argparse
 import ruamel.yaml

examples/deepvoice3/train.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import os
 import argparse
 import ruamel.yaml

examples/deepvoice3/utils.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import os
 import numpy as np
 from matplotlib import cm

examples/wavenet/data.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import csv
 import numpy as np
 import librosa

examples/wavenet/synthesis.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import os
 import ruamel.yaml
 import argparse

examples/wavenet/train.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import os
 import ruamel.yaml
 import argparse

examples/wavenet/utils.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import os
 import numpy as np
 import soundfile as sf

parakeet/models/clarinet/net.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import itertools
 import numpy as np
 from scipy import signal

parakeet/models/clarinet/parallel_wavenet.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import math
 import time
 import itertools

parakeet/models/clarinet/utils.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
+
 from paddle import fluid
 from paddle.fluid.core import ops
 

parakeet/models/deepvoice3/attention.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import numpy as np
 from collections import namedtuple
 from paddle import fluid

parakeet/models/deepvoice3/conv1dglu.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import numpy as np
 
 from paddle import fluid

parakeet/models/deepvoice3/converter.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import numpy as np
 from itertools import chain
 

parakeet/models/deepvoice3/decoder.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import numpy as np
 import paddle.fluid.layers as F
 import paddle.fluid.initializer as I

parakeet/models/deepvoice3/encoder.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import numpy as np
 from collections import namedtuple
 

parakeet/models/deepvoice3/loss.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import numpy as np
 from numba import jit
 

parakeet/models/deepvoice3/model.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import numpy as np
 
 import paddle.fluid.layers as F

parakeet/models/deepvoice3/position_embedding.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import numpy as np
 from paddle import fluid
 import paddle.fluid.layers as F

parakeet/models/wavenet/net.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import itertools
 import numpy as np
 from scipy import signal

parakeet/models/wavenet/wavenet.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import division
 import math
 import time
 import itertools

parakeet/utils/__init__.py

+# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

parakeet/utils/layer_tools.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import numpy as np
-from torch import nn
 import paddle.fluid.dygraph as dg