mattricesound commited on
Commit
b99be38
·
1 Parent(s): 6990e4a

Fix: dataset no longer treats rendered files as input files

Browse files
Files changed (3) hide show
  1. README.md +1 -1
  2. cfg/config.yaml +1 -1
  3. remfx/models.py +16 -16
README.md CHANGED
@@ -38,7 +38,7 @@ Ex. `python scripts/train.py +exp=umx_distortion trainer.accelerator='gpu' train
38
  ## Misc.
39
  By default, files are rendered to `input_dir / processed / train/val/test`.
40
  To skip rendering files (use previously rendered), add `render_files=False` to the command-line
41
-
42
  Test
43
  Experiment dictates data, ckpt dictates model
44
  `python scripts/test.py +exp=umx_distortion.yaml +ckpt_path=test_ckpts/umx_dist.ckpt`
 
38
  ## Misc.
39
  By default, files are rendered to `input_dir / processed / train/val/test`.
40
  To skip rendering files (use previously rendered), add `render_files=False` to the command-line
41
+ To change the rendered location, add `render_root={path/to/dir}` to the command-line
42
  Test
43
  Experiment dictates data, ckpt dictates model
44
  `python scripts/test.py +exp=umx_distortion.yaml +ckpt_path=test_ckpts/umx_dist.ckpt`
cfg/config.yaml CHANGED
@@ -9,7 +9,7 @@ sample_rate: 48000
9
  logs_dir: "./logs"
10
  log_every_n_steps: 1000
11
  render_files: True
12
- render_root: ${oc.env:DATASET_ROOT}
13
 
14
  callbacks:
15
  model_checkpoint:
 
9
  logs_dir: "./logs"
10
  log_every_n_steps: 1000
11
  render_files: True
12
+ render_root: "./data/processed"
13
 
14
  callbacks:
15
  model_checkpoint:
remfx/models.py CHANGED
@@ -39,7 +39,6 @@ class RemFXModel(pl.LightningModule):
39
  }
40
  )
41
  # Log first batch metrics input vs output only once
42
- self.log_first_metrics = True
43
  self.log_train_audio = True
44
 
45
  @property
@@ -73,21 +72,22 @@ class RemFXModel(pl.LightningModule):
73
  self.log(f"{mode}_loss", loss)
74
  x, y, label = batch
75
  # Metric logging
76
- for metric in self.metrics:
77
- # SISDR returns negative values, so negate them
78
- if metric == "SISDR":
79
- negate = -1
80
- else:
81
- negate = 1
82
- self.log(
83
- f"{mode}_{metric}",
84
- negate * self.metrics[metric](output, y),
85
- on_step=False,
86
- on_epoch=True,
87
- logger=True,
88
- prog_bar=True,
89
- sync_dist=True,
90
- )
 
91
 
92
  return loss
93
 
 
39
  }
40
  )
41
  # Log first batch metrics input vs output only once
 
42
  self.log_train_audio = True
43
 
44
  @property
 
72
  self.log(f"{mode}_loss", loss)
73
  x, y, label = batch
74
  # Metric logging
75
+ with torch.no_grad():
76
+ for metric in self.metrics:
77
+ # SISDR returns negative values, so negate them
78
+ if metric == "SISDR":
79
+ negate = -1
80
+ else:
81
+ negate = 1
82
+ self.log(
83
+ f"{mode}_{metric}",
84
+ negate * self.metrics[metric](output, y),
85
+ on_step=False,
86
+ on_epoch=True,
87
+ logger=True,
88
+ prog_bar=True,
89
+ sync_dist=True,
90
+ )
91
 
92
  return loss
93