Refactor VQT_Analyzer parameters and update batch_run to use wandb_script_wrapper path

Author: RichieHakim

batch_run/dispatcher.py

@@ -9,6 +9,7 @@
 from face_rhythm import util
 
 path_self, \
+path_wandb_script_wrapper, \
 path_script, \
 dir_save, \
 dir_videos, \
@@ -257,7 +258,7 @@
 [os.system(f"chmod -R 777 {p}") for p in [dir_save, dir_videos, path_ROIs]]
 
 ## run batch_run function
-paths_scripts = [path_script]
+paths_scripts = [path_wandb_script_wrapper]
 params_list = params
 max_n_jobs=1
 name_save=name_job

face_rhythm/pipelines.py

@@ -220,7 +220,7 @@ def pipeline_basic(params):
         ## - `F_min`: Lowest frequency band to use.
         ## - `F_max`: Highest frequency band to use.
         ## - `downsample_factor`: How much to downsample the spectrogram by in time.
-        ## - `return_complex`: Whether or not to return the complex spectrogram. Generally set to False unless you want to try something fancy.
+        ## - `take_abs`: Whether or not to return the complex spectrogram. Generally set to True unless you want to try something fancy.
 
         params['VQT_Analyzer']['device'] = fr.helpers.set_device(use_GPU=use_GPU)
 

face_rhythm/util.py

@@ -148,21 +148,24 @@ def get_default_parameters(
             },
             "VQT_Analyzer": {
                 "params_VQT": {
-                    "Q_lowF": 4,
-                    "Q_highF": 10,
-                    "F_min": 1.0,
-                    "F_max": 60,
-                    "n_freq_bins": 36,
-                    "win_size": 501,
-                    "symmetry": 'center',
-                    "taper_asymmetric": True,
-                    "plot_pref": False,
-                    "downsample_factor": 20,
-                    "padding": "valid",
-                    "batch_size": 10,
-                    "return_complex": False,
-                    "progressBar": True,
+                    'Fs_sample': 120,
+                    'Q_lowF': 4.0,
+                    'Q_highF': 10.0,
+                    'F_min': 1.0,
+                    'F_max': 60,
+                    'n_freq_bins': 36,
+                    'window_type': 'hann',
+                    'symmetry': 'center',
+                    'taper_asymmetric': True,
+                    'downsample_factor': 20,
+                    'padding': 'valid',
+                    'fft_conv': True,
+                    'fast_length': True,
+                    'take_abs': True,
+                    'filters': None, 
+                    'plot_pref': False,
                 },
+                "batch_size": 10,
                 "normalization_factor": 0.95,
                 "spectrogram_exponent": 1.0,
                 "one_over_f_exponent": 0.5,

scripts/params_pipeline_basic.json

@@ -91,21 +91,24 @@
     },
     "VQT_Analyzer": {
         "params_VQT": {
-            "Q_lowF": 4,
-            "Q_highF": 10,
+            "Fs_sample": 120,
+            "Q_lowF": 4.0,
+            "Q_highF": 10.0,
             "F_min": 1.0,
             "F_max": 60,
             "n_freq_bins": 36,
-            "win_size": 501,
-            "symmetry": "left",
+            "window_type": "hann",
+            "symmetry": "center",
             "taper_asymmetric": true,
-            "plot_pref": false,
             "downsample_factor": 20,
             "padding": "valid",
-            "batch_size": 10,
-            "return_complex": false,
-            "progressBar": true
+            "fft_conv": true,
+            "fast_length": true,
+            "take_abs": true,
+            "filters": null, 
+            "plot_pref": false,
         },
+        "batch_size": 10,
         "normalization_factor": 0.95,
         "spectrogram_exponent": 1.0,
         "one_over_f_exponent": 0.5,