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

update to Keras 2.2.2

Browse source
This commit is contained in:
TooMuchFun 2018-11-14 07:22:27 -08:00
parent c90d67bec1
commit 57fd6735a7
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
facelib/LandmarksExtractor.py
View file

@ -57,7 +57,7 @@ class LandmarksExtractor(object):
def __init__ (self, keras): def __init__ (self, keras):
self.keras = keras self.keras = keras
K = self.keras.backend K = self.keras.backend
class TorchBatchNorm2D(self.keras.engine.topology.Layer): class TorchBatchNorm2D(self.keras.layers.Layer):
def __init__(self, axis=-1, momentum=0.99, epsilon=1e-3, **kwargs): def __init__(self, axis=-1, momentum=0.99, epsilon=1e-3, **kwargs):
super(TorchBatchNorm2D, self).__init__(**kwargs) super(TorchBatchNorm2D, self).__init__(**kwargs)
self.supports_masking = True self.supports_masking = True

4
nnlib/__init__.py
View file

@ -84,10 +84,10 @@ def MSEMaskLossClass(keras):
return MSEMaskLoss return MSEMaskLoss
def PixelShufflerClass(keras): def PixelShufflerClass(keras):
class PixelShuffler(keras.engine.topology.Layer): class PixelShuffler(keras.layers.Layer):
def __init__(self, size=(2, 2), data_format=None, **kwargs): def __init__(self, size=(2, 2), data_format=None, **kwargs):
super(PixelShuffler, self).__init__(**kwargs) super(PixelShuffler, self).__init__(**kwargs)
self.data_format = keras.utils.conv_utils.normalize_data_format(data_format) self.data_format = keras.backend.common.normalize_data_format(data_format)
self.size = keras.utils.conv_utils.normalize_tuple(size, 2, 'size') self.size = keras.utils.conv_utils.normalize_tuple(size, 2, 'size')
def call(self, inputs): def call(self, inputs):

2
requirements-gpu-cuda9-cudnn7.txt
View file

@ -1,7 +1,7 @@
pathlib==1.0.1 pathlib==1.0.1
scandir==1.6 scandir==1.6
h5py==2.7.1 h5py==2.7.1
Keras==2.1.6 Keras==2.2.2
opencv-python==3.4.0.12 opencv-python==3.4.0.12
tensorflow-gpu==1.8.0 tensorflow-gpu==1.8.0
scikit-image scikit-image