Commit Graph

160 Commits

Author SHA1 Message Date
torzdf 88fbd433a8 Fixups
- Training: Replace -ac (augment-color) option with -nac (no-augment-color) option (color augmentation on by default)
    - Analysis: Correctly display currently loaded session
    - Analysis: Cursor events in graph popup
2019-06-25 23:46:39 +00:00
torzdf e6653dd027 Disable parallel processing when non-amd user uses a Keras extractor + non Keras extractor 2019-06-25 09:58:02 +00:00
torzdf b11ef60a2b Update parallel process checking for plaidML 2019-06-23 18:04:39 +01:00
torzdf 240751aff0 PlaidML Updates
- Add fan-amd details to Cli
- Update Extract Parallel Processing rules for plaidML
- Handle missing plaidML lib on amd flag
- Pass through correct loglevel from GPUStats to plaidml_tools
2019-06-23 17:57:09 +01:00
kilroythethird 67d4ff9df0 Added keras version of FAN for plaidml backends (#756)
* Added keras version of FAN for plaidml backends

* Added supports_plaidml flag to fan_amd
2019-06-22 18:58:36 +01:00
torzdf 11f35fa798 Fix Active Devices for plaidML. Add Supports PlaidML to Extractors 2019-06-20 18:25:28 +01:00
torzdf 5917cc40b1 Allow customization of number of preview images to display 2019-06-16 13:55:27 +01:00
torzdf d5b64ef839 Remove batchsize limit on preview images 2019-06-16 00:21:22 +00:00
torzdf 3c80794ff8 GUI: Show more previews for extract and convert 2019-06-14 12:25:29 +00:00
torzdf 6ac422ac27 Extraction Improvements
Default to parallel processing
Add Image normalization options for aligners
2019-06-13 15:22:56 +00:00
torzdf 2324ceecd6 tf.__version__ bugfix 2019-06-12 22:05:01 +01:00
torzdf b03f44827c Full RTX Support
Remove FFMPEG from Conda Requirements
Fix Tensorboard logging for Tensorflow 1.13.1
Bump default Conda Tensorflow to 1.13.1
Update max python version to 3.7
2019-06-12 19:20:53 +01:00
torzdf f117846c22 Extended Mask. Extends eyebrow points up the forehead 2019-06-12 11:05:48 +00:00
torzdf 71bcd863e1 Bugfixes and minor changes
Fix: Occasional memory leak in convert
Fix: Dynamic config loading in Windows
Change: Better folder naming for snapshots
2019-06-11 17:26:43 +00:00
torzdf 0496bb7806 Bugfix: Stop defaults from entering available plugins list 2019-06-11 11:09:26 +00:00
torzdf 0eff0a1719 Config Changes + Bugfixes
Bugfix: Fully disable keypress monitor for GUI
Bugfix: Preview - Handle missing alignments file
Config changes:
    - Separate plugin defaults into their own files
    - Move mask_type to global training config
    - Add ability to pass in custom config files
2019-06-11 01:13:42 +00:00
torzdf d447c7d535 Bugfixes
- Set previews to minimum of batchsize and number of images
- Add manual balance help text
- Remove illegal character from convert _config.py
2019-06-09 11:13:42 +00:00
torzdf 98db63c585 Bugfixes
- Switch to correct Tools tab when loading recent file.
- Fix on-the-fly conversion cuDNN error
2019-06-08 15:39:14 +00:00
torzdf 0da3b5ef82 Color Augmentation method (#752)
* Color Augmentation: Implement testing code

* Tweak Contrast and Lighting augmentation amounts

* Prevent color augmentation from entering timelapse

* Remove all augmentations from preview images
2019-06-08 11:52:17 +01:00
torzdf a5d1d60992 Minor changes
Convert - Force prediction batchsize to 1 when converting on CPU
Training: Move snapshot saving to outside of the save threads to avoid race condition
GUI Summary stats. Show iteration count for current training session (fixed to last save amount).
2019-06-04 12:43:49 +01:00
torzdf 2071c6df45 Add save snapshot backup option for training 2019-06-03 01:43:35 +00:00
torzdf 26836a4907 Bugfixes
Facefilter - Variable reference before assignment
masks - Facehull initialize to 255.0 instead of 1.0
Alignments tool - Stop tool from ignoring upper case extensions
pep8 fixes
2019-05-31 17:48:53 +01:00
torzdf 6b7efa436f Convert: Add manual balance color adjustment plugin 2019-05-31 11:32:09 +01:00
torzdf 236c35f11a Convert settings tool (#737)
* Initial prediction pipeline and display

* Patch faces from convert pipeline. Load configs

* Add tkinter canvas for image display

* Radio buttons to config gui. Standardise config gui. Remove dssim loss from realface

* Add action frame

* Live update cli options

* Live update config changes

* Quicker frame loading. Refresh faces button callback

* remove debug code

* Add saving and reloading config buttons

* Reduce lag with threading

* Busy indicator + geometry updates

* Fix options canvas resizing

* Add global config saving and resetting

* tools to own tab

* Rename tool to 'preview'

* geometry tweak

* pep8 fixes
2019-05-30 18:15:25 +01:00
torzdf 40ed94f200 Bugfixes
sysinfo,py: CUDNN Check fix for unsupported OSes
cli.py: More useful information
scripts/convert.py: Set processes to 1 if no images are passed in
cv2_dnn aligner: Fix bounding box for negative values
scripts/convert.py: Fix for incorrect frame ranges passed in
2019-05-20 12:57:52 +01:00
torzdf 7b12021dc1 Fixups
vgg_face: to own module
vgg_face: correct output and normalization
Extract: more aggressive queue sizes
sys_info: Fix cudnn check error on Linux
2019-05-14 16:06:15 +00:00
torzdf 12d83c6e68 Remove dlib (#725)
* Sort to vgg_face. Remove Face Recognition requirements

* Remove dlib components from setup.py

* Remove dlib from Windows Installer script

* Remove dlib and cmake from requirements.txt

* Update INSTALL.md to remove all dlib requirements

* Remove dlib and cmake from dockerfiles

* Windows installer. Output cli to details Window. Setup.py bugfix

* Skip FaceFilter if invalid paths passed in
2019-05-12 23:24:25 +01:00
torzdf 148318778c Face filter vgg face (#724)
* Implement extraction pipeline

* Face filter to vgg_face. Resume partial model downloads

* On-the-fly conversion to extraction pipeline

* Move git model ids from get_model to model definition
2019-05-11 18:43:09 +01:00
torzdf feef24c8b3 Use tqdm.write for StreamLogger. Reduce extract resize loglevel. 2019-05-10 12:06:36 +00:00
torzdf ab7fa48b8b Remove dlib.rectangles. Replace with BoundingBox class 2019-05-07 10:01:00 +00:00
torzdf ffd72b32d6 Remove all saved models from repo
All models now download when required
Model downloader can handle multiple files in model
2019-05-07 00:18:08 +00:00
torzdf 7904b32101 Remove Dlib Aligner
Remove Dlib Aligner
Add CV2-DNN Aligner replacement for dlib
Remove aligner models from repo
Add download function to pull models from remote location
Minor FAN fixups
2019-05-06 17:15:14 +00:00
torzdf 57726e4069 Remove extract debug code 2019-05-02 10:43:57 +00:00
torzdf 6c6aac77aa Dlib Detector Removal. CV2 Detector add. Bugfix on-the-fly convert
Remove dlib-hog + dlib-cnn detectors
Add cv2-dnn detector
Change on-the-fly detector to cv2-dnn
Bugfix: on-the-fly conversion
Bugfix: Pool processes
2019-05-01 22:46:33 +00:00
torzdf 7010154c10 Remove em dash 2019-04-28 13:43:10 +00:00
torzdf 47b4319103 Bugfixes [convert[: Correct output folder. Correct tqdm for skipped frames. 2019-04-22 00:02:39 +00:00
torzdf 27a685383e Convert refactor (#703)
* Separate predict and implement pool

* Add check and raise error to multithreading

Box functions to config. Add crop box option.

* All masks to mask module. Refactor convert masks

Predicted mask passed from model. Cli update

* Intesect box with mask and fixes

* Use raw NN output for convert

Use raw mask for face adjustments. Split adjustments to pre and post warp

* Separate out adjustments. Add unmask sharpen

* Set sensible defaults. Pre PR Testing

* Fix queue sizes. Move masked.py to lib

* Fix Skip Frames. Fix GUI Config popup

* Sensible queue limits. Add a less resource intensive single processing mode

* Fix predicted mask. Amend smooth box defaults

* Deterministic ordering for video output

* Video to Video convert implemented

* Fixups

- Remove defaults from folders across all stages
- Move match-hist and aca into color adjustments selectable
- Handle crashes properly for pooled processes
- Fix output directory does not exist error when creating a new output folder
- Force output to frames if input is not a video

* Add Color Transfer adjustment method

Wrap info text in GUI plugin configure popup

* Refactor image adjustments. Easier to create plugins

Start implementing config options for video encoding

* Add video encoding config options

Allow video encoding for frames input (must pass in a reference video)
Move video and image output writers to plugins

* Image writers config options

Move scaling to cli
Move draw_transparent to images config
Add config options for cv2 writer
Add Pillow image writer

* Add gif filetype to Pillow. Fix draw transparent for Pillow

* Add Animated GIF writer

standardize opencv/pillow defaults

* [speedup] Pre-encode supported writers in the convert pool (opencv, pillow)

Move scaling to convert pool
Remove dfaker mask

* Fix default writer

* Bugfixes

* Better custom argparse formatting
2019-04-21 19:19:06 +00:00
Artem Ivanov e474dd1005 Pegasus model plug-in rc1 (#701)
* added new RealFace training model (codenamed: Pegasus)

* minor re-factoring (doesn't break compatibility)

* fixed tf error for input/output sizes with ratios other than 1:2

* linting

* Minor formatting/grammar ammends

* Make loss a fixed config item. Make learning rate an unfixed item

* Check input and output sizes
2019-04-14 19:28:56 +00:00
torzdf 99ac2f687b Allow 'unfixed' parameters for model config 2019-04-10 11:42:42 +01:00
kvrooman bd08b9e405 Merge pull request #691 from kvrooman/histogram-fix
histogram fix
2019-04-03 03:41:21 -05:00
khilos 9aaf83aba2 histogram fix
histogram fix
2019-04-03 03:40:07 -05:00
torzdf a5fc60c070 Correct the mask decoders for dfl_h128 and IAE 2019-04-01 11:12:50 +01:00
torzdf cdc6f4250f Merge branch 'master' into staging 2019-03-25 10:23:03 +00:00
torzdf 88dffe0854 Fix losses bug 2019-03-25 10:22:45 +00:00
kvrooman e99fa49e48 Mask optimizations (#673)
* Mask optimizations

- Remove repetitive np.array() of items that are already np.arrays
- Remove repetitive reshaping
- Perform dilation on single channel only
- Clarify dfl_full mask parts
- Simplify with for loop
- Add more complex mask based on facial components
- Prep for convert masks

* Line width clarity

Line width clarity

* docstring

* style consistency

* flake8 fixes

* Update _config.py

descritions
2019-03-21 15:58:25 +00:00
kilroythethird 98ecfca84b simplify shape test in model (#672) 2019-03-21 11:41:30 +00:00
torzdf 304fa68dc3 Correct dfaker config.
Make lr configurable
2019-03-18 00:24:36 +00:00
torzdf dba7d4162d VRAM Improvement Options (#671)
* Implement ping-pong training

* Disable tensorboard for pingpong training

* Implement Memory Saving Gradients
2019-03-17 09:25:39 +00:00
khilos 7ae44c7606 fix on gaussian sharpen 2019-03-12 20:50:18 -05:00
khilos 9bca886905 Update masked.py
seamless error
2019-03-10 00:08:53 -06:00