Merge branch 'master' into revert-2893-add_visibility

tfjs-converter/cloudbuild.yml

@@ -6,80 +6,40 @@ steps:
   id: 'yarn-common'
   args: ['install']
 
-# Build core from master.
-- name: 'node:10'
-  dir: 'tfjs-converter'
-  id: 'build-core'
-  entrypoint: 'yarn'
-  args: ['build-core-ci']
-  waitFor: ['yarn-common']
-
-# Install converter dependencies.
-- name: 'node:10'
-  dir: 'tfjs-converter'
-  entrypoint: 'yarn'
-  id: 'yarn'
-  args: ['install']
-  waitFor: ['build-core']
-
-# Run lint.
-- name: 'node:10'
-  dir: 'tfjs-converter'
-  entrypoint: 'yarn'
-  id: 'lint'
-  args: ['lint']
-  waitFor: ['yarn']
-
-# Generate json file.
-- name: 'node:10'
-  dir: 'tfjs-converter'
-  entrypoint: 'yarn'
-  id: 'gen-json'
-  args: ['gen-json', '--test']
-  waitFor: ['yarn']
-
-# Build the project.
-- name: 'node:10'
-  dir: 'tfjs-converter'
-  entrypoint: 'yarn'
-  id: 'build'
-  args: ['build-ci']
-  waitFor: ['gen-json']
-
 # Run javascript tests.
 - name: 'node:10'
   dir: 'tfjs-converter'
   entrypoint: 'yarn'
   id: 'test-js'
   args: ['test-ci']
-  waitFor: ['build']
+  waitFor: ['yarn-common']
   env: ['NIGHTLY=$_NIGHTLY']
 
 # Run python tests.
 - name: 'gcr.io/google-appengine/python'
   dir: 'tfjs-converter/python'
   entrypoint: 'bash'
   args: ['./build-pip-package.sh', '--test', '/tmp/tfjs-pips']
-  waitFor: ['yarn']
+  waitFor: ['yarn-common']
 
 - name: 'python:2'
   dir: 'tfjs-converter/python'
   entrypoint: 'bash'
   args: ['./run-python-tests.sh']
-  waitFor: ['yarn']
+  waitFor: ['yarn-common']
 
 - name: 'python:3.6'
   dir: 'tfjs-converter/python'
   entrypoint: 'bash'
   args: ['./run-python-tests.sh']
-  waitFor: ['yarn']
+  waitFor: ['yarn-common']
 
 - name: 'node:10'
   dir: 'tfjs-converter'
   entrypoint: 'yarn'
   id: 'test-snippets'
   args: ['test-snippets']
-  waitFor: ['yarn']
+  waitFor: ['test-js']
 
 timeout: 1800s
 logsBucket: 'gs://tfjs-build-logs'

tfjs-converter/package.json

@@ -54,16 +54,17 @@
     "yalc": "~1.0.0-pre.21"
   },
   "scripts": {
-    "build": "yarn link-master && yarn gen-json --test && tsc",
+    "build": "yarn gen-json --test && 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-deps": "yarn build-core",
+    "build-deps-ci": "yarn build-core-ci",
     "build-npm": "./scripts/build-npm.sh",
     "link-local": "yalc link",
-    "link-master": "../scripts/link-master.js",
     "publish-local": "yarn build-npm && yalc push",
-    "test": "yarn link-master && yarn build-core && yarn && yarn gen-json --test && ts-node run_tests.ts",
-    "test-ci": "ts-node run_tests.ts",
+    "test": "yarn && yarn build-deps && yarn gen-json --test && ts-node run_tests.ts",
+    "test-ci": "yarn && yarn build-deps-ci && yarn build-ci && yarn lint && ts-node run_tests.ts",
     "test-snippets": "ts-node ./scripts/test_snippets.ts",
     "lint": "tslint -p . -t verbose",
     "make-version": "sh -c ./scripts/make-version",

tfjs-data/cloudbuild.yml

@@ -6,61 +6,21 @@ steps:
   id: 'yarn-common'
   args: ['install']
 
-# Build core from master.
-- name: 'node:10'
-  dir: 'tfjs-data'
-  id: 'build-core'
-  entrypoint: 'yarn'
-  args: ['build-core-ci']
-  waitFor: ['yarn-common']
-
-# Build layers from master.
-- name: 'node:10'
-  dir: 'tfjs-data'
-  id: 'build-layers'
-  entrypoint: 'yarn'
-  args: ['build-layers-ci']
-  waitFor: ['build-core']
-
-# Install data dependencies.
-- name: 'node:10'
-  dir: 'tfjs-data'
-  entrypoint: 'yarn'
-  id: 'yarn'
-  args: ['install']
-  waitFor: ['build-layers']
-
-# Run lint.
-- name: 'node:10'
-  dir: 'tfjs-data'
-  entrypoint: 'yarn'
-  id: 'lint'
-  args: ['lint']
-  waitFor: ['yarn']
-
-# Build the project.
-- name: 'node:10'
-  dir: 'tfjs-data'
-  entrypoint: 'yarn'
-  id: 'build'
-  args: ['build-ci']
-  waitFor: ['yarn']
-
 # Run tests in node.
 - name: 'node:10'
   dir: 'tfjs-data'
   entrypoint: 'yarn'
   id: 'test'
-  args: ['test']
-  waitFor: ['build']
+  args: ['test-ci']
+  waitFor: ['yarn-common']
 
 # Run data snippets tests.
 - name: 'node:10'
   dir: 'tfjs-data'
   entrypoint: 'yarn'
   id: 'test-snippets'
   args: ['test-snippets']
-  waitFor: ['build']
+  waitFor: ['test']
 
 timeout: 1800s
 logsBucket: 'gs://tfjs-build-logs'

tfjs-data/package.json

@@ -39,19 +39,20 @@
     "yalc": "^1.0.0-pre.23"
   },
   "scripts": {
-    "build": "yarn link-master && tsc",
+    "build": "tsc",
     "build-ci": "tsc",
     "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-deps": "yarn build-core && yarn build-layers",
+    "build-deps-ci": "yarn build-core-ci && yarn build-layers-ci",
     "build-npm": "./scripts/build-npm.sh",
-    "link-master": "../scripts/link-master.js",
     "link-local": "yalc link",
     "publish-local": "rimraf dist/ && yarn build-npm && yalc push",
-    "test": "yarn link-master && yarn build-core && yarn build-layers && yarn && ts-node src/test_node.ts",
+    "test": "yarn && yarn build-deps && ts-node src/test_node.ts",
     "test-browsers": "karma start --browsers='Chrome,Firefox'",
-    "test-ci": "ts-node src/test_node.ts",
+    "test-ci": "yarn && yarn build-deps-ci && yarn build-ci && yarn lint && ts-node src/test_node.ts",
     "test-snippets": "ts-node ./scripts/test_snippets.ts",
     "lint": "tslint -p . -t verbose"
   },

tfjs-layers/cloudbuild.yml

@@ -5,28 +5,13 @@ steps:
   id: 'yarn-common'
   args: ['install']
 
-# Build core from master.
-- name: 'node:10'
-  dir: 'tfjs-layers'
-  id: 'build-core'
-  entrypoint: 'yarn'
-  args: ['build-core-ci']
-  waitFor: ['yarn-common']
-
-# Install layers dependencies
-- name: 'node:10'
-  dir: 'tfjs-layers'
-  entrypoint: 'yarn'
-  id: 'yarn'
-  args: ['prep']
-  waitFor: ['build-core']
-
+# Run javascript tests
 - name: 'node:10'
   dir: 'tfjs-layers'
   entrypoint: 'yarn'
   id: 'test-browser'
   args: ['test-ci']
-  waitFor: ['yarn']
+  waitFor: ['yarn-common']
   env: ['BROWSERSTACK_USERNAME=deeplearnjs1', 'NIGHTLY=$_NIGHTLY']
   secretEnv: ['BROWSERSTACK_KEY']
 
@@ -44,6 +29,7 @@ steps:
   id: 'tfjs2keras-py'
   args: ['-c', './scripts/tfjs2keras-py.sh --stable && ./scripts/tfjs2keras-py.sh --stable --tfkeras']
   waitFor: ['tfjs2keras-js']
+
 - name: 'node:10'
   dir: 'tfjs-layers'
   entrypoint: 'yarn'

tfjs-layers/package.json

@@ -38,21 +38,22 @@
   },
   "scripts": {
     "prep": "yarn install && yarn build-ci",
-    "build": "yarn link-master && tsc",
+    "build": "tsc",
     "build-ci": "tsc",
     "build-core": "cd ../tfjs-core && yarn && yarn build",
     "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",
+    "build-deps": "yarn build-core",
+    "build-deps-ci": "yarn build-core-ci",
     "build-npm": "./scripts/build-npm.sh",
     "format": "./tools/clang_format_ts.sh",
-    "link-master": "../scripts/link-master.js",
     "link-local": "yalc link",
     "publish-local": "yarn build-npm && yalc push",
-    "test": "yarn link-master && yarn build-core && yarn && karma start",
+    "test": "yarn && yarn build-deps && karma start",
+    "test-ci": "./scripts/test-ci.sh",
+    "test-snippets": "ts-node ./scripts/test_snippets.ts",
     "tfjs2keras": "yarn tfjs2keras-js && yarn tfjs2keras-py --stable && yarn tfjs2keras-py --stable --tfkeras && yarn tfjs2keras-py --dev --tfkeras",
     "tfjs2keras-js": "./scripts/tfjs2keras-js.sh",
     "tfjs2keras-py": "./scripts/tfjs2keras-py.sh",
-    "test-ci": "./scripts/test-ci.sh",
-    "test-snippets": "ts-node ./scripts/test_snippets.ts",
     "run-browserstack": "karma start --browsers='bs_firefox_mac,bs_chrome_mac' --singleRun --reporters='dots,karma-typescript'",
     "lint": "tslint -p . -t verbose"
   },

tfjs-layers/scripts/test-ci.sh

@@ -10,6 +10,8 @@
 set -e
 
 # Regular testing.
+yarn
+yarn build-deps-ci
 yarn build-ci
 yarn lint
 yarn run-browserstack

tfjs-node-gpu/cloudbuild.yml

@@ -13,37 +13,29 @@ steps:
   args: ['install']
   waitFor: ['prep-gpu']
 
-# Install tfjs-node dependencies.
-- name: 'node:10'
-  dir: 'tfjs-node-gpu'
-  entrypoint: 'yarn'
-  id: 'yarn'
-  args: ['install']
-  waitFor: ['yarn-common']
-
 # Unit tests.
 - name: 'node:10'
   dir: 'tfjs-node-gpu'
   entrypoint: 'yarn'
   id: 'test'
   args: ['test-ci']
-  waitFor: ['yarn']
+  waitFor: ['yarn-common']
 
 # Integration test.
 - name: 'node:10'
   dir: 'tfjs-node-gpu'
   entrypoint: 'yarn'
   id: 'test-ts-integration'
   args: ['test-ts-integration']
-  waitFor: ['yarn', 'test']
+  waitFor: ['test']
 
 # CPU / GPU package alignment.
 - name: 'node:10'
   dir: 'tfjs-node-gpu'
   entrypoint: 'yarn'
   id: 'ensure-cpu-gpu-packages-align'
   args: ['ensure-cpu-gpu-packages-align']
-  waitFor: ['yarn', 'test']
+  waitFor: ['test']
 
 timeout: 1800s
 logsBucket: 'gs://tfjs-build-logs'