From 02bb59c29263b80b8e01f7c3c889c6c984663d3e Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Wed, 4 Aug 2021 15:02:24 -0700 Subject: [PATCH 1/3] Fix browserstack-benchmark build-deps --- .../browserstack-benchmark/package.json | 6 ++-- .../browserstack-benchmark/yarn.lock | 30 ++++++++++++++++++- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/e2e/benchmarks/browserstack-benchmark/package.json b/e2e/benchmarks/browserstack-benchmark/package.json index e9735765b41..e542deaf984 100644 --- a/e2e/benchmarks/browserstack-benchmark/package.json +++ b/e2e/benchmarks/browserstack-benchmark/package.json @@ -27,13 +27,11 @@ "scripts": { "test": "karma start", "test-node": "jasmine app_node_test.js", - "build-deps": "yarn build-core && yarn build-backend-cpu && yarn build-backend-wasm && yarn build-backend-webgl && yarn build-converter && yarn build-layers && yarn build-data && yarn build-tfjs && yarn build-vis", + "build-deps": "yarn build-link-package && yarn build-backend-wasm && yarn build-converter && yarn build-layers && yarn build-data && yarn build-tfjs && yarn build-vis", + "build-link-package": "cd ../../../link-package && yarn build", "build-tfjs": "cd ../../../tfjs && yarn && yarn build && yarn build-npm", - "build-backend-cpu": "cd ../../../tfjs-backend-cpu && yarn && yarn build-npm", "build-backend-wasm": "cd ../../../tfjs-backend-wasm && yarn && yarn build && yarn build-npm", - "build-backend-webgl": "cd ../../../tfjs-backend-webgl && yarn && yarn build && yarn build-npm", "build-converter": "cd ../../../tfjs-converter && yarn && yarn build && yarn build-npm", - "build-core": "cd ../../../tfjs-core && yarn && yarn build && yarn build-npm", "build-data": "cd ../../../tfjs-data && yarn && yarn build", "build-layers": "cd ../../../tfjs-layers && yarn && yarn build && yarn build-npm", "build-vis": "cd ../../../tfjs-vis && yarn && yarn build", diff --git a/e2e/benchmarks/browserstack-benchmark/yarn.lock b/e2e/benchmarks/browserstack-benchmark/yarn.lock index 9c7ee6147a0..81807223429 100644 --- a/e2e/benchmarks/browserstack-benchmark/yarn.lock +++ b/e2e/benchmarks/browserstack-benchmark/yarn.lock @@ -320,6 +320,9 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= +"@tensorflow/tfjs-backend-cpu@link:../../../link-package/node_modules/@tensorflow/link-package/node_modules/@tensorflow/tfjs-backend-cpu": + version "0.0.0" + "@tensorflow/tfjs-backend-cpu@link:../../../link-package/node_modules/@tensorflow/tfjs-backend-cpu": version "0.0.0" uid "" @@ -396,6 +399,26 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.3.tgz#c01c1a215721f6dec71b47d88b4687463601ba48" integrity sha512-GKM4FLMkWDc0sfx7tXqPWkM6NBow1kge0fgQh0bOnlqo4iT1kvTvMEKE0c1RtUGnbLlGRXiAA8SumE//90uKAg== +"@types/offscreencanvas@~2019.3.0": + version "2019.3.0" + resolved "https://registry.yarnpkg.com/@types/offscreencanvas/-/offscreencanvas-2019.3.0.tgz#3336428ec7e9180cf4566dfea5da04eb586a6553" + integrity sha512-esIJx9bQg+QYF0ra8GnvfianIY8qWB0GBx54PK5Eps6m+xTj86KLavHv6qDhzKcu5UUOgNfJ2pWaIIV7TRUd9Q== + +"@types/seedrandom@2.4.27": + version "2.4.27" + resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-2.4.27.tgz#9db563937dd86915f69092bc43259d2f48578e41" + integrity sha1-nbVjk33YaRX2kJK8QyWdL0hXjkE= + +"@types/webgl-ext@0.0.30": + version "0.0.30" + resolved "https://registry.yarnpkg.com/@types/webgl-ext/-/webgl-ext-0.0.30.tgz#0ce498c16a41a23d15289e0b844d945b25f0fb9d" + integrity sha512-LKVgNmBxN0BbljJrVUwkxwRYqzsAEPcZOe6S2T6ZaBDIrFp0qu4FNlpc5sM1tGbXUYFgdVQIoeLk1Y1UoblyEg== + +"@types/webgl2@0.0.5": + version "0.0.5" + resolved "https://registry.yarnpkg.com/@types/webgl2/-/webgl2-0.0.5.tgz#dd925e20ab8ace80eb4b1e46fda5b109c508fb0d" + integrity sha512-oGaKsBbxQOY5+aJFV3KECDhGaXt+yZJt2y/OZsnQGLRkH6Fvr7rv4pCt3SRH1somIHfej/c4u7NSpCyd9x+1Ow== + accepts@~1.3.4: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -1616,7 +1639,7 @@ log4js@^4.0.0: rfdc "^1.1.4" streamroller "^1.0.6" -long@^4.0.0: +long@4.0.0, long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== @@ -1995,6 +2018,11 @@ safe-buffer@~5.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +seedrandom@2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.3.tgz#2438504dad33917314bff18ac4d794f16d6aaecc" + integrity sha1-JDhQTa0zkXMUv/GKxNeU8W1qrsw= + semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" From 306453946b4f2f3076931b0297e83f7ef661fe18 Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 5 Aug 2021 09:08:45 -0700 Subject: [PATCH 2/3] Add @bazel/bazelisk to tflite --- tfjs-tflite/package.json | 3 ++- tfjs-tflite/yarn.lock | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/tfjs-tflite/package.json b/tfjs-tflite/package.json index 135ba2f0521..fe1159d1b3c 100644 --- a/tfjs-tflite/package.json +++ b/tfjs-tflite/package.json @@ -22,11 +22,12 @@ "@babel/core": "7.13.14", "@babel/plugin-transform-runtime": "^7.13.10", "@babel/polyfill": "^7.8.7", + "@bazel/bazelisk": "^1.10.1", "@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-node-resolve": "^11.2.1", "@rollup/plugin-typescript": "^3.0.0", - "@tensorflow/tfjs-core": "link:../link-package/node_modules/@tensorflow/tfjs-core", "@tensorflow/tfjs-backend-cpu": "link:../link-package/node_modules/@tensorflow/tfjs-backend-cpu", + "@tensorflow/tfjs-core": "link:../link-package/node_modules/@tensorflow/tfjs-core", "@types/jasmine": "~3.6.9", "clang-format": "~1.5.0", "jasmine": "~3.7.0", diff --git a/tfjs-tflite/yarn.lock b/tfjs-tflite/yarn.lock index c06c051c9c7..c9b313c76d5 100644 --- a/tfjs-tflite/yarn.lock +++ b/tfjs-tflite/yarn.lock @@ -851,6 +851,11 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" +"@bazel/bazelisk@^1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@bazel/bazelisk/-/bazelisk-1.10.1.tgz#46236a43ad58e310c55247f866da0dc6083c3d8b" + integrity sha512-IHszNzBO2UrUy6YtsSAsZtnU6I6qpzXGkWdEvGoMxLgJnDsEnsIYniDCUjvjU1KAP+A03eepmCHlyFcRHMSxRA== + "@istanbuljs/schema@^0.1.2": version "0.1.3" resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" @@ -936,11 +941,21 @@ resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.9.tgz#8785870f87839b7d91b45d7b226380f28dee5d9f" integrity sha512-B53NIwMj/AO0O+xfSWLYmKB0Mo6TYxfv2Mk8/c1T2w/e38t55iaPR6p7pHXTTtqfTmevPK3i8T1YweYFTZlxDw== +"@types/long@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" + integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== + "@types/node@*", "@types/node@>=10.0.0": version "14.14.37" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e" integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw== +"@types/offscreencanvas@~2019.3.0": + version "2019.3.0" + resolved "https://registry.yarnpkg.com/@types/offscreencanvas/-/offscreencanvas-2019.3.0.tgz#3336428ec7e9180cf4566dfea5da04eb586a6553" + integrity sha512-esIJx9bQg+QYF0ra8GnvfianIY8qWB0GBx54PK5Eps6m+xTj86KLavHv6qDhzKcu5UUOgNfJ2pWaIIV7TRUd9Q== + "@types/resolve@1.17.1": version "1.17.1" resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" @@ -948,6 +963,16 @@ dependencies: "@types/node" "*" +"@types/seedrandom@2.4.27": + version "2.4.27" + resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-2.4.27.tgz#9db563937dd86915f69092bc43259d2f48578e41" + integrity sha1-nbVjk33YaRX2kJK8QyWdL0hXjkE= + +"@types/webgl-ext@0.0.30": + version "0.0.30" + resolved "https://registry.yarnpkg.com/@types/webgl-ext/-/webgl-ext-0.0.30.tgz#0ce498c16a41a23d15289e0b844d945b25f0fb9d" + integrity sha512-LKVgNmBxN0BbljJrVUwkxwRYqzsAEPcZOe6S2T6ZaBDIrFp0qu4FNlpc5sM1tGbXUYFgdVQIoeLk1Y1UoblyEg== + accepts@~1.3.4: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -2509,6 +2534,11 @@ log4js@^6.2.1, log4js@^6.3.0: rfdc "^1.1.4" streamroller "^2.2.4" +long@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== + magic-string@^0.25.2, magic-string@^0.25.7: version "0.25.7" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" @@ -2631,6 +2661,11 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +node-fetch@~2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + node-releases@^1.1.70: version "1.1.71" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" @@ -3037,6 +3072,11 @@ safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +seedrandom@2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.3.tgz#2438504dad33917314bff18ac4d794f16d6aaecc" + integrity sha1-JDhQTa0zkXMUv/GKxNeU8W1qrsw= + semver@7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" From 6c5e9ac04d1cfe155120e3e265c88a2e2865976e Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Tue, 12 Oct 2021 12:31:13 -0700 Subject: [PATCH 3/3] [e2e] Fix browserstack-benchmark build script --- e2e/benchmarks/browserstack-benchmark/package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/e2e/benchmarks/browserstack-benchmark/package.json b/e2e/benchmarks/browserstack-benchmark/package.json index e542deaf984..b4fda1e8e4f 100644 --- a/e2e/benchmarks/browserstack-benchmark/package.json +++ b/e2e/benchmarks/browserstack-benchmark/package.json @@ -27,13 +27,11 @@ "scripts": { "test": "karma start", "test-node": "jasmine app_node_test.js", - "build-deps": "yarn build-link-package && yarn build-backend-wasm && yarn build-converter && yarn build-layers && yarn build-data && yarn build-tfjs && yarn build-vis", + "build-deps": "yarn build-link-package && yarn build-data && yarn build-tfjs && yarn build-vis", "build-link-package": "cd ../../../link-package && yarn build", "build-tfjs": "cd ../../../tfjs && yarn && yarn build && yarn build-npm", "build-backend-wasm": "cd ../../../tfjs-backend-wasm && yarn && yarn build && yarn build-npm", - "build-converter": "cd ../../../tfjs-converter && yarn && yarn build && yarn build-npm", "build-data": "cd ../../../tfjs-data && yarn && yarn build", - "build-layers": "cd ../../../tfjs-layers && yarn && yarn build && yarn build-npm", "build-vis": "cd ../../../tfjs-vis && yarn && yarn build", "run-cloud-benchmarks": "node app.js --benchmark='./preconfigured_browser.json' --webDeps --cloud --maxBenchmarks=9 --firestore" },