From 3feb54de56b39f313b48ce8450bf5005a9377d27 Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Mon, 9 Mar 2020 14:39:48 -0700
Subject: [PATCH 01/16] [node]Test against head.

---
 tfjs-converter/tsconfig.json |  3 +-
 tfjs-node/cloudbuild.yml     | 18 ++++++++++-
 tfjs-node/package.json       | 14 ++++++---
 tfjs-node/scripts/test-ci.sh |  2 +-
 tfjs-node/yarn.lock          | 58 ++++++++++++------------------------
 5 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/tfjs-converter/tsconfig.json b/tfjs-converter/tsconfig.json
index 3dcc900ac4c..a215627bb74 100644
--- a/tfjs-converter/tsconfig.json
+++ b/tfjs-converter/tsconfig.json
@@ -23,7 +23,6 @@
     "allowUnreachableCode": false
   },
   "include": [
-    "src/",
-    "scripts/"
+    "src/"
   ]
 }
diff --git a/tfjs-node/cloudbuild.yml b/tfjs-node/cloudbuild.yml
index 1dfe558c30a..a4c6dfe719e 100644
--- a/tfjs-node/cloudbuild.yml
+++ b/tfjs-node/cloudbuild.yml
@@ -5,13 +5,29 @@ steps:
   entrypoint: 'yarn'
   args: ['install']
 
+# Build core from master.
+- name: 'node:10'
+  dir: 'tfjs-node'
+  id: 'build-core'
+  entrypoint: 'yarn'
+  args: ['build-core-ci']
+  waitFor: ['yarn-common']
+
+# Build union package from master.
+- name: 'node:10'
+  dir: 'tfjs-node'
+  id: 'build-union'
+  entrypoint: 'yarn'
+  args: ['build-union-ci']
+  waitFor: ['build-core']
+
 # Install tfjs-node dependencies.
 - name: 'node:10'
   dir: 'tfjs-node'
   entrypoint: 'yarn'
   id: 'yarn'
   args: ['install']
-  waitFor: ['yarn-common']
+  waitFor: ['yarn-union']
 
 # Unit tests.
 - name: 'node:10'
diff --git a/tfjs-node/package.json b/tfjs-node/package.json
index 684ae278caf..5b3012d0f90 100644
--- a/tfjs-node/package.json
+++ b/tfjs-node/package.json
@@ -12,7 +12,12 @@
     "node": ">=8.11.0"
   },
   "scripts": {
-    "build": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
+    "build": "yarn link-master && yarn build-core && yarn build-union && tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
+    "build-ci": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
+    "build-core": "cd ../tfjs-core && yarn && yarn build",
+    "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",
+    "build-union": "cd ../tfjs && yarn && yarn build",
+    "build-union-ci": "cd ../tfjs && yarn && yarn build-ci",
     "build-npm": "./scripts/build-npm.sh",
     "build-addon": "./scripts/build-and-upload-addon.sh",
     "build-addon-from-source": "node-pre-gyp install --build-from-source",
@@ -24,10 +29,11 @@
     "install": "node scripts/install.js",
     "install-from-source": "yarn clean-deps && yarn && yarn build-addon-from-source",
     "link-local": "yalc link",
+    "link-master": "../scripts/link-master.js",
     "lint": "tslint -p . -t verbose",
     "prep": "cd node_modules/@tensorflow/tfjs-core && yarn && yarn build",
     "publish-local": "yarn prep && yalc push",
-    "test": "ts-node src/run_tests.ts",
+    "test": "yarn link-master && yarn && yarn build-union && ts-node src/run_tests.ts",
     "test-ci": "./scripts/test-ci.sh",
     "test-ts-integration": "./scripts/test-ts-integration.sh",
     "upload-windows-addon": "./scripts/build-and-upload-windows-addon.bat"
@@ -51,8 +57,8 @@
     "yargs": "^14.2.0"
   },
   "dependencies": {
-    "@tensorflow/tfjs": "1.7.0",
-    "@tensorflow/tfjs-core": "1.7.0",
+    "@tensorflow/tfjs": "link:../tfjs",
+    "@tensorflow/tfjs-core": "link:../tfjs-core",
     "adm-zip": "^0.4.11",
     "google-protobuf": "^3.9.2",
     "https-proxy-agent": "^2.2.1",
diff --git a/tfjs-node/scripts/test-ci.sh b/tfjs-node/scripts/test-ci.sh
index 3f5ff4d95cb..3a53d02037b 100755
--- a/tfjs-node/scripts/test-ci.sh
+++ b/tfjs-node/scripts/test-ci.sh
@@ -10,6 +10,6 @@
 set -e
 
 yarn build-addon-from-source
-yarn build
+yarn build-ci
 yarn lint
 yarn test
diff --git a/tfjs-node/yarn.lock b/tfjs-node/yarn.lock
index f55f50dde1d..2f2b7d8da14 100644
--- a/tfjs-node/yarn.lock
+++ b/tfjs-node/yarn.lock
@@ -90,45 +90,25 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@tensorflow/tfjs-converter@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.7.0.tgz#4dcfeffa0bfa4e26e8b64e15a24a6683645945cc"
-  integrity sha512-cFXLDKVEjEtFv/C0wETXpIeJNa25chC6nvFm06dB/ShvrGYZpDsGlWVNiCu4v5/VtrSZEQPZ2QdkpTpURbvAqQ==
-
-"@tensorflow/tfjs-core@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf"
-  integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw==
-  dependencies:
-    "@types/offscreencanvas" "~2019.3.0"
-    "@types/seedrandom" "2.4.27"
-    "@types/webgl-ext" "0.0.30"
-    "@types/webgl2" "0.0.4"
-    node-fetch "~2.1.2"
-    seedrandom "2.4.3"
-
-"@tensorflow/tfjs-data@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.7.0.tgz#6b5f91e328d1fdd577bc67b1c800197f34ae3f91"
-  integrity sha512-i3pPpCTN76cVArzQ1vby+YFDcxC7APOTW2NGcHr3VxWf9ZCMgjJv/s2z71U8OHoCzw/lTXYue8/l4j4q+D3PMg==
-  dependencies:
-    "@types/node-fetch" "^2.1.2"
-    node-fetch "~2.1.2"
-
-"@tensorflow/tfjs-layers@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.0.tgz#7d1f7246ac3f6f23d0923b7d69d7a97a0890a35d"
-  integrity sha512-sRdzuPc2CeLSxctqXdLTckvitSBjsjL8H6MSrvrbOfPEckKdAeNpojB0ayM+76Pc3AsS0/AI6F1R2lT9qoH9/g==
-
-"@tensorflow/tfjs@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-1.7.0.tgz#1b9b10240e18c4e6b34e7de76a5db00327210d14"
-  integrity sha512-lN4wSCb/pFFa60R4Ii8Znn+3Q42Ad8bDrqrIPvsxFQYFXd9BSgXXIgizRoSkyMsLVzJokuLLuElHGggF2VNnug==
-  dependencies:
-    "@tensorflow/tfjs-converter" "1.7.0"
-    "@tensorflow/tfjs-core" "1.7.0"
-    "@tensorflow/tfjs-data" "1.7.0"
-    "@tensorflow/tfjs-layers" "1.7.0"
+"@tensorflow/tfjs-converter@link:../tfjs-converter":
+  version "0.0.0"
+  uid ""
+
+"@tensorflow/tfjs-core@link:../tfjs-core":
+  version "0.0.0"
+  uid ""
+
+"@tensorflow/tfjs-data@link:../tfjs-data":
+  version "0.0.0"
+  uid ""
+
+"@tensorflow/tfjs-layers@link:../tfjs-layers":
+  version "0.0.0"
+  uid ""
+
+"@tensorflow/tfjs@link:../tfjs":
+  version "0.0.0"
+  uid ""
 
 "@types/events@*":
   version "3.0.0"

From d063ffc9c131b0d57e41d205d8cf9d5fb2326357 Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Mon, 9 Mar 2020 14:44:26 -0700
Subject: [PATCH 02/16] Fix typo.

---
 tfjs-node/cloudbuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tfjs-node/cloudbuild.yml b/tfjs-node/cloudbuild.yml
index a4c6dfe719e..a337b184178 100644
--- a/tfjs-node/cloudbuild.yml
+++ b/tfjs-node/cloudbuild.yml
@@ -27,7 +27,7 @@ steps:
   entrypoint: 'yarn'
   id: 'yarn'
   args: ['install']
-  waitFor: ['yarn-union']
+  waitFor: ['build-union']
 
 # Unit tests.
 - name: 'node:10'

From 12caed5cd6d3eb5fe29e6a0231619614121c9d97 Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Mon, 9 Mar 2020 14:52:33 -0700
Subject: [PATCH 03/16] Add build to cloudbuild.yml.

---
 tfjs-node/cloudbuild.yml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/tfjs-node/cloudbuild.yml b/tfjs-node/cloudbuild.yml
index a337b184178..dcd4bcff4a2 100644
--- a/tfjs-node/cloudbuild.yml
+++ b/tfjs-node/cloudbuild.yml
@@ -13,13 +13,37 @@ steps:
   args: ['build-core-ci']
   waitFor: ['yarn-common']
 
+# Build layers from master.
+- name: 'node:10'
+  dir: 'tfjs-node'
+  id: 'build-layers'
+  entrypoint: 'yarn'
+  args: ['build-layers-ci']
+  waitFor: ['build-core']
+
+# Build converter from master.
+- name: 'node:10'
+  dir: 'tfjs-node'
+  id: 'build-converter'
+  entrypoint: 'yarn'
+  args: ['build-converter-ci']
+  waitFor: ['build-core']
+
+# Build data from master.
+- name: 'node:10'
+  dir: 'tfjs-node'
+  id: 'build-data'
+  entrypoint: 'yarn'
+  args: ['build-data-ci']
+  waitFor: ['build-layers', 'build-converter']
+
 # Build union package from master.
 - name: 'node:10'
   dir: 'tfjs-node'
   id: 'build-union'
   entrypoint: 'yarn'
   args: ['build-union-ci']
-  waitFor: ['build-core']
+  waitFor: ['build-data']
 
 # Install tfjs-node dependencies.
 - name: 'node:10'

From 7e8e5dfb705944590223c47989d9b5707e07c125 Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Mon, 9 Mar 2020 15:07:16 -0700
Subject: [PATCH 04/16] Add commands to package.json.

---
 tfjs-node/package.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tfjs-node/package.json b/tfjs-node/package.json
index 5b3012d0f90..ff805b3a0ba 100644
--- a/tfjs-node/package.json
+++ b/tfjs-node/package.json
@@ -16,6 +16,12 @@
     "build-ci": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
     "build-core": "cd ../tfjs-core && yarn && yarn build",
     "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",
+    "build-layers": "cd ../tfjs-layers && yarn && yarn build",
+    "build-layers-ci": "cd ../tfjs-layers && yarn && yarn build-ci",
+    "build-converter": "cd ../tfjs-converter && yarn && yarn build",
+    "build-converter-ci": "cd ../tfjs-converter && yarn && yarn build-ci",
+    "build-data": "cd ../tfjs-data && yarn && yarn build",
+    "build-data-ci": "cd ../tfjs-data && yarn && yarn build-ci",
     "build-union": "cd ../tfjs && yarn && yarn build",
     "build-union-ci": "cd ../tfjs && yarn && yarn build-ci",
     "build-npm": "./scripts/build-npm.sh",

From 9808b893f794dc51bda7ab17f801ac3f8ce2e355 Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Mon, 9 Mar 2020 16:23:16 -0700
Subject: [PATCH 05/16] Change main entry and types for converter.

---
 tfjs-converter/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tfjs-converter/package.json b/tfjs-converter/package.json
index f79a5d3af90..92d84562f5a 100644
--- a/tfjs-converter/package.json
+++ b/tfjs-converter/package.json
@@ -2,10 +2,10 @@
   "name": "@tensorflow/tfjs-converter",
   "version": "1.7.0",
   "description": "Tensorflow model converter for javascript",
-  "main": "dist/src/index.js",
+  "main": "dist/index.js",
   "jsnext:main": "dist/tf-converter.esm.js",
   "module": "dist/tf-converter.esm.js",
-  "types": "dist/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "unpkg": "dist/tf-converter.min.js",
   "jsdelivr": "dist/tf-converter.min.js",
   "miniprogram": "dist/miniprogram",
@@ -55,7 +55,7 @@
   },
   "scripts": {
     "build": "yarn link-master && yarn gen-json --test && tsc",
-    "build-ci": "yarn gen-json --test && tsc",
+    "build-ci": "tsc",
     "build-core": "cd ../tfjs-core && yarn && yarn build",
     "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",
     "build-npm": "./scripts/build-npm.sh",

From dd8274e24a0b3af1d3f3347df1c9efff490e11c0 Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Mon, 9 Mar 2020 16:24:41 -0700
Subject: [PATCH 06/16] Add back code.

---
 tfjs-converter/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tfjs-converter/package.json b/tfjs-converter/package.json
index 92d84562f5a..3b1b91fb319 100644
--- a/tfjs-converter/package.json
+++ b/tfjs-converter/package.json
@@ -55,7 +55,7 @@
   },
   "scripts": {
     "build": "yarn link-master && yarn gen-json --test && tsc",
-    "build-ci": "tsc",
+    "build-ci": "yarn gen-json --test && tsc",
     "build-core": "cd ../tfjs-core && yarn && yarn build",
     "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",
     "build-npm": "./scripts/build-npm.sh",

From edb5c0466c19e209393b3072513278006c9b770b Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Mon, 9 Mar 2020 17:02:17 -0700
Subject: [PATCH 07/16] Add the same to node-gpu

---
 tfjs-node-gpu/package.json | 16 ++++++++++++++--
 tfjs-node/package.json     |  4 ++--
 tfjs/package.json          |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/tfjs-node-gpu/package.json b/tfjs-node-gpu/package.json
index 82a734650dd..02286ba70b1 100644
--- a/tfjs-node-gpu/package.json
+++ b/tfjs-node-gpu/package.json
@@ -12,7 +12,18 @@
     "node": ">=8.11.0"
   },
   "scripts": {
-    "build": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
+    "build": "yarn link-master && tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
+    "build-ci": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
+    "build-core": "cd ../tfjs-core && yarn && yarn build",
+    "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",
+    "build-layers": "cd ../tfjs-layers && yarn && yarn build",
+    "build-layers-ci": "cd ../tfjs-layers && yarn && yarn build-ci",
+    "build-converter": "cd ../tfjs-converter && yarn && yarn build",
+    "build-converter-ci": "cd ../tfjs-converter && yarn && yarn build-ci",
+    "build-data": "cd ../tfjs-data && yarn && yarn build",
+    "build-data-ci": "cd ../tfjs-data && yarn && yarn build-ci",
+    "build-union": "cd ../tfjs && yarn && yarn build",
+    "build-union-ci": "cd ../tfjs && yarn && yarn build-ci",
     "build-npm": "yarn prep-gpu && ./scripts/build-npm.sh",
     "build-addon": "./scripts/build-and-upload-addon.sh",
     "build-addon-from-source": "node-pre-gyp install --build-from-source",
@@ -24,12 +35,13 @@
     "install": "node scripts/install.js gpu download",
     "install-from-source": "yarn clean-deps && yarn && yarn build-addon-from-source",
     "link-local": "yalc link",
+    "link-master": "../scripts/link-master.js",
     "lint": "tslint -p . -t verbose",
     "prep": "cd node_modules/@tensorflow/tfjs-core && yarn && yarn build",
     "prep-gpu": "./prep-gpu.sh",
     "prep-gpu-windows": "./prep-gpu-windows.bat",
     "publish-local": "yarn prep && yalc push",
-    "test": "ts-node src/run_tests.ts",
+    "test": "yarn link-master && yarn && yarn build-core && yarn build-layers && yarn build-converter && yarn build-data && yarn build-union && ts-node src/run_tests.ts",
     "test-ci": "./scripts/test-ci.sh",
     "test-ts-integration": "./scripts/test-ts-integration.sh",
     "upload-windows-addon": "prep-gpu-windows.bat && ./scripts/build-and-upload-windows-addon-gpu.bat"
diff --git a/tfjs-node/package.json b/tfjs-node/package.json
index ff805b3a0ba..de30f2062e8 100644
--- a/tfjs-node/package.json
+++ b/tfjs-node/package.json
@@ -12,7 +12,7 @@
     "node": ">=8.11.0"
   },
   "scripts": {
-    "build": "yarn link-master && yarn build-core && yarn build-union && tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
+    "build": "yarn link-master && tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
     "build-ci": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
     "build-core": "cd ../tfjs-core && yarn && yarn build",
     "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",
@@ -39,7 +39,7 @@
     "lint": "tslint -p . -t verbose",
     "prep": "cd node_modules/@tensorflow/tfjs-core && yarn && yarn build",
     "publish-local": "yarn prep && yalc push",
-    "test": "yarn link-master && yarn && yarn build-union && ts-node src/run_tests.ts",
+    "test": "yarn link-master && yarn && yarn build-core && yarn build-layers && yarn build-converter && yarn build-data && yarn build-union && ts-node src/run_tests.ts",
     "test-ci": "./scripts/test-ci.sh",
     "test-ts-integration": "./scripts/test-ts-integration.sh",
     "upload-windows-addon": "./scripts/build-and-upload-windows-addon.bat"
diff --git a/tfjs/package.json b/tfjs/package.json
index 2e14066cc09..882f947ca73 100644
--- a/tfjs/package.json
+++ b/tfjs/package.json
@@ -50,7 +50,7 @@
     "yalc": "~1.0.0-pre.21"
   },
   "scripts": {
-    "build": "yarn link-master && yarn build-core && yarn build-layers && yarn build-converter && yarn build-data && tsc",
+    "build": "yarn link-master && tsc",
     "build-ci": "tsc",
     "build-core": "cd ../tfjs-core && yarn && yarn build",
     "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",

From 930062b7ee8007631dc5ff089f11464fd01645a1 Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Mon, 9 Mar 2020 17:06:47 -0700
Subject: [PATCH 08/16] Add the same to node-gpu

---
 tfjs-node-gpu/cloudbuild.yml | 42 +++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/tfjs-node-gpu/cloudbuild.yml b/tfjs-node-gpu/cloudbuild.yml
index 31919f3756b..205a13fedd3 100644
--- a/tfjs-node-gpu/cloudbuild.yml
+++ b/tfjs-node-gpu/cloudbuild.yml
@@ -13,13 +13,53 @@ steps:
   args: ['install']
   waitFor: ['prep-gpu']
 
+# Build core from master.
+- name: 'node:10'
+  dir: 'tfjs-node-gpu'
+  id: 'build-core'
+  entrypoint: 'yarn'
+  args: ['build-core-ci']
+  waitFor: ['yarn-common']
+
+# Build layers from master.
+- name: 'node:10'
+  dir: 'tfjs-node-gpu'
+  id: 'build-layers'
+  entrypoint: 'yarn'
+  args: ['build-layers-ci']
+  waitFor: ['build-core']
+
+# Build converter from master.
+- name: 'node:10'
+  dir: 'tfjs-node-gpu'
+  id: 'build-converter'
+  entrypoint: 'yarn'
+  args: ['build-converter-ci']
+  waitFor: ['build-core']
+
+# Build data from master.
+- name: 'node:10'
+  dir: 'tfjs-node-gpu'
+  id: 'build-data'
+  entrypoint: 'yarn'
+  args: ['build-data-ci']
+  waitFor: ['build-layers', 'build-converter']
+
+# Build union package from master.
+- name: 'node:10'
+  dir: 'tfjs-node-gpu'
+  id: 'build-union'
+  entrypoint: 'yarn'
+  args: ['build-union-ci']
+  waitFor: ['build-data']
+
 # Install tfjs-node dependencies.
 - name: 'node:10'
   dir: 'tfjs-node-gpu'
   entrypoint: 'yarn'
   id: 'yarn'
   args: ['install']
-  waitFor: ['yarn-common']
+  waitFor: ['build-union']
 
 # Unit tests.
 - name: 'node:10'

From 70fc64d23b45e292077cc16eb2ac8c10bbc2987e Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Mon, 9 Mar 2020 17:08:47 -0700
Subject: [PATCH 09/16] Add the same to node-gpu

---
 tfjs-node-gpu/package.json |  5 ++++
 tfjs-node-gpu/yarn.lock    | 58 +++++++++++++-------------------------
 2 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/tfjs-node-gpu/package.json b/tfjs-node-gpu/package.json
index 02286ba70b1..6cffd760ce5 100644
--- a/tfjs-node-gpu/package.json
+++ b/tfjs-node-gpu/package.json
@@ -66,8 +66,13 @@
     "yargs": "^14.2.0"
   },
   "dependencies": {
+<<<<<<< HEAD
     "@tensorflow/tfjs": "1.7.0",
     "@tensorflow/tfjs-core": "1.7.0",
+=======
+    "@tensorflow/tfjs": "link:../tfjs",
+    "@tensorflow/tfjs-core": "link:../tfjs-core",
+>>>>>>> Add the same to node-gpu
     "adm-zip": "^0.4.11",
     "google-protobuf": "^3.9.2",
     "https-proxy-agent": "^2.2.1",
diff --git a/tfjs-node-gpu/yarn.lock b/tfjs-node-gpu/yarn.lock
index c4572d0cea5..1e32ee3b870 100644
--- a/tfjs-node-gpu/yarn.lock
+++ b/tfjs-node-gpu/yarn.lock
@@ -90,45 +90,25 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@tensorflow/tfjs-converter@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.7.0.tgz#4dcfeffa0bfa4e26e8b64e15a24a6683645945cc"
-  integrity sha512-cFXLDKVEjEtFv/C0wETXpIeJNa25chC6nvFm06dB/ShvrGYZpDsGlWVNiCu4v5/VtrSZEQPZ2QdkpTpURbvAqQ==
-
-"@tensorflow/tfjs-core@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf"
-  integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw==
-  dependencies:
-    "@types/offscreencanvas" "~2019.3.0"
-    "@types/seedrandom" "2.4.27"
-    "@types/webgl-ext" "0.0.30"
-    "@types/webgl2" "0.0.4"
-    node-fetch "~2.1.2"
-    seedrandom "2.4.3"
-
-"@tensorflow/tfjs-data@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.7.0.tgz#6b5f91e328d1fdd577bc67b1c800197f34ae3f91"
-  integrity sha512-i3pPpCTN76cVArzQ1vby+YFDcxC7APOTW2NGcHr3VxWf9ZCMgjJv/s2z71U8OHoCzw/lTXYue8/l4j4q+D3PMg==
-  dependencies:
-    "@types/node-fetch" "^2.1.2"
-    node-fetch "~2.1.2"
-
-"@tensorflow/tfjs-layers@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.0.tgz#7d1f7246ac3f6f23d0923b7d69d7a97a0890a35d"
-  integrity sha512-sRdzuPc2CeLSxctqXdLTckvitSBjsjL8H6MSrvrbOfPEckKdAeNpojB0ayM+76Pc3AsS0/AI6F1R2lT9qoH9/g==
-
-"@tensorflow/tfjs@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-1.7.0.tgz#1b9b10240e18c4e6b34e7de76a5db00327210d14"
-  integrity sha512-lN4wSCb/pFFa60R4Ii8Znn+3Q42Ad8bDrqrIPvsxFQYFXd9BSgXXIgizRoSkyMsLVzJokuLLuElHGggF2VNnug==
-  dependencies:
-    "@tensorflow/tfjs-converter" "1.7.0"
-    "@tensorflow/tfjs-core" "1.7.0"
-    "@tensorflow/tfjs-data" "1.7.0"
-    "@tensorflow/tfjs-layers" "1.7.0"
+"@tensorflow/tfjs-converter@link:../tfjs-converter":
+  version "0.0.0"
+  uid ""
+
+"@tensorflow/tfjs-core@link:../tfjs-core":
+  version "0.0.0"
+  uid ""
+
+"@tensorflow/tfjs-data@link:../tfjs-data":
+  version "0.0.0"
+  uid ""
+
+"@tensorflow/tfjs-layers@link:../tfjs-layers":
+  version "0.0.0"
+  uid ""
+
+"@tensorflow/tfjs@link:../tfjs":
+  version "0.0.0"
+  uid ""
 
 "@types/events@*":
   version "3.0.0"

From adfd8c57690a13ab288904018653fcb57db799ea Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Mon, 9 Mar 2020 17:21:44 -0700
Subject: [PATCH 10/16] .

---
 tfjs/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tfjs/package.json b/tfjs/package.json
index 882f947ca73..2e14066cc09 100644
--- a/tfjs/package.json
+++ b/tfjs/package.json
@@ -50,7 +50,7 @@
     "yalc": "~1.0.0-pre.21"
   },
   "scripts": {
-    "build": "yarn link-master && tsc",
+    "build": "yarn link-master && yarn build-core && yarn build-layers && yarn build-converter && yarn build-data && tsc",
     "build-ci": "tsc",
     "build-core": "cd ../tfjs-core && yarn && yarn build",
     "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",

From 225c7339f4013851fb7707c84e3813777f876e00 Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Tue, 10 Mar 2020 10:24:33 -0700
Subject: [PATCH 11/16] .

---
 tfjs-node-gpu/package.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tfjs-node-gpu/package.json b/tfjs-node-gpu/package.json
index 6cffd760ce5..27646f6ec2d 100644
--- a/tfjs-node-gpu/package.json
+++ b/tfjs-node-gpu/package.json
@@ -66,13 +66,8 @@
     "yargs": "^14.2.0"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "@tensorflow/tfjs": "1.7.0",
-    "@tensorflow/tfjs-core": "1.7.0",
-=======
     "@tensorflow/tfjs": "link:../tfjs",
     "@tensorflow/tfjs-core": "link:../tfjs-core",
->>>>>>> Add the same to node-gpu
     "adm-zip": "^0.4.11",
     "google-protobuf": "^3.9.2",
     "https-proxy-agent": "^2.2.1",

From a5cb0e71f450710c0adab7939193c75b7318bad4 Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Tue, 10 Mar 2020 12:25:33 -0700
Subject: [PATCH 12/16] Change to symlink.

---
 tfjs-converter/package.json |  4 ++--
 tfjs-converter/yarn.lock    | 14 +++-----------
 tfjs-data/package.json      |  6 +++---
 tfjs-data/yarn.lock         | 21 ++++++---------------
 tfjs-layers/package.json    |  4 ++--
 tfjs-layers/yarn.lock       | 14 +++-----------
 tfjs-node/yarn.lock         | 36 +++++++++++++++++++++++++++---------
 tfjs/package.json           |  8 ++++----
 8 files changed, 50 insertions(+), 57 deletions(-)

diff --git a/tfjs-converter/package.json b/tfjs-converter/package.json
index 3b1b91fb319..44780c8905f 100644
--- a/tfjs-converter/package.json
+++ b/tfjs-converter/package.json
@@ -15,10 +15,10 @@
   },
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@tensorflow/tfjs-core": "1.7.0"
+    "@tensorflow/tfjs-core": "link:../tfjs-core"
   },
   "devDependencies": {
-    "@tensorflow/tfjs-core": "1.7.0",
+    "@tensorflow/tfjs-core": "link:../tfjs-core",
     "@types/deep-equal": "^1.0.1",
     "@types/jasmine": "~2.8.6",
     "@types/long": "~3.0.32",
diff --git a/tfjs-converter/yarn.lock b/tfjs-converter/yarn.lock
index 591fe3ac687..7e49367c2f0 100644
--- a/tfjs-converter/yarn.lock
+++ b/tfjs-converter/yarn.lock
@@ -55,17 +55,9 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@tensorflow/tfjs-core@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf"
-  integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw==
-  dependencies:
-    "@types/offscreencanvas" "~2019.3.0"
-    "@types/seedrandom" "2.4.27"
-    "@types/webgl-ext" "0.0.30"
-    "@types/webgl2" "0.0.4"
-    node-fetch "~2.1.2"
-    seedrandom "2.4.3"
+"@tensorflow/tfjs-core@link:../tfjs-core":
+  version "0.0.0"
+  uid ""
 
 "@types/deep-equal@^1.0.1":
   version "1.0.1"
diff --git a/tfjs-data/package.json b/tfjs-data/package.json
index 6eb8fa79b30..23869573262 100644
--- a/tfjs-data/package.json
+++ b/tfjs-data/package.json
@@ -12,8 +12,8 @@
   "miniprogram": "dist/miniprogram",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@tensorflow/tfjs-core": "1.7.0",
-    "@tensorflow/tfjs-layers": "1.7.0",
+    "@tensorflow/tfjs-core": "link:../tfjs-core",
+    "@tensorflow/tfjs-layers": "link:../tfjs-layers",
     "@types/jasmine": "~2.5.53",
     "@types/seedrandom": "^2.4.27",
     "@types/utf8": "~2.1.6",
@@ -56,7 +56,7 @@
     "lint": "tslint -p . -t verbose"
   },
   "peerDependencies": {
-    "@tensorflow/tfjs-core": "1.7.0",
+    "@tensorflow/tfjs-core": "link:../tfjs-core",
     "seedrandom": "~2.4.3"
   },
   "dependencies": {
diff --git a/tfjs-data/yarn.lock b/tfjs-data/yarn.lock
index efb821e0115..695892c5b55 100644
--- a/tfjs-data/yarn.lock
+++ b/tfjs-data/yarn.lock
@@ -2,22 +2,13 @@
 # yarn lockfile v1
 
 
-"@tensorflow/tfjs-core@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf"
-  integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw==
-  dependencies:
-    "@types/offscreencanvas" "~2019.3.0"
-    "@types/seedrandom" "2.4.27"
-    "@types/webgl-ext" "0.0.30"
-    "@types/webgl2" "0.0.4"
-    node-fetch "~2.1.2"
-    seedrandom "2.4.3"
+"@tensorflow/tfjs-core@link:../tfjs-core":
+  version "0.0.0"
+  uid ""
 
-"@tensorflow/tfjs-layers@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.0.tgz#7d1f7246ac3f6f23d0923b7d69d7a97a0890a35d"
-  integrity sha512-sRdzuPc2CeLSxctqXdLTckvitSBjsjL8H6MSrvrbOfPEckKdAeNpojB0ayM+76Pc3AsS0/AI6F1R2lT9qoH9/g==
+"@tensorflow/tfjs-layers@link:../tfjs-layers":
+  version "0.0.0"
+  uid ""
 
 "@types/estree@0.0.38":
   version "0.0.38"
diff --git a/tfjs-layers/package.json b/tfjs-layers/package.json
index e1a585d97ca..d79a87c42ef 100644
--- a/tfjs-layers/package.json
+++ b/tfjs-layers/package.json
@@ -12,7 +12,7 @@
   "unpkg": "dist/tf-layers.min.js",
   "miniprogram": "dist/miniprogram",
   "devDependencies": {
-    "@tensorflow/tfjs-core": "1.7.0",
+    "@tensorflow/tfjs-core": "link:../tfjs-core",
     "@types/jasmine": "~2.5.53",
     "clang-format": "~1.2.2",
     "http-server": "~0.10.0",
@@ -57,6 +57,6 @@
     "lint": "tslint -p . -t verbose"
   },
   "peerDependencies": {
-    "@tensorflow/tfjs-core": "1.7.0"
+    "@tensorflow/tfjs-core": "link:../tfjs-core"
   }
 }
diff --git a/tfjs-layers/yarn.lock b/tfjs-layers/yarn.lock
index 45e6f3965cd..ca7da050eae 100644
--- a/tfjs-layers/yarn.lock
+++ b/tfjs-layers/yarn.lock
@@ -2,17 +2,9 @@
 # yarn lockfile v1
 
 
-"@tensorflow/tfjs-core@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf"
-  integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw==
-  dependencies:
-    "@types/offscreencanvas" "~2019.3.0"
-    "@types/seedrandom" "2.4.27"
-    "@types/webgl-ext" "0.0.30"
-    "@types/webgl2" "0.0.4"
-    node-fetch "~2.1.2"
-    seedrandom "2.4.3"
+"@tensorflow/tfjs-core@link:../tfjs-core":
+  version "0.0.0"
+  uid ""
 
 "@types/estree@0.0.38":
   version "0.0.38"
diff --git a/tfjs-node/yarn.lock b/tfjs-node/yarn.lock
index 2f2b7d8da14..75381ed2d5d 100644
--- a/tfjs-node/yarn.lock
+++ b/tfjs-node/yarn.lock
@@ -90,21 +90,39 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@tensorflow/tfjs-converter@link:../tfjs-converter":
-  version "0.0.0"
-  uid ""
+"@tensorflow/tfjs-converter@1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.7.0.tgz#4dcfeffa0bfa4e26e8b64e15a24a6683645945cc"
+  integrity sha512-cFXLDKVEjEtFv/C0wETXpIeJNa25chC6nvFm06dB/ShvrGYZpDsGlWVNiCu4v5/VtrSZEQPZ2QdkpTpURbvAqQ==
+
+"@tensorflow/tfjs-core@1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf"
+  integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw==
+  dependencies:
+    "@types/offscreencanvas" "~2019.3.0"
+    "@types/seedrandom" "2.4.27"
+    "@types/webgl-ext" "0.0.30"
+    "@types/webgl2" "0.0.4"
+    node-fetch "~2.1.2"
+    seedrandom "2.4.3"
 
 "@tensorflow/tfjs-core@link:../tfjs-core":
   version "0.0.0"
   uid ""
 
-"@tensorflow/tfjs-data@link:../tfjs-data":
-  version "0.0.0"
-  uid ""
+"@tensorflow/tfjs-data@1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.7.0.tgz#6b5f91e328d1fdd577bc67b1c800197f34ae3f91"
+  integrity sha512-i3pPpCTN76cVArzQ1vby+YFDcxC7APOTW2NGcHr3VxWf9ZCMgjJv/s2z71U8OHoCzw/lTXYue8/l4j4q+D3PMg==
+  dependencies:
+    "@types/node-fetch" "^2.1.2"
+    node-fetch "~2.1.2"
 
-"@tensorflow/tfjs-layers@link:../tfjs-layers":
-  version "0.0.0"
-  uid ""
+"@tensorflow/tfjs-layers@1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.0.tgz#7d1f7246ac3f6f23d0923b7d69d7a97a0890a35d"
+  integrity sha512-sRdzuPc2CeLSxctqXdLTckvitSBjsjL8H6MSrvrbOfPEckKdAeNpojB0ayM+76Pc3AsS0/AI6F1R2lT9qoH9/g==
 
 "@tensorflow/tfjs@link:../tfjs":
   version "0.0.0"
diff --git a/tfjs/package.json b/tfjs/package.json
index 2e14066cc09..b54472ef77f 100644
--- a/tfjs/package.json
+++ b/tfjs/package.json
@@ -69,9 +69,9 @@
     "test-ci": "./scripts/test-ci.sh"
   },
   "dependencies": {
-    "@tensorflow/tfjs-converter": "1.7.0",
-    "@tensorflow/tfjs-core": "1.7.0",
-    "@tensorflow/tfjs-data": "1.7.0",
-    "@tensorflow/tfjs-layers": "1.7.0"
+    "@tensorflow/tfjs-converter": "link:../tfjs-converter",
+    "@tensorflow/tfjs-core": "link:../tfjs-core",
+    "@tensorflow/tfjs-data": "link:../tfjs-data",
+    "@tensorflow/tfjs-layers": "link:../tfjs-layers"
   }
 }

From 58d0240d6be4d99e96a57cae326dce458a229047 Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Tue, 10 Mar 2020 12:47:36 -0700
Subject: [PATCH 13/16] Add layers to devDependency because file_system_test
 uses it.

---
 tfjs-node/package.json |  1 +
 tfjs-node/yarn.lock    | 36 +++++++++-------------------------
 tfjs/yarn.lock         | 44 ++++++++++++++----------------------------
 3 files changed, 25 insertions(+), 56 deletions(-)

diff --git a/tfjs-node/package.json b/tfjs-node/package.json
index de30f2062e8..25e10a9de00 100644
--- a/tfjs-node/package.json
+++ b/tfjs-node/package.json
@@ -45,6 +45,7 @@
     "upload-windows-addon": "./scripts/build-and-upload-windows-addon.bat"
   },
   "devDependencies": {
+    "@tensorflow/tfjs-layers": "link:../tfjs-layers",
     "@types/jasmine": "~2.8.6",
     "@types/node": "^10.5.1",
     "@types/progress": "^2.0.1",
diff --git a/tfjs-node/yarn.lock b/tfjs-node/yarn.lock
index 75381ed2d5d..2f2b7d8da14 100644
--- a/tfjs-node/yarn.lock
+++ b/tfjs-node/yarn.lock
@@ -90,39 +90,21 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@tensorflow/tfjs-converter@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.7.0.tgz#4dcfeffa0bfa4e26e8b64e15a24a6683645945cc"
-  integrity sha512-cFXLDKVEjEtFv/C0wETXpIeJNa25chC6nvFm06dB/ShvrGYZpDsGlWVNiCu4v5/VtrSZEQPZ2QdkpTpURbvAqQ==
-
-"@tensorflow/tfjs-core@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf"
-  integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw==
-  dependencies:
-    "@types/offscreencanvas" "~2019.3.0"
-    "@types/seedrandom" "2.4.27"
-    "@types/webgl-ext" "0.0.30"
-    "@types/webgl2" "0.0.4"
-    node-fetch "~2.1.2"
-    seedrandom "2.4.3"
+"@tensorflow/tfjs-converter@link:../tfjs-converter":
+  version "0.0.0"
+  uid ""
 
 "@tensorflow/tfjs-core@link:../tfjs-core":
   version "0.0.0"
   uid ""
 
-"@tensorflow/tfjs-data@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.7.0.tgz#6b5f91e328d1fdd577bc67b1c800197f34ae3f91"
-  integrity sha512-i3pPpCTN76cVArzQ1vby+YFDcxC7APOTW2NGcHr3VxWf9ZCMgjJv/s2z71U8OHoCzw/lTXYue8/l4j4q+D3PMg==
-  dependencies:
-    "@types/node-fetch" "^2.1.2"
-    node-fetch "~2.1.2"
+"@tensorflow/tfjs-data@link:../tfjs-data":
+  version "0.0.0"
+  uid ""
 
-"@tensorflow/tfjs-layers@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.0.tgz#7d1f7246ac3f6f23d0923b7d69d7a97a0890a35d"
-  integrity sha512-sRdzuPc2CeLSxctqXdLTckvitSBjsjL8H6MSrvrbOfPEckKdAeNpojB0ayM+76Pc3AsS0/AI6F1R2lT9qoH9/g==
+"@tensorflow/tfjs-layers@link:../tfjs-layers":
+  version "0.0.0"
+  uid ""
 
 "@tensorflow/tfjs@link:../tfjs":
   version "0.0.0"
diff --git a/tfjs/yarn.lock b/tfjs/yarn.lock
index 55102cfcdb1..af47ed96dfc 100644
--- a/tfjs/yarn.lock
+++ b/tfjs/yarn.lock
@@ -2,35 +2,21 @@
 # yarn lockfile v1
 
 
-"@tensorflow/tfjs-converter@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.7.0.tgz#4dcfeffa0bfa4e26e8b64e15a24a6683645945cc"
-  integrity sha512-cFXLDKVEjEtFv/C0wETXpIeJNa25chC6nvFm06dB/ShvrGYZpDsGlWVNiCu4v5/VtrSZEQPZ2QdkpTpURbvAqQ==
-
-"@tensorflow/tfjs-core@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf"
-  integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw==
-  dependencies:
-    "@types/offscreencanvas" "~2019.3.0"
-    "@types/seedrandom" "2.4.27"
-    "@types/webgl-ext" "0.0.30"
-    "@types/webgl2" "0.0.4"
-    node-fetch "~2.1.2"
-    seedrandom "2.4.3"
-
-"@tensorflow/tfjs-data@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.7.0.tgz#6b5f91e328d1fdd577bc67b1c800197f34ae3f91"
-  integrity sha512-i3pPpCTN76cVArzQ1vby+YFDcxC7APOTW2NGcHr3VxWf9ZCMgjJv/s2z71U8OHoCzw/lTXYue8/l4j4q+D3PMg==
-  dependencies:
-    "@types/node-fetch" "^2.1.2"
-    node-fetch "~2.1.2"
-
-"@tensorflow/tfjs-layers@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.0.tgz#7d1f7246ac3f6f23d0923b7d69d7a97a0890a35d"
-  integrity sha512-sRdzuPc2CeLSxctqXdLTckvitSBjsjL8H6MSrvrbOfPEckKdAeNpojB0ayM+76Pc3AsS0/AI6F1R2lT9qoH9/g==
+"@tensorflow/tfjs-converter@link:../tfjs-converter":
+  version "0.0.0"
+  uid ""
+
+"@tensorflow/tfjs-core@link:../tfjs-core":
+  version "0.0.0"
+  uid ""
+
+"@tensorflow/tfjs-data@link:../tfjs-data":
+  version "0.0.0"
+  uid ""
+
+"@tensorflow/tfjs-layers@link:../tfjs-layers":
+  version "0.0.0"
+  uid ""
 
 "@types/estree@0.0.38":
   version "0.0.38"

From 18740d0cdacd2ae2019805a52fed8f937df04e7e Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Tue, 10 Mar 2020 12:59:35 -0700
Subject: [PATCH 14/16] Add layers to devDependency because file_system_test
 uses it.

---
 tfjs-node-gpu/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tfjs-node-gpu/package.json b/tfjs-node-gpu/package.json
index 27646f6ec2d..656d31a1c83 100644
--- a/tfjs-node-gpu/package.json
+++ b/tfjs-node-gpu/package.json
@@ -47,6 +47,7 @@
     "upload-windows-addon": "prep-gpu-windows.bat && ./scripts/build-and-upload-windows-addon-gpu.bat"
   },
   "devDependencies": {
+    "@tensorflow/tfjs-layers": "link:../tfjs-layers",
     "@types/jasmine": "~2.8.6",
     "@types/node": "^10.5.1",
     "@types/progress": "^2.0.1",

From a7e704985b20adaaeb67beb6b2feb36e66d4d117 Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Tue, 10 Mar 2020 13:27:10 -0700
Subject: [PATCH 15/16] Temporarily remove link-master for Node build, because
 it is used to build some bindings.

---
 tfjs-node/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tfjs-node/package.json b/tfjs-node/package.json
index 25e10a9de00..833b6c2850b 100644
--- a/tfjs-node/package.json
+++ b/tfjs-node/package.json
@@ -12,7 +12,7 @@
     "node": ">=8.11.0"
   },
   "scripts": {
-    "build": "yarn link-master && tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
+    "build": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
     "build-ci": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
     "build-core": "cd ../tfjs-core && yarn && yarn build",
     "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",

From 22dccaf1dcdd4ad8aff7827bd77c745f145faae3 Mon Sep 17 00:00:00 2001
From: Na Li <linazhao@google.com>
Date: Tue, 10 Mar 2020 15:18:21 -0700
Subject: [PATCH 16/16] Temporarily remove link-master for Node build, because
 it is used to build some bindings.

---
 tfjs-node-gpu/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tfjs-node-gpu/package.json b/tfjs-node-gpu/package.json
index 656d31a1c83..1c0cda63bfe 100644
--- a/tfjs-node-gpu/package.json
+++ b/tfjs-node-gpu/package.json
@@ -12,7 +12,7 @@
     "node": ">=8.11.0"
   },
   "scripts": {
-    "build": "yarn link-master && tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
+    "build": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
     "build-ci": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js",
     "build-core": "cd ../tfjs-core && yarn && yarn build",
     "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",