Create link from tests/integration to recipes/minimal_examples

pplantinga · pplantinga · commit 9ac8082e0341 · 2020-05-23T10:51:26.000-04:00
diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
@@ -59,4 +59,4 @@ jobs:
                   pytest --doctest-modules speechbrain
             - name: Integration tests with pytest
               run: |
-                  pytest recipes/minimal_examples
+                  pytest tests/integration
diff --git a/.pre-push-config.yaml b/.pre-push-config.yaml
@@ -52,7 +52,7 @@ repos:
       hooks:
           - id: integration
             name: integration
-            entry: pytest recipes/minimal_examples
+            entry: pytest tests/integration
             language: python
             pass_filenames: False
             always_run: True
diff --git a/README.md b/README.md
@@ -46,10 +46,9 @@ pytest --doctest-modules speechbrain
 The current version of Speechbrain has the following folder/file organization:
 - **speechbrain**: The core library
 - **recipes**: Experiment scripts and configurations
-- **exp**: Top directory under which to save experiment output (by convention)
 - **samples**: Some toy data for debugging and testing
 - **tools**: Additional, runnable utility script
-- **tests**: Unittests
+- **tests**: Unittests and integration tests
 
 ## How to run an experiment
 In SpeechBrain experiments can be run from anywhere, but the experimental `results/`
diff --git a/recipes/minimal_examples/neural_networks/ASR_CTC/example_asr_ctc_experiment.py b/recipes/minimal_examples/neural_networks/ASR_CTC/example_asr_ctc_experiment.py
@@ -10,10 +10,10 @@
 
 # Note, the manual seed does not ensure repeatability with CTC
 torch.manual_seed(1234)
-experiment_dir = os.path.dirname(os.path.abspath(__file__))
+experiment_dir = os.path.dirname(os.path.realpath(__file__))
 params_file = os.path.join(experiment_dir, "params.yaml")
-data_folder = "../../../../../samples/audio_samples/nn_training_samples"
-data_folder = os.path.abspath(experiment_dir + data_folder)
+data_folder = "../../../../samples/audio_samples/nn_training_samples"
+data_folder = os.path.realpath(os.path.join(experiment_dir, data_folder))
 with open(params_file) as fin:
     params = sb.yaml.load_extended_yaml(fin, {"data_folder": data_folder})
 
diff --git a/recipes/minimal_examples/neural_networks/ASR_DNN_HMM/example_asr_dnn_hmm_experiment.py b/recipes/minimal_examples/neural_networks/ASR_DNN_HMM/example_asr_dnn_hmm_experiment.py
@@ -5,10 +5,10 @@
 from speechbrain.utils.train_logger import summarize_average
 
 torch.manual_seed(1234)
-experiment_dir = os.path.dirname(os.path.abspath(__file__))
+experiment_dir = os.path.dirname(os.path.realpath(__file__))
 params_file = os.path.join(experiment_dir, "params.yaml")
-data_folder = "../../../../../samples/audio_samples/nn_training_samples"
-data_folder = os.path.abspath(experiment_dir + data_folder)
+data_folder = "../../../../samples/audio_samples/nn_training_samples"
+data_folder = os.path.realpath(os.path.join(experiment_dir, data_folder))
 with open(params_file) as fin:
     params = sb.yaml.load_extended_yaml(fin, {"data_folder": data_folder})
 
diff --git a/recipes/minimal_examples/neural_networks/autoencoder/example_auto_experiment.py b/recipes/minimal_examples/neural_networks/autoencoder/example_auto_experiment.py
@@ -5,10 +5,10 @@
 from speechbrain.utils.train_logger import summarize_average
 
 torch.manual_seed(1234)
-experiment_dir = os.path.dirname(os.path.abspath(__file__))
+experiment_dir = os.path.dirname(os.path.realpath(__file__))
 params_file = os.path.join(experiment_dir, "params.yaml")
-data_folder = "../../../../../samples/audio_samples/nn_training_samples"
-data_folder = os.path.abspath(experiment_dir + data_folder)
+data_folder = "../../../../samples/audio_samples/nn_training_samples"
+data_folder = os.path.realpath(os.path.join(experiment_dir, data_folder))
 with open(params_file) as fin:
     params = sb.yaml.load_extended_yaml(fin, {"data_folder": data_folder})
 
diff --git a/recipes/minimal_examples/neural_networks/speaker_identification/example_spkid_experiment.py b/recipes/minimal_examples/neural_networks/speaker_identification/example_spkid_experiment.py
@@ -5,10 +5,10 @@
 from speechbrain.utils.train_logger import summarize_average
 
 torch.manual_seed(1234)
-experiment_dir = os.path.dirname(os.path.abspath(__file__))
+experiment_dir = os.path.dirname(os.path.realpath(__file__))
 params_file = os.path.join(experiment_dir, "params.yaml")
-data_folder = "../../../../../samples/audio_samples/nn_training_samples"
-data_folder = os.path.abspath(experiment_dir + data_folder)
+data_folder = "../../../../samples/audio_samples/nn_training_samples"
+data_folder = os.path.realpath(os.path.join(experiment_dir, data_folder))
 with open(params_file) as fin:
     params = sb.yaml.load_extended_yaml(fin, {"data_folder": data_folder})
 
diff --git a/tests/integration b/tests/integration
@@ -0,0 +1 @@
+../recipes/minimal_examples/
