From d68113ec80c57f09a1ab5bb88d2120d72c456448 Mon Sep 17 00:00:00 2001 From: Faylixe Date: Fri, 4 Dec 2020 12:43:13 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E2=AC=86=EF=B8=8F=20=20add=20fi?= =?UTF-8?q?x=20dep=20and=20clean=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 6 ++++-- spleeter/utils/estimator.py | 11 ++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index e0824e6..5984078 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ __license__ = 'MIT License' # Default project values. project_name = 'spleeter' -project_version = '2.0.1' +project_version = '2.0.2' tensorflow_dependency = 'tensorflow' tensorflow_version = '2.3.0' here = path.abspath(path.dirname(__file__)) @@ -50,11 +50,13 @@ setup( python_requires='>=3.6, <3.9', include_package_data=True, install_requires=[ - 'ffmpeg-python', + 'ffmpeg-python==0.2.0', 'importlib_resources ; python_version<"3.7"', 'norbert==0.2.1', + 'numpy<1.19.0,>=1.16.0', 'pandas==1.1.2', 'requests', + 'scipy==1.4.1', 'setuptools>=41.0.0', 'librosa==0.8.0', '{}=={}'.format(tensorflow_dependency, tensorflow_version), diff --git a/spleeter/utils/estimator.py b/spleeter/utils/estimator.py index f49fb56..aefc355 100644 --- a/spleeter/utils/estimator.py +++ b/spleeter/utils/estimator.py @@ -3,18 +3,12 @@ """ Utility functions for creating estimator. """ -from pathlib import Path -from os.path import join - -# pylint: disable=import-error -import tensorflow as tf - +import tensorflow as tf # pylint: disable=import-error from ..model import model_fn from ..model.provider import get_default_model_provider - def get_default_model_dir(model_dir): """ Transforms a string like 'spleeter:2stems' into an actual path. @@ -24,6 +18,7 @@ def get_default_model_dir(model_dir): model_provider = get_default_model_provider() return model_provider.get(model_dir) + def create_estimator(params, MWF): """ Initialize tensorflow estimator that will perform separation @@ -35,8 +30,6 @@ def create_estimator(params, MWF): a tensorflow estimator """ # Load model. - - params['model_dir'] = get_default_model_dir(params['model_dir']) params['MWF'] = MWF # Setup config