Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

model_refactor (#571) #572

Merged
merged 157 commits into from
Feb 9, 2019
Merged

model_refactor (#571) #572

Changes from 1 commit
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
56526f8
model_refactor (#571)
torzdf Jan 2, 2019
f0a044f
Add mask to dfaker (#573)
torzdf Jan 2, 2019
5d21061
dfl mask. Make masks selectable in config (#575)
torzdf Jan 3, 2019
d68c001
remove gan_v2_2
torzdf Jan 3, 2019
860403a
Creating Input Size config for models
kvrooman Jan 3, 2019
c248d4b
Add mask loss options to config
torzdf Jan 3, 2019
24e0f9a
Merge branch 'train_refactor' of https://github.com/deepfakes/faceswa…
torzdf Jan 3, 2019
3a3b190
MTCNN options to config.ini. Remove GAN config. Update USAGE.md
torzdf Jan 4, 2019
e5b52d2
Add sliders for numerical values in GUI
torzdf Jan 4, 2019
a75281d
Add config plugins menu to gui. Validate config
torzdf Jan 8, 2019
fae1c92
Only backup model if loss has dropped. Get training working again
torzdf Jan 8, 2019
70e93d6
bugfixes
torzdf Jan 9, 2019
be6dbf0
Standardise loss printing
torzdf Jan 9, 2019
6acd3a0
GUI idle cpu fixes. Graph loss fix.
torzdf Jan 10, 2019
07f9da2
mutli-gpu logging bugfix
torzdf Jan 10, 2019
a5d9bb0
Merge branch 'staging' into train_refactor
torzdf Jan 10, 2019
15d412d
backup state file
torzdf Jan 11, 2019
2400fd5
Crash protection: Only backup if both total losses have dropped
torzdf Jan 11, 2019
3817f16
Port OriginalHiRes_RC4 to train_refactor (OriginalHiRes)
torzdf Jan 11, 2019
a54a39a
Merge branch 'staging' into train_refactor
torzdf Jan 11, 2019
e1596ce
Load and save model structure with weights
torzdf Jan 13, 2019
4b77330
Slight code update
torzdf Jan 13, 2019
4c8f4ba
Improve config loader. Add subpixel opt to all models. Config to state
torzdf Jan 13, 2019
973f09e
Show samples... wrong input
kvrooman Jan 13, 2019
f11ed11
Remove AE topology. Add input/output shapes to State
torzdf Jan 14, 2019
ffb97c0
Merge branch 'train_refactor' of https://github.com/deepfakes/faceswa…
torzdf Jan 14, 2019
4a5db0e
Merge branch 'staging' into train_refactor
torzdf Jan 14, 2019
1127324
Port original_villain (birb/VillainGuy) model to faceswap
torzdf Jan 15, 2019
d09a2db
Merge branch 'staging' into train_refactor
torzdf Jan 15, 2019
1514429
Add plugin info to GUI config pages
torzdf Jan 15, 2019
1d1061a
Load input shape from state. IAE Config options.
torzdf Jan 15, 2019
6846be4
Merge branch 'staging' into train_refactor
torzdf Jan 16, 2019
61d8147
Fix transform_kwargs.
torzdf Jan 16, 2019
7d18589
Suppress keras userwarnings.
torzdf Jan 16, 2019
2052a2f
Consolidation of converters & refactor (#574)
kvrooman Jan 16, 2019
6f11519
Backwards compatibility fix for models
torzdf Jan 16, 2019
f2e0089
Convert:
torzdf Jan 17, 2019
277007b
mask fix
kvrooman Jan 17, 2019
b3b0269
convert fixes
kvrooman Jan 17, 2019
45ef5df
Update cli.py
kvrooman Jan 17, 2019
5e8a7cd
default for blur
kvrooman Jan 17, 2019
c55f5ce
Update masked.py
kvrooman Jan 17, 2019
0d98cda
added preliminary low_mem version of OriginalHighRes model plugin
Jan 17, 2019
dde403f
Code cleanup, minor fixes
torzdf Jan 17, 2019
352eec9
Update masked.py
kvrooman Jan 17, 2019
14064be
Update masked.py
kvrooman Jan 17, 2019
9bbdf9c
Add dfl mask to convert
torzdf Jan 17, 2019
4e36051
Fix merge conflict
torzdf Jan 17, 2019
fa95e70
Merge branch 'staging' into train_refactor
torzdf Jan 18, 2019
794ce14
histogram fix & seamless location
kvrooman Jan 18, 2019
5c5bb13
update
kvrooman Jan 18, 2019
d194ad5
revert
kvrooman Jan 18, 2019
dcf3bbe
bugfix: Load actual configuration in gui
torzdf Jan 18, 2019
4bef884
Merge branch 'train_refactor' of https://github.com/deepfakes/faceswa…
torzdf Jan 18, 2019
0baafd1
Standardize nn_blocks
torzdf Jan 18, 2019
8ed9496
Merge branch 'staging' into train_refactor
torzdf Jan 18, 2019
9364728
Update cli.py
kvrooman Jan 18, 2019
f83b1f3
Minor code amends
torzdf Jan 18, 2019
5097f67
Merge branch 'train_refactor' of https://github.com/deepfakes/faceswa…
torzdf Jan 18, 2019
f965423
Fix Original HiRes model
torzdf Jan 21, 2019
9df5a36
Add masks to preview output for mask trainers
torzdf Jan 21, 2019
d6b0778
Masked trainers converter support
torzdf Jan 21, 2019
0a3397d
convert bugfix
torzdf Jan 21, 2019
2a4a7a0
Bugfix: Converter for masked (dfl/dfaker) trainers
torzdf Jan 21, 2019
32bf1a0
Additional Losses (#592)
kvrooman Jan 21, 2019
34e8fee
default initializer = He instead of Glorot (#588)
kvrooman Jan 21, 2019
1115953
Allow kernel_initializer to be overridable
torzdf Jan 21, 2019
7b8335c
Add ICNR Initializer option for upscale on all models.
torzdf Jan 22, 2019
8b554fc
Hopefully fixes RSoDs with original-highres model plugin
Jan 22, 2019
31d1105
Merge branch 'train_refactor' of https://github.com/deepfakes/faceswa…
Jan 22, 2019
1df779d
remove debug line
torzdf Jan 22, 2019
18003e1
Merge branch 'train_refactor' of https://github.com/deepfakes/faceswa…
torzdf Jan 22, 2019
ccdb09d
Original-HighRes model plugin Red Screen of Death fix, take #2
Jan 23, 2019
a06665d
Move global options to _base. Rename Villain model
torzdf Jan 23, 2019
268ccf2
clipnorm and res block biases
kvrooman Jan 23, 2019
62f2b6f
scale the end of res block
kvrooman Jan 23, 2019
c9d6698
res block
kvrooman Jan 23, 2019
5bb2ef5
dfaker pre-activation res
kvrooman Jan 23, 2019
5d3815f
OHRES pre-activation
kvrooman Jan 23, 2019
b9e6040
villain pre-activation
kvrooman Jan 23, 2019
86fba3a
tabs/space in nn_blocks
kvrooman Jan 24, 2019
a5f7311
fix for histogram with mask all set to zero
kvrooman Jan 24, 2019
46fa813
fix to prevent two networks with same name
kvrooman Jan 24, 2019
179fdc7
Merge branch 'staging' into train_refactor
torzdf Jan 24, 2019
a96c588
GUI: Wider tooltips. Improve TQDM capture
torzdf Jan 24, 2019
e50e525
Fix regex bug
torzdf Jan 24, 2019
3b95517
Convert padding=48 to ratio of image size
torzdf Jan 24, 2019
4b2ee6f
Add size option to alignments tool extract
torzdf Jan 25, 2019
da74ccd
Pass through training image size to convert from model
torzdf Jan 25, 2019
a4d2653
Convert: Pull training coverage from model
torzdf Jan 25, 2019
3acfcab
convert: coverage, blur and erode to percent
torzdf Jan 25, 2019
6ab46ed
simplify matrix scaling
kvrooman Jan 26, 2019
ce84cf9
ordering of sliders in train
kvrooman Jan 26, 2019
92725d3
Add matrix scaling to utils. Use interpolation in lib.aligner transform
torzdf Jan 26, 2019
75867c8
masked.py Import get_matrix_scaling from utils
torzdf Jan 26, 2019
ea26992
fix circular import
torzdf Jan 26, 2019
3b63ecb
Update masked.py
kvrooman Jan 26, 2019
cff5ae2
quick fix for matrix scaling
kvrooman Jan 26, 2019
e290c09
testing thus for now
kvrooman Jan 26, 2019
dff452a
Merge branch 'staging' into train_refactor
torzdf Jan 26, 2019
6e2a91e
tqdm regex capture bugfix
torzdf Jan 26, 2019
873b0e5
Merge branch 'train_refactor' of https://github.com/deepfakes/faceswa…
torzdf Jan 26, 2019
8cc9249
Minor ammends
torzdf Jan 26, 2019
39692bc
blur size cleanup
kvrooman Jan 26, 2019
4afb6a0
Remove coverage option from convert (Now cascades from model)
torzdf Jan 26, 2019
ed9382a
Merge branch 'train_refactor' of https://github.com/deepfakes/faceswa…
torzdf Jan 26, 2019
161e276
Implement convert for all model types
torzdf Jan 26, 2019
8cb4fcf
Add mask option and coverage option to all existing models
torzdf Jan 27, 2019
316a6f9
bugfix for model loading on convert
torzdf Jan 27, 2019
ab053a4
debug print removal
kvrooman Jan 27, 2019
53ea7dc
Bugfix for masks in dfl_h128 and iae
torzdf Jan 28, 2019
d7fa42c
Merge branch 'train_refactor' of https://github.com/deepfakes/faceswa…
torzdf Jan 28, 2019
6d70c89
Update preview display. Add preview scaling to cli
torzdf Jan 29, 2019
77366a5
mask notes
kvrooman Jan 29, 2019
11011b3
Delete training_data_v2.py
kvrooman Jan 29, 2019
8f2bf88
training data variables
kvrooman Jan 29, 2019
d691b05
Fix timelapse function
torzdf Jan 29, 2019
7182805
Add new config items to state file for legacy purposes
torzdf Jan 29, 2019
9fcf81b
Slight GUI tweak
torzdf Jan 29, 2019
2ddf864
Raise exception if problem with loaded model
torzdf Jan 29, 2019
6cc5852
Add Tensorboard support (Logs stored in model directory)
torzdf Jan 29, 2019
3ac4b81
ICNR fix
kvrooman Jan 29, 2019
b3757a8
loss bugfix
torzdf Jan 30, 2019
27fa627
convert bugfix
torzdf Jan 30, 2019
806189f
Move ini files to config folder. Make TensorBoard optional
torzdf Jan 30, 2019
b2011c6
Fix training data for unbalanced inputs/outputs
torzdf Jan 31, 2019
16a53bb
Fix config "none" test
torzdf Jan 31, 2019
732bd54
Keep helptext in .ini files when saving config from GUI
torzdf Jan 31, 2019
61bc67d
Remove frame_dims from alignments
torzdf Jan 31, 2019
a8ba677
Add no-flip and warp-to-landmarks cli options
torzdf Feb 1, 2019
19a05b0
Revert OHR to RC4_fix version
torzdf Feb 1, 2019
7adc197
Fix lowmem mode on OHR model
torzdf Feb 1, 2019
83c2a3b
padding to variable
kvrooman Feb 2, 2019
e1006e8
Save models in parallel threads
torzdf Feb 3, 2019
9357926
Merge branch 'train_refactor' of https://github.com/deepfakes/faceswa…
torzdf Feb 3, 2019
b08b920
Speed-up of res_block stability
kvrooman Feb 3, 2019
568cce6
Automated Reflection Padding
kvrooman Feb 3, 2019
d37ab8f
Reflect Padding as a training option
kvrooman Feb 3, 2019
7d48ab5
rest of reflect padding
kvrooman Feb 4, 2019
6597492
Move TB logging to cli. Session info to state file
torzdf Feb 4, 2019
40b8226
Merge branch 'train_refactor' of https://github.com/deepfakes/faceswa…
torzdf Feb 4, 2019
0363a5f
Add session iterations to state file
torzdf Feb 5, 2019
4da4142
Add recent files to menu. GUI code tidy up
torzdf Feb 6, 2019
fb631a5
[GUI] Fix recent file list update issue
torzdf Feb 6, 2019
42608be
Add correct loss names to TensorBoard logs
torzdf Feb 6, 2019
d4efa15
Update live graph to use TensorBoard and remove animation
torzdf Feb 7, 2019
61c7eda
Fix analysis tab. GUI optimizations
torzdf Feb 7, 2019
3af6e60
Analysis Graph popup to Tensorboard Logs
torzdf Feb 8, 2019
e929754
Merge branch 'staging' into train_refactor
torzdf Feb 8, 2019
af49107
[GUI] Bug fix for graphing for models with hypens in name
torzdf Feb 8, 2019
c32be6e
[GUI] Correctly split loss to tabs during training
torzdf Feb 8, 2019
9303491
[GUI] Add loss type selection to analysis graph
torzdf Feb 8, 2019
60b58da
Fix store command name in recent files. Switch to correct tab on open
torzdf Feb 9, 2019
21d2834
[GUI] Disable training graph when 'no-logs' is selected
torzdf Feb 9, 2019
8707936
Merge branch 'master' into train_refactor
torzdf Feb 9, 2019
a768d6b
Fix graphing race condition
torzdf Feb 9, 2019
8bcf59f
rename original_hires model to unbalanced
torzdf Feb 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into train_refactor
  • Loading branch information
@torzdf
torzdf committed Feb 9, 2019
commit 8707936b44888a4b0f2862f78e574719d956787b

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.