1
0
Fork 0
mirror of https://github.com/deepfakes/faceswap synced 2025-06-08 20:13:52 -04:00
Commit graph

285 commits

Author SHA1 Message Date
torzdf
4a68b3f023 Move custom dlight blocks to nn_blocks 2020-06-07 17:06:00 +00:00
torzdf
ac40b0f52f
Remove subpixel upscaling option (#1024) 2020-05-13 13:50:48 +01:00
torzdf
815c843f63
Simple backend unit tests (#1020)
* Add simple backend tests for lib.model
* Document lib.model
* Fix GMSD Loss for AMD
* Remove obsolete code from lib.model
2020-05-12 23:46:04 +01:00
torzdf
ff8d85118e
Cli Restructure + Multi-Mask Select on Extract (#1012)
- Split up cli.py to smaller modules
- Enable Multi Mask Selection in Extraction
- Handle multi option selection options in the GUI
- Document lib/cli
2020-04-22 00:04:21 +01:00
torzdf
ab4ef75671 Extract - Allow multiple pipelines to be loaded 2020-04-02 15:53:29 +01:00
torzdf
8d4f381e7c Extract - Better VRAM Allocation in Extraction Pipeline 2020-03-31 15:24:32 +01:00
torzdf
bb3e3d0f16 Extraction - Auto generate Components and Extended Masks 2020-03-30 19:24:29 +01:00
torzdf
e7c5b7b633 Bugfix: cv2-dnn aligner - Assertion image is empty error 2020-03-29 18:24:58 +01:00
torzdf
924d53789b
Core updates (#982)
* plugins.extract.align
  - Expose normalization method

* lib.gui core updates
  - Minor updates to support future development.
2020-03-10 14:48:12 +00:00
torzdf
e58fd535d5 bugfix: CV2-DNN aligner. Fix Assertion error when bounding box falls out of frame 2020-03-06 12:10:40 +00:00
torzdf
d11ed95d87 Merge branch 'master' into staging 2020-01-26 00:35:13 +00:00
torzdf
76bf610996 plugins.extract.mask - Enable allow_growth option for mask tool 2020-01-26 00:34:59 +00:00
Rodrigo Agundez
1be2fd1e55 plugins.train.model.villain - Change fixed input size to variable (#960) 2020-01-10 12:05:12 +00:00
torzdf
86d039c242 Convert - bugfixes
- Default mask to an available mask in Preview tool
- Correctly output predicted mask
2020-01-03 14:13:58 +00:00
torzdf
f2333e1f9d tools.preview - Limit mask selection to only masks available for all faces
plugins.mask - Correctly set dtype for "None" mask
2019-12-30 18:10:54 +00:00
torzdf
1bdc9da02f
Smart Masks to Convert (#957)
- scripts.convert - Use Smart Masks for Convert
    * Make on-the-fly conversion an explicit option

- Move BlurMask to lib.faces_detect

- tools.preview - Fix for smart masks
    * Subclass from tk.Tk
    * Options to lib.gui.control_helper
    *variable cleanup

- lib.logger - Demote more tensorflow deprecation messages

- Documentation:
    * lib.faces_detect.BlurMask
    * plugins.convert.mask
    * lib.convert
    * scripts.convert
    * scripts.fsmedia
    * tools.preview
2019-12-29 23:13:25 +00:00
torzdf
ba41a9c37a bugfix: dlight model
change "mask_type" to "learn_mask" in decoders
2019-12-27 03:50:25 +00:00
torzdf
8fee68e2b9 bugfix: plugins.train.model._base - Legacy update.
Set `learn_mask` to False on legacy models if a `mask_type` does not exist otherwise `True`
2019-12-19 23:41:32 +00:00
torzdf
c1e6080d92 Training: Cleaner loss printing 2019-12-12 13:27:14 +00:00
torzdf
c4b6ed0ba8 Small bugfix 2019-12-12 01:39:30 +00:00
torzdf
6efed85490 lib,cli: Add suppressed colab flag 2019-12-12 01:22:02 +00:00
torzdf
6afa6a9eb5 bugfix: plugins.train.trainer._base - Fix landmarks loading 2019-12-09 17:54:35 +00:00
torzdf
4e654eb328 plugins.train.trainer - Speed up mask caching 2019-12-09 12:50:27 +00:00
torzdf
43a4d06540
Smart Masks - Training Implementation (#914)
* Smart Masks - Training

- Reinstate smart mask training code
- Reinstate mask_type back to model.config
- change 'replicate_input_mask to 'learn_mask'
- Add learn mask option
- Add mask loading from alignments to plugins.train.trainer
- Add mask_blur and mask threshold options
- _base.py - Pass mask options through training_opts dict
- plugins.train.model - check for mask_type not None for learn_mask and penalized_mask_loss
- Limit alignments loading to just those faces that appear in the training folder
- Raise error if not all training images have an alignment, and alignment file is required
- lib.training_data - Mask generation code
- lib.faces_detect - cv2 dimension stripping bugfix
- Remove cv2 linting code

* Update mask helptext in cli.py

* Fix Warp to Landmarks
Remove SHA1 hashing from training data

* Update mask training config

* Capture missing masks at training init

* lib.image.read_image_batch - Return filenames with batch for ordering

* scripts.train - Documentation

* plugins.train.trainer - documentation

* Ensure backward compatibility.
Fix convert for new predicted masks

* Update removed masks to components for legacy models.
2019-12-05 16:02:01 +00:00
torzdf
aede5f0f44 bugfix: Extract - Calculate zero sized faces prior to scaling up 2019-11-30 19:33:59 +00:00
torzdf
4fdeb67fba Bugfix - Manual tool. Use new ExtractMedia class 2019-11-29 23:53:00 +00:00
torzdf
46309771bb plugins.extract - Create ExtractMedia class for pipeline flow
Bugfix - Fix memory leak in extract
2019-11-29 00:46:27 +00:00
torzdf
3ce448ba90 plugins.convert.ffmpef - Explicit stream selection on mux audio 2019-11-22 22:08:24 +00:00
Kyle
d5c2063459 fix to error on out of bounds 2019-11-15 18:09:12 -06:00
torzdf
e4b7717c64 Minor fixes 2019-11-15 20:16:45 +00:00
kvrooman
47681a8bab Landmarks stored and used as floating point numbers (#928)
* remove and fix int adjustments
* masking rounding
2019-11-15 11:01:37 +00:00
kvrooman
36be6cd4d8 Vectorize FAN post-processing (#926) 2019-11-14 13:01:35 +00:00
kvrooman
64a400f6b4 Refine S3FD post-processing: NMS box voting (#902) 2019-11-14 12:49:47 +00:00
torzdf
73ff840fbd scripts.extract - code optimizations
Limit queue sizes to reduce RAM usage
Rename lib.image.BackgroundIO to ImageIO
Create separate ImagesLoader and ImagesSaver classes
Load/Save images from centralized lib.image.ImageIO
scripts.extract documentation
2019-11-13 19:16:25 +00:00
kvrooman
b49c352e8f # pylint:disable=no-member cleanup (#927)
# pylint:disable=no-member cleanup
2019-11-13 12:17:59 +00:00
kilroythethird
54b6e86008 Changed MTCNN input to RGB 2019-11-11 20:13:33 +01:00
torzdf
b15494d7a9 Merge branch 'master' into staging 2019-10-29 22:41:17 +00:00
torzdf
68109fcc80 bugfix: plugins.extract.pipeline - Exclude CPU plugins from vram calculations 2019-10-29 22:41:01 +00:00
torzdf
efbe606b0e Merge branch 'master' into staging 2019-10-29 11:38:53 +00:00
torzdf
ef49d121e1 Add masker to Travis Tests
Bugfix: Parallel VRAM calculation for non-gpu extractors
2019-10-28 11:56:38 +00:00
Artem Ivanov
3f29b72a93 DeLight model rc3 (#908)
* DeLight model rc3

* lint wishes fulfilled
2019-10-28 10:03:54 +00:00
Vyacheslav Linnik
9af7726897 Always set batchsize as int (#913) 2019-10-26 22:51:04 +01:00
torzdf
e488baf5f4 Mask Updates
- Remove storage of original frame_dims from alignments file
- Require frame dims to be passed in to faces_detect.Mask when requesting full frame mask
- Create copy of read only mask when adding blurring/threshold
2019-10-25 17:25:06 +00:00
torzdf
c065916f23 Extract - Mask updates
- Remove none mask plugin
- Make pipeline more flexible
- Add support for pre-aligned faces to masker plugin
- Migrate blur and threshold settings to mask output
2019-10-23 15:05:24 +00:00
torzdf
ad035f2a24 Optimize Extract parallel VRAM allocation 2019-10-19 23:53:42 +00:00
torzdf
d93e7b1114 Smart Mask - Extract code review
- Lint simple_tests.py
- Only reformat alignments file if it exists otherwise change filename
- Update legacy alignments to new format at all stages
- faces_detect.Mask.from_dict - logging format fix
- convert.py fix otf for new pipeline
- cli.py - Add note that masks not used. Revert convert masks
- faces_detect.py - Revert non-extract code
- Add .p and .pickle extensions for serializer
- plugins/extract revert some changes
- scripts/fsmedia - Revert code changes
- Pipeline - cleanup
- Consistant alpha channel stripping (fixes single-process)
- Store landmarks as numpy array
- Code attribution
- Normalize feed face and reference face to 0.0 - 1.0 in convert
- Lock in mask VRAM sized
- Add documentation to plugin_loader
- Update alignments tool to work with new format
2019-10-18 15:44:25 +00:00
torzdf
eceee07241 Legacy alignments update
- Remove legacy update hashes
- Remove legacy job from alignment-tools
- Remove legacy landmark rotation
- Add rotate face method to plugins/extract/detect
- Update travis test for new alignments extension
- Alignments format to .fsa
- Remove serializer option from alignments-tool
- Auto update legacy format alignment files to new format
2019-10-15 16:08:20 +00:00
torzdf
bc822fad22 Merge branch 'staging' into smart-mask-alpha 2019-10-15 09:40:26 +00:00
torzdf
bc6ab7313f Mask extraction fixes
- Save mask to alignments file as dict
- Remove blur_kernel param from plugins
- Correctly read out the mask buffer on decompress
- Fix full frame mask output
- Remove BORDER_TRANSPARENT in warp_affine (it is bugged. Don't use it)
- Store the affine matrix for the saved mask size
2019-10-14 18:42:59 +00:00
torzdf
d60118fd6f Capture cudnn launch error in extract model init 2019-10-14 09:37:58 +01:00