Graph.loadOperations now takes {alias -> graph name} map

nikhilk · nikhilk · commit e48c34805f19 · 2018-01-06T09:24:47.000-08:00
diff --git a/src/graph.js b/src/graph.js
@@ -41,25 +41,24 @@ class Graph extends api.Reference {
     return this._ops;
   }
 
-  loadOperations(nameAliasMap) {
+  loadOperations(operations) {
     this.ensureValid();
 
-    let unresolvedOps = false;
-    let unresolvedOpsMap = {};
-    for (let name in nameAliasMap) {
-      let alias = nameAliasMap[name];
+    let unresolvedOps = null;
+    for (let alias in operations) {
+      let name = operations[alias];
       let op = api.TF_GraphOperationByName(this._handle, name);
 
       if (op && !op.isNull()) {
         this._ops[alias] = op;
       }
       else {
-        unresolvedOps = true;
-        unresolvedOpsMap[name] = alias;
+        unresolvedOps = unresolvedOps || {};
+        unresolvedOps[alias] = name;
       }
     }
 
-    return unresolvedOps ? unresolvedOpsMap : null;
+    return unresolvedOps;
   }
 
   static fromGraphDef(graphDefPath) {

Original file line number	Diff line number	Diff line change
`@@ -41,25 +41,24 @@ class Graph extends api.Reference {`
`41`	`41`	`return this._ops;`
`42`	`42`	`}`
`43`	`43`
`44`		`- loadOperations(nameAliasMap) {`
	`44`	`+ loadOperations(operations) {`
`45`	`45`	`this.ensureValid();`
`46`	`46`
`47`		`- let unresolvedOps = false;`
`48`		`- let unresolvedOpsMap = {};`
`49`		`- for (let name in nameAliasMap) {`
`50`		`- let alias = nameAliasMap[name];`
	`47`	`+ let unresolvedOps = null;`
	`48`	`+ for (let alias in operations) {`
	`49`	`+ let name = operations[alias];`
`51`	`50`	`let op = api.TF_GraphOperationByName(this._handle, name);`
`52`	`51`
`53`	`52`	`if (op && !op.isNull()) {`
`54`	`53`	`this._ops[alias] = op;`
`55`	`54`	`}`
`56`	`55`	`else {`
`57`		`- unresolvedOps = true;`
`58`		`- unresolvedOpsMap[name] = alias;`
	`56`	`+ unresolvedOps = unresolvedOps \|\| {};`
	`57`	`+ unresolvedOps[alias] = name;`
`59`	`58`	`}`
`60`	`59`	`}`
`61`	`60`
`62`		`- return unresolvedOps ? unresolvedOpsMap : null;`
	`61`	`+ return unresolvedOps;`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`static fromGraphDef(graphDefPath) {`