Compare commits

...

132 Commits

Author SHA1 Message Date
shahules786 957db4fcba dec duration 2022-11-24 10:31:10 +05:30
shahules786 24ac484b23 config 2022-11-23 19:26:16 +05:30
shahules786 530dab4648 fix metrics 2022-11-21 11:45:43 +05:30
shahules786 ebfb64c766 config 2022-11-21 09:45:46 +05:30
shahules786 9da80bbfb1 config 2022-11-21 09:45:24 +05:30
shahules786 75aa54b9d7 config 2022-11-15 14:55:24 +05:30
shahules786 07eb1d53ef config 2022-11-14 11:10:11 +05:30
shahules786 d522dc4233 config 2022-11-14 10:53:11 +05:30
shahules786 d5b17f3745 negate 2022-11-14 10:51:26 +05:30
shahules786 4e58df5e37 reduce bs 2022-11-10 12:07:02 +05:30
shahules786 ea9218077e config 2022-11-10 10:41:24 +05:30
shahules786 ca6797c3f1 config 2022-11-10 10:41:07 +05:30
shahules786 effb4b03fb fix valid 2022-11-10 10:33:35 +05:30
shahules786 2dda2fa1c1 config 2022-11-09 19:08:41 +05:30
shahules786 b5582832f3 config 2022-11-09 19:07:53 +05:30
shahules786 86b71ce090 mv coeff to device 2022-11-09 18:53:31 +05:30
shahules786 cad0bbedc8 dccrn 2022-11-08 17:18:45 +05:30
shahules786 c4e392aff5 config 2022-11-07 19:38:27 +05:30
shahules786 24fa16ca25 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-11-07 16:01:10 +05:30
shahules786 846b64ab88 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-11-07 13:01:21 +05:30
shahules786 e304e36c8a Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-11-07 12:28:44 +05:30
shahules786 69f6bb4926 add direction si-snr 2022-11-07 12:26:58 +05:30
shahules786 5b635a82a9 fix param 2022-11-07 12:14:41 +05:30
shahules786 ba25365eab config 2022-11-07 12:08:45 +05:30
shahules786 2d0b309b4d Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-11-07 12:02:42 +05:30
shahules786 ce04720e59 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-11-07 11:54:25 +05:30
shahules786 c0b18872b7 config 2022-11-07 10:55:10 +05:30
shahules786 cdda1deb87 rmv arg 2022-11-03 11:38:43 +05:30
shahules786 a3e488f101 config 2022-11-02 10:47:03 +05:30
shahules786 4badf64540 waveunet 2022-10-31 10:42:15 +05:30
shahules786 887a792d21 waveunet 2022-10-31 10:41:48 +05:30
shahules786 9e315ca6c4 waveunet 2022-10-31 10:11:22 +05:30
shahules786 00bb38c95b vctk 2022-10-31 10:08:24 +05:30
shahules786 3879dce620 config 2022-10-31 10:06:20 +05:30
shahules786 53e223954e config 2022-10-29 10:43:33 +05:30
shahules786 ce37ac06c6 config 2022-10-29 09:42:57 +05:30
shahules786 c4b8c5dfc8 rmv sampler print 2022-10-28 17:22:36 +05:30
shahules786 acb68c9855 merge dev 2022-10-28 13:10:36 +05:30
shahules786 8d8eaa80d5 vctk+demucs 2022-10-28 13:09:29 +05:30
shahules786 6028d918b6 debug ddp 2022-10-28 10:17:51 +05:30
shahules786 c321abe2ec DNS 2022-10-27 21:33:08 +05:30
shahules786 73cc925059 fix earlystop 2022-10-27 21:26:56 +05:30
shahules786 3a9e577ccb Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-27 16:18:53 +05:30
shahules786 430696cfac config 2022-10-27 15:31:47 +05:30
shahules786 77f3658e5c config 2022-10-27 15:30:06 +05:30
shahules786 dbfa580618 merge dev 2022-10-27 15:23:17 +05:30
shahules786 7425c9bf3a replace with mse 2022-10-22 20:25:43 +05:30
shahules786 96c934e96f w/o striding 2022-10-22 18:09:55 +05:30
shahules786 4cfe7a2463 Demus + DNS 2022-10-22 12:07:45 +05:30
shahules786 f492e44e6b Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-22 12:00:46 +05:30
shahules786 4b34cf6980 merge dev 2022-10-22 11:21:22 +05:30
shahules786 4b0e8a5ef1 DNS-2020 + VTCK 2022-10-22 11:20:25 +05:30
shahules786 ed30840f4e cpu 2022-10-19 16:41:23 +05:30
shahules786 23bee75ceb dataloader 2022-10-19 16:39:31 +05:30
shahules786 38e0de689e stride=1 2022-10-19 15:28:00 +05:30
shahules786 ba855e39e5 run waveunet 2022-10-19 15:27:41 +05:30
shahules786 2d8ca3f4b2 400 epochs
:
2022-10-19 12:40:27 +05:30
shahules786 11fbba6f77 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-19 12:38:54 +05:30
shahules786 7b3626c912 dns 2022-10-19 10:03:00 +05:30
shahules786 a2992cf759 dns 2022-10-19 09:33:30 +05:30
shahules786 3bec8c7723 dns 2022-10-18 21:31:39 +05:30
shahules786 3df4b27132 dns 2022-10-18 21:29:55 +05:30
shahules786 8737ed8066 config 2022-10-18 21:17:24 +05:30
shahules786 f426c3d880 vctk 4.5 2022-10-18 15:31:02 +05:30
shahules786 982520f30d vctk + demucs 2022-10-18 15:30:42 +05:30
shahules786 94d70c4ddf Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-18 15:23:57 +05:30
shahules786 d7991a5c0e fix arg 2022-10-18 09:51:56 +05:30
shahules786 37a4471b07 demucs + vctk 56 2022-10-17 21:43:48 +05:30
shahules786 399e7062f2 rmv mv operation 2022-10-17 15:33:29 +05:30
shahules786 897e913cfa valid size 30mins 2022-10-17 13:12:02 +05:30
shahules786 77e5a14908 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-17 13:10:54 +05:30
shahules786 3cb5c18c39 30hrs data 2022-10-17 12:39:29 +05:30
shahules786 4ed7fe3ce5 dns 30 hrs demucs 2022-10-17 11:03:09 +05:30
shahules786 32da7b347c demucs + vctk 3 sec 2022-10-16 17:40:29 +05:30
shahules786 3014a41501 load best model to test 2022-10-16 12:22:46 +05:30
shahules786 dab68de260 config 2022-10-16 12:04:43 +05:30
shahules786 288b5f4906 merge dev 2022-10-16 11:17:04 +05:30
shahules786 45b6fe0f3d Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-15 12:24:20 +05:30
shahules786 4744390dc6 configure dns 2022-10-15 11:51:58 +05:30
shahules786 b0c73bd109 dns 2020 2022-10-15 11:20:09 +05:30
shahules786 a66089a920 set max time 2022-10-15 11:18:30 +05:30
shahules786 8bbd1abf2f dns 2020 2022-10-15 11:18:20 +05:30
shahules786 6e0f69f575 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-14 12:46:48 +05:30
shahules786 0e58691a2c demucs 250 2022-10-14 12:45:34 +05:30
shahules786 807f4b93ea Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-14 12:43:47 +05:30
shahules786 315d646347 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-14 11:32:59 +05:30
shahules786 f34e49e341 WaveUnet 2022-10-14 11:15:16 +05:30
shahules786 fa47860f57 set BS to 256 2022-10-14 11:12:16 +05:30
shahules786 f7eb0a600c 500 epochs 2022-10-14 10:47:20 +05:30
shahules786 ba2d00648c demucs 100 epochs 2022-10-13 10:57:24 +05:30
shahules786 8a55a77640 run 100 epochs 2022-10-13 10:52:22 +05:30
shahules786 94a4ea38ed Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-13 10:50:59 +05:30
shahules786 8d25b0ed79 reduce epochs 2022-10-12 20:27:05 +05:30
shahules786 09ba645315 fix logging 2022-10-12 20:23:55 +05:30
shahules786 8906496366 waveunet 500 epochs 2022-10-12 10:49:00 +05:30
shahules786 e4a2eb7844 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-12 10:32:52 +05:30
shahules786 8a6af87627 pesq 2022-10-11 21:56:55 +05:30
shahules786 5a392332ba ensure 2 gpus 2022-10-11 21:56:35 +05:30
shahules786 f66a5236e1 Revert "demucs"
This reverts commit d415bb0c59.
2022-10-11 21:54:47 +05:30
shahules786 d415bb0c59 demucs 2022-10-11 21:41:19 +05:30
shahules786 8c1524a998 500 epochs 2022-10-11 21:38:27 +05:30
shahules786 7161f84a27 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-11 21:36:59 +05:30
shahules786 2c79e60a85 params 2022-10-11 21:33:19 +05:30
shahules786 41ee2fce0b Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-11 21:30:40 +05:30
shahules786 0c5db496e2 run waveunet 2022-10-11 16:51:41 +05:30
shahules786 031221b79e merge dev 2022-10-11 16:50:09 +05:30
shahules786 50062eaf40 rmv inplace operation 2022-10-11 15:10:34 +05:30
shahules786 0b02b73094 run demucs 32 2022-10-11 11:12:44 +05:30
shahules786 2ccc2822cd Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-11 11:12:02 +05:30
shahules786 1667de624e min settings 2022-10-10 21:04:43 +05:30
shahules786 32579b7a39 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-10 21:04:01 +05:30
shahules786 bb68e9e4eb demucs 2022-10-10 16:48:40 +05:30
shahules786 a21ef707ad ensure gpu 2022-10-10 15:59:48 +05:30
shahules786 81c5f13ff6 log metric 2022-10-10 15:32:37 +05:30
shahules786 a417e226f3 testrun for metrics 2022-10-10 12:49:41 +05:30
shahules786 5d8f49d78e Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-10 12:48:11 +05:30
shahules786 14156743f9 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-08 11:04:32 +05:30
shahules786 845575a2ad config 2022-10-08 10:18:22 +05:30
shahules786 c9b78b0e73 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-08 10:12:38 +05:30
shahules786 3068476512 reduce batch_size 2022-10-08 09:59:23 +05:30
shahules786 ffb364196e increase sr 2022-10-07 11:32:33 +05:30
shahules786 52cefcb962 run demucs 2022-10-07 10:56:14 +05:30
shahules786 61923f6d68 config 2022-10-07 10:46:06 +05:30
shahules786 e90efe3163 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-07 10:43:34 +05:30
shahules786 aa043aaf40 rmv max_steps 2022-10-06 11:52:05 +05:30
shahules786 4f6ccadf4b Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-06 11:49:40 +05:30
shahules786 0e982cd493 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-06 10:33:26 +05:30
shahules786 0787d946da decrease epochs 2022-10-06 10:21:07 +05:30
shahules786 e06ba07889 Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-06 10:19:38 +05:30
shahules786 741fd7b87c run cli 2022-10-06 09:55:01 +05:30
shahules786 a064151e2e Merge branch 'dev' of https://github.com/shahules786/enhancer into dev-hawk 2022-10-06 09:54:14 +05:30
shahules786 25557757c7 inc epochs 2022-10-03 21:26:59 +05:30
13 changed files with 35 additions and 32 deletions

View File

@ -60,9 +60,9 @@ def main(config: DictConfig):
if parameters.get("Early_stop", False):
early_stopping = EarlyStopping(
monitor="val_loss",
monitor=f"valid_{parameters.get('EarlyStopping_metric','loss')}",
mode=direction,
min_delta=0.0,
min_delta=parameters.get("EarlyStopping_delta", 0.00),
patience=parameters.get("EarlyStopping_patience", 10),
strict=True,
verbose=False,
@ -93,7 +93,7 @@ def main(config: DictConfig):
trainer = instantiate(config.trainer, logger=logger, callbacks=callbacks)
trainer.fit(model)
trainer.test(model)
trainer.test(ckpt_path="best")
logger.experiment.log_artifact(
logger.run_id, f"{trainer.default_root_dir}/config_log.yaml"

View File

@ -1,6 +1,6 @@
defaults:
- model : Demucs
- dataset : Vctk
- model : DCCRN
- dataset : DNS-2020
- optimizer : Adam
- hyperparameters : default
- trainer : default

View File

@ -1,12 +1,13 @@
_target_: enhancer.data.dataset.EnhancerDataset
root_dir : /Users/shahules/Myprojects/MS-SNSD
root_dir : /scratch/c.sistc3/MS-SNSD/DNS20
name : dns-2020
duration : 2.0
duration : 1.5
stride : 1
sampling_rate: 16000
batch_size: 32
valid_size: 0.05
min_valid_minutes: 25.0
files:
train_clean : CleanSpeech_training
test_clean : CleanSpeech_training
test_clean : CleanSpeech_testing
train_noisy : NoisySpeech_training
test_noisy : NoisySpeech_training
test_noisy : NoisySpeech_testing

View File

@ -1,11 +1,11 @@
_target_: enhancer.data.dataset.EnhancerDataset
name : vctk
root_dir : /scratch/c.sistc3/DS_10283_2791
duration : 4.5
stride : 2
duration : 2
stride : 1
sampling_rate: 16000
batch_size: 32
valid_minutes : 15
min_valid_minutes : 25
files:
train_clean : clean_trainset_28spk_wav
test_clean : clean_testset_wav

View File

@ -1,7 +1,8 @@
loss : mae
metric : [stoi,pesq,si-sdr]
lr : 0.0003
ReduceLr_patience : 5
ReduceLr_factor : 0.2
min_lr : 0.000001
EarlyStopping_factor : 10
loss : si-snr
metric : [stoi,pesq]
lr : 0.001
ReduceLr_patience : 10
Early_stop : False
ReduceLr_factor : 0.5
min_lr : 0.0000001
EarlyStopping_patience : 10

View File

@ -1,2 +1,2 @@
experiment_name : shahules/enhancer
run_name : Demucs + Vtck with stride + augmentations
run_name : dccrn-dns20

View File

@ -4,7 +4,7 @@ sampling_rate : 16000
complex_lstm : True
complex_norm : True
complex_relu : True
masking_mode : True
masking_mode : "E"
encoder_decoder:
initial_output_channels : 32

View File

@ -12,5 +12,5 @@ encoder_decoder:
glu: True
lstm:
bidirectional: False
bidirectional: True
num_layers: 2

View File

@ -2,14 +2,14 @@ _target_: pytorch_lightning.Trainer
accelerator: gpu
accumulate_grad_batches: 1
amp_backend: native
auto_lr_find: True
auto_lr_find: False
auto_scale_batch_size: False
auto_select_gpus: True
benchmark: False
check_val_every_n_epoch: 1
detect_anomaly: False
deterministic: False
devices: 2
devices: 1
enable_checkpointing: True
enable_model_summary: True
enable_progress_bar: True
@ -23,7 +23,7 @@ limit_test_batches: 1.0
limit_train_batches: 1.0
limit_val_batches: 1.0
log_every_n_steps: 50
max_epochs: 200
max_epochs: 100
max_steps: -1
max_time: null
min_epochs: 1
@ -38,9 +38,8 @@ precision: 32
profiler: null
reload_dataloaders_every_n_epochs: 0
replace_sampler_ddp: True
strategy: ddp
strategy: null
sync_batchnorm: False
tpu_cores: null
track_grad_norm: -1
val_check_interval: 1.0
weights_save_path: null

View File

@ -135,7 +135,7 @@ class TaskDataset(pl.LightningDataModule):
speaker_index = rng.choice(possible_indices)
possible_indices.remove(speaker_index)
speaker_name = all_speakers[speaker_index]
print(f"Selected f{speaker_name} for valid")
print(f"Selected {speaker_name} for valid")
file_indices = [
i
for i, file in enumerate(data)

View File

@ -192,7 +192,7 @@ class Si_snr(nn.Module):
super().__init__()
self.loss_fun = ScaleInvariantSignalNoiseRatio(**kwargs)
self.higher_better = True
self.higher_better = False
self.name = "si_snr"
def forward(self, prediction: torch.Tensor, target: torch.Tensor):
@ -203,7 +203,7 @@ class Si_snr(nn.Module):
got {prediction.size()} and {target.size()} instead"""
)
return self.loss_fun(prediction, target)
return -1 * self.loss_fun(prediction, target)
LOSS_MAP = {

View File

@ -85,7 +85,7 @@ class ConviSTFT(ConvFFT):
input = torch.cat([real, imag], 1)
out = F.conv_transpose1d(input, self.weight, stride=self.hop_size)
coeff = self.window.unsqueeze(1).repeat(1, 1, input.size(-1)) ** 2
coeff.to(input.device)
coeff = coeff.to(input.device)
coeff = F.conv_transpose1d(coeff, self.enframe, stride=self.hop_size)
out = out / (coeff + 1e-8)
pad = self.window_len - self.hop_size

View File

@ -34,6 +34,8 @@ pwd
#python transcriber/tasks/embeddings/timit.py --directory /scratch/$USER/TIMIT/data/lisa/data/timit/raw/TIMIT/TRAIN --output ./data/train
#python transcriber/tasks/embeddings/timit.py --directory /scratch/$USER/TIMIT/data/lisa/data/timit/raw/TIMIT/TEST --output ./data/test
# mv /scratch/c.sistc3/MS-SNSD/DNS20/CleanSpeech_testing /scratch/c.sistc3/MS-SNSD/DNS30/CleanSpeech_testing
# mv /scratch/c.sistc3/MS-SNSD/DNS20/NoisySpeech_testing /scratch/c.sistc3/MS-SNSD/DNS30/NoisySpeech_testing
echo "Start Training..."
python enhancer/cli/train.py