Fixed merge conflicts

Cloud-CV · Nov 5, 2018 · 96c2cec · 96c2cec
2 parents 2d55052 + 4b7e3ed
commit 96c2cec
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 3 deletions.
diff --git a/docs/source/tested_models.md b/docs/source/tested_models.md
@@ -46,7 +46,7 @@
 
 ## Segmentation
 * Image Segmentation CRF-RNN [\[Source\]](https://github.com/torrvision/crfasrnn/tree/master/python-scripts)[\[Visualise\]](http://fabrik.cloudcv.org/caffe/load?id=20180111183110okaux)
-* UNET [\[Source\]](https://github.com/ZFTurbo/ZF_UNET_224_Pretrained_Model)[\[Visualise]](http://fabrik.cloudcv.org/caffe/load?id=20180116070834rggzh)
+* UNET [\[Source\]](https://github.com/ZFTurbo/ZF_UNET_224_Pretrained_Model)[\[Visualise\]](http://fabrik.cloudcv.org/caffe/load?id=20180116070834rggzh)
 
 ### Miscellaneous
 

diff --git a/ide/tasks.py b/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,

diff --git a/keras_app/views/export_json.py b/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,

diff --git a/keras_app/views/import_json.py b/keras_app/views/import_json.py
@@ -68,6 +68,7 @@ def import_json(request):
         'tanh': Activation,
         'sigmoid': Activation,
         'hard_sigmoid': Activation,
+        'linear': Activation,
         'Dropout': Dropout,
         'Flatten': Flatten,
         'Reshape': Reshape,

diff --git a/keras_app/views/layers_export.py b/keras_app/views/layers_export.py
@@ -127,6 +127,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

diff --git a/keras_app/views/layers_import.py b/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)

diff --git a/tests/unit/keras_app/keras_export_test.json b/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, 

diff --git a/tests/unit/keras_app/test_views.py b/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()

diff --git a/tutorials/tested_models.md b/tutorials/tested_models.md
@@ -49,7 +49,7 @@
 
 ## Segmentation
 * Image Segmentation CRF-RNN [\[Source\]](https://github.com/torrvision/crfasrnn/tree/master/python-scripts)[\[Visualise\]](http://fabrik.cloudcv.org/caffe/load?id=20180111183110okaux)
-* UNET [\[Source\]](https://github.com/ZFTurbo/ZF_UNET_224_Pretrained_Model)[\[Visualise]](http://fabrik.cloudcv.org/caffe/load?id=20180116070834rggzh)
+* UNET [\[Source\]](https://github.com/ZFTurbo/ZF_UNET_224_Pretrained_Model)[\[Visualise\]](http://fabrik.cloudcv.org/caffe/load?id=20180116070834rggzh)
 
 ### Miscellaneous