Support for json graphdef objects

package.json

@@ -35,7 +35,7 @@
   "main": "src/index.js",
   "dependencies": {
     "ffi": "^2.2.0",
-    "protocol-buffers": "^3.2.1",
+    "pbf": "^3.1.0",
     "ref": "^1.3.5",
     "ref-array": "^1.2.0",
     "ref-struct": "^1.1.0"

samples/graphs/json/main.js

@@ -0,0 +1,65 @@
+const tf = require('tensorflow');
+
+var const1 = {
+  name: 'c1',
+  op: 'Const',
+  attr: {
+    value: {
+      value: 'tensor',
+      tensor: {
+        dtype: 3,
+        tensor_shape: { dim: [] },
+        int_val: [1]
+      }
+    },
+    dtype: {
+      value: 'type',
+      type: 3
+    }
+  }
+};
+
+var const2 = {
+  name: 'c2',
+  op: 'Const',
+  attr: {
+    value: {
+      value: 'tensor',
+      tensor: {
+        dtype: 3,
+        tensor_shape: { dim: [] },
+        int_val: [41]
+      }
+    },
+    dtype: {
+      value: 'type',
+      type: 3
+    }
+  }
+};
+
+var add = {
+  name: 'sum',
+  op: 'Add',
+  input: [
+    'c1',
+    'c2'
+  ],
+  attr: {
+    T: {
+      value: 'type',
+      type: 3
+    }
+  }
+};
+
+var graphDef = {
+  node: [ const1, const2, add ]
+}
+
+let session = tf.Session.fromGraphDef(graphDef, { sum: 'sum' });
+let results = session.run(null, ['sum'], null);
+
+console.log(results.sum.toValue());
+results.sum.delete();
+session.delete();

samples/graphs/json/package.json

@@ -0,0 +1,8 @@
+{
+  "dependencies": {
+    "tensorflow": "^0.6.5"
+  },
+  "scripts": {
+    "sample": "node main.js"
+  }
+}

src/graph.js

@@ -4,7 +4,7 @@
 
 'use strict';
 
-const api = require('./api'),
+const api = require('./interop/api'),
       fs = require('fs');
 
 function loadGraph(protobuf) {
@@ -61,8 +61,23 @@ class Graph extends api.Reference {
     return unresolvedOps;
   }
 
-  static fromGraphDef(graphDefPath, operations) {
-    let protobuf = fs.readFileSync(graphDefPath);
+  static fromGraphDef(graphDef, operations) {
+    let protobuf = null;
+    if (graphDef.constructor == String) {
+      protobuf = fs.readFileSync(graphDef);
+    }
+    else if (Buffer.isBuffer(graphDef)) {
+      protobuf = graphDef;
+    }
+    else {
+      let ProtobufWriter = require('pbf');
+
+      let writer = new ProtobufWriter();
+      api.Protos.GraphDef.write(graphDef, writer);
+
+      protobuf = writer.finish();
+    }
+
     let graph = loadGraph(protobuf);
 
     if (operations) {
@@ -71,13 +86,6 @@ class Graph extends api.Reference {
 
     return graph;
   }
-
-  // TODO: Implement loading a Graph from an in-memory JSON object representatio of a GraphDef.
-  //       However, this doesn't yet work. The resulting protobuf/GraphDef is invalid.
-  // static fromGraphDefObject(graphDefObject) {
-  //   let protobuf = api.Protos.GraphDef.encode(graphDefObject);
-  //   return loadGraph(protobuf);
-  // }
 }
 
 

src/index.js

@@ -2,7 +2,7 @@
 // Defines the TensorFlow module.
 //
 
-const api = require('./api');
+const api = require('./interop/api');
 
 module.exports = {
   Types: api.Types,

src/api.js → src/interop/api.js

@@ -1,4 +1,4 @@
-// api.js
+// tf.js
 // Interface for TensorFlow C API
 //
 // This defines the TensorFlow library matching a subset of the C API methods as defined in
@@ -91,7 +91,7 @@ const statusCodes = {
 
 let libPath = process.env['TENSORFLOW_LIB_PATH'];
 if (!libPath) {
-  libPath = path.join(__dirname, '..', 'lib');
+  libPath = path.join(__dirname, '..', '..', 'lib');
 }
 if (!fs.existsSync(path.join(libPath, 'libtensorflow.so'))) {
   throw new Error(`libtensorflow.so was not found at "${libPath}"`);
@@ -191,7 +191,7 @@ const libApi = {
 };
 
 const library = ffi.Library(path.join(libPath, 'libtensorflow'), libApi);
-library.Protos = protobuf(fs.readFileSync(path.join(__dirname, 'api.proto')));
+library.Protos = require('./messages');
 library.ApiTypes = types;
 library.StatusCodes = statusCodes;
 library.Types = tensorTypes;