diff --git a/Makefile b/Makefile index 26129d3..c2b40ba 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # ======================================================= # Library lifecycle management. # -# @author Deezer Research +# @author Deezer Research # @licence MIT Licence # ======================================================= diff --git a/setup.py b/setup.py index 72f7a0b..2465cfa 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ import sys from os import path from setuptools import setup -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' @@ -33,7 +33,7 @@ setup( long_description=readme, long_description_content_type='text/markdown', author='Deezer Research', - author_email='research@deezer.com', + author_email='spleeter@deezer.com', url='https://github.com/deezer/spleeter', license='MIT License', packages=[ diff --git a/spleeter/__init__.py b/spleeter/__init__.py index 0650c97..c2329ed 100644 --- a/spleeter/__init__.py +++ b/spleeter/__init__.py @@ -13,7 +13,7 @@ by providing train, evaluation and source separation action. """ -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/__main__.py b/spleeter/__main__.py index 5c18b21..e4f3f4a 100644 --- a/spleeter/__main__.py +++ b/spleeter/__main__.py @@ -18,7 +18,7 @@ from .utils.logging import ( enable_tensorflow_logging, get_logger) -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/audio/__init__.py b/spleeter/audio/__init__.py index 02f83c0..3d973c5 100644 --- a/spleeter/audio/__init__.py +++ b/spleeter/audio/__init__.py @@ -10,6 +10,6 @@ - Waveform convertion and transforming functions. """ -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/audio/adapter.py b/spleeter/audio/adapter.py index bda1441..2bfcc9b 100644 --- a/spleeter/audio/adapter.py +++ b/spleeter/audio/adapter.py @@ -19,7 +19,7 @@ from tensorflow.contrib.signal import stft, hann_window from .. import SpleeterError from ..utils.logging import get_logger -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/audio/convertor.py b/spleeter/audio/convertor.py index 550345a..0751b03 100644 --- a/spleeter/audio/convertor.py +++ b/spleeter/audio/convertor.py @@ -10,7 +10,7 @@ import tensorflow as tf from ..utils.tensor import from_float32_to_uint8, from_uint8_to_float32 -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/audio/ffmpeg.py b/spleeter/audio/ffmpeg.py index 2277d87..890e02e 100644 --- a/spleeter/audio/ffmpeg.py +++ b/spleeter/audio/ffmpeg.py @@ -20,7 +20,7 @@ from .adapter import AudioAdapter from .. import SpleeterError from ..utils.logging import get_logger -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/audio/spectrogram.py b/spleeter/audio/spectrogram.py index 38d0cf5..80ff65a 100644 --- a/spleeter/audio/spectrogram.py +++ b/spleeter/audio/spectrogram.py @@ -10,7 +10,7 @@ import tensorflow as tf from tensorflow.contrib.signal import stft, hann_window # pylint: enable=import-error -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/commands/__init__.py b/spleeter/commands/__init__.py index 995e866..79773db 100644 --- a/spleeter/commands/__init__.py +++ b/spleeter/commands/__init__.py @@ -9,7 +9,7 @@ from argparse import ArgumentParser from tempfile import gettempdir from os.path import exists, join -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/commands/evaluate.py b/spleeter/commands/evaluate.py index 1e1e3f1..64dbf09 100644 --- a/spleeter/commands/evaluate.py +++ b/spleeter/commands/evaluate.py @@ -38,7 +38,7 @@ except ImportError: logger.error('Please install musdb and museval first, abort') sys.exit(1) -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' @@ -148,11 +148,16 @@ def entrypoint(arguments, params): if not exists(musdb_root_directory): raise IOError(f'musdb directory {musdb_root_directory} not found') # Separate musdb sources. + verbose = arguments.verbose + if verbose: + print("Separating audio files") audio_output_directory = _separate_evaluation_dataset( arguments, musdb_root_directory, params) # Compute metrics with musdb. + if verbose: + print("Compute Metrics with musdb") metrics_output_directory = _compute_musdb_metrics( arguments, musdb_root_directory, diff --git a/spleeter/commands/separate.py b/spleeter/commands/separate.py index 158190c..193d8f6 100644 --- a/spleeter/commands/separate.py +++ b/spleeter/commands/separate.py @@ -14,7 +14,7 @@ from ..audio.adapter import get_audio_adapter from ..separator import Separator -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/commands/train.py b/spleeter/commands/train.py index 2a40c84..3bffaef 100644 --- a/spleeter/commands/train.py +++ b/spleeter/commands/train.py @@ -19,7 +19,7 @@ from ..model import model_fn from ..model.provider import ModelProvider from ..utils.logging import get_logger -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/dataset.py b/spleeter/dataset.py index fe2d349..d6d5d03 100644 --- a/spleeter/dataset.py +++ b/spleeter/dataset.py @@ -38,7 +38,7 @@ from .utils.tensor import ( set_tensor_shape, sync_apply) -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/model/__init__.py b/spleeter/model/__init__.py index 531f84c..2097e9c 100644 --- a/spleeter/model/__init__.py +++ b/spleeter/model/__init__.py @@ -13,7 +13,7 @@ from tensorflow.contrib.signal import stft, inverse_stft, hann_window from ..utils.tensor import pad_and_partition, pad_and_reshape -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/model/functions/__init__.py b/spleeter/model/functions/__init__.py index abe52e9..684f923 100644 --- a/spleeter/model/functions/__init__.py +++ b/spleeter/model/functions/__init__.py @@ -3,7 +3,7 @@ """ This package provide model functions. """ -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/model/functions/blstm.py b/spleeter/model/functions/blstm.py index ff7ce02..b81122b 100644 --- a/spleeter/model/functions/blstm.py +++ b/spleeter/model/functions/blstm.py @@ -33,7 +33,7 @@ from tensorflow.keras.layers import ( from . import apply -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/model/functions/unet.py b/spleeter/model/functions/unet.py index 60dea1e..7f9dbea 100644 --- a/spleeter/model/functions/unet.py +++ b/spleeter/model/functions/unet.py @@ -32,7 +32,7 @@ from tensorflow.compat.v1.keras.initializers import he_uniform from . import apply -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/model/provider/__init__.py b/spleeter/model/provider/__init__.py index 3aa3d8d..3921907 100644 --- a/spleeter/model/provider/__init__.py +++ b/spleeter/model/provider/__init__.py @@ -15,7 +15,7 @@ from abc import ABC, abstractmethod from os import environ, makedirs from os.path import exists, isabs, join, sep -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/model/provider/github.py b/spleeter/model/provider/github.py index cd4d904..65a10b4 100644 --- a/spleeter/model/provider/github.py +++ b/spleeter/model/provider/github.py @@ -25,7 +25,7 @@ import requests from . import ModelProvider from ...utils.logging import get_logger -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/resources/__init__.py b/spleeter/resources/__init__.py index 41d2a65..01939fb 100644 --- a/spleeter/resources/__init__.py +++ b/spleeter/resources/__init__.py @@ -3,6 +3,6 @@ """ Packages that provides static resources file for the library. """ -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/separator.py b/spleeter/separator.py index e769c28..35d8ae2 100644 --- a/spleeter/separator.py +++ b/spleeter/separator.py @@ -31,7 +31,7 @@ from .utils.estimator import create_estimator, to_predictor, get_default_model_d from .model import EstimatorSpecBuilder, InputProviderFactory -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/utils/__init__.py b/spleeter/utils/__init__.py index a4ccb5b..8828652 100644 --- a/spleeter/utils/__init__.py +++ b/spleeter/utils/__init__.py @@ -3,6 +3,6 @@ """ This package provides utility function and classes. """ -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/utils/configuration.py b/spleeter/utils/configuration.py index d1fb167..36f1043 100644 --- a/spleeter/utils/configuration.py +++ b/spleeter/utils/configuration.py @@ -16,7 +16,7 @@ from os.path import exists from .. import resources, SpleeterError -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/utils/logging.py b/spleeter/utils/logging.py index 15431d0..6fee540 100644 --- a/spleeter/utils/logging.py +++ b/spleeter/utils/logging.py @@ -7,7 +7,7 @@ import logging from os import environ -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/spleeter/utils/tensor.py b/spleeter/utils/tensor.py index 402548c..cc5e7e8 100644 --- a/spleeter/utils/tensor.py +++ b/spleeter/utils/tensor.py @@ -8,7 +8,7 @@ import tensorflow as tf import pandas as pd # pylint: enable=import-error -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/tests/__init__.py b/tests/__init__.py index f584f49..a58c36b 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -3,6 +3,6 @@ """ Unit testing package. """ -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/tests/test_eval.py b/tests/test_eval.py index 6a3634b..21229b1 100644 --- a/tests/test_eval.py +++ b/tests/test_eval.py @@ -3,7 +3,7 @@ """ Unit testing for Separator class. """ -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' @@ -71,7 +71,7 @@ def generate_fake_eval_dataset(path): def test_evaluate(path="FAKE_MUSDB_DIR"): generate_fake_eval_dataset(path) p = create_argument_parser() - arguments = p.parse_args(["evaluate", "-p", "spleeter:4stems", "--mus_dir", path]) + arguments = p.parse_args(["evaluate", "-p", "spleeter:4stems", "--mus_dir", path, '--verbose']) params = load_configuration(arguments.configuration) metrics = evaluate.entrypoint(arguments, params) for instrument, metric in metrics.items(): diff --git a/tests/test_ffmpeg_adapter.py b/tests/test_ffmpeg_adapter.py index 195b737..8eb284a 100644 --- a/tests/test_ffmpeg_adapter.py +++ b/tests/test_ffmpeg_adapter.py @@ -3,7 +3,7 @@ """ Unit testing for audio adapter. """ -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License' diff --git a/tests/test_separator.py b/tests/test_separator.py index 691f112..7213af6 100644 --- a/tests/test_separator.py +++ b/tests/test_separator.py @@ -3,7 +3,7 @@ """ Unit testing for Separator class. """ -__email__ = 'research@deezer.com' +__email__ = 'spleeter@deezer.com' __author__ = 'Deezer Research' __license__ = 'MIT License'