WIP #541 Added check for class method match

deepforge-dev · Jul 26, 2016 · 0717598 · 0717598
1 parent ec1a693
commit 0717598
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/common/layer-parser.js b/src/common/layer-parser.js
@@ -44,10 +44,11 @@
         return null;
     };
 
-    var isSetterMethod = function(curr, parent){
+    var isSetterMethod = function(curr, parent, className){
         if (parent && parent.type === 'stat.method') {
             // is it a fn w/ two statements (stats)
-            if (curr.type === 'function' && curr.block.stats.length === 2) {
+            if (parent.self.val === className && curr.type === 'function' &&
+                curr.block.stats.length === 2) {
                 // Is the first statement setting a value?
                 return returnsSelf(curr) && getSettingAttrName(curr.block.stats[0]);  // does it return itself?
             }
@@ -125,21 +126,22 @@
             luajs.codegen.traverse((curr, parent) => {
                 var firstLine,
                     schema,
-                    name;
+                    attrName;
 
-                if (isSetterMethod(curr, parent)) {
+                if (isSetterMethod(curr, parent, name)) {
                     firstLine = curr.block.stats[0];
-                    // just use the attribute name for now...
-                    name = getSettingAttrName(firstLine);
+                    // just use the attribute attrName for now...
+                    attrName = getSettingAttrName(firstLine);
 
                     // merge schemas
                     schema = getSetterSchema(firstLine, parent);
-                    if (setters[name] && setters[name].setterType === 'const') {  // merge
+                    if (setters[attrName] && setters[attrName].setterType === 'const') {  // merge
                         for (var val in schema.setterFn) {
-                            setters[name].setterFn[val] = schema.setterFn[val];
+                            setters[attrName].setterFn[val] = schema.setterFn[val];
                         }
+                        // TODO: Get the default value
                     } else {
-                        setters[name] = schema;
+                        setters[attrName] = schema;
                     }
                 }
 

diff --git a/src/common/layers.json b/src/common/layers.json
@@ -1490,4 +1490,4 @@
     "setters": {},
     "type": "Criterion"
   }
-]
+]
diff --git a/utils/nn-parser.js b/utils/nn-parser.js
@@ -32,7 +32,6 @@ fs.readdir(torchPath, function(err,files){
         layerByName = {};
 
     layers = files.filter(filename => path.extname(filename) === '.lua')
-        //.filter(filename => filename === 'SpatialMaxPooling.lua')
         .map(filename => fs.readFileSync(torchPath + filename, 'utf8'))
         .map(code => LayerParser.parse(code))
         .filter(layer => !!layer && layer.name);