Commit Graph

124 Commits

Author SHA1 Message Date
dfaker
02ac46ec5a
Add GNU General Public License v3.0 2018-02-25 16:41:32 +00:00
Clorr
51f1993d93
Adding allow_growth option (#140) 2018-02-14 16:23:21 +01:00
Clorr
0085b5b8a7
Clearer requirements for each platform (#183) 2018-02-14 16:22:02 +01:00
GSonderling
809dfc20f8 Update INSTALL.md (#178)
INSTALL.md now aligns with requirements in script.
2018-02-12 15:44:17 +01:00
Gareth Dunstone
9181b1a9ba
Merge pull request #155 from gdunstone/master
Added serializers for storing faces between extract and convert.
2018-02-12 13:15:04 +11:00
Gareth Dunstone
46c5f8776f fix for have_face. 2018-02-12 12:53:11 +11:00
Gareth Dunstone
f170e43c57 no os import in convert. 2018-02-12 12:51:50 +11:00
Gareth Dunstone
0dc10adf17 Skip images that arent in the alignments.json 2018-02-12 12:49:49 +11:00
Gareth Dunstone
7c4bfaa27e fixed and tested, briefly with gan and original. 2018-02-12 11:17:16 +11:00
Gareth Dunstone
db65e38a0b didnt import os in extract. 2018-02-12 10:35:25 +11:00
Gareth Dunstone
20527cd744 should fix full paths, and windowspath issues 2018-02-12 10:33:05 +11:00
Gareth Dunstone
2cdf8a903a fixes for some comments 2018-02-12 10:28:05 +11:00
Satoshi Sato
d56b9c13f8 Documentation and grammar (#167)
* Fixed gramatical mistake

* Improved documentation and fixed spelling and grammar
2018-02-11 17:27:16 +01:00
GSonderling
c418b956d2 New arg. (#177) 2018-02-11 17:25:34 +01:00
dfaker
ab8ee42ead lowercase mask_type (#181)
The mask_type passed in to this function is lowercase, changing string literals to match.
2018-02-11 17:21:03 +01:00
Gareth Dunstone
29eec42594 Added serializers.
This speeds up convert speed x4 on my machine.
2018-02-09 02:44:31 +11:00
Leijurv
20753a64b7 print out which image caused error (#147) 2018-02-08 11:14:11 +01:00
Gareth Dunstone
f3bb0bba07
Fixing ConvertImage has no attribute check_skip
https://github.com/deepfakes/faceswap/issues/143
2018-02-08 04:20:00 +11:00
Clorr
6bea4c2b27 Correcting model paths 2018-02-07 15:25:26 +01:00
Clorr
1fd9e99555
Adding GAN plugin (#102)
Update GAN plugin to latest official version
2018-02-07 15:00:49 +01:00
Clorr
5815baa920
Changes I forgot to push :-/ (#136) 2018-02-07 13:54:24 +01:00
Clorr
b3ae6130ed
Misc updates on master before GAN. Added multithreading + mmod face detector (#109)
* Preparing GAN plugin

* Adding multithreading for extract

* Adding support for mmod human face detector

* Adding face filter argument

* Added process number argument to multiprocessing extractor.

Fixed progressbar for multiprocessing.

* Added tiff as image type.
compression artefacts hurt my feelings.

* Cleanup
2018-02-07 13:42:19 +01:00
czfhhh
d5b4c919ae Update Convert_Masked.py (#130)
correct issue when seamless_clone is true
2018-02-07 12:20:01 +01:00
czfhhh
23de50214c Add demosaic (#131)
Copy from https://github.com/dfaker/df/blob/master/merge_faces_larger.py#L127-L133
2018-02-07 12:09:30 +01:00
Gareth Dunstone
b34d7d1a49
Merge pull request #121 from fat-tire/fixbreak
Show help when main argument isn't passed
2018-02-05 18:25:26 +11:00
fattire
6b175cfbb3 Fix breakage on some versions of python3 (on Ubuntu 17.10 for sure)
Also gives better info when you don't include any arguments (or bad ones)
2018-02-04 16:12:51 -08:00
facepainter
1f1cbdf0e7 Adds information about running scripts with help (#111)
Updated information so that users can quickly see the available parameters for the various scripts.
Also made the section headers correspond with the actual scripts - e.g. extract, train, convert
2018-02-04 19:57:00 +11:00
Clorr
2198ec6779
Added CUDA link for Ubuntu 2018-02-03 18:33:51 +01:00
facepainter
e9c4177fdf Adds arg to select trainer used to create model (#105)
Stops the layer count mismatch when a LowMem model is converted using the Original model.
2018-02-03 15:59:23 +01:00
Gareth Dunstone
68ef3b9926
python version check (#99)
* detect minimum python3.2

* change for when python4.0 is (eventually) released
2018-02-02 15:30:11 +11:00
Gareth Dunstone
c529bd4f1c
check_skip fixes (#95)
* extended arguments for convert re https://github.com/deepfakes/faceswap/issues/85

* forgot to change helptext for extended arguments.

* Added -fr --frame-range argument to convert

accepts a list of frame ranges like `-fr 40-50 90-100`

still writes out frames that havent been converted.

* added --discard-frames argument

--discard-frames discards frames not included in --frame-range instead
of writing them out unchanged.

* Made training message slightly clearer

* Revert "Made training message slightly clearer"

This reverts commit 25a9744aea444a67a4825ec86d06357b31a43c9d.

* Training status now '\r's rather than newlines.
Maybe its good, maybe its bad.
I like it.

* fixing https://github.com/deepfakes/faceswap/pull/90#issuecomment-362309166

* Fixing issues with frame-range if no frame-range is specified.

* fixes for check_skip
2018-02-02 09:15:47 +11:00
Gareth Dunstone
6692a10a4e
Fix issue with frame-range (#94)
* extended arguments for convert re https://github.com/deepfakes/faceswap/issues/85

* forgot to change helptext for extended arguments.

* Added -fr --frame-range argument to convert

accepts a list of frame ranges like `-fr 40-50 90-100`

still writes out frames that havent been converted.

* added --discard-frames argument

--discard-frames discards frames not included in --frame-range instead
of writing them out unchanged.

* Made training message slightly clearer

* Revert "Made training message slightly clearer"

This reverts commit 25a9744aea444a67a4825ec86d06357b31a43c9d.

* Training status now '\r's rather than newlines.
Maybe its good, maybe its bad.
I like it.

* fixing https://github.com/deepfakes/faceswap/pull/90#issuecomment-362309166
2018-02-02 09:05:31 +11:00
Gareth Dunstone
2633da9ed7
frame-range changes (#92)
* extended arguments for convert re https://github.com/deepfakes/faceswap/issues/85

* forgot to change helptext for extended arguments.

* Added -fr --frame-range argument to convert

accepts a list of frame ranges like `-fr 40-50 90-100`

still writes out frames that havent been converted.

* added --discard-frames argument

--discard-frames discards frames not included in --frame-range instead
of writing them out unchanged.

* Made training message slightly clearer

* Revert "Made training message slightly clearer"

This reverts commit 25a9744aea444a67a4825ec86d06357b31a43c9d.

* Training status now '\r's rather than newlines.
Maybe its good, maybe its bad.
I like it.

* fixing https://github.com/deepfakes/faceswap/pull/90#issuecomment-362309166
2018-02-02 03:11:26 +11:00
Gareth Dunstone
0f8d9db826
frame-range option for convert (#90)
* extended arguments for convert re https://github.com/deepfakes/faceswap/issues/85

* forgot to change helptext for extended arguments.

* Added -fr --frame-range argument to convert

accepts a list of frame ranges like `-fr 40-50 90-100`

still writes out frames that havent been converted.

* added --discard-frames argument

--discard-frames discards frames not included in --frame-range instead
of writing them out unchanged.
2018-02-02 00:46:42 +11:00
Gareth Dunstone
7e7cf0bd2d
extended arguments for convert.py (#89)
* extended arguments for convert re https://github.com/deepfakes/faceswap/issues/85

* helptext for extended arguments.

* changed default mask type to facehullandrect
2018-02-01 23:19:03 +11:00
Gareth Dunstone
d909ae2695
Merge pull request #83 from gdunstone/master
Progress bar for DirectoryProcessor, save now key, trainer cli arguments, uppercase extension fix.
2018-02-01 22:02:37 +11:00
Gareth Dunstone
100121026d Merge branch 'master' of github.com:gdunstone/faceswap 2018-02-01 21:54:44 +11:00
Gareth Dunstone
44d20889d6 merge conflicts. 2018-02-01 21:53:52 +11:00
Gareth Dunstone
283096d2f7
Merge branch 'master' into master 2018-02-01 21:52:32 +11:00
Gareth Dunstone
df38ac3a2b added batch-size cli argumet.
neatened up train.py and added LowMem trainer option.
Added save_now/show key to preview.
2018-02-01 21:50:29 +11:00
cclauss
a3c81c50c2 import sys for line 21 (#88) 2018-02-01 11:06:44 +01:00
Gareth Dunstone
77aa47f96b sys wasnt imported here, raised importerror with some input. 2018-02-01 20:10:52 +11:00
Gareth Dunstone
bd09c64660 Processing message messes with tqdm. 2018-02-01 19:56:49 +11:00
Gareth Dunstone
c3e15089fe
Merge branch 'master' into master 2018-02-01 19:26:23 +11:00
Rafael Xavier de Souza
f91210fc0c Docs: Fix installation link (#84) 2018-01-31 18:57:17 +01:00
Clorr
34945cfcd7
Adding models as plugins + Face filtering (#53) + #39 + #43 + #44 + #49 (#61)
* Making Models as plugins

* Do not reload model on each image #39 + Adding FaceFilter #53

* Adding @lukaville PR for #43 and #44 (possibly)

* Training done in a separate thread

* Better log for plugin load

* Adding a prefetch to train.py #49
(Note that we prefetch 2 batches of images, due to the queue behavior)
+ More compact logging with verbose info included

* correction of DirectoryProcessor signature

* adding missing import

* Convert with parallel preprocessing of files

* Added coverage var for trainer

Added a var with comment. Feel free to add it as argument

* corrections

* Modifying preview and normalization of image + correction

* Cleanup
2018-01-31 18:56:44 +01:00
Gareth Dunstone
314df51515 added tqdm to requirements-gpu 2018-01-31 13:30:25 +11:00
Gareth Dunstone
d17d7bd2dd Added progress bar re https://github.com/deepfakes/faceswap/issues/80
Fixed uppercase extensions re
https://github.com/deepfakes/faceswap/issues/75
2018-01-31 11:33:14 +11:00
mpuels
bdece07fa5 doc: Fix typos (#79) 2018-01-29 20:10:58 +01:00
mpuels
027b833e69 doc: Fix typos (#78) 2018-01-29 20:09:12 +01:00