Commit Graph

201 Commits

Author SHA1 Message Date
Yin Li
d2840f01b0 Add --adv-start as epoch to start adversarial training
This is similar to the deprecated --adv-delay, but specify
absolute epoch (--adv-delay counts from start_epoch in resumed training)
2020-02-13 16:00:50 -05:00
Yin Li
e8039dcccc Move map loss computation forward in training 2020-02-13 14:40:51 -05:00
Yin Li
e383ec3977 Fix warnings on incompatible keys 2020-02-13 14:39:37 -05:00
Yin Li
53ed5a91f4 Change to nearest interpolation from linear in model super-resolution
To be consistent with the data super-resolution in data/fields.py
2020-02-13 12:01:04 -05:00
Yin Li
db3414e11c Disable D grad when updating G; Revert D and G order
The reason for the latter is to follow most code but I haven't
found the reason
2020-02-13 11:33:40 -05:00
Yin Li
aeeeb966d8 Add stride to ConvBlock 2020-02-11 17:20:42 -05:00
Yin Li
cc0efd28ec Fix bug: pprint -> pformat 2020-02-11 12:55:08 -05:00
Yin Li
2e2adc761d Add spectral normalization 2020-02-11 11:58:05 -05:00
Yin Li
b41e85eda5 Fix stupid merging bug 2020-02-09 23:07:40 -05:00
Yin Li
16b82fcc56 Merge branch 'anneal_loss'
Conflicts:
	map2map/models/patchgan.py
	map2map/train.py
2020-02-09 21:25:39 -05:00
Yin Li
2aed00d97e Add argument to disable ReduceLROnPlateau by default 2020-02-09 20:15:23 -05:00
Yin Li
a2e3a9dc64 Change PatchGAN architecture 2020-02-09 17:33:23 -05:00
Yin Li
1dd2b6d748 Extend training epochs in example scripts 2020-02-09 17:32:27 -05:00
Yin Li
09493ad4ec Add non-strict model state loading 2020-02-09 17:32:09 -05:00
Yin Li
f831afbccf Add PatchGAN42 similar to the PatchGAN in pix2pix 2020-02-07 15:26:16 -05:00
Yin Li
45c1d57e72 Add pretty-print argument to job stdout 2020-02-07 11:40:08 -05:00
Yin Li
3fb9708575 Remove saving / loading optimizer & scheduler states
Conflicts:
	map2map/train.py
2020-02-07 10:15:14 -05:00
Yin Li
23b903f81b Remove saving / loading optimizer & scheduler states 2020-02-07 10:02:32 -05:00
Yin Li
1cd34c2eed Remove lazy argument feeding from field dataset 2020-02-07 09:49:27 -05:00
Yin Li
890a459363 Fix bug 2020-02-06 19:34:43 -06:00
Yin Li
cd63324724 Change delayed adversary to a smooth annealing scheme 2020-02-06 19:04:30 -05:00
Yin Li
291dfb24b3 Add diff between out and tgt to figure 2020-02-05 21:19:03 -05:00
Yin Li
e20f3194a5 Change linear interpolation to nearest in super-resolution 2020-02-05 21:09:39 -05:00
Yin Li
679f9f2545 Add pyramid network 2020-02-05 20:20:17 -05:00
Yin Li
a5c48e71b0 Change noise channel removal from input 2020-02-05 14:40:45 -05:00
Yin Li
ef0235f97b Fix upsampling crop bug 2020-02-05 14:10:58 -05:00
Yin Li
b609797e27 Add per field colormap and Fix scope bug 2020-02-05 11:58:05 -05:00
Yin Li
a22fb64d12 Wrap Dice loss with nn.Module 2020-02-03 22:19:38 -05:00
Yin Li
db69e9f953 Add figures with tensorboard 2020-02-03 22:18:08 -05:00
Yin Li
7f6578c63e Add delay to scheduler by adv_delay 2020-02-03 14:44:14 -05:00
Yin Li
0a2fc9a9e9 Add wrappers of adversary model and adversarial loss
commit c0dafec94bb7d131938650027f84e5308bf16ffd
Author: Yin Li <eelregit@gmail.com>
Date:   Mon Feb 3 11:18:08 2020 -0600

    Fix bug

commit b470b873649515f4b8a1cac7b4b33181eac51199
Author: Yin Li <eelregit@gmail.com>
Date:   Mon Feb 3 09:39:08 2020 -0600

    Fix bug

commit 9f8f64b3510c72bfcf2a1236ba5285edf280701c
Author: Yin Li <eelregit@gmail.com>
Date:   Mon Feb 3 10:20:37 2020 -0500

    Add wrappers of adversary model and adversarial loss
2020-02-03 12:05:47 -06:00
Yin Li
a237245514 Add displacement to density script 2020-01-31 11:13:55 -05:00
Yin Li
ea61bb9b65 Add exp and log functions from torch 2020-01-31 11:11:31 -05:00
Yin Li
698b2a8df7 Add Dice loss 2020-01-29 15:58:07 -05:00
Yin Li
0721301113 Add noise channels to the input 2020-01-29 15:57:10 -05:00
Yin Li
31ea70fca9 Merge branch 'master' of github.com:eelregit/map2map
Conflicts:
	scripts/srsgan.slurm
2020-01-27 11:17:24 -05:00
Yin Li
ec074748d0 Fix slurm script for training on 2 nodes on Frontera 2020-01-27 11:15:46 -05:00
Yin Li
0d1827669a Fix super-resolution script for Frontera 2020-01-23 11:53:53 -06:00
Yin Li
1b3f32b791 Merge branch 'master' of github.com:eelregit/map2map 2020-01-23 11:35:57 -06:00
Yin Li
71bf37d0aa Merge branch 'master' of github.com:eelregit/map2map 2020-01-23 11:35:26 -06:00
Yin Li
de71df51f5 Fix touch-up... 2020-01-23 12:34:32 -05:00
yueyingn
d5b76b3725
fix crop function with upsample 2020-01-23 11:34:20 -05:00
Yin Li
1008312a20 Merge branch 'master' of github.com:eelregit/map2map 2020-01-23 09:00:33 -06:00
Yin Li
55ee131910 Merge 2020-01-23 09:00:31 -06:00
Yin Li
581ad5d60b Change tensorboard to optional dependency 2020-01-23 09:58:54 -05:00
Yin Li
6252629631 Change tensorboard to optional dependency 2020-01-23 09:55:01 -05:00
Yin Li
6c030f1eb1 Fix bug that target needs to be cropped with upsampled size 2020-01-23 09:29:43 -05:00
Yin Li
6938eea089 Fix bug that F.interpolate does not apply to np arrays 2020-01-23 07:22:34 -05:00
Yin Li
84a369d4ed Add super-resolution 2020-01-22 19:47:27 -05:00
Yin Li
ba42bc6a55 Add PatchGAN to __init__ 2020-01-22 19:02:44 -05:00