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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Luke Barr 2019-05-24 01:51:28 -05:00
commit e9a695bb55
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nnlib/nnlib.py
View file

@ -161,7 +161,6 @@ NLayerDiscriminator = nnlib.NLayerDiscriminator
return nnlib.code_import_keras
nnlib.backend = device_config.backend
if "tensorflow" in nnlib.backend:
nnlib._import_tf(device_config)
elif nnlib.backend == "plaidML":
@ -174,6 +173,9 @@ NLayerDiscriminator = nnlib.NLayerDiscriminator
import keras as keras_
nnlib.keras = keras_
if 'KERAS_BACKEND' in os.environ:
os.environ.pop('KERAS_BACKEND')
if nnlib.backend == "plaidML":
import plaidml
import plaidml.tile