initial restructuring - most stuff is still broken

Lab41 · Nov 29, 2017 · fa050ab · fa050ab
1 parent b0727c5
commit fa050ab
Show file tree

Hide file tree

Showing 242 changed files with 547 additions and 4,971 deletions.
diff --git a/src/__init__.py → CHANGELOG.md b/src/__init__.py → CHANGELOG.md
diff --git a/data/commchannel/communitychannel-1-left.wav b/data/commchannel/communitychannel-1-left.wav
diff --git a/data/commchannel/communitychannel-1-right.wav b/data/commchannel/communitychannel-1-right.wav
diff --git a/data/commchannel/communitychannel-2-left.wav b/data/commchannel/communitychannel-2-left.wav
diff --git a/data/commchannel/communitychannel-2-right.wav b/data/commchannel/communitychannel-2-right.wav
diff --git a/data/commchannel/karltiffany-1-left.wav b/data/commchannel/karltiffany-1-left.wav
diff --git a/data/commchannel/karltiffany-1-right.wav b/data/commchannel/karltiffany-1-right.wav
diff --git a/data/commchannel/karltiffany-2-left.wav b/data/commchannel/karltiffany-2-left.wav
diff --git a/data/commchannel/karltiffany-2-right.wav b/data/commchannel/karltiffany-2-right.wav
diff --git a/data/commchannel/karltiffany-3-left.wav b/data/commchannel/karltiffany-3-left.wav
diff --git a/data/commchannel/karltiffany-3-right.wav b/data/commchannel/karltiffany-3-right.wav
diff --git a/data/commchannel/karltiffany-4-left.wav b/data/commchannel/karltiffany-4-left.wav
diff --git a/data/commchannel/karltiffany-4-right.wav b/data/commchannel/karltiffany-4-right.wav
diff --git a/data/data_partitions/UrbanSound8K/time_volume_interference/out_of_sample_test.csv b/data/data_partitions/UrbanSound8K/time_volume_interference/out_of_sample_test.csv
diff --git a/data/data_partitions/UrbanSound8K/time_volume_interference/training_set/in_sample_test.csv b/data/data_partitions/UrbanSound8K/time_volume_interference/training_set/in_sample_test.csv
diff --git a/data/data_partitions/UrbanSound8K/time_volume_interference/training_set/train.csv b/data/data_partitions/UrbanSound8K/time_volume_interference/training_set/train.csv
diff --git a/data/data_partitions/UrbanSound8K/time_volume_interference/training_set/validation.csv b/data/data_partitions/UrbanSound8K/time_volume_interference/training_set/validation.csv
diff --git a/data/examples/mixture.wav b/data/examples/mixture.wav
diff --git a/data/librispeech/authors/dev-clean-F.txt b/data/librispeech/authors/dev-clean-F.txt
diff --git a/data/librispeech/authors/dev-clean-M.txt b/data/librispeech/authors/dev-clean-M.txt
diff --git a/data/librispeech/authors/test-clean-F.txt b/data/librispeech/authors/test-clean-F.txt
diff --git a/data/librispeech/authors/test-clean-M.txt b/data/librispeech/authors/test-clean-M.txt
diff --git a/data/librispeech/authors/train-clean-100-F.txt b/data/librispeech/authors/train-clean-100-F.txt
diff --git a/data/librispeech/authors/train-clean-100-M.txt b/data/librispeech/authors/train-clean-100-M.txt
diff --git a/data/pictures/mask-rnn-mask.png b/data/pictures/mask-rnn-mask.png
diff --git a/data/pictures/mask-rnn.png b/data/pictures/mask-rnn.png
diff --git a/evaluation/README.md b/evaluation/README.md
diff --git a/src/factorization/__init__.py → magnolia/__init__.py b/src/factorization/__init__.py → magnolia/__init__.py
diff --git a/settings/assign_uids_template.json → ...peline_settings/assign_uids_template.json b/settings/assign_uids_template.json → ...peline_settings/assign_uids_template.json
diff --git a/settings/logging.conf → magnolia/data/pipeline_settings/logging.conf b/settings/logging.conf → magnolia/data/pipeline_settings/logging.conf
diff --git a/settings/mixing_template.json → ...ta/pipeline_settings/mixing_template.json b/settings/mixing_template.json → ...ta/pipeline_settings/mixing_template.json
diff --git a/settings/partition_LibriSpeech.json → ...eline_settings/partition_LibriSpeech.json b/settings/partition_LibriSpeech.json → ...eline_settings/partition_LibriSpeech.json
diff --git a/settings/partition_UrbanSound8K.json → ...line_settings/partition_UrbanSound8K.json b/settings/partition_UrbanSound8K.json → ...line_settings/partition_UrbanSound8K.json
diff --git a/settings/partition_graph_LibriSpeech.json → ...settings/partition_graph_LibriSpeech.json b/settings/partition_graph_LibriSpeech.json → ...settings/partition_graph_LibriSpeech.json
diff --git a/settings/partition_graph_UrbanSound8K.json → ...ettings/partition_graph_UrbanSound8K.json b/settings/partition_graph_UrbanSound8K.json → ...ettings/partition_graph_UrbanSound8K.json
diff --git a/settings/preprocess_LibriSpeech.json → ...line_settings/preprocess_LibriSpeech.json b/settings/preprocess_LibriSpeech.json → ...line_settings/preprocess_LibriSpeech.json
diff --git a/settings/preprocess_UrbanSound8K.json → ...ine_settings/preprocess_UrbanSound8K.json b/settings/preprocess_UrbanSound8K.json → ...ine_settings/preprocess_UrbanSound8K.json
diff --git a/settings/preprocess_template.json → ...ipeline_settings/preprocess_template.json b/settings/preprocess_template.json → ...ipeline_settings/preprocess_template.json
diff --git a/src/README.md → magnolia/python/README.md b/src/README.md → magnolia/python/README.md
diff --git a/src/features/__init__.py → magnolia/python/__init__.py b/src/features/__init__.py → magnolia/python/__init__.py
diff --git a/src/iterate/__init__.py → magnolia/python/analysis/__init__.py b/src/iterate/__init__.py → magnolia/python/analysis/__init__.py
diff --git a/src/statistics/bss_evaluate.py → magnolia/python/analysis/bss_evaluate.py b/src/statistics/bss_evaluate.py → magnolia/python/analysis/bss_evaluate.py
diff --git a/src/statistics/comparison_plot.py → magnolia/python/analysis/comparison_plot.py b/src/statistics/comparison_plot.py → magnolia/python/analysis/comparison_plot.py
diff --git a/src/statistics/make_sdr_table.py → magnolia/python/analysis/make_sdr_table.py b/src/statistics/make_sdr_table.py → magnolia/python/analysis/make_sdr_table.py
diff --git a/...out_of_set_sdr_delta_versus_input_snr.pdf → ...out_of_set_sdr_delta_versus_input_snr.pdf b/...out_of_set_sdr_delta_versus_input_snr.pdf → ...out_of_set_sdr_delta_versus_input_snr.pdf
diff --git a/...ut_of_set_sdr_delta_versus_noise_type.pdf → ...ut_of_set_sdr_delta_versus_noise_type.pdf b/...ut_of_set_sdr_delta_versus_noise_type.pdf → ...ut_of_set_sdr_delta_versus_noise_type.pdf
diff --git a/src/statistics/pesq_evaluate.py → magnolia/python/analysis/pesq_evaluate.py b/src/statistics/pesq_evaluate.py → magnolia/python/analysis/pesq_evaluate.py
diff --git a/src/utils/__init__.py → .../python/hyperparameter_search/__init__.py b/src/utils/__init__.py → .../python/hyperparameter_search/__init__.py
diff --git a/src/demo/app/test_imports.py → magnolia/python/inference/__init__.py b/src/demo/app/test_imports.py → magnolia/python/inference/__init__.py
diff --git a/src/demo/config.py → ...n/inference/denoising/Chimera/__init__.py b/src/demo/config.py → ...n/inference/denoising/Chimera/__init__.py
diff --git a/...raining/denoising/Chimera/separate_mix.py → ...ference/denoising/Chimera/separate_mix.py b/...raining/denoising/Chimera/separate_mix.py → ...ference/denoising/Chimera/separate_mix.py
diff --git a/...ising/Chimera/separate_sample_from_mix.py → ...ising/Chimera/separate_sample_from_mix.py b/...ising/Chimera/separate_sample_from_mix.py → ...ising/Chimera/separate_sample_from_mix.py
diff --git a/src/iterate/feat_iterator.py → ...ia/python/inference/denoising/__init__.py b/src/iterate/feat_iterator.py → ...ia/python/inference/denoising/__init__.py
diff --git a/magnolia/python/models/__init__.py b/magnolia/python/models/__init__.py
@@ -0,0 +1,19 @@
+from .dnnseparate.chimera import Chimera
+from .dnnseparate.L41_regression_model import L41RegressionModel
+
+__all__ = [
+    "Chimera",
+    "L41RegressionModel",
+]
+
+def make_model(config, env):
+    if config['model_name'] in __all__:
+        return globals()[config['model_name']](config, env)
+    else:
+        raise Exception('The model name %s does not exist' % config['model_name'])
+
+def get_model_class(config):
+    if config['model_name'] in __all__:
+        return globals()[config['model_name']]
+    else:
+        raise Exception('The model name %s does not exist' % config['model_name'])
diff --git a/src/dnndenoise/DAE.py → magnolia/python/models/dnndenoise/DAE.py b/src/dnndenoise/DAE.py → magnolia/python/models/dnndenoise/DAE.py
diff --git a/magnolia/python/models/dnndenoise/__init__.py b/magnolia/python/models/dnndenoise/__init__.py
diff --git a/src/dnnseparate/DANmodel.py → ...lia/python/models/dnnseparate/DANmodel.py b/src/dnnseparate/DANmodel.py → ...lia/python/models/dnnseparate/DANmodel.py