don't set KERAS_IMPLEMENTATION if default

Author: Sigrid Keydana

R/package.R

@@ -88,9 +88,7 @@ keras <- NULL
 
   # resolve the implementaiton module (might be keras proper or might be tensorflow)
   implementation_module <- resolve_implementation_module()
-  if (implementation_module == "tensorflow.python.keras")
-    Sys.setenv(KERAS_IMPLEMENTATION = "tensorflow")
-  
+
   # if KERAS_PYTHON is defined then forward it to RETICULATE_PYTHON
   keras_python <- get_keras_python()
   if (!is.null(keras_python))

inst/python/kerastools/layer.py

@@ -1,17 +1,18 @@
 
 import os
 
-if (os.getenv('KERAS_IMPLEMENTATION', 'keras') == 'tensorflow'):
+if (os.getenv('KERAS_IMPLEMENTATION', 'keras') == 'keras'):
+  from keras.engine.topology import Layer
+  def shape_filter(shape):
+    return shape
+else:
   from tensorflow.python.keras.engine import Layer
   def shape_filter(shape):
     if not isinstance(shape, list):
       return shape.as_list()
     else:
       return shape
-else:
-  from keras.engine.topology import Layer
-  def shape_filter(shape):
-    return shape
+  
 
 class RLayer(Layer):
 

inst/python/kerastools/model.py

@@ -2,15 +2,14 @@
 
 import os
 
-if (os.getenv('KERAS_IMPLEMENTATION', 'keras') == 'tensorflow'):
+if (os.getenv('KERAS_IMPLEMENTATION', 'keras') == 'keras'):
+  from keras.engine import Model
+else:
   try:
     from tensorflow.python.keras.engine import Model
   except:
     from tensorflow.python.keras.engine.training import Model
-else:
-  from keras.engine import Model
- 
- 
+
 class RModel(Model):
 
   def __init__(self, name = None):

inst/python/kerastools/wrapper.py

@@ -1,17 +1,17 @@
 import os
 
-if (os.getenv('KERAS_IMPLEMENTATION', 'keras') == 'tensorflow'):
+if (os.getenv('KERAS_IMPLEMENTATION', 'keras') == 'keras'):
+  from keras.layers import Wrapper
+  def shape_filter(shape): 
+    return shape
+else:
   from tensorflow.python.keras.layers import Wrapper
   def shape_filter(shape):
     if not isinstance(shape, list):
       return shape.as_list()
     else:
       return shape
-else:
-  from keras.layers import Wrapper
-  def shape_filter(shape):
-    return shape
-
+ 
 class RWrapper(Wrapper):
 
   def __init__(self, r_build, r_call, r_compute_output_shape, **kwargs):