Added support for variable arguments in nn importer. Fixes #328

WIP #328 Renamed arg to 'params'. Fixed eslint issues WIP #328 Updated nn layers.json WIP #328 Added ReLU6 layer WIP #328 Updated seeds
deepforge-dev · Jun 21, 2016 · c9e2cde · c9e2cde
1 parent ec8fcb2
commit c9e2cde
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 9 deletions.
diff --git a/src/common/layers.json b/src/common/layers.json
@@ -88,7 +88,9 @@
   {
     "name": "CMul",
     "baseType": "Module",
-    "params": [],
+    "params": [
+      "params"
+    ],
     "type": "Simple",
     "setters": []
   },
@@ -285,7 +287,9 @@
   {
     "name": "GradientReversal",
     "baseType": "Module",
-    "params": [],
+    "params": [
+      "lambda"
+    ],
     "type": "Misc",
     "setters": []
   },
@@ -303,7 +307,8 @@
     "baseType": "Module",
     "params": [
       "min_value",
-      "max_value"
+      "max_value",
+      "inplace"
     ],
     "type": "Transfer",
     "setters": []
@@ -394,9 +399,7 @@
   {
     "name": "Log",
     "baseType": "Module",
-    "params": [
-      "inputSize"
-    ],
+    "params": [],
     "type": "Misc",
     "setters": []
   },
@@ -698,6 +701,15 @@
     "type": "Transfer",
     "setters": []
   },
+  {
+    "name": "ReLU6",
+    "baseType": "Module",
+    "params": [
+      "inplace"
+    ],
+    "type": "Transfer",
+    "setters": []
+  },
   {
     "name": "Replicate",
     "baseType": "Module",
@@ -712,7 +724,9 @@
   {
     "name": "Reshape",
     "baseType": "Module",
-    "params": [],
+    "params": [
+      "params"
+    ],
     "type": "Simple",
     "setters": []
   },
@@ -844,6 +858,16 @@
     "type": "Convolution",
     "setters": []
   },
+  {
+    "name": "SpatialClassNLLCriterion",
+    "baseType": "Criterion",
+    "params": [
+      "weights",
+      "sizeAverage"
+    ],
+    "type": "Criterion",
+    "setters": []
+  },
   {
     "name": "SpatialContrastiveNormalization",
     "baseType": "Module",
@@ -931,6 +955,24 @@
     "type": "Convolution",
     "setters": []
   },
+  {
+    "name": "SpatialDilatedConvolution",
+    "baseType": "SpatialConvolution",
+    "params": [
+      "nInputPlane",
+      "nOutputPlane",
+      "kW",
+      "kH",
+      "dW",
+      "dH",
+      "padW",
+      "padH",
+      "dilationH",
+      "dilationW"
+    ],
+    "type": "Convolution",
+    "setters": []
+  },
   {
     "name": "SpatialDivisiveNormalization",
     "baseType": "Module",
@@ -1217,7 +1259,9 @@
   {
     "name": "Transpose",
     "baseType": "Module",
-    "params": [],
+    "params": [
+      "params"
+    ],
     "type": "Misc",
     "setters": []
   },
@@ -1234,7 +1278,9 @@
   {
     "name": "View",
     "baseType": "Module",
-    "params": [],
+    "params": [
+      "params"
+    ],
     "type": "Simple",
     "setters": []
   },
@@ -1340,6 +1386,20 @@
     "type": "Convolution",
     "setters": []
   },
+  {
+    "name": "VolumetricReplicationPadding",
+    "baseType": "Module",
+    "params": [
+      "pleft",
+      "pright",
+      "ptop",
+      "pbottom",
+      "pfront",
+      "pback"
+    ],
+    "type": "Misc",
+    "setters": []
+  },
   {
     "name": "WeightedEuclidean",
     "baseType": "Module",

diff --git a/src/seeds/cifar10/cifar10.webgmex b/src/seeds/cifar10/cifar10.webgmex
diff --git a/src/seeds/nn/nn.webgmex b/src/seeds/nn/nn.webgmex
diff --git a/src/seeds/project/project.webgmex b/src/seeds/project/project.webgmex
diff --git a/utils/categories.json b/utils/categories.json
@@ -107,6 +107,7 @@
       "Sigmoid",
       "Tanh",
       "ReLU",
+      "ReLU6",
       "PReLU",
       "RReLU",
       "LeakyReLU"

diff --git a/utils/nn-parser.js b/utils/nn-parser.js
@@ -12,6 +12,9 @@ var findInitParams = function(ast){
     ast.block.stats.forEach(function(block){
         if(block.key && block.key.val == '__init' && block.func){
             params = block.func.args;
+            if(params.length === 0 && block.func.varargs){
+                params[0] = 'params';
+            }
         }
     });
     return params;