yuzu/spleeter
1
0
Fork 0
mirror of https://github.com/YuzuZensai/spleeter.git synced 2026-01-31 14:58:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

🎨 ⬆️ add fix dep and clean code

Browse Source
This commit is contained in:
Faylixe
2020-12-04 12:43:13 +01:00
parent 1181f4b54d
commit d68113ec80
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup.py
View File

@@ -14,7 +14,7 @@ __license__ = 'MIT License'
# Default project values. # Default project values.
project_name = 'spleeter' project_name = 'spleeter'
project_version = '2.0.1' project_version = '2.0.2'
tensorflow_dependency = 'tensorflow' tensorflow_dependency = 'tensorflow'
tensorflow_version = '2.3.0' tensorflow_version = '2.3.0'
here = path.abspath(path.dirname(__file__)) here = path.abspath(path.dirname(__file__))
@@ -50,11 +50,13 @@ setup(
python_requires='>=3.6, <3.9', python_requires='>=3.6, <3.9',
include_package_data=True, include_package_data=True,
install_requires=[ install_requires=[
'ffmpeg-python', 'ffmpeg-python==0.2.0',
'importlib_resources ; python_version<"3.7"', 'importlib_resources ; python_version<"3.7"',
'norbert==0.2.1', 'norbert==0.2.1',
'numpy<1.19.0,>=1.16.0',
'pandas==1.1.2', 'pandas==1.1.2',
'requests', 'requests',
'scipy==1.4.1',
'setuptools>=41.0.0', 'setuptools>=41.0.0',
'librosa==0.8.0', 'librosa==0.8.0',
'{}=={}'.format(tensorflow_dependency, tensorflow_version), '{}=={}'.format(tensorflow_dependency, tensorflow_version),

11
spleeter/utils/estimator.py
View File

@@ -3,18 +3,12 @@
""" Utility functions for creating estimator. """ """ Utility functions for creating estimator. """
from pathlib import Path import tensorflow as tf # pylint: disable=import-error
from os.path import join
# pylint: disable=import-error
import tensorflow as tf
from ..model import model_fn from ..model import model_fn
from ..model.provider import get_default_model_provider from ..model.provider import get_default_model_provider
def get_default_model_dir(model_dir): def get_default_model_dir(model_dir):
""" """
Transforms a string like 'spleeter:2stems' into an actual path. 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() model_provider = get_default_model_provider()
return model_provider.get(model_dir) return model_provider.get(model_dir)
def create_estimator(params, MWF): def create_estimator(params, MWF):
""" """
Initialize tensorflow estimator that will perform separation Initialize tensorflow estimator that will perform separation
@@ -35,8 +30,6 @@ def create_estimator(params, MWF):
a tensorflow estimator a tensorflow estimator
""" """
# Load model. # Load model.
params['model_dir'] = get_default_model_dir(params['model_dir']) params['model_dir'] = get_default_model_dir(params['model_dir'])
params['MWF'] = MWF params['MWF'] = MWF
# Setup config # Setup config