Skip to content

Commit b599f03

Browse files
cohimameAleksei Silvestrov
andauthored
Neat configs (#24)
* cleaner configs * visualizer genearalize * visualizer genearalize * lama-celeba configs * optimizers config and celeba readme upd * noop vis in predict.py * default optimizers config * default opt fixed Co-authored-by: Aleksei Silvestrov <[email protected]>
1 parent 5b9f06c commit b599f03

27 files changed

+252
-485
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ On the host machine:
209209
bash fetch_data/celebahq_gen_masks.sh
210210
211211
# Run training
212-
# You can change bs with data.batch_size=10
213-
python bin/train.py -cn ablv2_work_no_segmpl_csdilirpl_celeba_csdilirpl1_new location=celeba
212+
python bin/train.py -cn lama-fourier-celeba data.batch_size=10
214213
215214
# Infer model on thick/thin/medium masks in 256 and run evaluation
216215
# like this:

bin/predict.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ def main(predict_config: OmegaConf):
4747
train_config = OmegaConf.create(yaml.safe_load(f))
4848

4949
train_config.training_model.predict_only = True
50+
train_config.visualizer.kind = 'noop'
5051

5152
out_ext = predict_config.get('out_ext', '.png')
5253

configs/training/ablv2_work.yaml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,12 @@ losses:
2424
weight: 30
2525
weights_path: ${env:TORCH_HOME}
2626

27-
optimizers:
28-
generator:
29-
kind: adam
30-
lr: 0.001
31-
discriminator:
32-
kind: adam
33-
lr: 0.0001
34-
35-
visualizer: # override only keys, the rest parameters are kept from defaults/visualizer
36-
key_order:
37-
- image
38-
- predicted_image
39-
- discr_output_fake
40-
- discr_output_real
41-
- inpainted
42-
rescale_keys:
43-
- discr_output_fake
44-
- discr_output_real
45-
4627
defaults:
4728
- location: docker
4829
- data: abl-04-256-mh-dist
4930
- generator: pix2pixhd_global_sigmoid
5031
- discriminator: pix2pixhd_nlayer
32+
- optimizers: default_optimizers
5133
- visualizer: directory
5234
- evaluator: default_inpainted
5335
- trainer: any_gpu_large_ssim_ddp_final

configs/training/ablv2_work_ffc075.yaml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,12 @@ losses:
2424
weight: 30
2525
weights_path: ${env:TORCH_HOME}
2626

27-
optimizers:
28-
generator:
29-
kind: adam
30-
lr: 0.001
31-
discriminator:
32-
kind: adam
33-
lr: 0.0001
34-
35-
visualizer: # override only keys, the rest parameters are kept from defaults/visualizer
36-
key_order:
37-
- image
38-
- predicted_image
39-
- discr_output_fake
40-
- discr_output_real
41-
- inpainted
42-
rescale_keys:
43-
- discr_output_fake
44-
- discr_output_real
45-
4627
defaults:
4728
- location: docker
4829
- data: abl-04-256-mh-dist
4930
- generator: ffc_resnet_075
5031
- discriminator: pix2pixhd_nlayer
32+
- optimizers: default_optimizers
5133
- visualizer: directory
5234
- evaluator: default_inpainted
5335
- trainer: any_gpu_large_ssim_ddp_final

configs/training/ablv2_work_md.yaml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,12 @@ losses:
2424
weight: 30
2525
weights_path: ${env:TORCH_HOME}
2626

27-
optimizers:
28-
generator:
29-
kind: adam
30-
lr: 0.001
31-
discriminator:
32-
kind: adam
33-
lr: 0.0001
34-
35-
visualizer: # override only keys, the rest parameters are kept from defaults/visualizer
36-
key_order:
37-
- image
38-
- predicted_image
39-
- discr_output_fake
40-
- discr_output_real
41-
- inpainted
42-
rescale_keys:
43-
- discr_output_fake
44-
- discr_output_real
45-
4627
defaults:
4728
- location: docker
4829
- data: abl-04-256-mh-dist
4930
- generator: pix2pixhd_multidilated_catin_4dil_9b
5031
- discriminator: pix2pixhd_nlayer
32+
- optimizers: default_optimizers
5133
- visualizer: directory
5234
- evaluator: default_inpainted
5335
- trainer: any_gpu_large_ssim_ddp_final_benchmark

configs/training/ablv2_work_no_fm.yaml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,12 @@ losses:
2424
weight: 30
2525
weights_path: ${env:TORCH_HOME}
2626

27-
optimizers:
28-
generator:
29-
kind: adam
30-
lr: 0.001
31-
discriminator:
32-
kind: adam
33-
lr: 0.0001
34-
35-
visualizer: # override only keys, the rest parameters are kept from defaults/visualizer
36-
key_order:
37-
- image
38-
- predicted_image
39-
- discr_output_fake
40-
- discr_output_real
41-
- inpainted
42-
rescale_keys:
43-
- discr_output_fake
44-
- discr_output_real
45-
4627
defaults:
4728
- location: mlp-mow-final
4829
- data: abl-04-256-mh-dist
4930
- generator: pix2pixhd_global_sigmoid
5031
- discriminator: pix2pixhd_nlayer
32+
- optimizers: default_optimizers
5133
- visualizer: directory
5234
- evaluator: default_inpainted
5335
- trainer: any_gpu_large_ssim_ddp_final

configs/training/ablv2_work_no_segmpl.yaml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,12 @@ losses:
2424
weight: 0
2525
# weights_path: ${env:TORCH_HOME}
2626

27-
optimizers:
28-
generator:
29-
kind: adam
30-
lr: 0.001
31-
discriminator:
32-
kind: adam
33-
lr: 0.0001
34-
35-
visualizer: # override only keys, the rest parameters are kept from defaults/visualizer
36-
key_order:
37-
- image
38-
- predicted_image
39-
- discr_output_fake
40-
- discr_output_real
41-
- inpainted
42-
rescale_keys:
43-
- discr_output_fake
44-
- discr_output_real
45-
4627
defaults:
4728
- location: docker
4829
- data: abl-04-256-mh-dist
4930
- generator: pix2pixhd_global_sigmoid
5031
- discriminator: pix2pixhd_nlayer
32+
- optimizers: default_optimizers
5133
- visualizer: directory
5234
- evaluator: default_inpainted
5335
- trainer: any_gpu_large_ssim_ddp_final

configs/training/ablv2_work_no_segmpl_csdilirpl.yaml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,12 @@ losses:
2424
weight: 1
2525
segmentation: false
2626

27-
optimizers:
28-
generator:
29-
kind: adam
30-
lr: 0.001
31-
discriminator:
32-
kind: adam
33-
lr: 0.0001
34-
35-
visualizer: # override only keys, the rest parameters are kept from defaults/visualizer
36-
key_order:
37-
- image
38-
- predicted_image
39-
- discr_output_fake
40-
- discr_output_real
41-
- inpainted
42-
rescale_keys:
43-
- discr_output_fake
44-
- discr_output_real
45-
4627
defaults:
4728
- location: docker
4829
- data: abl-04-256-mh-dist
4930
- generator: pix2pixhd_global_sigmoid
5031
- discriminator: pix2pixhd_nlayer
32+
- optimizers: default_optimizers
5133
- visualizer: directory
5234
- evaluator: default_inpainted
5335
- trainer: any_gpu_large_ssim_ddp_final_benchmark
Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,5 @@
11
run_title: ''
22

3-
visualizer:
4-
kind: directory
5-
outdir: ./visualizer-output/celeba/train_ablv2_work_no_segmpl_csdilirpl_celeba_csdilirpl1_new/samples
6-
key_order:
7-
- image
8-
- predicted_image
9-
- discr_output_fake
10-
- discr_output_real
11-
- inpainted
12-
rescale_keys:
13-
- discr_output_fake
14-
- discr_output_real
15-
trainer:
16-
kwargs:
17-
gpus: -1
18-
accelerator: ddp
19-
max_epochs: 40
20-
gradient_clip_val: 1
21-
log_gpu_memory: None
22-
limit_train_batches: 25000
23-
val_check_interval: 2600
24-
log_every_n_steps: 250
25-
precision: 32
26-
terminate_on_nan: false
27-
check_val_every_n_epoch: 1
28-
num_sanity_val_steps: 8
29-
replace_sampler_ddp: false
30-
benchmark: true
31-
resume_from_checkpoint: /group-volume/User-Driven-Content-Generation/e.logacheva/CelebA-HQ-inpainting/experiments/e.logacheva_2021-10-12_21-37-20_train_ablv2_work_no_segmpl_csdilirpl_celeba_csdilirpl1_new/models/last.ckpt
32-
checkpoint_kwargs:
33-
verbose: true
34-
save_top_k: 5
35-
save_last: true
36-
period: 1
37-
monitor: val_ssim_fid100_f1_total_mean
38-
mode: max
393
training_model:
404
kind: default
415
visualize_each_iters: 1000
@@ -58,18 +22,14 @@ losses:
5822
segm_pl:
5923
weight: 1
6024
imagenet_weights: true
61-
optimizers:
62-
generator:
63-
kind: adam
64-
lr: 0.001
65-
discriminator:
66-
kind: adam
67-
lr: 0.0001
6825

6926
defaults:
7027
- location: celeba
7128
- data: abl-04-256-mh-dist-celeba
72-
- evaluator: default_inpainted
7329
- generator: pix2pixhd_global_sigmoid
7430
- discriminator: pix2pixhd_nlayer
31+
- optimizers: default_optimizers
32+
- visualizer: directory
33+
- evaluator: default_inpainted
34+
- trainer: any_gpu_large_ssim_ddp_final_celeba
7535
- hydra: overrides

configs/training/ablv2_work_no_segmpl_csirpl.yaml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,12 @@ losses:
2525
arch_encoder: 'resnet50'
2626
segmentation: false
2727

28-
optimizers:
29-
generator:
30-
kind: adam
31-
lr: 0.001
32-
discriminator:
33-
kind: adam
34-
lr: 0.0001
35-
36-
visualizer: # override only keys, the rest parameters are kept from defaults/visualizer
37-
key_order:
38-
- image
39-
- predicted_image
40-
- discr_output_fake
41-
- discr_output_real
42-
- inpainted
43-
rescale_keys:
44-
- discr_output_fake
45-
- discr_output_real
46-
4728
defaults:
4829
- location: docker
4930
- data: abl-04-256-mh-dist
5031
- generator: pix2pixhd_global_sigmoid
5132
- discriminator: pix2pixhd_nlayer
33+
- optimizers: default_optimizers
5234
- visualizer: directory
5335
- evaluator: default_inpainted
5436
- trainer: any_gpu_large_ssim_ddp_final

0 commit comments

Comments
 (0)