From c9da4cd89b5af4f65efe7aba6cab6947d20eb81b Mon Sep 17 00:00:00 2001 From: iperov Date: Fri, 24 May 2019 09:30:39 +0400 Subject: [PATCH] fix for plaidML --- nnlib/device.py | 2 +- nnlib/nnlib.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nnlib/device.py b/nnlib/device.py index 914a1ed..144de43 100644 --- a/nnlib/device.py +++ b/nnlib/device.py @@ -299,7 +299,7 @@ def get_plaidML_devices(): except: pass return plaidML_devices - + if not has_nvidia_device: get_plaidML_devices() diff --git a/nnlib/nnlib.py b/nnlib/nnlib.py index 7f9be2d..edcb201 100644 --- a/nnlib/nnlib.py +++ b/nnlib/nnlib.py @@ -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 @@ -591,7 +593,7 @@ NLayerDiscriminator = nnlib.NLayerDiscriminator nnlib.Adam = Adam def CAInitializerMP( conv_weights_list ): - #Convolution Aware Initialization https://arxiv.org/abs/1702.06295 + #Convolution Aware Initialization https://arxiv.org/abs/1702.06295 result = CAInitializerMPSubprocessor ( [ (i, K.int_shape(conv_weights)) for i, conv_weights in enumerate(conv_weights_list) ], K.floatx(), K.image_data_format() ).run() for idx, weights in result: K.set_value ( conv_weights_list[idx], weights ) @@ -696,7 +698,7 @@ NLayerDiscriminator = nnlib.NLayerDiscriminator x = ReflectionPadding2D( self.pad ) (x) return self.func(x) nnlib.Conv2D = Conv2D - + class Conv2DTranspose(): def __init__ (self, *args, **kwargs): self.reflect_pad = False