Merge branch 'master' into fixpf

e2e/benchmarks/browserstack-benchmark/karma.conf.js

@@ -26,7 +26,7 @@ function getBrowserStackConfig() {
     hostname: 'bs-local.com',
     plugins: ['karma-jasmine', 'karma-browserstack-launcher'],
     reporters: ['progress', 'BrowserStack'],
-    port: 9812,
+    port: 9200,
     browserStack: {
       username: process.env.BROWSERSTACK_USERNAME,
       accessKey: process.env.BROWSERSTACK_ACCESS_KEY,

e2e/karma.conf.js

@@ -108,7 +108,7 @@ const browserstackConfig = {
   // breaks WASM file serving.
   // See https://www.browserstack.com/question/39574
   singleRun: true,
-  port: 9876
+  port: 9200
 };
 
 const chromeWebgpuFlags = [

e2e/script_tag_tests/tfjs-core-cpu/karma.conf.js

@@ -43,7 +43,7 @@ module.exports = function(config) {
   };
 
   const browserstackConfig =
-      {...devConfig, hostname: 'bs-local.com', singleRun: true, port: 9811};
+      {...devConfig, hostname: 'bs-local.com', singleRun: true, port: 9200};
 
   if (config.grep) {
     args.push('--grep', config.grep);

e2e/script_tag_tests/tfjs/karma.conf.js

@@ -35,7 +35,7 @@ module.exports = function(config) {
   };
 
   const browserstackConfig =
-      {...devConfig, hostname: 'bs-local.com', singleRun: true, port: 9811};
+      {...devConfig, hostname: 'bs-local.com', singleRun: true, port: 9200};
 
   if (config.grep) {
     args.push('--grep', config.grep);

e2e/scripts/run-browserstack-tests.sh

@@ -39,7 +39,8 @@ if [[ "$NIGHTLY" = true || "$RELEASE" = true ]]; then
   COMMANDS+=(
     "yarn run-browserstack --browsers=bs_ios_12 --tags '$TAGS' --testEnv webgl --flags '{\"\\"\"WEBGL_VERSION\"\\"\": 1, \"\\"\"WEBGL_CPU_FORWARD\"\\"\": false, \"\\"\"WEBGL_SIZE_UPLOAD_UNIFORM\"\\"\": 0}'"
     "yarn run-browserstack --browsers=bs_safari_mac --tags '$TAGS' --testEnv webgl --flags '{\"\\"\"WEBGL_VERSION\"\\"\": 1, \"\\"\"WEBGL_CPU_FORWARD\"\\"\": false, \"\\"\"WEBGL_SIZE_UPLOAD_UNIFORM\"\\"\": 0}'"
-    "yarn run-browserstack --browsers=bs_firefox_mac --tags '$TAGS'"
+    # TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
+    # "yarn run-browserstack --browsers=bs_firefox_mac --tags '$TAGS'"
     "yarn run-browserstack --browsers=bs_android_10 --tags '$TAGS'"
     # Test script tag bundles
     "karma start ./script_tag_tests/tfjs-core-cpu/karma.conf.js --browserstack --browsers=bs_chrome_mac"

tfjs-automl/karma.conf.js

@@ -71,7 +71,7 @@ module.exports = function(config) {
     preprocessors: {'**/*.ts': ['karma-typescript']},
     karmaTypescriptConfig,
     reporters: ['progress', 'karma-typescript'],
-    port: 9866,
+    port: 9200,
     colors: true,
     browsers: ['Chrome'],
     client: {jasmine: {random: false}, args: args},
@@ -82,7 +82,7 @@ module.exports = function(config) {
       tunnelIdentifier:
           `tfjs_automl_${Date.now()}_${Math.floor(Math.random() * 1000)}`
     },
-    captureTimeout: 3e5,
+    captureTimeout: 10 * 1000,
     reportSlowerThan: 500,
     browserNoActivityTimeout: 3e5,
     browserDisconnectTimeout: 3e5,
@@ -94,21 +94,21 @@ module.exports = function(config) {
         browser: 'chrome',
         browser_version: 'latest',
         os: 'OS X',
-        os_version: 'High Sierra'
+        os_version: 'Ventura'
       },
       bs_firefox_mac: {
         base: 'BrowserStack',
         browser: 'firefox',
         browser_version: 'latest',
         os: 'OS X',
-        os_version: 'High Sierra'
+        os_version: 'Ventura'
       },
       bs_safari_mac: {
         base: 'BrowserStack',
         browser: 'safari',
         browser_version: 'latest',
         os: 'OS X',
-        os_version: 'Big Sur'
+        os_version: 'Ventura'
       },
       bs_ios_12: {
         base: 'BrowserStack',

tfjs-automl/package.json

@@ -15,7 +15,7 @@
     "test-node": "tsc && ts-node --transpile-only --skip-ignore --project tsconfig.test.json src/test_node.ts",
     "coverage": "KARMA_COVERAGE=1 karma start --singleRun",
     "run-flaky": "node ../scripts/run_flaky.js",
-    "run-browserstack": "karma start --singleRun --reporters='dots,karma-typescript,BrowserStack' --hostname='bs-local.com'",
+    "run-browserstack": "karma start --singleRun --reporters='dots,karma-typescript,BrowserStack'",
     "test-ci": "./scripts/test-ci.sh",
     "build-npm": "./scripts/build-npm.sh"
   },

tfjs-automl/scripts/test-ci.sh

@@ -27,5 +27,7 @@ yarn run-flaky "yarn run-browserstack --browsers=bs_chrome_mac"
 # Run the rest of the karma tests in parallel. These runs will reuse the
 # already downloaded binary.
 npm-run-all -p -c --aggregate-output \
-  "run-flaky \"yarn run-browserstack --browsers=bs_firefox_mac\"" \
-  "run-flaky \"yarn run-browserstack --browsers=bs_safari_mac  --testEnv webgl1\""
+  "run-flaky \"yarn run-browserstack --browsers=bs_safari_mac --testEnv webgl1\""
+# TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
+# "run-flaky \"yarn run-browserstack --browsers=bs_firefox_mac\"" \
+

tfjs-backend-wasm/BUILD.bazel

@@ -151,7 +151,8 @@ tfjs_web_test(
     ],
     browsers = [
         "bs_chrome_mac",
-        "bs_firefox_mac",
+        # TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
+        # "bs_firefox_mac",
         "bs_safari_mac",
         "bs_ios_12",
         # TODO(mattsoulanille): Fix clipByValue on Android.

tfjs-backend-webgl/BUILD.bazel

@@ -107,7 +107,8 @@ tfjs_web_test(
     ],
     browsers = [
         "bs_chrome_mac",
-        "bs_firefox_mac",
+        # TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
+        # "bs_firefox_mac",
         "bs_android_10",
         "win_10_chrome",
     ],

tfjs-backend-webgpu/karma.conf.js

@@ -67,7 +67,7 @@ module.exports = function(config) {
       require('karma-jasmine-html-reporter'),
     ],
     exclude,
-    port: 9876,
+    port: 9200,
     colors: true,
     autoWatch: false,
     browsers: ['Chrome', 'chrome_webgpu'],

tfjs-core/BUILD.bazel

@@ -111,7 +111,8 @@ tfjs_web_test(
     ],
     browsers = [
         "bs_chrome_mac",
-        "bs_firefox_mac",
+        # TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
+        # "bs_firefox_mac",
         "bs_safari_mac",
         "bs_ios_12",
         "bs_android_10",

tfjs-core/src/BUILD.bazel

@@ -222,7 +222,8 @@ tfjs_web_test(
     name = "worker_test",
     browsers = [
         "bs_chrome_mac",
-        "bs_firefox_mac",
+        # TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
+        # "bs_firefox_mac",
         "bs_safari_mac",
         # Temporarily disabled because BrowserStack does not support loading
         # absolute paths in iOS, which is required for loading the worker.

tfjs-core/src/ops/range_test.ts

@@ -148,4 +148,13 @@ describeWithFlags('range', ALL_ENVS, () => {
     expect(a.dtype).toEqual('int32');
     expect(a.shape).toEqual([3]);
   });
+
+  it('should support large number for int32 dtype', async () => {
+    const length = Math.pow(2, 24) + 10;
+    const a = tf.range(1, length, 1, 'int32');
+    const data = await a.data();
+    expect(data[length - 2]).toEqual(length - 1);
+    expect(a.dtype).toEqual('int32');
+    expect(a.shape).toEqual([length - 1]);
+  });
 });

tfjs-data/karma.conf.js

@@ -27,7 +27,7 @@ module.exports = function(config) {
         {tsconfig: 'tsconfig.json', compilerOptions: {module: 'commonjs'}},
     reporters: ['progress', 'karma-typescript'],
     browsers: ['Chrome'],
-    port: 9876,
+    port: 9200,
     browserStack: {
       username: process.env.BROWSERSTACK_USERNAME,
       accessKey: process.env.BROWSERSTACK_KEY,

tfjs-layers/BUILD.bazel

@@ -51,7 +51,8 @@ tfjs_web_test(
     ],
     browsers = [
         "bs_chrome_mac",
-        "bs_firefox_mac",
+        # TODO(mattSoulanille): Re-enable firefox once it works on browserstack.
+        # "bs_firefox_mac",
         # disabled android test due to training flakiness
         # "bs_android_10",
         "win_10_chrome",

tfjs-layers/karma.conf.js

@@ -56,7 +56,7 @@ module.exports = function(config) {
     karmaTypescriptConfig,
     reporters: ['progress', 'karma-typescript'],
     browsers: ['Chrome'],
-    port: 9846,
+    port: 9200,
     browserStack: {
       username: process.env.BROWSERSTACK_USERNAME,
       accessKey: process.env.BROWSERSTACK_KEY,

tfjs-layers/src/layers/nlp/models/backbone.ts

@@ -25,7 +25,7 @@ import { serialization } from '@tensorflow/tfjs-core';
 import { ContainerArgs } from '../../../engine/container';
 import { LayersModel } from '../../../engine/training';
 import { NotImplementedError } from '../../../errors';
-import { Layer } from '../../../exports_layers';
+import { Embedding } from '../../embeddings';
 
 export class Backbone extends LayersModel {
   /** @nocollapse */
@@ -38,7 +38,7 @@ export class Backbone extends LayersModel {
   /**
    * A `tf.layers.embedding` instance for embedding token ids.
    */
-  get tokenEmbedding(): Layer {
+  get tokenEmbedding(): Embedding {
     throw new NotImplementedError();
   }