From c33068ad4035ea0b1599c5210970334c5c588f94 Mon Sep 17 00:00:00 2001
From: erogol <erogol@hotmail.com>
Date: Sun, 12 Jul 2020 16:09:03 +0200
Subject: [PATCH] use librosa 0.7.2 and fix vocoder datatset assert

---
 requirements.txt               | 2 +-
 requirements_tests.txt         | 2 +-
 setup.py                       | 2 +-
 vocoder/tests/test_datasets.py | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index fb3e2281..03873061 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ tensorflow>=2.2
 numpy>=1.16.0
 scipy>=0.19.0
 numba==0.48
-librosa==0.6.2
+librosa==0.7.2
 unidecode==0.4.20
 attrdict
 tensorboardX
diff --git a/requirements_tests.txt b/requirements_tests.txt
index 6823b172..cd5df3fa 100644
--- a/requirements_tests.txt
+++ b/requirements_tests.txt
@@ -3,7 +3,7 @@ tensorflow==2.3rc
 numpy>=1.16.0
 scipy>=0.19.0
 numba==0.48
-librosa==0.6.2
+librosa==0.7.2
 unidecode==0.4.20
 attrdict
 tensorboardX
diff --git a/setup.py b/setup.py
index 7e40f234..bfc59516 100644
--- a/setup.py
+++ b/setup.py
@@ -82,7 +82,7 @@ requirements = {
         "numpy>=1.16.0",
         "numba==0.48",
         "scipy>=0.19.0",
-        "librosa==0.6.2",
+        "librosa==0.7.2",
         "unidecode==0.4.20",
         "attrdict",
         "tensorboardX",
diff --git a/vocoder/tests/test_datasets.py b/vocoder/tests/test_datasets.py
index 5d409b3f..43d0d3de 100644
--- a/vocoder/tests/test_datasets.py
+++ b/vocoder/tests/test_datasets.py
@@ -59,9 +59,9 @@ def gan_dataset_case(batch_size, seq_len, hop_len, conv_pad, return_segments, us
                     audio = wav1[idx].squeeze()
                     feat = feat1[idx]
                     mel = ap.melspectrogram(audio)
-                    # the first 2 and the last frame is skipped due to the padding
-                    # applied in spec. computation.
-                    assert (feat - mel[:, :feat1.shape[-1]])[:, 2:-1].sum() == 0, f' [!] {(feat - mel[:, :feat1.shape[-1]])[:, 2:-1].sum()}'
+                    # the first 2 and the last 2 frames are skipped due to the padding
+                    # differences in stft
+                    assert (feat - mel[:, :feat1.shape[-1]])[:, 2:-2].sum() <= 0, f' [!] {(feat - mel[:, :feat1.shape[-1]])[:, 2:-2].sum()}'
 
             count_iter += 1
             # if count_iter == max_iter: