Added linear activation support for Keras (#426)

* Add PaneElement for linear activation

* Add linear activation layer data to data.js

* Add support for export of Linear activation layer to keras

* Add support for import of Linear activation layer from keras

* Add unit tests for linear activation layer

* Fix comment formatting

* add Linear activation to layer map in export_json.py

ide/static/js/data.js

@@ -3065,6 +3065,36 @@ export default {
     },
     learn: true
   },
+  Linear: { // Only Keras
+    name: 'linear',
+    color: '#009688',
+    endpoint: {
+      src: ['Bottom'],
+      trg: ['Top']
+    },
+    params: {
+      inplace: {
+        name: 'Inplace operation',
+        value: true,
+        type: 'checkbox',
+        required: false
+      },
+      caffe: {
+        name: 'Available Caffe',
+        value: false,
+        type: 'checkbox',
+        required: false
+      }
+    },
+    props: {
+      name: {
+        name: 'Name',
+        value: '',
+        type: 'text'
+      }
+    },
+    learn: false
+  },
   /* ********** Utility Layers ********** */
   Flatten: {
     name: 'flatten',

ide/static/js/pane.js

@@ -322,6 +322,9 @@ class Pane extends React.Component {
                     <PaneElement setDraggingLayer={this.props.setDraggingLayer}
                       handleClick={this.props.handleClick}
                       id="Scale_Button">Scale</PaneElement>
+                    <PaneElement setDraggingLayer={this.props.setDraggingLayer}
+                      handleClick={this.props.handleClick}
+                      id="Linear_Button">Linear</PaneElement>
                   </div>
                 </div>
               </div>

ide/tasks.py

@@ -78,6 +78,7 @@ def export_keras_json(net, net_name, is_tf, reply_channel):
         'TanH': activation,
         'Sigmoid': activation,
         'HardSigmoid': activation,
+        'Linear': activation,
         'Dropout': dropout,
         'Flatten': flatten,
         'Reshape': reshape,

keras_app/views/export_json.py

@@ -49,6 +49,7 @@ def export_json(request, is_tf=False):
             'TanH': activation,
             'Sigmoid': activation,
             'HardSigmoid': activation,
+            'Linear': activation,
             'Dropout': dropout,
             'Flatten': flatten,
             'Reshape': reshape,

keras_app/views/import_json.py

@@ -62,6 +62,7 @@ def import_json(request):
         'tanh': Activation,
         'sigmoid': Activation,
         'hard_sigmoid': Activation,
+        'linear': Activation,
         'Dropout': Dropout,
         'Flatten': Flatten,
         'Reshape': Reshape,

keras_app/views/layers_export.py

@@ -123,6 +123,8 @@ def activation(layer, layer_in, layerId, tensor=True):
         out[layerId] = Activation('softsign')
     elif (layer['info']['type'] == 'HardSigmoid'):
         out[layerId] = Activation('hard_sigmoid')
+    elif (layer['info']['type'] == 'Linear'):
+        out[layerId] = Activation('linear')
     if tensor:
         out[layerId] = out[layerId](*layer_in)
     return out

keras_app/views/layers_import.py

@@ -41,7 +41,8 @@ def Activation(layer):
         'selu': 'SELU',
         'softplus': 'Softplus',
         'softsign': 'Softsign',
-        'hard_sigmoid': 'HardSigmoid'
+        'hard_sigmoid': 'HardSigmoid',
+        'linear': 'Linear'
     }
     if (layer.__class__.__name__ == 'Activation'):
         return jsonLayer(activationMap[layer.activation.func_name], {}, layer)

tests/unit/keras_app/keras_export_test.json

@@ -777,6 +777,21 @@
             "inplace": true
         }
     },
+    "Linear": {
+        "connection": {
+            "input": [
+                "l0"
+            ],
+            "ouput": []
+        },
+        "info": {
+            "phase": null,
+            "type": "Linear"
+        },
+        "params": {
+            "inplace": true
+        }
+    },
     "Upsample": {
         "info": {
             "phase": null, 

tests/unit/keras_app/test_views.py

@@ -285,6 +285,11 @@ def test_keras_import(self):
         model.add(ThresholdedReLU(theta=1, input_shape=(15,)))
         model.build()
         self.keras_type_test(model, 0, 'ThresholdedReLU')
+        # Linear
+        model = Sequential()
+        model.add(Activation('linear', input_shape=(15,)))
+        model.build()
+        self.keras_type_test(model, 0, 'Linear')
 
 
 class DropoutImportTest(unittest.TestCase, HelperFunctions):
@@ -943,6 +948,24 @@ def test_keras_export(self):
         self.assertEqual(model.layers[1].__class__.__name__, 'Activation')
 
 
+class LinearActivationExportTest(unittest.TestCase):
+    def setUp(self):
+        self.client = Client()
+
+    def test_keras_export(self):
+        tests = open(os.path.join(settings.BASE_DIR, 'tests', 'unit', 'keras_app',
+                                  'keras_export_test.json'), 'r')
+        response = json.load(tests)
+        tests.close()
+        net = yaml.safe_load(json.dumps(response['net']))
+        net = {'l0': net['Input'], 'l1': net['Linear']}
+        net['l0']['connection']['output'].append('l1')
+        inp = data(net['l0'], '', 'l0')['l0']
+        net = activation(net['l1'], [inp], 'l1')
+        model = Model(inp, net['l1'])
+        self.assertEqual(model.layers[1].__class__.__name__, 'Activation')
+
+
 class DropoutExportTest(unittest.TestCase):
     def setUp(self):
         self.client = Client()