From 922fcd85bbde235aac58098e7529f0466fc79fa3 Mon Sep 17 00:00:00 2001
From: akhlif <akhlif@deezer.com>
Date: Thu, 27 Feb 2020 14:37:02 +0100
Subject: [PATCH] add librosa dependency

---
 requirements.txt           | 3 ++-
 setup.py                   | 3 ++-
 spleeter/model/__init__.py | 9 ++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 8e1f7be..cf289ee 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,4 +4,5 @@ setuptools>=41.0.0
 pandas==0.25.1
 tensorflow==1.14.0
 ffmpeg-python
-norbert==0.2.1
\ No newline at end of file
+norbert==0.2.1
+librosa==0.7.2
\ No newline at end of file
diff --git a/setup.py b/setup.py
index b70dcdc..f89042f 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ __license__ = 'MIT License'
 
 # Default project values.
 project_name = 'spleeter'
-project_version = '1.4.9'
+project_version = '1.5.0'
 tensorflow_dependency = 'tensorflow'
 tensorflow_version = '1.14.0'
 here = path.abspath(path.dirname(__file__))
@@ -56,6 +56,7 @@ setup(
         'pandas==0.25.1',
         'requests',
         'setuptools>=41.0.0',
+        'librosa==0.7.2',
         '{}=={}'.format(tensorflow_dependency, tensorflow_version),
     ],
     extras_require={
diff --git a/spleeter/model/__init__.py b/spleeter/model/__init__.py
index b99a9dd..6c2fe3a 100644
--- a/spleeter/model/__init__.py
+++ b/spleeter/model/__init__.py
@@ -18,7 +18,6 @@ __author__ = 'Deezer Research'
 __license__ = 'MIT License'
 
 
-
 placeholder = tf.compat.v1.placeholder
 
 
@@ -326,14 +325,14 @@ class EstimatorSpecBuilder(object):
             self._build_masked_stfts()
         return self._masked_stfts
 
-    def _inverse_stft(self, stft, time_crop=None):
+    def _inverse_stft(self, stft_t, time_crop=None):
         """ Inverse and reshape the given STFT
 
-        :param stft: input STFT
+        :param stft_t: input STFT
         :returns: inverse STFT (waveform)
         """
         inversed = inverse_stft(
-            tf.transpose(stft, perm=[2, 0, 1]),
+            tf.transpose(stft_t, perm=[2, 0, 1]),
             self._frame_length,
             self._frame_step,
             window_fn=lambda frame_length, dtype: (
@@ -419,7 +418,7 @@ class EstimatorSpecBuilder(object):
             output = output_dict[f'{instrument}_spectrogram']
             # Compute mask with the model.
             instrument_mask = (output ** separation_exponent
-                                      + (self.EPSILON / len(output_dict))) / output_sum
+                               + (self.EPSILON / len(output_dict))) / output_sum
             # Extend mask;
             instrument_mask = self._extend_mask(instrument_mask)
             # Stack back mask.