Merge pull request #663 from rstudio/feature/tf-keras-default-2

further Python classes needing new tf.keras default

Author: Sigrid Keydana

inst/python/kerastools/callback.py

@@ -2,10 +2,10 @@
 
 import os
 
-if (os.getenv('KERAS_IMPLEMENTATION', 'keras') == 'tensorflow'):
-  from tensorflow.python.keras.callbacks import Callback
-else:
+if (os.getenv('KERAS_IMPLEMENTATION', 'tensorflow') == 'keras'):
   from keras.callbacks import Callback
+else:
+  from tensorflow.python.keras.callbacks import Callback
 
 class RCallback(Callback):
 

inst/python/kerastools/constraint.py

@@ -1,10 +1,10 @@
 
 import os
 
-if (os.getenv('KERAS_IMPLEMENTATION', 'keras') == 'tensorflow'):
-  from tensorflow.python.keras.constraints import Constraint
-else:
+if (os.getenv('KERAS_IMPLEMENTATION', 'tensorflow') == 'keras'):
   from keras.constraints import Constraint
+else:
+  from tensorflow.python.keras.constraints import Constraint
 
 class RConstraint(Constraint):
 

inst/python/kerastools/progbar.py

@@ -6,10 +6,10 @@
 
 import os
 
-if (os.getenv('KERAS_IMPLEMENTATION', 'keras') == 'tensorflow'):
-  from tensorflow.python.keras.utils import Progbar
-else:
+if (os.getenv('KERAS_IMPLEMENTATION', 'tensorflow') == 'keras'):
   from keras.utils import Progbar
+else:
+  from tensorflow.python.keras.utils import Progbar
 
 def apply_patch():