Merge pull request #71 from OpenMined/vvm/update-serde

cereallarceny · web-flow · commit 45bb34487ba3 · 2019-12-29T13:45:41.000-03:00
Update serde, fix with-node example
diff --git a/examples/with-grid/index.html b/examples/with-grid/index.html
@@ -39,7 +39,8 @@
 
     <title>syft.js Example</title>
 
-    <script src="https://cdn.jsdelivr.net/npm/@tensorflow/tfjs@1.2.5/dist/tf.min.js"></script>
+    <!-- NOTE: TFJS version must match with one in package-lock.json -->
+    <script src="https://cdn.jsdelivr.net/npm/@tensorflow/tfjs@1.5.1/dist/tf.min.js"></script>
     <script src="https://webrtc.github.io/adapter/adapter-latest.js"></script>
   </head>
   <body>
@@ -71,7 +72,7 @@ <h1>syft.js/grid.js testing</h1>
       >.
     </p>
     <input type="text" id="grid-server" value="ws://localhost:3000" />
-    <input type="text" id="protocol" value="5259950754" />
+    <input type="text" id="protocol" value="50801316202" />
     <button id="connect">Connect to grid.js server</button>
     <div id="app">
       <button id="disconnect">Disconnect</button>
diff --git a/jest-globals.js b/jest-globals.js
@@ -1,7 +1,10 @@
-global.tf = {
-  tensor: (value, shape, type) => {
-    console.log('Created a tensor!', value, shape, type);
-  },
-  add: jest.fn(),
-  abs: jest.fn()
-};
+import * as tf from '@tensorflow/tfjs';
+const tensor = tf.tensor;
+jest.spyOn(tf, 'tensor').mockImplementation((values, shape, dtype) => {
+  let t = tensor(values, shape, dtype);
+  // override id to always return same value
+  Object.defineProperty(t, 'id', {
+    value: 42
+  });
+  return t;
+});
diff --git a/src/_helpers.js b/src/_helpers.js
@@ -1,6 +1,7 @@
 import { TorchTensor } from './types/torch';
 import PointerTensor from './types/pointer-tensor';
 import { CANNOT_FIND_COMMAND } from './_errors';
+import * as tf from '@tensorflow/tfjs';
 
 export const pickTensors = tree => {
   const objects = {};
diff --git a/src/serde.js b/src/serde.js
@@ -88,7 +88,7 @@ export const detail = data => {
     [proto['torch.Size']]: d => new TorchSize(d),
     [proto['syft.messaging.plan.plan.Plan']]: d => new Plan(...d.map(i => parse(i))),
     [proto['syft.messaging.plan.state.State']]: d => new State(...d.map(i => parse(i))),
-    [proto['syft.messaging.plan.procedure.Procedure']]: d => new Procedure(d[0].map(i => parse(i)), ...d.slice(1).map(i => parse(i))),
+    [proto['syft.messaging.plan.procedure.Procedure']]: d => new Procedure(...d.map(i => parse(i))),
     [proto['syft.messaging.protocol.Protocol']]: d => new Protocol(...d.map(i => parse(i))),
     [proto['syft.generic.pointers.pointer_tensor.PointerTensor']]: d => new PointerTensor(...d.map(i => parse(i))),
     [proto['syft.messaging.message.Message']]: d => new Message(...d.map(i => parse(i))),
diff --git a/src/types/torch.js b/src/types/torch.js
@@ -1,4 +1,5 @@
 import { default as proto } from '../proto';
+import * as tf from '@tensorflow/tfjs';
 
 export class TorchTensor {
   constructor(id, bin, chain, gradChain, tags, description, serializer) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { default as proto } from '../proto';`
	`2`	`+import * as tf from '@tensorflow/tfjs';`
`2`	`3`
`3`	`4`	`export class TorchTensor {`
`4`	`5`	`constructor(id, bin, chain, gradChain, tags, description, serializer) {`