Merge branch 'master' into patch-4

Author: pabloegpf1

.gitignore

@@ -28,6 +28,7 @@ tfjs-layers/integration_tests/tfjs2keras/test-data/
 tfjs-layers/integration/typescript/yarn.lock
 e2e/integration_tests/create_save_predict_data
 e2e/integration_tests/convert_predict_data
+e2e/integration_tests/metadata
 e2e/scripts/storage
 e2e/scripts/htpasswd
 e2e/benchmarks/browserstack-benchmark/browsers.json
@@ -58,3 +59,4 @@ tfjs-backend-wasm/wasm-out/*.js
 tfjs-backend-wasm/wasm-out/*.wasm
 yalc.lock
 yarn-error.log
+cloudbuild_generated.yml

cloudbuild.yml

@@ -5,138 +5,25 @@ steps:
   id: 'yarn'
   args: ['install']
 
-# Run find-affected-packages to find affected files in each folder.
+# Generate cloudbuild_generated.yml,
+# which builds and tests all affected packages.
 - name: 'node:10'
   entrypoint: 'yarn'
-  id: 'find-affected-packages'
-  args: ['find-affected-packages']
+  id: 'generate-cloudbuild-for-packages'
+  args: ['generate-cloudbuild-for-packages']
   waitFor: ['yarn']
   env:
   - 'COMMIT_SHA=$COMMIT_SHA'
   - 'BRANCH_NAME=$BRANCH_NAME'
   - 'BASE_BRANCH=$_BASE_BRANCH'
+  - 'NIGHTLY=$_NIGHTLY'
 
-# Core.
+# Run the generated cloudbuild file
 - name: 'gcr.io/cloud-builders/gcloud'
   entrypoint: 'bash'
-  id: 'tfjs-core'
-  args: ['./scripts/run-build.sh', 'tfjs-core']
-  waitFor: ['find-affected-packages']
-  env: ['NIGHTLY=$_NIGHTLY']
-
-# CPU backend.
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs-backend-cpu'
-  args: ['./scripts/run-build.sh', 'tfjs-backend-cpu']
-  waitFor: ['find-affected-packages']
-  env: ['NIGHTLY=$_NIGHTLY']
-
-# Webgl backend.
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs-backend-webgl'
-  args: ['./scripts/run-build.sh', 'tfjs-backend-webgl']
-  waitFor: ['find-affected-packages']
-  env: ['NIGHTLY=$_NIGHTLY']
-
-# Converter.
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs-converter'
-  args: ['./scripts/run-build.sh', 'tfjs-converter']
-  waitFor: ['find-affected-packages']
-  env: ['NIGHTLY=$_NIGHTLY']
-
-# Data.
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs-data'
-  args: ['./scripts/run-build.sh', 'tfjs-data']
-  waitFor: ['find-affected-packages']
-  env: ['NIGHTLY=$_NIGHTLY']
-
-# Layers.
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs-layers'
-  args: ['./scripts/run-build.sh', 'tfjs-layers']
-  waitFor: ['find-affected-packages']
-  env: ['NIGHTLY=$_NIGHTLY']
-
-# Union.
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs'
-  args: ['./scripts/run-build.sh', 'tfjs']
-  waitFor: ['find-affected-packages']
-
-# Vis.
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs-vis'
-  args: ['./scripts/run-build.sh', 'tfjs-vis']
-  waitFor: ['find-affected-packages']
-
-# WebGPU.
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs-backend-webgpu'
-  args: ['./scripts/run-build.sh', 'tfjs-backend-webgpu']
-  waitFor: ['find-affected-packages']
-
-# WASM.
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs-backend-wasm'
-  args: ['./scripts/run-build.sh', 'tfjs-backend-wasm']
-  waitFor: ['find-affected-packages']
-  env: ['NIGHTLY=$_NIGHTLY']
-
-# React Native.
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs-react-native'
-  args: ['./scripts/run-build.sh', 'tfjs-react-native']
-  waitFor: ['find-affected-packages']
-
-# Node CPU.
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs-node'
-  args: ['./scripts/run-build.sh', 'tfjs-node']
-  waitFor: ['find-affected-packages']
-  env: ['NIGHTLY=$_NIGHTLY']
-
-# Node GPU.
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs-node-gpu'
-  args: ['./scripts/run-build.sh', 'tfjs-node-gpu']
-  waitFor: ['find-affected-packages']
-  env: ['NIGHTLY=$_NIGHTLY']
-
-# Release notes test
-- name: 'node:10'
-  id: 'test-monorepo'
-  entrypoint: 'yarn'
-  args: ['test-release-notes']
-  waitFor: ['yarn']
-
-# E2E test
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'e2e'
-  args: ['./scripts/run-build.sh', 'e2e']
-  waitFor: ['find-affected-packages']
-  env: ['NIGHTLY=$_NIGHTLY']
-
-# Inference API
-- name: 'gcr.io/cloud-builders/gcloud'
-  entrypoint: 'bash'
-  id: 'tfjs-inference'
-  args: ['scripts/run-build.sh', 'tfjs-inference']
-  waitFor: ['find-affected-packages']
+  id: 'run-cloudbuild'
+  args: ['./scripts/run-build.sh']
+  waitFor: ['generate-cloudbuild-for-packages']
   env: ['NIGHTLY=$_NIGHTLY']
 
 # General settings.

e2e/cloudbuild.yml

@@ -14,15 +14,28 @@ steps:
   id: 'build-deps'
   args: ['build-deps-ci']
 
+# Build tfjs-node.
+# This is a workaround for CI runs, which don't run
+# build-deps. For some reason, there's an N-API mismatch
+# between the tfjs-node node bindings and this image's
+# node version. Rebuilding the bindings with e2e's node
+# version fixes the problem and adds ~8 seconds to build time.
+# TODO(mattsoulanille): Fix the N-API issue and remove this step.
+- name: 'gcr.io/learnjs-174218/release'
+  dir: 'e2e'
+  entrypoint: 'yarn'
+  id: 'build-node'
+  args: ['build-node-ci']
+
 # Test.
 - name: 'gcr.io/learnjs-174218/release'
   dir: 'e2e'
   entrypoint: 'yarn'
   id: 'test'
   args: ['test-ci']
   env: ['BROWSERSTACK_USERNAME=deeplearnjs1', 'NIGHTLY=$_NIGHTLY']
-
   secretEnv: ['BROWSERSTACK_KEY']
+  waitFor: ['yarn', 'build-deps']
 
 secrets:
 - kmsKeyName: projects/learnjs-174218/locations/global/keyRings/tfjs/cryptoKeys/enc

e2e/custom_bundle/blazeface/app_tfjs_config.json

@@ -3,7 +3,7 @@
         "Cast",
         "Reshape",
         "ResizeBilinear",
-        "Div",
+        "RealDiv",
         "Sub",
         "Multiply",
         "FusedConv2D",

e2e/custom_bundle/blazeface/custom_tfjs_blazeface/custom_tfjs.js

@@ -15,7 +15,7 @@
  * =============================================================================
  */
 
- // This file is autogenerated.
+// This file is autogenerated.
 
 
 import {registerKernel} from '@tensorflow/tfjs-core/dist/base';
@@ -31,8 +31,8 @@ import {reshapeConfig as Reshape_wasm} from '@tensorflow/tfjs-backend-wasm/dist/
 registerKernel(Reshape_wasm);
 import {resizeBilinearConfig as ResizeBilinear_wasm} from '@tensorflow/tfjs-backend-wasm/dist/kernels/ResizeBilinear';
 registerKernel(ResizeBilinear_wasm);
-import {divConfig as Div_wasm} from '@tensorflow/tfjs-backend-wasm/dist/kernels/Div';
-registerKernel(Div_wasm);
+import {realDivConfig as RealDiv_wasm} from '@tensorflow/tfjs-backend-wasm/dist/kernels/RealDiv';
+registerKernel(RealDiv_wasm);
 import {subConfig as Sub_wasm} from '@tensorflow/tfjs-backend-wasm/dist/kernels/Sub';
 registerKernel(Sub_wasm);
 import {multiplyConfig as Multiply_wasm} from '@tensorflow/tfjs-backend-wasm/dist/kernels/Multiply';

e2e/custom_bundle/blazeface/custom_tfjs_blazeface/custom_tfjs_core.js

@@ -15,7 +15,7 @@
  * =============================================================================
  */
 
- // This file is autogenerated.
+// This file is autogenerated.
 
 
 import {registerKernel} from '@tensorflow/tfjs-core/dist/base';

e2e/custom_bundle/blazeface/model.json

@@ -2,50 +2,48 @@
     "format": "graph-model",
     "generatedBy": "1.15.0",
     "convertedBy": "TensorFlow.js Converter v1.3.2",
-    "userDefinedMetadata": {
-        "signature": {
-            "inputs": {
-                "input:0": {
-                    "name": "input:0",
-                    "dtype": "DT_FLOAT",
-                    "tensorShape": {
-                        "dim": [
-                            {
-                                "size": "-1"
-                            },
-                            {
-                                "size": "128"
-                            },
-                            {
-                                "size": "128"
-                            },
-                            {
-                                "size": "3"
-                            }
-                        ]
-                    }
-                }
-            },
-            "outputs": {
-                "Identity:0": {
-                    "name": "Identity:0",
-                    "dtype": "DT_FLOAT",
-                    "tensorShape": {
-                        "dim": [
-                            {
-                                "size": "-1"
-                            },
-                            {
-                                "size": "-1"
-                            },
-                            {
-                                "size": "17"
-                            }
-                        ]
-                    }
-                }
-            }
-        }
+    "signature": {
+      "inputs": {
+          "input:0": {
+              "name": "input:0",
+              "dtype": "DT_FLOAT",
+              "tensorShape": {
+                  "dim": [
+                      {
+                          "size": "-1"
+                      },
+                      {
+                          "size": "128"
+                      },
+                      {
+                          "size": "128"
+                      },
+                      {
+                          "size": "3"
+                      }
+                  ]
+              }
+          }
+      },
+      "outputs": {
+          "Identity:0": {
+              "name": "Identity:0",
+              "dtype": "DT_FLOAT",
+              "tensorShape": {
+                  "dim": [
+                      {
+                          "size": "-1"
+                      },
+                      {
+                          "size": "-1"
+                      },
+                      {
+                          "size": "17"
+                      }
+                  ]
+              }
+          }
+      }
     },
     "modelTopology": {
         "node": [
@@ -5473,4 +5471,4 @@
             ]
         }
     ]
-}
+}

e2e/custom_bundle/dense_model/custom_tfjs/custom_tfjs.js

@@ -15,7 +15,7 @@
  * =============================================================================
  */
 
- // This file is autogenerated.
+// This file is autogenerated.
 
 
 import {registerKernel} from '@tensorflow/tfjs-core/dist/base';

e2e/custom_bundle/dense_model/custom_tfjs/custom_tfjs_core.js

@@ -15,7 +15,7 @@
  * =============================================================================
  */
 
- // This file is autogenerated.
+// This file is autogenerated.
 
 
 import {registerKernel} from '@tensorflow/tfjs-core/dist/base';