Merge remote-tracking branch 'origin' into exportsobj

Author: Nikhil Thorat

.gitignore

@@ -43,6 +43,7 @@ package-lock.json
 release-notes.md
 tensorflow-tfjs-*.tgz
 tfjs-backend-wasm/dist
-tfjs-backend-wasm/wasm-out
+tfjs-backend-wasm/wasm-out/*.js
+tfjs-backend-wasm/wasm-out/*.wasm
 yalc.lock
 yarn-error.log

CONTRIBUTING.md

@@ -23,7 +23,7 @@ use GitHub pull requests for this purpose. Consult
 information on using pull requests.
 
 ## Continuous Integration
-Continuous Integration tests run for every PR that is sent against TensorFlow.js repositories. Any time you push to the branch, they will re-run. Before asking for a review, make sure that the continous integration tests are passing.
+Continuous Integration tests run for every PR that is sent against TensorFlow.js repositories. Any time you push to the branch, they will re-run. Before asking for a review, make sure that the continuous integration tests are passing.
 
 To see the logs from the Cloud Build CI, please join either
 our [discussion](https://groups.google.com/a/tensorflow.org/forum/#!forum/tfjs)
@@ -67,7 +67,7 @@ add new backends.
 ### Adding an op
 
 When adding ops to the library and deciding whether to write a kernel
-implementation in [backend.ts](https://github.com/tensorflow/tfjs-core/blob/master/src/backends/backend.ts),
+implementation in [backend.ts](/tfjs-core/src/backends/backend.ts),
 be sure to check out the TensorFlow ops list [here](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/core/ops/ops.pbtxt).
 This list shows the kernels available for the TensorFlow C API. To ensure that
 we can bind to this with node.js, we should ensure that our backend.ts

README.md

@@ -23,20 +23,20 @@ other client-side data.
 
 This repository contains the logic and scripts that combine
 four packages:
-- [TensorFlow.js Core](https://github.com/tensorflow/tfjs-core),
+- [TensorFlow.js Core](/tfjs-core),
   a flexible low-level API, formerly known as *deeplearn.js*.
-- [TensorFlow.js Layers](https://github.com/tensorflow/tfjs-layers),
+- [TensorFlow.js Layers](/tfjs-layers),
   a high-level API which implements functionality similar to
   [Keras](https://keras.io/).
-- [TensorFlow.js Data](https://github.com/tensorflow/tfjs-data),
+- [TensorFlow.js Data](/tfjs-data),
   a simple API to load and prepare data analogous to
   [tf.data](https://www.tensorflow.org/guide/datasets).
-- [TensorFlow.js Converter](https://github.com/tensorflow/tfjs-converter),
+- [TensorFlow.js Converter](/tfjs-converter),
   tools to import a TensorFlow SavedModel to TensorFlow.js
 
 If you care about bundle size, you can import those packages individually.
 
-If you are looking for Node.js support, check out the [TensorFlow.js Node repository](https://github.com/tensorflow/tfjs-node).
+If you are looking for Node.js support, check out the [TensorFlow.js Node directory](/tfjs-node).
 
 ## Examples
 

cloudbuild.yml

@@ -64,6 +64,13 @@ steps:
   args: ['./scripts/run-build.sh', 'tfjs-backend-webgpu']
   waitFor: ['diff']
 
+# WASM.
+- name: 'gcr.io/cloud-builders/gcloud'
+  entrypoint: 'bash'
+  id: 'tfjs-backend-wasm'
+  args: ['./scripts/run-build.sh', 'tfjs-backend-wasm']
+  waitFor: ['diff']
+
 # React Native.
 - name: 'gcr.io/cloud-builders/gcloud'
   entrypoint: 'bash'

package.json

@@ -1,7 +1,9 @@
 {
   "devDependencies": {
-    "clang-format": "~1.2.4",
+    "@types/node": "^12.7.5",
+    "argparse": "^1.0.10",
     "chalk": "~2.4.2",
+    "clang-format": "~1.2.4",
     "shelljs": "~0.8.3",
     "ts-node": "~4.1.0",
     "tslint": "~5.20.0",

scripts/release.ts

@@ -31,6 +31,7 @@ import * as readline from 'readline';
 import * as shell from 'shelljs';
 import * as fs from 'fs';
 import chalk from 'chalk';
+import * as argparse from 'argparse';
 
 interface Phase {
   // The list of packages that will be updated with this change.
@@ -87,6 +88,13 @@ const PHASES: Phase[] = [
 
 const TMP_DIR = '/tmp/tfjs-release';
 
+const parser = new argparse.ArgumentParser();
+
+parser.addArgument('--git-protocol', {
+  action: 'storeTrue',
+  help: 'Use the git protocal rather than the http protocol when cloning repos.'
+});
+
 function printPhase(phaseId: number) {
   const phase = PHASES[phaseId];
   console.log(chalk.green(`Phase ${phaseId}:`));
@@ -104,6 +112,8 @@ function getPatchUpdateVersion(version: string): string {
 }
 
 async function main() {
+  const args = parser.parseArgs();
+
   PHASES.forEach((_, i) => printPhase(i));
   console.log();
 
@@ -131,11 +141,13 @@ async function main() {
   $(`rm -f -r ${dir}`);
   $(`mkdir ${dir}`);
 
+  const urlBase = args.git_protocol ? '[email protected]:' : 'https://github.com/';
+
   if (phase.repo != null) {
-    $(`git clone https://github.com/tensorflow/${phase.repo} ${dir} --depth=1`);
+    $(`git clone ${urlBase}tensorflow/${phase.repo} ${dir} --depth=1`);
     shell.cd(dir);
   } else {
-    $(`git clone https://github.com/tensorflow/tfjs ${dir} --depth=1`);
+    $(`git clone ${urlBase}tensorflow/tfjs ${dir} --depth=1`);
     shell.cd(dir);
   }
 

tfjs-automl/README.md

@@ -109,7 +109,7 @@ Make sure you can access those files as static assets from your web app by servi
 ### Demo
 
 The object detection demo lives in
-[demo/object_classification](./demo/object_classification). To run it:
+[demo/object_detection](./demo/object_detection). To run it:
 
 ```sh
 cd demo/object_detection

tfjs-automl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tensorflow/tfjs-automl",
-  "version": "0.0.1-alpha.1",
+  "version": "0.0.1-alpha.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/tf-automl.esm.js",

tfjs-automl/src/img_classification_test.ts

@@ -17,6 +17,7 @@
 
 import {GraphModel} from '@tensorflow/tfjs-converter';
 import * as tf from '@tensorflow/tfjs-core';
+// tslint:disable-next-line: no-imports-from-dist
 import {BROWSER_ENVS, describeWithFlags} from '@tensorflow/tfjs-core/dist/jasmine_util';
 
 import * as automl from './index';

tfjs-automl/src/object_detection_test.ts

@@ -17,6 +17,7 @@
 
 import {GraphModel} from '@tensorflow/tfjs-converter';
 import * as tf from '@tensorflow/tfjs-core';
+// tslint:disable-next-line: no-imports-from-dist
 import {BROWSER_ENVS, describeWithFlags} from '@tensorflow/tfjs-core/dist/jasmine_util';
 
 import * as automl from './index';