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

deepforge-dev · Jun 20, 2016 · f24f9bd · f24f9bd
1 parent f301e93
commit f24f9bd
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 8 deletions.
diff --git a/src/common/layers.json b/src/common/layers.json
@@ -88,7 +88,9 @@
   {
     "name": "CMul",
     "baseType": "Module",
-    "params": [],
+    "params": [
+      "VariableArguments"
+    ],
     "type": "Simple",
     "setters": []
   },
@@ -285,7 +287,9 @@
   {
     "name": "GradientReversal",
     "baseType": "Module",
-    "params": [],
+    "params": [
+      "lambda"
+    ],
     "type": "Misc",
     "setters": []
   },
@@ -394,9 +398,7 @@
   {
     "name": "Log",
     "baseType": "Module",
-    "params": [
-      "inputSize"
-    ],
+    "params": [],
     "type": "Misc",
     "setters": []
   },
@@ -712,7 +714,9 @@
   {
     "name": "Reshape",
     "baseType": "Module",
-    "params": [],
+    "params": [
+      "VariableArguments"
+    ],
     "type": "Simple",
     "setters": []
   },
@@ -844,6 +848,16 @@
     "type": "Convolution",
     "setters": []
   },
+  {
+    "name": "SpatialClassNLLCriterion",
+    "baseType": "Criterion",
+    "params": [
+      "weights",
+      "sizeAverage"
+    ],
+    "type": "Criterion",
+    "setters": []
+  },
   {
     "name": "SpatialContrastiveNormalization",
     "baseType": "Module",
@@ -931,6 +945,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 +1249,9 @@
   {
     "name": "Transpose",
     "baseType": "Module",
-    "params": [],
+    "params": [
+      "VariableArguments"
+    ],
     "type": "Misc",
     "setters": []
   },
@@ -1234,7 +1268,9 @@
   {
     "name": "View",
     "baseType": "Module",
-    "params": [],
+    "params": [
+      "VariableArguments"
+    ],
     "type": "Simple",
     "setters": []
   },

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] = 'VariableArguments'
+            }
         }
     });
     return params;