WIP #541 Added setter support in ImportTorch

deepforge-dev · Jul 26, 2016 · d84764a · d84764a
1 parent a7bb1e9
commit d84764a
Show file tree

Hide file tree

Showing 5 changed files with 1,786 additions and 24 deletions.
diff --git a/src/plugins/CreateTorchMeta/CreateTorchMeta.js b/src/plugins/CreateTorchMeta/CreateTorchMeta.js
@@ -272,6 +272,7 @@ define([
         if (attrs) {  // Add the attributes
             // Remove attributes not in the given list
             var currentAttrs = this.core.getValidAttributeNames(node),
+                defVal,
                 rmAttrs;
 
             rmAttrs = _.difference(currentAttrs, attrs)  // old attribute names
@@ -291,15 +292,15 @@ define([
             attrs.forEach((name, index) => {
                 desc = {};
                 desc.argindex = index;
-                desc.default = defaults.hasOwnProperty(name) ? defaults[name] : '';
-                this.addAttribute(name, node, desc);
+                defVal = defaults.hasOwnProperty(name) ? defaults[name] : '';
+                this.addAttribute(name, node, desc, defVal);
             });
 
             // Add the setters to the meta
             Object.keys(setters).forEach(name => {
                 var values;
                 desc = setters[name];
-                desc.default = defaults.hasOwnProperty(name) ? defaults[name] : '';
+                defVal = defaults.hasOwnProperty(name) ? defaults[name] : '';
                 if (desc.setterType === 'const') {
                     values = Object.keys(desc.setterFn);
                     desc.isEnum = true;
@@ -308,16 +309,16 @@ define([
                         if (!defaults.hasOwnProperty(name) && values.length === 1) {
                             // there is only a method to toggle the flag to true/false, 
                             // then the default must be the other one
-                            desc.default = values[0] === 'true' ? false : true;
+                            defVal = values[0] === 'true' ? false : true;
                         }
 
-                        if (isBoolean(desc.default)) {
+                        if (isBoolean(defVal)) {
                             this.logger.debug(`setting ${name} to boolean`);
                             desc.type = 'boolean';
                         }
                     }
                 }
-                this.addAttribute(name, node, desc);
+                this.addAttribute(name, node, desc, defVal);
             });
         }
         this.logger.debug(`added ${name} to the meta`);
@@ -352,36 +353,30 @@ define([
         };
     };
 
-    CreateTorchMeta.prototype.addAttribute = function (name, node, def) {
-        var initial,
-            schema = {};
-
-        schema.type = def.type || 'string';
+    CreateTorchMeta.prototype.addAttribute = function (name, node, schema, defVal) {
+        schema.type = schema.type || 'string';
         if (schema.type === 'list') {  // FIXME: add support for lists
             schema.type = 'string';
         }
 
-        if (def.min !== undefined) {
-            schema.min = +def.min;
+        if (schema.min !== undefined) {
+            schema.min = +schema.min;
         }
 
-        if (def.max !== undefined) {
+        if (schema.max !== undefined) {
             // Set the min, max
-            schema.max = +def.max;
+            schema.max = +schema.max;
         }
 
         // Add the argindex flag
-        schema.argindex = def.argindex;
+        schema.argindex = schema.argindex;
 
         // Create the attribute and set the schema
         this.core.setAttributeMeta(node, name, schema);
 
-        // Determine a default value
-        initial = def.hasOwnProperty('default') ? def.default : def.min || null;
-        if (schema.type === 'boolean') {
-            initial = initial !== null ? initial : false;
+        if (defVal) {
+            this.core.setAttribute(node, name, defVal);
         }
-        this.core.setAttribute(node, name, initial);
     };
 
     return CreateTorchMeta;

diff --git a/src/plugins/ImportTorch/nn.js b/src/plugins/ImportTorch/nn.js
@@ -89,9 +89,9 @@ define([
 
         Layer.prototype._setAttribute = function(name, self, value) {
             var node = this._node();
-            debugger;
             logger.info(`Setting ${name} to ${value}`);
             core.setAttribute(node, name, value);
+            return self;
         };
 
         // Each container will have `inputs` and `outputs`
@@ -191,7 +191,7 @@ define([
                 for (var i = vals.length; i--;) {
                     fn = desc.setterFn[vals[i]];
                     value = getValue(vals[i]);
-                    table.set(fn, layer._setAttribute.bind(layer, attr, value));
+                    table.set(fn, layer._setAttribute.bind(layer, attr, table, value));
                 }
             }
         };
@@ -200,7 +200,7 @@ define([
             var res = luajs.newContext()._G,
                 attrs = [].slice.call(arguments, 1),
                 ltGet = luajs.types.LuaTable.prototype.get,
-                setters = {},
+                setters = [],
                 args = [],
                 node;
 

diff --git a/test/plugins/ImportTorch/ImportTorch.spec.js b/test/plugins/ImportTorch/ImportTorch.spec.js
@@ -19,6 +19,7 @@ var testFixture = require('../../globals'),
         'basic4.lua'
     ],
     ONLY_TESTS = [
+        'googlenet-setters.lua',
         'vgg.lua'
     ];
 

diff --git a/test/test-cases/code/googlenet-setters.lua b/test/test-cases/code/googlenet-setters.lua
@@ -1,6 +1,7 @@
 -- Copy of googlenet.lua which uses setters (the other googlenet has them removed)
 require 'nn'
 nGPU = 10
+nClasses = 1000
 local function inception(input_size, config)
    local concat = nn.Concat(2)
    if config[1][1] ~= 0 then