github/DeepFaceLab
1
0
Fork 0
mirror of https://github.com/iperov/DeepFaceLab.git synced 2025-08-22 14:24:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'build/update-from-seranus' into build/dev

Browse source
This commit is contained in:
Jeremy Hummel 2019-08-15 13:56:05 -07:00
commit 4eafd682d1
3 changed files with 18 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -1,4 +1,4 @@
![](doc/DFL_welcome.jpg) ![](doc/DFL_welcome.jpg)
![](doc/logo_cuda.jpg)![](doc/logo_opencl.jpg)![](doc/logo_keras.jpg)![](doc/logo_tensorflow.jpg)![](doc/logo_plaidml.jpg) ![](doc/logo_cuda.jpg)![](doc/logo_opencl.jpg)![](doc/logo_keras.jpg)![](doc/logo_tensorflow.jpg)![](doc/logo_plaidml.jpg)
@ -10,12 +10,6 @@ If you like this software, please consider a donation.
GOAL: next DeepFacelab update. GOAL: next DeepFacelab update.
[Donate via Yandex.Money](https://money.yandex.ru/to/41001142318065)
[Donate via Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=lepersorium@gmail.com&lc=US&no_note=0&item_name=Support+DeepFaceLab&cn=&curency_code=USD&bn=PP-DonationsBF:btn_donateCC_LG.gif:NonHosted)
bitcoin:31mPd6DxPCzbpCMZk4k1koWAbErSyqkAXr
- ### [Gallery](doc/gallery/doc_gallery.md) - ### [Gallery](doc/gallery/doc_gallery.md)
- ### Manuals: - ### Manuals:

4
facelib/LandmarksProcessor.py
View file

@ -209,7 +209,7 @@ def get_image_hull_mask (image_shape, image_landmarks, ie_polys=None):
for item in parts: for item in parts:
merged = np.concatenate(item) merged = np.concatenate(item)
cv2.fillConvexPoly(hull_mask, cv2.convexHull(merged), 1) cv2.fillConvexPoly(hull_mask, cv2.convexHull(merged), 255.) # pylint: disable=no-member
if ie_polys is not None: if ie_polys is not None:
ie_polys.overlay_mask(hull_mask) ie_polys.overlay_mask(hull_mask)
@ -321,7 +321,7 @@ def draw_landmarks (image, image_landmarks, color=(0,255,0), transparent_mask=Fa
mask = get_image_hull_mask (image.shape, image_landmarks, ie_polys) mask = get_image_hull_mask (image.shape, image_landmarks, ie_polys)
image[...] = ( image * (1-mask) + image * mask / 2 )[...] image[...] = ( image * (1-mask) + image * mask / 2 )[...]
def draw_rect_landmarks (image, rect, image_landmarks, face_size, face_type, transparent_mask=False, ie_polys=None, landmarks_color=(0,255,0)): def draw_rect_landmarks (image, rect, image_landmarks, face_size, face_type, transparent_mask=False, ie_polys=None, landmarks_color=(0,255,0) ):
draw_landmarks(image, image_landmarks, color=landmarks_color, transparent_mask=transparent_mask, ie_polys=ie_polys) draw_landmarks(image, image_landmarks, color=landmarks_color, transparent_mask=transparent_mask, ie_polys=ie_polys)
imagelib.draw_rect (image, rect, (255,0,0), 2 ) imagelib.draw_rect (image, rect, (255,0,0), 2 )

2
requirements-cuda.txt
View file

@ -2,7 +2,7 @@ numpy==1.16.3
h5py==2.9.0 h5py==2.9.0
Keras==2.2.4 Keras==2.2.4
opencv-python==4.0.0.21 opencv-python==4.0.0.21
tensorflow-gpu==1.12.0 tensorflow-gpu==1.14.0
plaidml==0.6.0 plaidml==0.6.0
plaidml-keras==0.5.0 plaidml-keras==0.5.0
scikit-image scikit-image