From b7cd69134c46154b0968942247cf9cc0a83db1e8 Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Wed, 27 Oct 2021 13:07:13 -0700 Subject: [PATCH 01/16] Add global lint script --- package.json | 1 + tsconfig.json | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c95003f8c12..cce3ea28648 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,7 @@ "typescript": "3.5.3" }, "scripts": { + "lint": "tslint -p .", "test-packages-ci": "yarn generate-cloudbuild-for-packages && ./scripts/run-build.sh", "generate-cloudbuild-for-packages": "./scripts/generate_cloudbuild_for_packages.js", "test-generate-cloudbuild": "jasmine run scripts/generate_cloudbuild_test.js", diff --git a/tsconfig.json b/tsconfig.json index 211d7f2e278..178ba7f2c6e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -36,9 +36,11 @@ ] }, "include": [ - "src/" + "**/src/" ], "exclude": [ + "bazel-out/", + "dist/", "node_modules/" ] } From 1b159f14724eb1938ebb16d25c4d5217b6bfea3c Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Wed, 27 Oct 2021 13:33:26 -0700 Subject: [PATCH 02/16] Omit non-bazel packages from repo-wide lint --- tsconfig.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 178ba7f2c6e..2f07a01044c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -39,8 +39,17 @@ "**/src/" ], "exclude": [ - "bazel-out/", - "dist/", - "node_modules/" + "bazel-out", + "dist", + "tfjs", + "tfjs-automl", + "tfjs-backend-nodegl", + "tfjs-backend-wasm", + "tfjs-backend-webgpu", + "tfjs-node", + "tfjs-node-gpu", + "tfjs-react-native", + "tfjs-vis", + "node_modules" ] } From 94fc46f68075f844663d56adc4a4cc5d6d4de8fb Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 28 Oct 2021 14:23:19 -0700 Subject: [PATCH 03/16] Lint Bazel packages with a global lint script --- package.json | 4 ++-- tsconfig_tslint.json | 46 ++++++++++++++++++++++++++++++++++++++++++++ yarn.lock | 24 +++++------------------ 3 files changed, 53 insertions(+), 21 deletions(-) create mode 100644 tsconfig_tslint.json diff --git a/package.json b/package.json index cce3ea28648..b34ffccf6b4 100644 --- a/package.json +++ b/package.json @@ -55,12 +55,12 @@ "terser": "^5.7.0", "ts-morph": "^11.0.3", "ts-node": "~8.8.2", - "tslint": "~6.1.3", + "tslint": "^6.1.3", "tslint-no-circular-imports": "~0.7.0", "typescript": "3.5.3" }, "scripts": { - "lint": "tslint -p .", + "lint": "tslint -p tsconfig_tslint.json", "test-packages-ci": "yarn generate-cloudbuild-for-packages && ./scripts/run-build.sh", "generate-cloudbuild-for-packages": "./scripts/generate_cloudbuild_for_packages.js", "test-generate-cloudbuild": "jasmine run scripts/generate_cloudbuild_test.js", diff --git a/tsconfig_tslint.json b/tsconfig_tslint.json new file mode 100644 index 00000000000..eab4466b8d2 --- /dev/null +++ b/tsconfig_tslint.json @@ -0,0 +1,46 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./tsc-dist", + "baseUrl": ".", + "paths": { + "@tensorflow/tfjs-backend-cpu": ["tfjs-backend-cpu/src/index.ts"], + "@tensorflow/tfjs-backend-cpu/dist/*": ["tfjs-backend-cpu/src/*"], + "@tensorflow/tfjs-backend-webgl": ["tfjs-backend-webgl/src/index.ts"], + "@tensorflow/tfjs-backend-webgl/dist/*": ["tfjs-backend-webgl/src/*"], + "@tensorflow/tfjs-converter": ["tfjs-converter/src/index.ts"], + "@tensorflow/tfjs-converter/dist/*": ["tfjs-converter/src/*"], + "@tensorflow/tfjs-core": ["tfjs-core/src/index.ts"], + "@tensorflow/tfjs-core/dist/*": ["tfjs-core/src/*"], + "@tensorflow/tfjs-layers": ["tfjs-layers/src/index.ts"], + "@tensorflow/tfjs-layers/dist/*": ["tfjs-layers/src/*"], + "@tensorflow/tfjs-tflite": ["tfjs-tflite/src/index.ts"], + "@tensorflow/tfjs-tflite/dist/*": ["tfjs-tflite/src/*"] + }, + "rootDirs": [ + ".", + "dist/bin/" + ] + }, + "include": [ + "**/src", + ], + "exclude": [ + "**/dist", + "bazel-out", + "dist", + "link-package", + "link-package-core", + "node_modules", + "tfjs-backend-nodegl", + "tfjs-backend-wasm", + "tfjs-backend-webgpu", + "tfjs-inference", + "tfjs-node", + "tfjs-node-gpu", + "tfjs-react-native", + "tfjs-vis", + "tsc-dist", + "wasm-dist" + ] +} diff --git a/yarn.lock b/yarn.lock index 31f59dd0234..9c186059952 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,11 +3,11 @@ "@babel/code-frame@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" - integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== + version "7.15.8" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503" + integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg== dependencies: - "@babel/highlight" "^7.12.13" + "@babel/highlight" "^7.14.5" "@babel/code-frame@^7.10.4": version "7.14.5" @@ -16,25 +16,11 @@ dependencies: "@babel/highlight" "^7.14.5" -"@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== - "@babel/helper-validator-identifier@^7.14.5": version "7.14.9" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== -"@babel/highlight@^7.12.13": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1" - integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg== - dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - chalk "^2.0.0" - js-tokens "^4.0.0" - "@babel/highlight@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" @@ -2477,7 +2463,7 @@ tslint-no-circular-imports@~0.7.0: resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.7.0.tgz#9df0a15654d66b172e0b7843eed073fa5ae99b5f" integrity sha512-k3wxpeMC4ef40UbpfBVHEHIzKfNZq5/SCtAO1YjGsaNTklo+K53/TWLrym+poA65RJFDiYgYNWvkeIIkJNA0Vw== -tslint@~6.1.3: +tslint@^6.1.3: version "6.1.3" resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg== From 6ef1b6a9cb296e5637e51f10de966f30d1539f86 Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 28 Oct 2021 14:25:19 -0700 Subject: [PATCH 04/16] Fix lint errors --- tfjs-backend-nodegl/src/run_tests.ts | 1 + tfjs-backend-webgl/src/setup_test.ts | 4 ++-- tfjs-backend-webgpu/src/backend_webgpu.ts | 2 +- tfjs-converter/scripts/gen_op.ts | 2 +- tfjs-core/src/log.ts | 1 + tfjs-core/src/ops/browser.ts | 2 +- tfjs-tflite/demo/src/script.ts | 6 +++--- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tfjs-backend-nodegl/src/run_tests.ts b/tfjs-backend-nodegl/src/run_tests.ts index 2309c93e1aa..9d96865cfea 100644 --- a/tfjs-backend-nodegl/src/run_tests.ts +++ b/tfjs-backend-nodegl/src/run_tests.ts @@ -19,6 +19,7 @@ import './index'; import * as tf from '@tensorflow/tfjs-core'; +// tslint:disable-next-line:no-imports-from-dist import * as jasmine_util from '@tensorflow/tfjs-core/dist/jasmine_util'; Error.stackTraceLimit = Infinity; diff --git a/tfjs-backend-webgl/src/setup_test.ts b/tfjs-backend-webgl/src/setup_test.ts index fc9cf8e8838..af592fcb6e5 100644 --- a/tfjs-backend-webgl/src/setup_test.ts +++ b/tfjs-backend-webgl/src/setup_test.ts @@ -54,9 +54,9 @@ if (typeof __karma__ !== 'undefined') { // the preceding snippet that parses test environments. // Import and run tests from core. // tslint:disable-next-line:no-imports-from-dist -// tslint:disable-next-line:no-require +// tslint:disable-next-line:no-require-imports require('@tensorflow/tfjs-core/dist/tests'); // Import and run tests from webgl. // tslint:disable-next-line:no-imports-from-dist -// tslint:disable-next-line:no-require +// tslint:disable-next-line:no-require-imports require('./tests'); diff --git a/tfjs-backend-webgpu/src/backend_webgpu.ts b/tfjs-backend-webgpu/src/backend_webgpu.ts index 3204d0c6790..c7f35bb4966 100644 --- a/tfjs-backend-webgpu/src/backend_webgpu.ts +++ b/tfjs-backend-webgpu/src/backend_webgpu.ts @@ -814,7 +814,7 @@ export class WebGPUBackend extends KernelBackend { const uniformInfo = { byteSize: uniformsByteLength, usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.UNIFORM, - buffer: (uniforms as GPUBufferBinding).buffer + buffer: uniforms.buffer }; this.uniformDisposalQueue.push(uniformInfo); } diff --git a/tfjs-converter/scripts/gen_op.ts b/tfjs-converter/scripts/gen_op.ts index 44e5caf5455..39d66d8ef43 100644 --- a/tfjs-converter/scripts/gen_op.ts +++ b/tfjs-converter/scripts/gen_op.ts @@ -14,7 +14,7 @@ const {json, out} = parser.parseArgs() as { out: string, }; -const jsonContents = fs.readFileSync(json, 'utf8'); +const jsonContents = fs.readFileSync(json, 'utf8').replace(/"/g, '\''); const tsContents = ` /** * @license diff --git a/tfjs-core/src/log.ts b/tfjs-core/src/log.ts index 5a03b379c53..3010ed7b3d6 100644 --- a/tfjs-core/src/log.ts +++ b/tfjs-core/src/log.ts @@ -15,6 +15,7 @@ * ============================================================================= */ +// tslint:disable-next-line:no-circular-imports import {env} from './environment'; export function warn(...msg: Array<{}>): void { diff --git a/tfjs-core/src/ops/browser.ts b/tfjs-core/src/ops/browser.ts index 580feb9976f..bf277eb8de3 100644 --- a/tfjs-core/src/ops/browser.ts +++ b/tfjs-core/src/ops/browser.ts @@ -154,7 +154,7 @@ function fromPixels_( fromPixels2DContext.canvas.width = width; fromPixels2DContext.canvas.height = height; fromPixels2DContext.drawImage( - pixels as HTMLVideoElement, 0, 0, width, height); + pixels as HTMLVideoElement, 0, 0, width, height); vals = fromPixels2DContext.getImageData(0, 0, width, height).data; } let values: Int32Array; diff --git a/tfjs-tflite/demo/src/script.ts b/tfjs-tflite/demo/src/script.ts index fc42e2f6dd8..b1301bfd273 100644 --- a/tfjs-tflite/demo/src/script.ts +++ b/tfjs-tflite/demo/src/script.ts @@ -95,7 +95,7 @@ function handleClickTrigger( } // Run inference and draw the result on the corresponding canvas. - const canvas = imageContainer.querySelector('canvas')! as HTMLCanvasElement; + const canvas = imageContainer.querySelector('canvas')!; const ctx = canvas.getContext('2d')!; const inferenceStart = Date.now(); const imageData = cartoonize(tfliteModel, srcMedia); @@ -122,9 +122,9 @@ function cartoonize( // we don't resize them here. const input = tf.sub(tf.div(tf.expandDims(img), 127.5), 1); // Run the inference. - let outputTensor = tfliteModel.predict(input) as tf.Tensor; + const outputTensor = tfliteModel.predict(input) as tf.Tensor; // De-normalize the result. - return tf.mul(tf.add(outputTensor, 1), 127.5) + return tf.mul(tf.add(outputTensor, 1), 127.5); }); // Convert from RGB to RGBA, and create and return ImageData. From a1cf5a7a9107c746099d2c773707c152758e263a Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 28 Oct 2021 14:26:15 -0700 Subject: [PATCH 05/16] [core] Remove lint script --- scripts/package_dependencies.json | 15 ++-- tfjs-core/cloudbuild.yml | 25 ------ tfjs-core/package.json | 3 - tfjs-core/tslint.json | 3 - tfjs-core/yarn.lock | 138 ++---------------------------- 5 files changed, 14 insertions(+), 170 deletions(-) delete mode 100644 tfjs-core/cloudbuild.yml delete mode 100644 tfjs-core/tslint.json diff --git a/scripts/package_dependencies.json b/scripts/package_dependencies.json index 0a67900b3bb..f9434cb645a 100644 --- a/scripts/package_dependencies.json +++ b/scripts/package_dependencies.json @@ -1,16 +1,15 @@ { "tfjs-automl": [], - "tfjs-core": [], - "tfjs-converter": ["tfjs-core"], - "tfjs-layers": ["tfjs-core"], - "tfjs-data": ["tfjs-core", "tfjs-layers"], - "tfjs": ["tfjs-core", "tfjs-converter", "tfjs-layers", "tfjs-data"], + "tfjs-converter": [], + "tfjs-layers": [], + "tfjs-data": ["tfjs-layers"], + "tfjs": ["tfjs-converter", "tfjs-layers", "tfjs-data"], "tfjs-node": ["tfjs"], "tfjs-node-gpu": ["tfjs"], - "tfjs-backend-wasm": ["tfjs-core"], - "tfjs-backend-webgpu": ["tfjs-core"], + "tfjs-backend-wasm": [], + "tfjs-backend-webgpu": [], "tfjs-inference": [], "tfjs-react-native": [], "tfjs-vis": [], - "e2e": ["tfjs", "tfjs-converter", "tfjs-core", "tfjs-data", "tfjs-layers", "tfjs-node", "tfjs-backend-wasm"] + "e2e": ["tfjs", "tfjs-converter", "tfjs-data", "tfjs-layers", "tfjs-node", "tfjs-backend-wasm"] } diff --git a/tfjs-core/cloudbuild.yml b/tfjs-core/cloudbuild.yml deleted file mode 100644 index 74b24786792..00000000000 --- a/tfjs-core/cloudbuild.yml +++ /dev/null @@ -1,25 +0,0 @@ -steps: -# Install common dependencies. -- name: 'gcr.io/learnjs-174218/release' - id: 'yarn-common' - entrypoint: 'yarn' - args: ['install'] - -# All steps are now handled by Bazel tests, but a future PR may add back the -# 'test-bundle-size' step, which will be adapted to work on Bazel outputs but -# will not be able to compare a Bazel output (in dist/bin) with a non-bazel -# output. - -# General configuration -secrets: -- kmsKeyName: projects/learnjs-174218/locations/global/keyRings/tfjs/cryptoKeys/enc - secretEnv: - BROWSERSTACK_KEY: CiQAkwyoIW0LcnxymzotLwaH4udVTQFBEN4AEA5CA+a3+yflL2ASPQAD8BdZnGARf78MhH5T9rQqyz9HNODwVjVIj64CTkFlUCGrP1B2HX9LXHWHLmtKutEGTeFFX9XhuBzNExA= -timeout: 3600s -logsBucket: 'gs://tfjs-build-logs' -substitutions: - _NIGHTLY: '' -options: - logStreamingOption: 'STREAM_ON' - machineType: 'N1_HIGHCPU_8' - substitution_option: 'ALLOW_LOOSE' diff --git a/tfjs-core/package.json b/tfjs-core/package.json index 30bf426dc48..d9307de146c 100644 --- a/tfjs-core/package.json +++ b/tfjs-core/package.json @@ -44,8 +44,6 @@ "rollup-plugin-visualizer": "~3.3.2", "shelljs": "~0.8.3", "ts-node": "~8.8.2", - "tslint": "~5.11.0", - "tslint-no-circular-imports": "~0.5.0", "typescript": "3.5.3", "yalc": "~1.0.0-pre.21", "yargs": "~13.2.2" @@ -61,7 +59,6 @@ "link-local": "yalc link", "publish-local": "rimraf dist/ && yarn build && rollup -c && yalc push", "publish-npm": "bazel run :tfjs-core_pkg.publish", - "lint": "tslint -p . -t verbose", "coverage": "bazel coverage :tfjs-core_node_test", "test": "bazel test --flaky_test_attempts=3 :tfjs-core_test :test_snippets_test :tfjs-core_node_test tfjs-core_async_backends_test --test_output=all", "test-dev": "ibazel test --flaky_test_attempts=3 :tfjs-core_test :test_snippets_test :tfjs-core_node_test tfjs-core_async_backends_test --test_output=all", diff --git a/tfjs-core/tslint.json b/tfjs-core/tslint.json deleted file mode 100644 index ec365f164b3..00000000000 --- a/tfjs-core/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../tslint.json" -} diff --git a/tfjs-core/yarn.lock b/tfjs-core/yarn.lock index 480513e0209..71c82768dd6 100644 --- a/tfjs-core/yarn.lock +++ b/tfjs-core/yarn.lock @@ -433,11 +433,6 @@ agent-base@^4.3.0: dependencies: es6-promisify "^5.0.0" -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - ansi-regex@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" @@ -448,11 +443,6 @@ ansi-regex@^5.0.0: resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= - ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -480,13 +470,6 @@ arg@^4.1.0: resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - asn1.js@^5.2.0: version "5.4.1" resolved "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" @@ -522,15 +505,6 @@ available-typed-arrays@^1.0.2: resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz#9e0ae84ecff20caae6a94a1c3bc39b955649b7a9" integrity sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA== -babel-code-frame@^6.22.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -716,11 +690,6 @@ buffer@^5.4.3: base64-js "^1.3.1" ieee754 "^1.1.13" -builtin-modules@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - builtin-modules@^3.1.0: version "3.2.0" resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" @@ -754,18 +723,7 @@ caniuse-lite@^1.0.30001219: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz#45b941bbd833cb0fa53861ff2bae746b3c6ca5d4" integrity sha512-768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA== -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.4.1: version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -890,7 +848,7 @@ combine-source-map@^0.8.0: lodash.memoize "~3.0.3" source-map "~0.5.3" -commander@^2.12.1, commander@^2.20.0: +commander@^2.20.0: version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -1097,11 +1055,6 @@ di@^0.0.1: resolved "https://registry.npmjs.org/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw= -diff@^3.2.0: - version "3.5.0" - resolved "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" - integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== - diff@^4.0.1: version "4.0.2" resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" @@ -1276,16 +1229,11 @@ escape-html@~1.0.3: resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - estree-walker@^0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362" @@ -1296,11 +1244,6 @@ estree-walker@^1.0.1: resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - event-stream@=3.3.4: version "3.3.4" resolved "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" @@ -1467,7 +1410,7 @@ glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob@^7.0.0, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.7" resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== @@ -1489,13 +1432,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - dependencies: - ansi-regex "^2.0.0" - has-bigints@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" @@ -1897,24 +1833,11 @@ jest-worker@^24.9.0: merge-stream "^2.0.0" supports-color "^6.1.0" -js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= - js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.7.0: - version "3.14.1" - resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -2710,7 +2633,7 @@ requires-port@^1.0.0: resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.3.2: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0: version "1.20.0" resolved "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -2809,7 +2732,7 @@ seedrandom@2.4.3: resolved "https://registry.npmjs.org/seedrandom/-/seedrandom-2.4.3.tgz#2438504dad33917314bff18ac4d794f16d6aaecc" integrity sha1-JDhQTa0zkXMUv/GKxNeU8W1qrsw= -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0: +"semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -2983,11 +2906,6 @@ split@0.3: dependencies: through "2" -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" @@ -3077,13 +2995,6 @@ string_decoder@^1.1.1, string_decoder@^1.3.0: dependencies: safe-buffer "~5.2.0" -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" @@ -3108,11 +3019,6 @@ strip-eof@^1.0.0: resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - supports-color@^5.3.0: version "5.5.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -3197,34 +3103,11 @@ ts-node@~8.8.2: source-map-support "^0.5.6" yn "3.1.1" -tslib@^1.8.0, tslib@^1.8.1: +tslib@^1.8.1: version "1.14.1" resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslint-no-circular-imports@~0.5.0: - version "0.5.2" - resolved "https://registry.npmjs.org/tslint-no-circular-imports/-/tslint-no-circular-imports-0.5.2.tgz#47ac9194ec531101ac19198d5144f7ac9f57d980" - integrity sha512-Uzu2NiVX7b/kAk9vPrLqUmoCkth0dXUUNOaqwfxpvYgsHfoH67cmj0IHOUMZ1bC0swksJjaTyq7acHe/gU8H4A== - -tslint@~5.11.0: - version "5.11.0" - resolved "https://registry.npmjs.org/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed" - integrity sha1-mPMMAurjzecAYgHkwzywi0hYHu0= - dependencies: - babel-code-frame "^6.22.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^3.2.0" - glob "^7.1.1" - js-yaml "^3.7.0" - minimatch "^3.0.4" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.8.0" - tsutils "^2.27.2" - tsutils@2.27.2: version "2.27.2" resolved "https://registry.npmjs.org/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7" @@ -3232,13 +3115,6 @@ tsutils@2.27.2: dependencies: tslib "^1.8.1" -tsutils@^2.27.2: - version "2.29.0" - resolved "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" - integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== - dependencies: - tslib "^1.8.1" - tty-browserify@^0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" From 89e1acfce81e6b97fd41f127395581dbc39bbd38 Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 28 Oct 2021 14:27:36 -0700 Subject: [PATCH 06/16] [cpu] Remove lint script --- tfjs-backend-cpu/package.json | 3 -- tfjs-backend-cpu/tslint.json | 3 -- tfjs-backend-cpu/yarn.lock | 55 +++++------------------------------ 3 files changed, 7 insertions(+), 54 deletions(-) delete mode 100644 tfjs-backend-cpu/tslint.json diff --git a/tfjs-backend-cpu/package.json b/tfjs-backend-cpu/package.json index e0fb6bf1c9a..4934123010f 100644 --- a/tfjs-backend-cpu/package.json +++ b/tfjs-backend-cpu/package.json @@ -41,8 +41,6 @@ "rollup-plugin-terser": "~5.3.0", "rollup-plugin-visualizer": "~3.3.2", "ts-node": "~8.8.2", - "tslint": "~6.1.3", - "tslint-no-circular-imports": "~0.7.0", "typescript": "3.5.3", "yalc": "~1.0.0-pre.50" }, @@ -57,7 +55,6 @@ "link-local": "yalc link", "publish-local": "rimraf dist/ && yarn build && rollup -c && yalc push", "publish-npm": "bazel run :tfjs-backend-cpu_pkg.publish", - "lint": "tslint -p . -t verbose", "coverage": "bazel coverage :tfjs-backend-cpu_test", "test": "bazel test :tfjs-backend-cpu_test --test_output=streamed", "test-debug": "bazel run :tfjs-backend-cpu_test --config=debug", diff --git a/tfjs-backend-cpu/tslint.json b/tfjs-backend-cpu/tslint.json deleted file mode 100644 index ec365f164b3..00000000000 --- a/tfjs-backend-cpu/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../tslint.json" -} diff --git a/tfjs-backend-cpu/yarn.lock b/tfjs-backend-cpu/yarn.lock index efe81a56ff4..97673872b06 100644 --- a/tfjs-backend-cpu/yarn.lock +++ b/tfjs-backend-cpu/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5": +"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== @@ -666,11 +666,6 @@ buffers@~0.1.1: resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= -builtin-modules@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - builtin-modules@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" @@ -721,7 +716,7 @@ chainsaw@~0.1.0: dependencies: traverse ">=0.3.0 <0.4" -chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.4.1: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -842,7 +837,7 @@ combine-source-map@^0.8.0: lodash.memoize "~3.0.3" source-map "~0.5.3" -commander@^2.12.1, commander@^2.20.0: +commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -1424,7 +1419,7 @@ glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" -glob@^7.0.0, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.0.6, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -2152,7 +2147,7 @@ minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -"mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@^0.5.3: +"mkdirp@>=0.5 0", mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -2662,7 +2657,7 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.3.2: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -2761,7 +2756,7 @@ seedrandom@2.4.3: resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.3.tgz#2438504dad33917314bff18ac4d794f16d6aaecc" integrity sha1-JDhQTa0zkXMUv/GKxNeU8W1qrsw= -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0: +"semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -3118,42 +3113,6 @@ ts-node@~8.8.2: source-map-support "^0.5.6" yn "3.1.1" -tslib@^1.13.0, tslib@^1.8.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslint-no-circular-imports@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.7.0.tgz#9df0a15654d66b172e0b7843eed073fa5ae99b5f" - integrity sha512-k3wxpeMC4ef40UbpfBVHEHIzKfNZq5/SCtAO1YjGsaNTklo+K53/TWLrym+poA65RJFDiYgYNWvkeIIkJNA0Vw== - -tslint@~6.1.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" - integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg== - dependencies: - "@babel/code-frame" "^7.0.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^4.0.1" - glob "^7.1.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - mkdirp "^0.5.3" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.13.0" - tsutils "^2.29.0" - -tsutils@^2.29.0: - version "2.29.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" - integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== - dependencies: - tslib "^1.8.1" - tty-browserify@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" From fa1b5bb145acbfc6669cd9b6dfa61e6a865dc89e Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 28 Oct 2021 14:28:22 -0700 Subject: [PATCH 07/16] [webgl] Remove lint script --- tfjs-backend-webgl/package.json | 3 -- tfjs-backend-webgl/tslint.json | 3 -- tfjs-backend-webgl/yarn.lock | 80 +++------------------------------ 3 files changed, 7 insertions(+), 79 deletions(-) delete mode 100644 tfjs-backend-webgl/tslint.json diff --git a/tfjs-backend-webgl/package.json b/tfjs-backend-webgl/package.json index 4d61b416cc2..5a82c8bd786 100644 --- a/tfjs-backend-webgl/package.json +++ b/tfjs-backend-webgl/package.json @@ -43,8 +43,6 @@ "rollup-plugin-terser": "~7.0.2", "rollup-plugin-visualizer": "~3.3.2", "ts-node": "~7.0.0", - "tslint": "~6.1.3", - "tslint-no-circular-imports": "~0.7.0", "typescript": "3.5.3", "yalc": "~1.0.0-pre.50" }, @@ -60,7 +58,6 @@ "link-local": "yalc link", "publish-local": "rimraf dist/ && yarn build && rollup -c && yalc push", "publish-npm": "bazel run :tfjs-backend-webgl_pkg.publish", - "lint": "tslint -p . -t verbose", "test": "yarn test-dev", "test-dev": "ibazel run :tfjs-backend-webgl2_test --test-output=streamed", "coverage": "KARMA_COVERAGE=1 karma start --browsers='Chrome' --singleRun", diff --git a/tfjs-backend-webgl/tslint.json b/tfjs-backend-webgl/tslint.json deleted file mode 100644 index ec365f164b3..00000000000 --- a/tfjs-backend-webgl/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../tslint.json" -} diff --git a/tfjs-backend-webgl/yarn.lock b/tfjs-backend-webgl/yarn.lock index f07c6999ac9..eca5f5ad530 100644 --- a/tfjs-backend-webgl/yarn.lock +++ b/tfjs-backend-webgl/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5": +"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5": version "7.14.5" resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== @@ -1064,13 +1064,6 @@ anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - arrify@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -1327,11 +1320,6 @@ buffer@^5.4.3: base64-js "^1.3.1" ieee754 "^1.1.13" -builtin-modules@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - builtin-modules@^3.1.0: version "3.2.0" resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" @@ -1365,7 +1353,7 @@ caniuse-lite@^1.0.30001219: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz#66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8" integrity sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ== -chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.4.1: version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1481,7 +1469,7 @@ combine-source-map@^0.8.0: lodash.memoize "~3.0.3" source-map "~0.5.3" -commander@^2.12.1, commander@^2.20.0: +commander@^2.20.0: version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -1873,11 +1861,6 @@ escape-string-regexp@^1.0.5: resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - estree-walker@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" @@ -2034,7 +2017,7 @@ glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob@^7.0.0, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: +glob@^7.0.0, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: version "7.1.7" resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== @@ -2438,14 +2421,6 @@ js-tokens@^4.0.0: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -2739,7 +2714,7 @@ minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp@^0.5.1, mkdirp@^0.5.3: +mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -3206,7 +3181,7 @@ requires-port@^1.0.0: resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.3.2: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0: version "1.20.0" resolved "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -3297,7 +3272,7 @@ seedrandom@2.4.3: resolved "https://registry.npmjs.org/seedrandom/-/seedrandom-2.4.3.tgz#2438504dad33917314bff18ac4d794f16d6aaecc" integrity sha1-JDhQTa0zkXMUv/GKxNeU8W1qrsw= -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0: +"semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -3449,11 +3424,6 @@ split@0.3: dependencies: through "2" -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" @@ -3626,42 +3596,6 @@ ts-node@~7.0.0: source-map-support "^0.5.6" yn "^2.0.0" -tslib@^1.13.0, tslib@^1.8.1: - version "1.14.1" - resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslint-no-circular-imports@~0.7.0: - version "0.7.0" - resolved "https://registry.npmjs.org/tslint-no-circular-imports/-/tslint-no-circular-imports-0.7.0.tgz#9df0a15654d66b172e0b7843eed073fa5ae99b5f" - integrity sha512-k3wxpeMC4ef40UbpfBVHEHIzKfNZq5/SCtAO1YjGsaNTklo+K53/TWLrym+poA65RJFDiYgYNWvkeIIkJNA0Vw== - -tslint@~6.1.3: - version "6.1.3" - resolved "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" - integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg== - dependencies: - "@babel/code-frame" "^7.0.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^4.0.1" - glob "^7.1.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - mkdirp "^0.5.3" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.13.0" - tsutils "^2.29.0" - -tsutils@^2.29.0: - version "2.29.0" - resolved "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" - integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== - dependencies: - tslib "^1.8.1" - tty-browserify@^0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" From 89f1b5d8f28aeb0a411acf4f9bae17aa2e222008 Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 28 Oct 2021 14:30:31 -0700 Subject: [PATCH 08/16] [converter] Remove tslint script --- tfjs-converter/cloudbuild.yml | 9 +---- tfjs-converter/package.json | 3 -- tfjs-converter/tslint.json | 3 -- tfjs-converter/yarn.lock | 68 ++++------------------------------- 4 files changed, 8 insertions(+), 75 deletions(-) delete mode 100644 tfjs-converter/tslint.json diff --git a/tfjs-converter/cloudbuild.yml b/tfjs-converter/cloudbuild.yml index 497fbbd25f0..d3bd56ed559 100644 --- a/tfjs-converter/cloudbuild.yml +++ b/tfjs-converter/cloudbuild.yml @@ -15,14 +15,7 @@ steps: args: ['install'] waitFor: ['yarn-common'] -# Lint. -- name: 'gcr.io/learnjs-174218/release' - dir: 'tfjs-converter' - id: 'lint' - entrypoint: 'yarn' - args: ['lint'] - waitFor: ['yarn'] - +# Create python pips - name: 'gcr.io/learnjs-174218/release' id: 'create-pips' entrypoint: 'bash' diff --git a/tfjs-converter/package.json b/tfjs-converter/package.json index a7267bc4b3b..d245f6e473a 100644 --- a/tfjs-converter/package.json +++ b/tfjs-converter/package.json @@ -49,8 +49,6 @@ "rollup-plugin-visualizer": "~3.3.2", "ts-morph": "^7.1.3", "ts-node": "~8.8.2", - "tslint": "~6.1.3", - "tslint-no-circular-imports": "~0.7.0", "typescript": "3.5.3", "yalc": "~1.0.0-pre.50" }, @@ -69,7 +67,6 @@ "test-dev": "ibazel run :tfjs-converter_test", "test-snippets": "bazel test :test_snippets_test --test_output=all", "test-snippets-ci": "yarn test-snippets", - "lint": "tslint -p . -t verbose", "gen-doc": "ts-node -s ./scripts/gen_doc.ts", "model-summary": "ts-node -s ./tools/model_summary.ts", "pb2json": "ts-node -s ./tools/pb2json_converter.ts", diff --git a/tfjs-converter/tslint.json b/tfjs-converter/tslint.json deleted file mode 100644 index ec365f164b3..00000000000 --- a/tfjs-converter/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../tslint.json" -} diff --git a/tfjs-converter/yarn.lock b/tfjs-converter/yarn.lock index 48c2647f6fe..75980ac9c20 100644 --- a/tfjs-converter/yarn.lock +++ b/tfjs-converter/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4": +"@babel/code-frame@^7.10.4": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== @@ -306,7 +306,7 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.10, argparse@^1.0.7: +argparse@^1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -889,11 +889,6 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== -builtin-modules@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - builtin-modules@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" @@ -928,7 +923,7 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.3.0: +chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1001,7 +996,7 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -commander@^2.12.1, commander@^2.20.0: +commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -1118,11 +1113,6 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - estree-walker@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" @@ -1232,7 +1222,7 @@ glob-parent@^5.1.0: dependencies: is-glob "^4.0.1" -glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@^7.0.0, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -1465,14 +1455,6 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - jsesc@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" @@ -1580,7 +1562,7 @@ minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp@^0.5.1, mkdirp@^0.5.3: +mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -1861,7 +1843,7 @@ require-main-filename@^2.0.0: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== -resolve@^1.1.6, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.3.2: +resolve@^1.1.6, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -2102,42 +2084,6 @@ ts-node@~8.8.2: source-map-support "^0.5.6" yn "3.1.1" -tslib@^1.13.0, tslib@^1.8.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslint-no-circular-imports@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.7.0.tgz#9df0a15654d66b172e0b7843eed073fa5ae99b5f" - integrity sha512-k3wxpeMC4ef40UbpfBVHEHIzKfNZq5/SCtAO1YjGsaNTklo+K53/TWLrym+poA65RJFDiYgYNWvkeIIkJNA0Vw== - -tslint@~6.1.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" - integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg== - dependencies: - "@babel/code-frame" "^7.0.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^4.0.1" - glob "^7.1.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - mkdirp "^0.5.3" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.13.0" - tsutils "^2.29.0" - -tsutils@^2.29.0: - version "2.29.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" - integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== - dependencies: - tslib "^1.8.1" - typescript@3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977" From e6a7cd904b12fd15cce9ea1d285459bf23f64ff9 Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 28 Oct 2021 14:34:30 -0700 Subject: [PATCH 09/16] [layers] Remove tslint script --- scripts/package_dependencies.json | 7 ++- tfjs-layers/cloudbuild.yml | 34 ------------- tfjs-layers/package.json | 5 +- tfjs-layers/tslint.json | 3 -- tfjs-layers/yarn.lock | 83 +++---------------------------- 5 files changed, 10 insertions(+), 122 deletions(-) delete mode 100644 tfjs-layers/cloudbuild.yml delete mode 100644 tfjs-layers/tslint.json diff --git a/scripts/package_dependencies.json b/scripts/package_dependencies.json index f9434cb645a..1f1568c76a5 100644 --- a/scripts/package_dependencies.json +++ b/scripts/package_dependencies.json @@ -1,9 +1,8 @@ { "tfjs-automl": [], "tfjs-converter": [], - "tfjs-layers": [], - "tfjs-data": ["tfjs-layers"], - "tfjs": ["tfjs-converter", "tfjs-layers", "tfjs-data"], + "tfjs-data": [], + "tfjs": ["tfjs-converter", "tfjs-data"], "tfjs-node": ["tfjs"], "tfjs-node-gpu": ["tfjs"], "tfjs-backend-wasm": [], @@ -11,5 +10,5 @@ "tfjs-inference": [], "tfjs-react-native": [], "tfjs-vis": [], - "e2e": ["tfjs", "tfjs-converter", "tfjs-data", "tfjs-layers", "tfjs-node", "tfjs-backend-wasm"] + "e2e": ["tfjs", "tfjs-converter", "tfjs-data", "tfjs-node", "tfjs-backend-wasm"] } diff --git a/tfjs-layers/cloudbuild.yml b/tfjs-layers/cloudbuild.yml deleted file mode 100644 index dbc428cf8f3..00000000000 --- a/tfjs-layers/cloudbuild.yml +++ /dev/null @@ -1,34 +0,0 @@ -steps: -# Install common dependencies. -- name: 'gcr.io/learnjs-174218/release' - entrypoint: 'yarn' - id: 'yarn-common' - args: ['install'] - -# Install packages. -- name: 'gcr.io/learnjs-174218/release' - dir: 'tfjs-layers' - entrypoint: 'yarn' - id: 'yarn' - args: ['install'] - waitFor: ['yarn-common'] - -# Lint. -- name: 'gcr.io/learnjs-174218/release' - dir: 'tfjs-layers' - entrypoint: 'yarn' - id: 'lint' - args: ['lint'] - waitFor: ['yarn'] - -secrets: -- kmsKeyName: projects/learnjs-174218/locations/global/keyRings/tfjs/cryptoKeys/enc - secretEnv: - BROWSERSTACK_KEY: CiQAkwyoIW0LcnxymzotLwaH4udVTQFBEN4AEA5CA+a3+yflL2ASPQAD8BdZnGARf78MhH5T9rQqyz9HNODwVjVIj64CTkFlUCGrP1B2HX9LXHWHLmtKutEGTeFFX9XhuBzNExA= -timeout: 1800s -logsBucket: 'gs://tfjs-build-logs' -substitutions: - _NIGHTLY: '' -options: - logStreamingOption: 'STREAM_ON' - substitution_option: 'ALLOW_LOOSE' diff --git a/tfjs-layers/package.json b/tfjs-layers/package.json index 2be16974dcc..f55b07c760c 100644 --- a/tfjs-layers/package.json +++ b/tfjs-layers/package.json @@ -38,8 +38,6 @@ "rollup-plugin-terser": "~7.0.2", "rollup-plugin-visualizer": "~3.3.2", "ts-node": "~8.8.2", - "tslint": "~6.1.3", - "tslint-no-circular-imports": "^0.7.0", "typescript": "3.5.3", "yalc": "~1.0.0-pre.50" }, @@ -60,8 +58,7 @@ "coverage": "KARMA_COVERAGE=1 karma start --browsers='Chrome' --singleRun", "test-dev": "ibazel run :tfjs-layers_webgl2_test --test-output=streamed", "test": "yarn test-dev", - "run-browserstack": "bazel test :browserstack_bs_chrome_mac_tfjs-layers_webgl2_test", - "lint": "tslint -p . -t verbose" + "run-browserstack": "bazel test :browserstack_bs_chrome_mac_tfjs-layers_webgl2_test" }, "peerDependencies": { "@tensorflow/tfjs-core": "link:../link-package/node_modules/@tensorflow/tfjs-core" diff --git a/tfjs-layers/tslint.json b/tfjs-layers/tslint.json deleted file mode 100644 index ec365f164b3..00000000000 --- a/tfjs-layers/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../tslint.json" -} diff --git a/tfjs-layers/yarn.lock b/tfjs-layers/yarn.lock index e7b99e00d23..4f42e851eac 100644 --- a/tfjs-layers/yarn.lock +++ b/tfjs-layers/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": +"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== @@ -1041,13 +1041,6 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - array-filter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" @@ -1318,11 +1311,6 @@ buffer@^5.4.3: base64-js "^1.3.1" ieee754 "^1.1.13" -builtin-modules@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - builtin-modules@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" @@ -1356,7 +1344,7 @@ caniuse-lite@^1.0.30001181: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz#256c85709a348ec4d175e847a3b515c66e79f2aa" integrity sha512-JUdjWpcxfJ9IPamy2f5JaRDCaqJOxDzOSKtbdx4rH9VivMd1vIzoPumsJa9LoMIi4Fx2BV2KZOxWhNkBjaYivQ== -chalk@^2.0.0, chalk@^2.3.0: +chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1472,7 +1460,7 @@ combine-source-map@^0.8.0: lodash.memoize "~3.0.3" source-map "~0.5.3" -commander@^2.12.1, commander@^2.20.0: +commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -1856,11 +1844,6 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - estree-walker@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" @@ -2017,7 +2000,7 @@ glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" -glob@^7.0.0, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.0.5, glob@^7.0.6, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -2432,14 +2415,6 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -2718,7 +2693,7 @@ minimist@^1.1.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5: +mkdirp@^0.5.1, mkdirp@^0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -3138,7 +3113,7 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -resolve@^1.1.6, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.3.2: +resolve@^1.1.6, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -3239,11 +3214,6 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@^5.3.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -3352,11 +3322,6 @@ split@0.3: dependencies: through "2" -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" @@ -3517,42 +3482,6 @@ ts-node@~8.8.2: source-map-support "^0.5.6" yn "3.1.1" -tslib@^1.13.0, tslib@^1.8.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslint-no-circular-imports@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.7.0.tgz#9df0a15654d66b172e0b7843eed073fa5ae99b5f" - integrity sha512-k3wxpeMC4ef40UbpfBVHEHIzKfNZq5/SCtAO1YjGsaNTklo+K53/TWLrym+poA65RJFDiYgYNWvkeIIkJNA0Vw== - -tslint@~6.1.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" - integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg== - dependencies: - "@babel/code-frame" "^7.0.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^4.0.1" - glob "^7.1.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - mkdirp "^0.5.3" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.13.0" - tsutils "^2.29.0" - -tsutils@^2.29.0: - version "2.29.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" - integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== - dependencies: - tslib "^1.8.1" - tty-browserify@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" From 76e1d05343eaeb621cc709b6d5d1e2c992ab7a6c Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 28 Oct 2021 14:35:07 -0700 Subject: [PATCH 10/16] [tflite] Remove tslint script --- tfjs-tflite/package.json | 3 -- tfjs-tflite/tslint.json | 3 -- tfjs-tflite/yarn.lock | 81 +++------------------------------------- 3 files changed, 5 insertions(+), 82 deletions(-) delete mode 100644 tfjs-tflite/tslint.json diff --git a/tfjs-tflite/package.json b/tfjs-tflite/package.json index f181cfde2c9..e069dd76234 100644 --- a/tfjs-tflite/package.json +++ b/tfjs-tflite/package.json @@ -46,8 +46,6 @@ "tmp": "^0.2.1", "ts-node": "^5.0.1", "tslib": "^2.1.0", - "tslint": "~6.1.3", - "tslint-no-circular-imports": "^0.7.0", "typescript": "3.5.3", "yalc": "~1.0.0-pre.50" }, @@ -60,7 +58,6 @@ "build-link-package": "cd ../link-package && yarn build", "build-deps": "yarn build-link-package", "build-npm": "bazel build :tfjs-tflite_pkg", - "lint": "tslint -p . -t verbose", "publish-npm": "bazel run :tfjs-tflite_pkg.publish", "test": "bazel test --flaky_test_attempts=3 :tfjs-tflite_test --test_output=all", "test-ci": "yarn test", diff --git a/tfjs-tflite/tslint.json b/tfjs-tflite/tslint.json deleted file mode 100644 index ec365f164b3..00000000000 --- a/tfjs-tflite/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../tslint.json" -} diff --git a/tfjs-tflite/yarn.lock b/tfjs-tflite/yarn.lock index c9b313c76d5..d80fbfd8201 100644 --- a/tfjs-tflite/yarn.lock +++ b/tfjs-tflite/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": +"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== @@ -1030,13 +1030,6 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - array-filter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" @@ -1300,11 +1293,6 @@ buffer@^5.4.3: base64-js "^1.3.1" ieee754 "^1.1.13" -builtin-modules@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - builtin-modules@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" @@ -1440,7 +1428,7 @@ combine-source-map@^0.8.0: lodash.memoize "~3.0.3" source-map "~0.5.3" -commander@^2.12.1, commander@^2.20.0: +commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -1809,11 +1797,6 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - estree-walker@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" @@ -1950,7 +1933,7 @@ glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" -glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -2351,14 +2334,6 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -2629,7 +2604,7 @@ minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp@^0.5.1, mkdirp@^0.5.3: +mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -2995,7 +2970,7 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -resolve@^1.1.6, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.3.2: +resolve@^1.1.6, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -3082,11 +3057,6 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@^5.3.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -3181,11 +3151,6 @@ split@0.3: dependencies: through "2" -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" @@ -3344,47 +3309,11 @@ ts-node@^5.0.1: source-map-support "^0.5.3" yn "^2.0.0" -tslib@^1.13.0, tslib@^1.8.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - tslib@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== -tslint-no-circular-imports@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.7.0.tgz#9df0a15654d66b172e0b7843eed073fa5ae99b5f" - integrity sha512-k3wxpeMC4ef40UbpfBVHEHIzKfNZq5/SCtAO1YjGsaNTklo+K53/TWLrym+poA65RJFDiYgYNWvkeIIkJNA0Vw== - -tslint@~6.1.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" - integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg== - dependencies: - "@babel/code-frame" "^7.0.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^4.0.1" - glob "^7.1.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - mkdirp "^0.5.3" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.13.0" - tsutils "^2.29.0" - -tsutils@^2.29.0: - version "2.29.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" - integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== - dependencies: - tslib "^1.8.1" - tty-browserify@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" From 60acee20591c53411d61bcd86fcb72fea4ef1b90 Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 28 Oct 2021 14:44:48 -0700 Subject: [PATCH 11/16] [data] Remove tslint script --- scripts/package_dependencies.json | 5 +- tfjs-data/cloudbuild.yml | 24 --------- tfjs-data/package.json | 5 +- tfjs-data/tslint.json | 3 -- tfjs-data/yarn.lock | 88 +++++++++++++------------------ tsconfig_tslint.json | 2 + 6 files changed, 41 insertions(+), 86 deletions(-) delete mode 100644 tfjs-data/cloudbuild.yml delete mode 100644 tfjs-data/tslint.json diff --git a/scripts/package_dependencies.json b/scripts/package_dependencies.json index 1f1568c76a5..82b4443981f 100644 --- a/scripts/package_dependencies.json +++ b/scripts/package_dependencies.json @@ -1,8 +1,7 @@ { "tfjs-automl": [], "tfjs-converter": [], - "tfjs-data": [], - "tfjs": ["tfjs-converter", "tfjs-data"], + "tfjs": ["tfjs-converter"], "tfjs-node": ["tfjs"], "tfjs-node-gpu": ["tfjs"], "tfjs-backend-wasm": [], @@ -10,5 +9,5 @@ "tfjs-inference": [], "tfjs-react-native": [], "tfjs-vis": [], - "e2e": ["tfjs", "tfjs-converter", "tfjs-data", "tfjs-node", "tfjs-backend-wasm"] + "e2e": ["tfjs", "tfjs-converter", "tfjs-node", "tfjs-backend-wasm"] } diff --git a/tfjs-data/cloudbuild.yml b/tfjs-data/cloudbuild.yml deleted file mode 100644 index 8b180499290..00000000000 --- a/tfjs-data/cloudbuild.yml +++ /dev/null @@ -1,24 +0,0 @@ -steps: -# Install packages. -- name: 'gcr.io/learnjs-174218/release' - dir: 'tfjs-data' - entrypoint: 'yarn' - id: 'yarn' - args: ['install'] - waitFor: ['yarn-common'] - -# Lint. -- name: 'gcr.io/learnjs-174218/release' - dir: 'tfjs-data' - entrypoint: 'yarn' - id: 'lint' - args: ['lint'] - waitFor: ['yarn', 'build-deps'] - -timeout: 1800s -logsBucket: 'gs://tfjs-build-logs' -substitutions: - _NIGHTLY: '' -options: - logStreamingOption: 'STREAM_ON' - substitution_option: 'ALLOW_LOOSE' diff --git a/tfjs-data/package.json b/tfjs-data/package.json index 07eccf302a0..ef2cc37bce2 100644 --- a/tfjs-data/package.json +++ b/tfjs-data/package.json @@ -40,8 +40,6 @@ "rollup-plugin-terser": "~7.0.2", "rollup-plugin-visualizer": "~3.3.2", "ts-node": "~7.0.0", - "tslint": "~6.1.3", - "tslint-no-circular-imports": "^0.7.0", "typescript": "3.5.3", "yalc": "^1.0.0-pre.50" }, @@ -59,8 +57,7 @@ "publish-npm": "bazel run :tfjs-data_pkg.publish", "test-browser": "ibazel run :tfjs-data_browser_test --test-output=streamed", "test-dev": "bazel test tfjs-data_test", - "coverage": "yarn nyc yarn ts-node --transpile-only -P tsconfig.test.json src/test_node.ts", - "lint": "tslint -p . -t verbose" + "coverage": "yarn nyc yarn ts-node --transpile-only -P tsconfig.test.json src/test_node.ts" }, "peerDependencies": { "@tensorflow/tfjs-core": "link:../link-package/node_modules/@tensorflow/tfjs-core", diff --git a/tfjs-data/tslint.json b/tfjs-data/tslint.json deleted file mode 100644 index ec365f164b3..00000000000 --- a/tfjs-data/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../tslint.json" -} diff --git a/tfjs-data/yarn.lock b/tfjs-data/yarn.lock index ea5a6dec987..b6fa795ce0c 100644 --- a/tfjs-data/yarn.lock +++ b/tfjs-data/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": +"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== @@ -950,6 +950,11 @@ resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.5.54.tgz#a6b5f2ae2afb6e0307774e8c7c608e037d491c63" integrity sha512-B9YofFbUljs19g5gBKUYeLIulsh31U5AK70F41BImQRHEZQGm4GcN922UvnYwkduMqbC/NH+9fruWa/zrqvHIg== +"@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-fetch@^2.1.2": version "2.5.8" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.8.tgz#e199c835d234c7eb0846f6618012e558544ee2fb" @@ -963,6 +968,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.36.tgz#5637905dbb15c30a33a3c65b9ef7c20e3c85ebad" integrity sha512-kjivUwDJfIjngzbhooRnOLhGYz6oRFi+L+EpMjxroDYXwDw9lHrJJ43E+dJ6KAd3V3WxWAJ/qZE9XKYHhjPOFQ== +"@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@0.0.8": version "0.0.8" resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194" @@ -970,6 +980,11 @@ 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/seedrandom@^2.4.27": version "2.4.29" resolved "https://registry.yarnpkg.com/@types/seedrandom/-/seedrandom-2.4.29.tgz#09917443c50832730a7fab8d7f014b5926859dc7" @@ -980,6 +995,11 @@ resolved "https://registry.yarnpkg.com/@types/utf8/-/utf8-2.1.6.tgz#430cabb71a42d0a3613cce5621324fe4f5a25753" integrity sha512-pRs2gYF5yoKYrgSaira0DJqVg2tFuF+Qjp838xS7K+mJyY2jJzjsrl6y17GbIa4uMRogMbxs+ghNCvKg6XyNrA== +"@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" @@ -1315,11 +1335,6 @@ buffer@^5.4.3: base64-js "^1.3.1" ieee754 "^1.1.13" -builtin-modules@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - builtin-modules@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" @@ -1363,7 +1378,7 @@ caniuse-lite@^1.0.30001181: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz#256c85709a348ec4d175e847a3b515c66e79f2aa" integrity sha512-JUdjWpcxfJ9IPamy2f5JaRDCaqJOxDzOSKtbdx4rH9VivMd1vIzoPumsJa9LoMIi4Fx2BV2KZOxWhNkBjaYivQ== -chalk@^2.0.0, chalk@^2.3.0: +chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1491,7 +1506,7 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -commander@^2.12.1, commander@^2.20.0: +commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -2068,7 +2083,7 @@ glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" -glob@^7.0.0, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.0.6, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -2697,6 +2712,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" @@ -2787,7 +2807,7 @@ minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5: +mkdirp@^0.5.1, mkdirp@^0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -3274,7 +3294,7 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve@^1.1.6, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.3.2: +resolve@^1.1.6, resolve@^1.11.0, resolve@^1.14.1, resolve@^1.14.2, resolve@^1.17.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -3358,16 +3378,16 @@ secure-compare@3.0.1: resolved "https://registry.yarnpkg.com/secure-compare/-/secure-compare-3.0.1.tgz#f1a0329b308b221fae37b9974f3d578d0ca999e3" integrity sha1-8aAymzCLIh+uN7mXTz1XjQypmeM= +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" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@^5.3.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -3656,42 +3676,6 @@ ts-node@~7.0.0: source-map-support "^0.5.6" yn "^2.0.0" -tslib@^1.13.0, tslib@^1.8.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslint-no-circular-imports@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.7.0.tgz#9df0a15654d66b172e0b7843eed073fa5ae99b5f" - integrity sha512-k3wxpeMC4ef40UbpfBVHEHIzKfNZq5/SCtAO1YjGsaNTklo+K53/TWLrym+poA65RJFDiYgYNWvkeIIkJNA0Vw== - -tslint@~6.1.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" - integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg== - dependencies: - "@babel/code-frame" "^7.0.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^4.0.1" - glob "^7.1.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - mkdirp "^0.5.3" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.13.0" - tsutils "^2.29.0" - -tsutils@^2.29.0: - version "2.29.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" - integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== - dependencies: - tslib "^1.8.1" - tty-browserify@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" diff --git a/tsconfig_tslint.json b/tsconfig_tslint.json index eab4466b8d2..7f2faca3932 100644 --- a/tsconfig_tslint.json +++ b/tsconfig_tslint.json @@ -14,6 +14,8 @@ "@tensorflow/tfjs-core/dist/*": ["tfjs-core/src/*"], "@tensorflow/tfjs-layers": ["tfjs-layers/src/index.ts"], "@tensorflow/tfjs-layers/dist/*": ["tfjs-layers/src/*"], + "@tensorflow/tfjs-data": ["tfjs-data/src/index.ts"], + "@tensorflow/tfjs-data/dist/*": ["tfjs-data/src/*"], "@tensorflow/tfjs-tflite": ["tfjs-tflite/src/index.ts"], "@tensorflow/tfjs-tflite/dist/*": ["tfjs-tflite/src/*"] }, From beb4ab44c358f008f786b69fb27796830ecb79bd Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 28 Oct 2021 14:59:36 -0700 Subject: [PATCH 12/16] Update cloudbuild golden file tests --- package.json | 2 +- scripts/cloudbuild_e2e_expected.yml | 271 +++++++++++ scripts/cloudbuild_general_config.yml | 7 + scripts/cloudbuild_tfjs_core_expected.yml | 542 ---------------------- scripts/cloudbuild_tfjs_node_expected.yml | 84 +--- scripts/generate_cloudbuild_test.js | 6 +- 6 files changed, 289 insertions(+), 623 deletions(-) create mode 100644 scripts/cloudbuild_e2e_expected.yml delete mode 100644 scripts/cloudbuild_tfjs_core_expected.yml diff --git a/package.json b/package.json index b34ffccf6b4..d91c7931674 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "test-release-notes": "ts-node -s ./scripts/release_notes/run_tests.ts", "update-tfjs-lockfiles": "ts-node -s ./scripts/update-tfjs-lockfiles", "tag-tfjs-release": "ts-node -s ./scripts/tag-tfjs-release", - "update-cloudbuild-tests": "yarn generate-cloudbuild-for-packages tfjs-node -o scripts/cloudbuild_tfjs_node_expected.yml && yarn generate-cloudbuild-for-packages tfjs-core -o scripts/cloudbuild_tfjs_core_expected.yml", + "update-cloudbuild-tests": "yarn generate-cloudbuild-for-packages tfjs-node -o scripts/cloudbuild_tfjs_node_expected.yml && yarn generate-cloudbuild-for-packages e2e -o scripts/cloudbuild_e2e_expected.yml", "bazel:format": "find . -type f \\( -name \"*.bzl\" -or -name WORKSPACE -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs buildifier -v --warnings=attr-cfg,attr-license,attr-non-empty,attr-output-default,attr-single-file,constant-glob,ctx-actions,ctx-args,depset-iteration,depset-union,dict-concatenation,duplicated-name,filetype,git-repository,http-archive,integer-division,load,load-on-top,native-build,native-package,out-of-order-load,output-group,package-name,package-on-top,positional-args,redefined-variable,repository-name,same-origin-load,string-iteration,unsorted-dict-items,unused-variable", "bazel:format-check": "yarn bazel:format --mode=check", "bazel:lint": "yarn bazel:format --lint=warn", diff --git a/scripts/cloudbuild_e2e_expected.yml b/scripts/cloudbuild_e2e_expected.yml new file mode 100644 index 00000000000..0de6b57c58d --- /dev/null +++ b/scripts/cloudbuild_e2e_expected.yml @@ -0,0 +1,271 @@ +steps: + - name: gcr.io/learnjs-174218/release + entrypoint: yarn + id: yarn-common + args: + - install + - name: gcr.io/learnjs-174218/release + dir: scripts + id: test-generate-cloudbuild + entrypoint: yarn + args: + - test-generate-cloudbuild + waitFor: + - yarn-common + - name: gcr.io/learnjs-174218/release + id: test-run-flaky + entrypoint: yarn + args: + - test-run-flaky + waitFor: + - yarn-common + - name: gcr.io/learnjs-174218/release + id: buildifier + entrypoint: yarn + args: + - buildifier-ci + waitFor: + - yarn-common + - name: gcr.io/learnjs-174218/release + id: tslint + entrypoint: yarn + args: + - lint + waitFor: + - yarn-common + - name: gcr.io/learnjs-174218/release + id: bazel-tests + entrypoint: bash + args: + - ./scripts/run_bazel_ci_tests.sh + env: + - BROWSERSTACK_USERNAME=deeplearnjs1 + - NIGHTLY=$_NIGHTLY + waitFor: + - yarn-common + secretEnv: + - BROWSERSTACK_KEY + - name: gcr.io/learnjs-174218/release + dir: link-package-core + entrypoint: yarn + id: yarn-link-package-core + args: + - install + waitFor: + - bazel-tests + - name: gcr.io/learnjs-174218/release + dir: link-package + entrypoint: yarn + id: yarn-link-package + args: + - install + waitFor: + - bazel-tests + - yarn-link-package-core + - name: gcr.io/learnjs-174218/release + dir: tfjs-converter + entrypoint: yarn + id: yarn-tfjs-converter + args: + - install + waitFor: + - yarn-common + - yarn-link-package + - name: gcr.io/learnjs-174218/release + id: create-pips-tfjs-converter + entrypoint: bash + args: + - ./tfjs-converter/scripts/create_python_pips.sh + waitFor: + - yarn-common + - yarn-link-package + - name: gcr.io/learnjs-174218/release + dir: tfjs-backend-wasm + entrypoint: yarn + id: yarn-tfjs-backend-wasm + args: + - install + waitFor: + - yarn-common + - yarn-link-package + - name: gcr.io/learnjs-174218/release + dir: tfjs-backend-wasm + entrypoint: bash + id: build-tfjs-backend-wasm + args: + - ./scripts/build-ci.sh + waitFor: + - yarn-tfjs-backend-wasm + - yarn-common + - yarn-link-package + - name: gcr.io/learnjs-174218/release + dir: tfjs-backend-wasm + entrypoint: yarn + id: lint-tfjs-backend-wasm + args: + - lint + waitFor: + - yarn-tfjs-backend-wasm + - yarn-common + - yarn-link-package + - name: gcr.io/learnjs-174218/release + dir: tfjs + entrypoint: yarn + id: yarn-tfjs + args: + - install + waitFor: + - yarn-common + - yarn-link-package + - yarn-tfjs-converter + - create-pips-tfjs-converter + - name: gcr.io/learnjs-174218/release + dir: tfjs + entrypoint: yarn + id: build-tfjs + args: + - build-ci + waitFor: + - yarn-tfjs + - yarn-common + - yarn-link-package + - yarn-tfjs-converter + - create-pips-tfjs-converter + - name: gcr.io/learnjs-174218/release + dir: tfjs + entrypoint: yarn + id: lint-tfjs + args: + - lint + waitFor: + - yarn-tfjs + - yarn-common + - yarn-link-package + - yarn-tfjs-converter + - create-pips-tfjs-converter + - name: gcr.io/learnjs-174218/release + dir: tfjs-node + entrypoint: yarn + id: yarn-tfjs-node + args: + - install + waitFor: + - yarn-common + - yarn-link-package + - yarn-tfjs + - build-tfjs + - lint-tfjs + - name: gcr.io/learnjs-174218/release + dir: tfjs-node + entrypoint: yarn + id: build-addon-tfjs-node + args: + - build-addon-from-source + waitFor: + - yarn-tfjs-node + - yarn-common + - yarn-link-package + - yarn-tfjs + - build-tfjs + - lint-tfjs + - name: gcr.io/learnjs-174218/release + dir: tfjs-node + entrypoint: yarn + id: build-tfjs-node + args: + - build-ci + waitFor: + - yarn-tfjs-node + - yarn-common + - yarn-link-package + - yarn-tfjs + - build-tfjs + - lint-tfjs + - name: gcr.io/learnjs-174218/release + dir: tfjs-node + entrypoint: yarn + id: lint-tfjs-node + args: + - lint + waitFor: + - yarn-tfjs-node + - yarn-common + - yarn-link-package + - yarn-tfjs + - build-tfjs + - lint-tfjs + - name: gcr.io/learnjs-174218/release + dir: tfjs-node + entrypoint: yarn + id: ensure-cpu-gpu-packages-align-tfjs-node + args: + - ensure-cpu-gpu-packages-align + waitFor: + - yarn-common + - yarn-link-package + - yarn-tfjs + - build-tfjs + - lint-tfjs + - name: gcr.io/learnjs-174218/release + dir: e2e + entrypoint: yarn + id: yarn-e2e + args: + - install + waitFor: + - yarn-common + - yarn-link-package + - yarn-tfjs + - build-tfjs + - lint-tfjs + - yarn-tfjs-converter + - create-pips-tfjs-converter + - yarn-tfjs-node + - build-addon-tfjs-node + - build-tfjs-node + - lint-tfjs-node + - ensure-cpu-gpu-packages-align-tfjs-node + - yarn-tfjs-backend-wasm + - build-tfjs-backend-wasm + - lint-tfjs-backend-wasm + - name: gcr.io/learnjs-174218/release + dir: e2e + entrypoint: yarn + id: test-e2e + args: + - test-ci + env: + - BROWSERSTACK_USERNAME=deeplearnjs1 + - NIGHTLY=$_NIGHTLY + secretEnv: + - BROWSERSTACK_KEY + waitFor: + - yarn-e2e + - yarn-common + - yarn-link-package + - yarn-tfjs + - build-tfjs + - lint-tfjs + - yarn-tfjs-converter + - create-pips-tfjs-converter + - yarn-tfjs-node + - build-addon-tfjs-node + - build-tfjs-node + - lint-tfjs-node + - ensure-cpu-gpu-packages-align-tfjs-node + - yarn-tfjs-backend-wasm + - build-tfjs-backend-wasm + - lint-tfjs-backend-wasm +secrets: + - kmsKeyName: projects/learnjs-174218/locations/global/keyRings/tfjs/cryptoKeys/enc + secretEnv: + BROWSERSTACK_KEY: >- + CiQAkwyoIW0LcnxymzotLwaH4udVTQFBEN4AEA5CA+a3+yflL2ASPQAD8BdZnGARf78MhH5T9rQqyz9HNODwVjVIj64CTkFlUCGrP1B2HX9LXHWHLmtKutEGTeFFX9XhuBzNExA= +timeout: 3600s +logsBucket: 'gs://tfjs-build-logs' +substitutions: + _NIGHTLY: '' +options: + logStreamingOption: STREAM_ON + machineType: N1_HIGHCPU_32 + substitution_option: ALLOW_LOOSE diff --git a/scripts/cloudbuild_general_config.yml b/scripts/cloudbuild_general_config.yml index 8740bb13e36..faeeeeedd99 100644 --- a/scripts/cloudbuild_general_config.yml +++ b/scripts/cloudbuild_general_config.yml @@ -30,6 +30,13 @@ steps: args: ['buildifier-ci'] waitFor: ['yarn-common'] +# Lint Bazel package typescript files. +- name: 'gcr.io/learnjs-174218/release' + id: 'tslint' + entrypoint: 'yarn' + args: ['lint'] + waitFor: ['yarn-common'] + # Bazel tests # These use a remote cache and only re-run if changes occurred, so we run them # in every build. diff --git a/scripts/cloudbuild_tfjs_core_expected.yml b/scripts/cloudbuild_tfjs_core_expected.yml deleted file mode 100644 index 901acc0b707..00000000000 --- a/scripts/cloudbuild_tfjs_core_expected.yml +++ /dev/null @@ -1,542 +0,0 @@ -steps: - - name: gcr.io/learnjs-174218/release - entrypoint: yarn - id: yarn-common - args: - - install - - name: gcr.io/learnjs-174218/release - dir: scripts - id: test-generate-cloudbuild - entrypoint: yarn - args: - - test-generate-cloudbuild - waitFor: - - yarn-common - - name: gcr.io/learnjs-174218/release - id: test-run-flaky - entrypoint: yarn - args: - - test-run-flaky - waitFor: - - yarn-common - - name: gcr.io/learnjs-174218/release - id: buildifier - entrypoint: yarn - args: - - buildifier-ci - waitFor: - - yarn-common - - name: gcr.io/learnjs-174218/release - id: bazel-tests - entrypoint: bash - args: - - ./scripts/run_bazel_ci_tests.sh - env: - - BROWSERSTACK_USERNAME=deeplearnjs1 - - NIGHTLY=$_NIGHTLY - waitFor: - - yarn-common - secretEnv: - - BROWSERSTACK_KEY - - name: gcr.io/learnjs-174218/release - dir: link-package-core - entrypoint: yarn - id: yarn-link-package-core - args: - - install - waitFor: - - bazel-tests - - name: gcr.io/learnjs-174218/release - dir: link-package - entrypoint: yarn - id: yarn-link-package - args: - - install - waitFor: - - bazel-tests - - yarn-link-package-core - - name: gcr.io/learnjs-174218/release - dir: tfjs-converter - entrypoint: yarn - id: yarn-tfjs-converter - args: - - install - waitFor: - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-converter - id: lint-tfjs-converter - entrypoint: yarn - args: - - lint - waitFor: - - yarn-tfjs-converter - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - id: create-pips-tfjs-converter - entrypoint: bash - args: - - ./tfjs-converter/scripts/create_python_pips.sh - waitFor: - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-converter/python - entrypoint: bash - id: test-python-pip-tfjs-converter - args: - - ./build-pip-package.sh - - '--test' - - /tmp/tfjs-pips - waitFor: - - create-pips-tfjs-converter - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-layers - entrypoint: yarn - id: yarn-tfjs-layers - args: - - install - waitFor: - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-layers - entrypoint: yarn - id: lint-tfjs-layers - args: - - lint - waitFor: - - yarn-tfjs-layers - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-backend-wasm - entrypoint: yarn - id: yarn-tfjs-backend-wasm - args: - - install - waitFor: - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-backend-wasm - entrypoint: bash - id: build-tfjs-backend-wasm - args: - - ./scripts/build-ci.sh - waitFor: - - yarn-tfjs-backend-wasm - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-backend-wasm - entrypoint: yarn - id: lint-tfjs-backend-wasm - args: - - lint - waitFor: - - yarn-tfjs-backend-wasm - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-backend-wasm - entrypoint: yarn - id: test-wasm-tfjs-backend-wasm - args: - - test-ci - waitFor: - - yarn-tfjs-backend-wasm - - build-tfjs-backend-wasm - - lint-tfjs-backend-wasm - - yarn-common - - yarn-link-package - env: - - BROWSERSTACK_USERNAME=deeplearnjs1 - - NIGHTLY=$_NIGHTLY - secretEnv: - - BROWSERSTACK_KEY - - name: gcr.io/learnjs-174218/release - dir: tfjs-backend-wasm - id: test-bundle-size-tfjs-backend-wasm - entrypoint: yarn - args: - - test-bundle-size - waitFor: - - yarn-tfjs-backend-wasm - - build-tfjs-backend-wasm - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-backend-webgpu - id: yarn-tfjs-backend-webgpu - entrypoint: yarn - args: - - install - waitFor: - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-backend-webgpu - id: lint-tfjs-backend-webgpu - entrypoint: yarn - args: - - lint - waitFor: - - yarn-tfjs-backend-webgpu - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-backend-webgpu - entrypoint: yarn - id: test-webgpu-tfjs-backend-webgpu - args: - - test-ci - waitFor: - - yarn-tfjs-backend-webgpu - - lint-tfjs-backend-webgpu - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-data - entrypoint: yarn - id: yarn-tfjs-data - args: - - install - waitFor: - - yarn-common - - yarn-link-package - - yarn-tfjs-layers - - lint-tfjs-layers - - name: gcr.io/learnjs-174218/release - dir: tfjs-data - entrypoint: yarn - id: lint-tfjs-data - args: - - lint - waitFor: - - yarn-tfjs-data - - yarn-common - - yarn-link-package - - yarn-tfjs-layers - - lint-tfjs-layers - - name: gcr.io/learnjs-174218/release - dir: tfjs - entrypoint: yarn - id: yarn-tfjs - args: - - install - waitFor: - - yarn-common - - yarn-link-package - - yarn-tfjs-converter - - lint-tfjs-converter - - create-pips-tfjs-converter - - yarn-tfjs-layers - - lint-tfjs-layers - - yarn-tfjs-data - - lint-tfjs-data - - name: gcr.io/learnjs-174218/release - dir: tfjs - entrypoint: yarn - id: build-tfjs - args: - - build-ci - waitFor: - - yarn-tfjs - - yarn-common - - yarn-link-package - - yarn-tfjs-converter - - lint-tfjs-converter - - create-pips-tfjs-converter - - yarn-tfjs-layers - - lint-tfjs-layers - - yarn-tfjs-data - - lint-tfjs-data - - name: gcr.io/learnjs-174218/release - dir: tfjs - entrypoint: yarn - id: lint-tfjs - args: - - lint - waitFor: - - yarn-tfjs - - yarn-common - - yarn-link-package - - yarn-tfjs-converter - - lint-tfjs-converter - - create-pips-tfjs-converter - - yarn-tfjs-layers - - lint-tfjs-layers - - yarn-tfjs-data - - lint-tfjs-data - - name: gcr.io/learnjs-174218/release - dir: tfjs - entrypoint: yarn - id: test-tfjs - args: - - test-ci - waitFor: - - yarn-tfjs - - lint-tfjs - - yarn-common - - yarn-link-package - - yarn-tfjs-converter - - lint-tfjs-converter - - create-pips-tfjs-converter - - yarn-tfjs-layers - - lint-tfjs-layers - - yarn-tfjs-data - - lint-tfjs-data - env: - - BROWSERSTACK_USERNAME=deeplearnjs1 - - NIGHTLY=$_NIGHTLY - secretEnv: - - BROWSERSTACK_KEY - - FIREBASE_KEY - - name: gcr.io/learnjs-174218/release - dir: tfjs-node - entrypoint: yarn - id: yarn-tfjs-node - args: - - install - waitFor: - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: tfjs-node - entrypoint: yarn - id: build-addon-tfjs-node - args: - - build-addon-from-source - waitFor: - - yarn-tfjs-node - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: tfjs-node - entrypoint: yarn - id: build-tfjs-node - args: - - build-ci - waitFor: - - yarn-tfjs-node - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: tfjs-node - entrypoint: yarn - id: lint-tfjs-node - args: - - lint - waitFor: - - yarn-tfjs-node - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: tfjs-node - entrypoint: yarn - id: test-tfjs-node - args: - - test-ci - waitFor: - - yarn-tfjs-node - - lint-tfjs-node - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: tfjs-node - entrypoint: yarn - id: ensure-cpu-gpu-packages-align-tfjs-node - args: - - ensure-cpu-gpu-packages-align - waitFor: - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: tfjs-node-gpu - id: prep-gpu-tfjs-node-gpu - entrypoint: yarn - args: - - prep-gpu - waitFor: - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: tfjs-node-gpu - entrypoint: yarn - id: yarn-tfjs-node-gpu - args: - - install - waitFor: - - prep-gpu-tfjs-node-gpu - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: tfjs-node-gpu - entrypoint: yarn - id: build-addon-tfjs-node-gpu - args: - - build-addon-from-source - waitFor: - - yarn-tfjs-node-gpu - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: tfjs-node-gpu - entrypoint: yarn - id: build-tfjs-node-gpu - args: - - build-ci - waitFor: - - yarn-tfjs-node-gpu - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: tfjs-node-gpu - entrypoint: yarn - id: lint-tfjs-node-gpu - args: - - lint - waitFor: - - yarn-tfjs-node-gpu - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: tfjs-node-gpu - entrypoint: yarn - id: test-tfjs-node-gpu - args: - - test-ci - waitFor: - - yarn-tfjs-node-gpu - - lint-tfjs-node-gpu - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: tfjs-node-gpu - entrypoint: yarn - id: ensure-cpu-gpu-packages-align-tfjs-node-gpu - args: - - ensure-cpu-gpu-packages-align - waitFor: - - prep-gpu-tfjs-node-gpu - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - name: gcr.io/learnjs-174218/release - dir: e2e - entrypoint: yarn - id: yarn-e2e - args: - - install - waitFor: - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - yarn-tfjs-converter - - lint-tfjs-converter - - create-pips-tfjs-converter - - yarn-tfjs-data - - lint-tfjs-data - - yarn-tfjs-layers - - lint-tfjs-layers - - yarn-tfjs-node - - build-addon-tfjs-node - - build-tfjs-node - - lint-tfjs-node - - ensure-cpu-gpu-packages-align-tfjs-node - - yarn-tfjs-backend-wasm - - build-tfjs-backend-wasm - - lint-tfjs-backend-wasm - - name: gcr.io/learnjs-174218/release - dir: e2e - entrypoint: yarn - id: test-e2e - args: - - test-ci - env: - - BROWSERSTACK_USERNAME=deeplearnjs1 - - NIGHTLY=$_NIGHTLY - secretEnv: - - BROWSERSTACK_KEY - waitFor: - - yarn-e2e - - yarn-common - - yarn-link-package - - yarn-tfjs - - build-tfjs - - lint-tfjs - - yarn-tfjs-converter - - lint-tfjs-converter - - create-pips-tfjs-converter - - yarn-tfjs-data - - lint-tfjs-data - - yarn-tfjs-layers - - lint-tfjs-layers - - yarn-tfjs-node - - build-addon-tfjs-node - - build-tfjs-node - - lint-tfjs-node - - ensure-cpu-gpu-packages-align-tfjs-node - - yarn-tfjs-backend-wasm - - build-tfjs-backend-wasm - - lint-tfjs-backend-wasm -secrets: - - kmsKeyName: projects/learnjs-174218/locations/global/keyRings/tfjs/cryptoKeys/enc - secretEnv: - BROWSERSTACK_KEY: >- - CiQAkwyoIW0LcnxymzotLwaH4udVTQFBEN4AEA5CA+a3+yflL2ASPQAD8BdZnGARf78MhH5T9rQqyz9HNODwVjVIj64CTkFlUCGrP1B2HX9LXHWHLmtKutEGTeFFX9XhuBzNExA= - FIREBASE_KEY: >- - CiQAkwyoIXmET39jOD3ywloCIa6+WUpu3w49twpMmkMqy0vS+YsSUAAD8BdZQGOL8FKEBxr/1jl0G78OigwlNVHjD3usZobNtlOp8tV/9iacb8zPFqy0SwIO1gvz3HRr+VU7c7LS2qqaTCdacZF+dx3VJNewvdZu -timeout: 3600s -logsBucket: 'gs://tfjs-build-logs' -substitutions: - _NIGHTLY: '' -options: - logStreamingOption: STREAM_ON - machineType: N1_HIGHCPU_32 - substitution_option: ALLOW_LOOSE diff --git a/scripts/cloudbuild_tfjs_node_expected.yml b/scripts/cloudbuild_tfjs_node_expected.yml index b1c54b7527f..59931fc511b 100644 --- a/scripts/cloudbuild_tfjs_node_expected.yml +++ b/scripts/cloudbuild_tfjs_node_expected.yml @@ -26,6 +26,13 @@ steps: - buildifier-ci waitFor: - yarn-common + - name: gcr.io/learnjs-174218/release + id: tslint + entrypoint: yarn + args: + - lint + waitFor: + - yarn-common - name: gcr.io/learnjs-174218/release id: bazel-tests entrypoint: bash @@ -64,16 +71,6 @@ steps: waitFor: - yarn-common - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-converter - id: lint-tfjs-converter - entrypoint: yarn - args: - - lint - waitFor: - - yarn-tfjs-converter - - yarn-common - - yarn-link-package - name: gcr.io/learnjs-174218/release id: create-pips-tfjs-converter entrypoint: bash @@ -82,25 +79,6 @@ steps: waitFor: - yarn-common - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-layers - entrypoint: yarn - id: yarn-tfjs-layers - args: - - install - waitFor: - - yarn-common - - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-layers - entrypoint: yarn - id: lint-tfjs-layers - args: - - lint - waitFor: - - yarn-tfjs-layers - - yarn-common - - yarn-link-package - name: gcr.io/learnjs-174218/release dir: tfjs-backend-wasm entrypoint: yarn @@ -130,29 +108,6 @@ steps: - yarn-tfjs-backend-wasm - yarn-common - yarn-link-package - - name: gcr.io/learnjs-174218/release - dir: tfjs-data - entrypoint: yarn - id: yarn-tfjs-data - args: - - install - waitFor: - - yarn-common - - yarn-link-package - - yarn-tfjs-layers - - lint-tfjs-layers - - name: gcr.io/learnjs-174218/release - dir: tfjs-data - entrypoint: yarn - id: lint-tfjs-data - args: - - lint - waitFor: - - yarn-tfjs-data - - yarn-common - - yarn-link-package - - yarn-tfjs-layers - - lint-tfjs-layers - name: gcr.io/learnjs-174218/release dir: tfjs entrypoint: yarn @@ -163,12 +118,7 @@ steps: - yarn-common - yarn-link-package - yarn-tfjs-converter - - lint-tfjs-converter - create-pips-tfjs-converter - - yarn-tfjs-layers - - lint-tfjs-layers - - yarn-tfjs-data - - lint-tfjs-data - name: gcr.io/learnjs-174218/release dir: tfjs entrypoint: yarn @@ -180,12 +130,7 @@ steps: - yarn-common - yarn-link-package - yarn-tfjs-converter - - lint-tfjs-converter - create-pips-tfjs-converter - - yarn-tfjs-layers - - lint-tfjs-layers - - yarn-tfjs-data - - lint-tfjs-data - name: gcr.io/learnjs-174218/release dir: tfjs entrypoint: yarn @@ -197,12 +142,7 @@ steps: - yarn-common - yarn-link-package - yarn-tfjs-converter - - lint-tfjs-converter - create-pips-tfjs-converter - - yarn-tfjs-layers - - lint-tfjs-layers - - yarn-tfjs-data - - lint-tfjs-data - name: gcr.io/learnjs-174218/release dir: tfjs-node entrypoint: yarn @@ -293,12 +233,7 @@ steps: - build-tfjs - lint-tfjs - yarn-tfjs-converter - - lint-tfjs-converter - create-pips-tfjs-converter - - yarn-tfjs-data - - lint-tfjs-data - - yarn-tfjs-layers - - lint-tfjs-layers - yarn-tfjs-node - build-addon-tfjs-node - build-tfjs-node @@ -326,12 +261,7 @@ steps: - build-tfjs - lint-tfjs - yarn-tfjs-converter - - lint-tfjs-converter - create-pips-tfjs-converter - - yarn-tfjs-data - - lint-tfjs-data - - yarn-tfjs-layers - - lint-tfjs-layers - yarn-tfjs-node - build-addon-tfjs-node - build-tfjs-node diff --git a/scripts/generate_cloudbuild_test.js b/scripts/generate_cloudbuild_test.js index b950a7f47a7..317c571d2c4 100644 --- a/scripts/generate_cloudbuild_test.js +++ b/scripts/generate_cloudbuild_test.js @@ -24,10 +24,10 @@ const path = require('path'); // TODO(mattsoulanille): When Jasmine is updated to >=3.3.0, Use // jasmine.withContext to show the above message if the tests fail. describe('generateCloudbuild', () => { - it('generates the correct cloudbuild file for tfjs-core', () => { + it('generates the correct cloudbuild file for e2e', () => { const expectedCloudbuild = yaml.safeLoad(fs.readFileSync( - path.join('scripts/cloudbuild_tfjs_core_expected.yml'))); - const cloudbuild = generateCloudbuild(['tfjs-core'], /* print */ false); + path.join('scripts/cloudbuild_e2e_expected.yml'))); + const cloudbuild = generateCloudbuild(['e2e'], /* print */ false); expect(cloudbuild).toEqual(expectedCloudbuild); }); From a1e8d518b5dce7184f526d8bbebb05da74b55804 Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 28 Oct 2021 16:54:30 -0700 Subject: [PATCH 13/16] [webgpu] Revert incorrect lint changes --- tfjs-backend-webgpu/src/backend_webgpu.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tfjs-backend-webgpu/src/backend_webgpu.ts b/tfjs-backend-webgpu/src/backend_webgpu.ts index c7f35bb4966..3204d0c6790 100644 --- a/tfjs-backend-webgpu/src/backend_webgpu.ts +++ b/tfjs-backend-webgpu/src/backend_webgpu.ts @@ -814,7 +814,7 @@ export class WebGPUBackend extends KernelBackend { const uniformInfo = { byteSize: uniformsByteLength, usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.UNIFORM, - buffer: uniforms.buffer + buffer: (uniforms as GPUBufferBinding).buffer }; this.uniformDisposalQueue.push(uniformInfo); } From 03b052d41d7c5d8a3191f1c55117c24a2e9af40a Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Thu, 28 Oct 2021 17:16:51 -0700 Subject: [PATCH 14/16] Add lint instructions to Bazel migration doc --- BAZEL_MIGRATION.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/BAZEL_MIGRATION.md b/BAZEL_MIGRATION.md index b56b1d22449..77f66710e6d 100644 --- a/BAZEL_MIGRATION.md +++ b/BAZEL_MIGRATION.md @@ -403,6 +403,24 @@ Update all downstream dependencies that depend on the package to point to its lo To find downstream packages, run `grep -r --exclude=yarn.lock --exclude-dir=node_modules "link:.*your-package-name" .` in the root of the repository. +### Move linting to the repo-wide lint script +#### Add the new Bazel package to the [repo-wide tslint tsconfig](tsconfig_tslint.json): + +Add the path mapping: +```json +"paths": { + ..., + "@tensorflow/the-new-package": ["the-new-package/src/index.ts"], + "@tensorflow/the-new-package/dist/*": ["the-new-package/src/*"] +``` + +Also, remove the package from the `exclude` list. + +It's a good idea to test that linting is working on the package. Create a lint error in one if its files, e.g. `const x = "Hello, world!"` (note the double quotes), and then run `yarn lint` in the root of the repository. + +#### Remove the package's own TypeScript linting scripts: +Remove the `package.json` `lint` script, the `tslint.json` file, and the cloudbuild `lint` step from the package's `cloudbuild.yml` file. Remove `tslint`-related dependencies from the package's `package.json` and run `yarn` to regenerate the `yarn.lock` file. + ### Update or Remove `cloudbuild.yml` Update the `cloudbuild.yml` to remove any steps that are now built with Bazel. These will be run by the `bazel-tests` step, which runs before other packages' steps. Any Bazel rule tagged as `ci` will be tested / build in CI. @@ -433,3 +451,4 @@ Before pushing to Git, run the Bazel linter by running `yarn bazel:format` and ` * Make sure the `package.json` scripts are updated and that the package.json includes `@bazel/bazelisk` as a dev dependency. * Make sure the package has a `build-npm` script and a `publish-npm` script. These are used by the release script. * Check the generated bundle sizes and make sure they don't include any unexpected files. Check the `_stats` files for info on this. +* Make sure the package is added to the [repo-wide tslint tsconfig](tsconfig_tslint.json) and that its original lint scripts are removed. From df7cff8e47073b973d76dbd4f4587a1475cabc85 Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Mon, 1 Nov 2021 11:48:07 -0700 Subject: [PATCH 15/16] Fix lint errors --- tfjs-core/src/base_side_effects.ts | 1 + tfjs-core/src/log.ts | 1 - tfjs-core/src/ops/from_pixels_worker_test.ts | 2 +- tfjs-core/src/ops/fused/mat_mul.ts | 7 +++---- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tfjs-core/src/base_side_effects.ts b/tfjs-core/src/base_side_effects.ts index 6c198966df8..c404e3bc096 100644 --- a/tfjs-core/src/base_side_effects.ts +++ b/tfjs-core/src/base_side_effects.ts @@ -25,6 +25,7 @@ getOrMakeEngine(); import './flags'; // Register platforms import './platforms/platform_browser'; +// tslint:disable-next-line:no-circular-imports import './platforms/platform_node'; // Set up OpHandler diff --git a/tfjs-core/src/log.ts b/tfjs-core/src/log.ts index 3010ed7b3d6..5a03b379c53 100644 --- a/tfjs-core/src/log.ts +++ b/tfjs-core/src/log.ts @@ -15,7 +15,6 @@ * ============================================================================= */ -// tslint:disable-next-line:no-circular-imports import {env} from './environment'; export function warn(...msg: Array<{}>): void { diff --git a/tfjs-core/src/ops/from_pixels_worker_test.ts b/tfjs-core/src/ops/from_pixels_worker_test.ts index 82408d300dc..5d6d0bf576c 100644 --- a/tfjs-core/src/ops/from_pixels_worker_test.ts +++ b/tfjs-core/src/ops/from_pixels_worker_test.ts @@ -16,7 +16,7 @@ */ import '@tensorflow/tfjs-backend-cpu'; -import { expectArraysEqual } from "../test_util"; +import {expectArraysEqual} from '../test_util'; describe('fromPixels worker', () => { it('fromPixels for ImageBitmap, worker', (done) => { diff --git a/tfjs-core/src/ops/fused/mat_mul.ts b/tfjs-core/src/ops/fused/mat_mul.ts index 2cd858e2e61..e4048bd32f4 100644 --- a/tfjs-core/src/ops/fused/mat_mul.ts +++ b/tfjs-core/src/ops/fused/mat_mul.ts @@ -81,8 +81,7 @@ function fusedMatMul_({ } return applyActivation( - result, activation, preluActivationWeights, leakyreluAlpha) as - Tensor; + result, activation, preluActivationWeights, leakyreluAlpha); } let $a = convertToTensor(a, 'a', 'fused matMul'); @@ -192,7 +191,7 @@ function fusedMatMul_({ return {value: reshape(res, outShape), gradFunc: grad}; }); - return customOp(a3D, b3D) as Tensor; + return customOp(a3D, b3D); } else { const customOpWithBias = customGrad( (a3D: Tensor3D, b3D: Tensor3D, $bias: Tensor, save: GradSaveFunc) => { @@ -207,7 +206,7 @@ function fusedMatMul_({ return {value: reshape(res, outShape), gradFunc: grad}; }); - return customOpWithBias(a3D, b3D, $bias) as Tensor; + return customOpWithBias(a3D, b3D, $bias); } } From cdc726319f67e7ab59581ef8f28632566f5958e2 Mon Sep 17 00:00:00 2001 From: Matthew Soulanille Date: Mon, 1 Nov 2021 12:30:21 -0700 Subject: [PATCH 16/16] [core] Remove circular import in platform_node --- tfjs-core/src/base_side_effects.ts | 1 - tfjs-core/src/platforms/platform_node.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/tfjs-core/src/base_side_effects.ts b/tfjs-core/src/base_side_effects.ts index c404e3bc096..6c198966df8 100644 --- a/tfjs-core/src/base_side_effects.ts +++ b/tfjs-core/src/base_side_effects.ts @@ -25,7 +25,6 @@ getOrMakeEngine(); import './flags'; // Register platforms import './platforms/platform_browser'; -// tslint:disable-next-line:no-circular-imports import './platforms/platform_node'; // Set up OpHandler diff --git a/tfjs-core/src/platforms/platform_node.ts b/tfjs-core/src/platforms/platform_node.ts index fa62a9cae21..19ddedb6af8 100644 --- a/tfjs-core/src/platforms/platform_node.ts +++ b/tfjs-core/src/platforms/platform_node.ts @@ -15,7 +15,6 @@ * ============================================================================= */ import {env} from '../environment'; -import '../base_side_effects'; import {Platform} from './platform'; // We are wrapping this within an object so it can be stubbed by Jasmine.