From 9a61dfa155086c78d8b5ffe3c6cd22a6fd457d23 Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Fri, 19 Jul 2019 11:35:06 +0200
Subject: [PATCH] Address additional lint problems

---
 .pylintrc            |  1 +
 tests/test_layers.py |  3 ++-
 train.py             | 16 ++++++++--------
 utils/audio.py       |  4 ++--
 utils/synthesis.py   |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index cd96b343..b6e04944 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -62,6 +62,7 @@ confidence=
 # --disable=W".
 disable=missing-docstring,
         line-too-long,
+        fixme,
         wrong-import-order,
         ungrouped-imports,
         wrong-import-position,
diff --git a/tests/test_layers.py b/tests/test_layers.py
index 5f84509a..a7f03099 100644
--- a/tests/test_layers.py
+++ b/tests/test_layers.py
@@ -38,7 +38,8 @@ class CBHGTests(unittest.TestCase):
 
 
 class DecoderTests(unittest.TestCase):
-    def test_in_out(self):
+    @staticmethod
+    def test_in_out():
         layer = Decoder(in_features=256, memory_dim=80, r=2, memory_size=4, attn_windowing=False, attn_norm="sigmoid") #FIXME: several missing required parameters for Decoder ctor
         dummy_input = T.rand(4, 8, 256)
         dummy_memory = T.rand(4, 2, 80)
diff --git a/train.py b/train.py
index 6252c993..cfab590d 100644
--- a/train.py
+++ b/train.py
@@ -38,8 +38,7 @@ print(" > Using CUDA: ", use_cuda)
 print(" > Number of GPUs: ", num_gpus)
 
 
-def setup_loader(is_val=False, verbose=False):
-    global ap
+def setup_loader(ap, is_val=False, verbose=False):
     global meta_data_train
     global meta_data_eval
     if "meta_data_train" not in globals():
@@ -85,7 +84,7 @@ def setup_loader(is_val=False, verbose=False):
 
 def train(model, criterion, criterion_st, optimizer, optimizer_st, scheduler,
           ap, epoch):
-    data_loader = setup_loader(is_val=False, verbose=(epoch == 0))
+    data_loader = setup_loader(ap, is_val=False, verbose=(epoch == 0))
     if c.use_speaker_embedding:
         speaker_mapping = load_speaker_mapping(OUT_PATH)
     model.train()
@@ -273,7 +272,7 @@ def train(model, criterion, criterion_st, optimizer, optimizer_st, scheduler,
 
 
 def evaluate(model, criterion, criterion_st, ap, current_step, epoch):
-    data_loader = setup_loader(is_val=True)
+    data_loader = setup_loader(ap, is_val=True)
     if c.use_speaker_embedding:
         speaker_mapping = load_speaker_mapping(OUT_PATH)
     model.eval()
@@ -432,7 +431,11 @@ def evaluate(model, criterion, criterion_st, ap, current_step, epoch):
     return avg_postnet_loss
 
 
-def main(args):
+#FIXME: move args definition/parsing inside of main?
+def main(args): #pylint: disable=redefined-outer-name
+    # Audio processor
+    ap = AudioProcessor(**c.audio)
+
     # DISTRUBUTED
     if num_gpus > 1:
         init_distributed(args.rank, num_gpus, args.group_id,
@@ -617,9 +620,6 @@ if __name__ == '__main__':
         LOG_DIR = OUT_PATH
         tb_logger = Logger(LOG_DIR)
 
-    # Audio processor
-    ap = AudioProcessor(**c.audio)
-
     try:
         main(args)
     except KeyboardInterrupt:
diff --git a/utils/audio.py b/utils/audio.py
index 657b5275..d4d9d67f 100644
--- a/utils/audio.py
+++ b/utils/audio.py
@@ -30,7 +30,7 @@ class AudioProcessor(object):
 
         self.sample_rate = sample_rate
         self.num_mels = num_mels
-        self.min_level_db = min_level_db
+        self.min_level_db = min_level_db or 0
         self.frame_shift_ms = frame_shift_ms
         self.frame_length_ms = frame_length_ms
         self.ref_level_db = ref_level_db
@@ -40,7 +40,7 @@ class AudioProcessor(object):
         self.griffin_lim_iters = griffin_lim_iters
         self.signal_norm = signal_norm
         self.symmetric_norm = symmetric_norm
-        self.mel_fmin = 0 if mel_fmin is None else mel_fmin
+        self.mel_fmin = mel_fmin or 0
         self.mel_fmax = mel_fmax
         self.max_norm = 1.0 if max_norm is None else float(max_norm)
         self.clip_norm = clip_norm
diff --git a/utils/synthesis.py b/utils/synthesis.py
index a6677bbc..7d7bf604 100644
--- a/utils/synthesis.py
+++ b/utils/synthesis.py
@@ -77,7 +77,7 @@ def synthesis(model,
               speaker_id=None,
               style_wav=None,
               truncated=False,
-              enable_eos_bos_chars=False,
+              enable_eos_bos_chars=False, #pylint: disable=unused-argument
               do_trim_silence=False):
     """Synthesize voice for the given text.