diff --git a/tfjs-converter/package.json b/tfjs-converter/package.json index f79a5d3af90..44780c8905f 100644 --- a/tfjs-converter/package.json +++ b/tfjs-converter/package.json @@ -2,10 +2,10 @@ "name": "@tensorflow/tfjs-converter", "version": "1.7.0", "description": "Tensorflow model converter for javascript", - "main": "dist/src/index.js", + "main": "dist/index.js", "jsnext:main": "dist/tf-converter.esm.js", "module": "dist/tf-converter.esm.js", - "types": "dist/src/index.d.ts", + "types": "dist/index.d.ts", "unpkg": "dist/tf-converter.min.js", "jsdelivr": "dist/tf-converter.min.js", "miniprogram": "dist/miniprogram", @@ -15,10 +15,10 @@ }, "license": "Apache-2.0", "peerDependencies": { - "@tensorflow/tfjs-core": "1.7.0" + "@tensorflow/tfjs-core": "link:../tfjs-core" }, "devDependencies": { - "@tensorflow/tfjs-core": "1.7.0", + "@tensorflow/tfjs-core": "link:../tfjs-core", "@types/deep-equal": "^1.0.1", "@types/jasmine": "~2.8.6", "@types/long": "~3.0.32", diff --git a/tfjs-converter/tsconfig.json b/tfjs-converter/tsconfig.json index 3dcc900ac4c..a215627bb74 100644 --- a/tfjs-converter/tsconfig.json +++ b/tfjs-converter/tsconfig.json @@ -23,7 +23,6 @@ "allowUnreachableCode": false }, "include": [ - "src/", - "scripts/" + "src/" ] } diff --git a/tfjs-converter/yarn.lock b/tfjs-converter/yarn.lock index 591fe3ac687..7e49367c2f0 100644 --- a/tfjs-converter/yarn.lock +++ b/tfjs-converter/yarn.lock @@ -55,17 +55,9 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= -"@tensorflow/tfjs-core@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf" - integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw== - dependencies: - "@types/offscreencanvas" "~2019.3.0" - "@types/seedrandom" "2.4.27" - "@types/webgl-ext" "0.0.30" - "@types/webgl2" "0.0.4" - node-fetch "~2.1.2" - seedrandom "2.4.3" +"@tensorflow/tfjs-core@link:../tfjs-core": + version "0.0.0" + uid "" "@types/deep-equal@^1.0.1": version "1.0.1" diff --git a/tfjs-data/package.json b/tfjs-data/package.json index 6eb8fa79b30..23869573262 100644 --- a/tfjs-data/package.json +++ b/tfjs-data/package.json @@ -12,8 +12,8 @@ "miniprogram": "dist/miniprogram", "license": "Apache-2.0", "devDependencies": { - "@tensorflow/tfjs-core": "1.7.0", - "@tensorflow/tfjs-layers": "1.7.0", + "@tensorflow/tfjs-core": "link:../tfjs-core", + "@tensorflow/tfjs-layers": "link:../tfjs-layers", "@types/jasmine": "~2.5.53", "@types/seedrandom": "^2.4.27", "@types/utf8": "~2.1.6", @@ -56,7 +56,7 @@ "lint": "tslint -p . -t verbose" }, "peerDependencies": { - "@tensorflow/tfjs-core": "1.7.0", + "@tensorflow/tfjs-core": "link:../tfjs-core", "seedrandom": "~2.4.3" }, "dependencies": { diff --git a/tfjs-data/yarn.lock b/tfjs-data/yarn.lock index efb821e0115..695892c5b55 100644 --- a/tfjs-data/yarn.lock +++ b/tfjs-data/yarn.lock @@ -2,22 +2,13 @@ # yarn lockfile v1 -"@tensorflow/tfjs-core@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf" - integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw== - dependencies: - "@types/offscreencanvas" "~2019.3.0" - "@types/seedrandom" "2.4.27" - "@types/webgl-ext" "0.0.30" - "@types/webgl2" "0.0.4" - node-fetch "~2.1.2" - seedrandom "2.4.3" +"@tensorflow/tfjs-core@link:../tfjs-core": + version "0.0.0" + uid "" -"@tensorflow/tfjs-layers@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.0.tgz#7d1f7246ac3f6f23d0923b7d69d7a97a0890a35d" - integrity sha512-sRdzuPc2CeLSxctqXdLTckvitSBjsjL8H6MSrvrbOfPEckKdAeNpojB0ayM+76Pc3AsS0/AI6F1R2lT9qoH9/g== +"@tensorflow/tfjs-layers@link:../tfjs-layers": + version "0.0.0" + uid "" "@types/estree@0.0.38": version "0.0.38" diff --git a/tfjs-layers/package.json b/tfjs-layers/package.json index e1a585d97ca..d79a87c42ef 100644 --- a/tfjs-layers/package.json +++ b/tfjs-layers/package.json @@ -12,7 +12,7 @@ "unpkg": "dist/tf-layers.min.js", "miniprogram": "dist/miniprogram", "devDependencies": { - "@tensorflow/tfjs-core": "1.7.0", + "@tensorflow/tfjs-core": "link:../tfjs-core", "@types/jasmine": "~2.5.53", "clang-format": "~1.2.2", "http-server": "~0.10.0", @@ -57,6 +57,6 @@ "lint": "tslint -p . -t verbose" }, "peerDependencies": { - "@tensorflow/tfjs-core": "1.7.0" + "@tensorflow/tfjs-core": "link:../tfjs-core" } } diff --git a/tfjs-layers/yarn.lock b/tfjs-layers/yarn.lock index 45e6f3965cd..ca7da050eae 100644 --- a/tfjs-layers/yarn.lock +++ b/tfjs-layers/yarn.lock @@ -2,17 +2,9 @@ # yarn lockfile v1 -"@tensorflow/tfjs-core@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf" - integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw== - dependencies: - "@types/offscreencanvas" "~2019.3.0" - "@types/seedrandom" "2.4.27" - "@types/webgl-ext" "0.0.30" - "@types/webgl2" "0.0.4" - node-fetch "~2.1.2" - seedrandom "2.4.3" +"@tensorflow/tfjs-core@link:../tfjs-core": + version "0.0.0" + uid "" "@types/estree@0.0.38": version "0.0.38" diff --git a/tfjs-node-gpu/cloudbuild.yml b/tfjs-node-gpu/cloudbuild.yml index 31919f3756b..205a13fedd3 100644 --- a/tfjs-node-gpu/cloudbuild.yml +++ b/tfjs-node-gpu/cloudbuild.yml @@ -13,13 +13,53 @@ steps: args: ['install'] waitFor: ['prep-gpu'] +# Build core from master. +- name: 'node:10' + dir: 'tfjs-node-gpu' + id: 'build-core' + entrypoint: 'yarn' + args: ['build-core-ci'] + waitFor: ['yarn-common'] + +# Build layers from master. +- name: 'node:10' + dir: 'tfjs-node-gpu' + id: 'build-layers' + entrypoint: 'yarn' + args: ['build-layers-ci'] + waitFor: ['build-core'] + +# Build converter from master. +- name: 'node:10' + dir: 'tfjs-node-gpu' + id: 'build-converter' + entrypoint: 'yarn' + args: ['build-converter-ci'] + waitFor: ['build-core'] + +# Build data from master. +- name: 'node:10' + dir: 'tfjs-node-gpu' + id: 'build-data' + entrypoint: 'yarn' + args: ['build-data-ci'] + waitFor: ['build-layers', 'build-converter'] + +# Build union package from master. +- name: 'node:10' + dir: 'tfjs-node-gpu' + id: 'build-union' + entrypoint: 'yarn' + args: ['build-union-ci'] + waitFor: ['build-data'] + # Install tfjs-node dependencies. - name: 'node:10' dir: 'tfjs-node-gpu' entrypoint: 'yarn' id: 'yarn' args: ['install'] - waitFor: ['yarn-common'] + waitFor: ['build-union'] # Unit tests. - name: 'node:10' diff --git a/tfjs-node-gpu/package.json b/tfjs-node-gpu/package.json index 82a734650dd..1c0cda63bfe 100644 --- a/tfjs-node-gpu/package.json +++ b/tfjs-node-gpu/package.json @@ -13,6 +13,17 @@ }, "scripts": { "build": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js", + "build-ci": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js", + "build-core": "cd ../tfjs-core && yarn && yarn build", + "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci", + "build-layers": "cd ../tfjs-layers && yarn && yarn build", + "build-layers-ci": "cd ../tfjs-layers && yarn && yarn build-ci", + "build-converter": "cd ../tfjs-converter && yarn && yarn build", + "build-converter-ci": "cd ../tfjs-converter && yarn && yarn build-ci", + "build-data": "cd ../tfjs-data && yarn && yarn build", + "build-data-ci": "cd ../tfjs-data && yarn && yarn build-ci", + "build-union": "cd ../tfjs && yarn && yarn build", + "build-union-ci": "cd ../tfjs && yarn && yarn build-ci", "build-npm": "yarn prep-gpu && ./scripts/build-npm.sh", "build-addon": "./scripts/build-and-upload-addon.sh", "build-addon-from-source": "node-pre-gyp install --build-from-source", @@ -24,17 +35,19 @@ "install": "node scripts/install.js gpu download", "install-from-source": "yarn clean-deps && yarn && yarn build-addon-from-source", "link-local": "yalc link", + "link-master": "../scripts/link-master.js", "lint": "tslint -p . -t verbose", "prep": "cd node_modules/@tensorflow/tfjs-core && yarn && yarn build", "prep-gpu": "./prep-gpu.sh", "prep-gpu-windows": "./prep-gpu-windows.bat", "publish-local": "yarn prep && yalc push", - "test": "ts-node src/run_tests.ts", + "test": "yarn link-master && yarn && yarn build-core && yarn build-layers && yarn build-converter && yarn build-data && yarn build-union && ts-node src/run_tests.ts", "test-ci": "./scripts/test-ci.sh", "test-ts-integration": "./scripts/test-ts-integration.sh", "upload-windows-addon": "prep-gpu-windows.bat && ./scripts/build-and-upload-windows-addon-gpu.bat" }, "devDependencies": { + "@tensorflow/tfjs-layers": "link:../tfjs-layers", "@types/jasmine": "~2.8.6", "@types/node": "^10.5.1", "@types/progress": "^2.0.1", @@ -54,8 +67,8 @@ "yargs": "^14.2.0" }, "dependencies": { - "@tensorflow/tfjs": "1.7.0", - "@tensorflow/tfjs-core": "1.7.0", + "@tensorflow/tfjs": "link:../tfjs", + "@tensorflow/tfjs-core": "link:../tfjs-core", "adm-zip": "^0.4.11", "google-protobuf": "^3.9.2", "https-proxy-agent": "^2.2.1", diff --git a/tfjs-node-gpu/yarn.lock b/tfjs-node-gpu/yarn.lock index c4572d0cea5..1e32ee3b870 100644 --- a/tfjs-node-gpu/yarn.lock +++ b/tfjs-node-gpu/yarn.lock @@ -90,45 +90,25 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" -"@tensorflow/tfjs-converter@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.7.0.tgz#4dcfeffa0bfa4e26e8b64e15a24a6683645945cc" - integrity sha512-cFXLDKVEjEtFv/C0wETXpIeJNa25chC6nvFm06dB/ShvrGYZpDsGlWVNiCu4v5/VtrSZEQPZ2QdkpTpURbvAqQ== - -"@tensorflow/tfjs-core@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf" - integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw== - dependencies: - "@types/offscreencanvas" "~2019.3.0" - "@types/seedrandom" "2.4.27" - "@types/webgl-ext" "0.0.30" - "@types/webgl2" "0.0.4" - node-fetch "~2.1.2" - seedrandom "2.4.3" - -"@tensorflow/tfjs-data@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.7.0.tgz#6b5f91e328d1fdd577bc67b1c800197f34ae3f91" - integrity sha512-i3pPpCTN76cVArzQ1vby+YFDcxC7APOTW2NGcHr3VxWf9ZCMgjJv/s2z71U8OHoCzw/lTXYue8/l4j4q+D3PMg== - dependencies: - "@types/node-fetch" "^2.1.2" - node-fetch "~2.1.2" - -"@tensorflow/tfjs-layers@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.0.tgz#7d1f7246ac3f6f23d0923b7d69d7a97a0890a35d" - integrity sha512-sRdzuPc2CeLSxctqXdLTckvitSBjsjL8H6MSrvrbOfPEckKdAeNpojB0ayM+76Pc3AsS0/AI6F1R2lT9qoH9/g== - -"@tensorflow/tfjs@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-1.7.0.tgz#1b9b10240e18c4e6b34e7de76a5db00327210d14" - integrity sha512-lN4wSCb/pFFa60R4Ii8Znn+3Q42Ad8bDrqrIPvsxFQYFXd9BSgXXIgizRoSkyMsLVzJokuLLuElHGggF2VNnug== - dependencies: - "@tensorflow/tfjs-converter" "1.7.0" - "@tensorflow/tfjs-core" "1.7.0" - "@tensorflow/tfjs-data" "1.7.0" - "@tensorflow/tfjs-layers" "1.7.0" +"@tensorflow/tfjs-converter@link:../tfjs-converter": + version "0.0.0" + uid "" + +"@tensorflow/tfjs-core@link:../tfjs-core": + version "0.0.0" + uid "" + +"@tensorflow/tfjs-data@link:../tfjs-data": + version "0.0.0" + uid "" + +"@tensorflow/tfjs-layers@link:../tfjs-layers": + version "0.0.0" + uid "" + +"@tensorflow/tfjs@link:../tfjs": + version "0.0.0" + uid "" "@types/events@*": version "3.0.0" diff --git a/tfjs-node/cloudbuild.yml b/tfjs-node/cloudbuild.yml index 1dfe558c30a..dcd4bcff4a2 100644 --- a/tfjs-node/cloudbuild.yml +++ b/tfjs-node/cloudbuild.yml @@ -5,13 +5,53 @@ steps: entrypoint: 'yarn' args: ['install'] +# Build core from master. +- name: 'node:10' + dir: 'tfjs-node' + id: 'build-core' + entrypoint: 'yarn' + args: ['build-core-ci'] + waitFor: ['yarn-common'] + +# Build layers from master. +- name: 'node:10' + dir: 'tfjs-node' + id: 'build-layers' + entrypoint: 'yarn' + args: ['build-layers-ci'] + waitFor: ['build-core'] + +# Build converter from master. +- name: 'node:10' + dir: 'tfjs-node' + id: 'build-converter' + entrypoint: 'yarn' + args: ['build-converter-ci'] + waitFor: ['build-core'] + +# Build data from master. +- name: 'node:10' + dir: 'tfjs-node' + id: 'build-data' + entrypoint: 'yarn' + args: ['build-data-ci'] + waitFor: ['build-layers', 'build-converter'] + +# Build union package from master. +- name: 'node:10' + dir: 'tfjs-node' + id: 'build-union' + entrypoint: 'yarn' + args: ['build-union-ci'] + waitFor: ['build-data'] + # Install tfjs-node dependencies. - name: 'node:10' dir: 'tfjs-node' entrypoint: 'yarn' id: 'yarn' args: ['install'] - waitFor: ['yarn-common'] + waitFor: ['build-union'] # Unit tests. - name: 'node:10' diff --git a/tfjs-node/package.json b/tfjs-node/package.json index 684ae278caf..833b6c2850b 100644 --- a/tfjs-node/package.json +++ b/tfjs-node/package.json @@ -13,6 +13,17 @@ }, "scripts": { "build": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js", + "build-ci": "tsc && mkdir -p dist/proto && cp src/proto/api_pb.js dist/proto/api_pb.js", + "build-core": "cd ../tfjs-core && yarn && yarn build", + "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci", + "build-layers": "cd ../tfjs-layers && yarn && yarn build", + "build-layers-ci": "cd ../tfjs-layers && yarn && yarn build-ci", + "build-converter": "cd ../tfjs-converter && yarn && yarn build", + "build-converter-ci": "cd ../tfjs-converter && yarn && yarn build-ci", + "build-data": "cd ../tfjs-data && yarn && yarn build", + "build-data-ci": "cd ../tfjs-data && yarn && yarn build-ci", + "build-union": "cd ../tfjs && yarn && yarn build", + "build-union-ci": "cd ../tfjs && yarn && yarn build-ci", "build-npm": "./scripts/build-npm.sh", "build-addon": "./scripts/build-and-upload-addon.sh", "build-addon-from-source": "node-pre-gyp install --build-from-source", @@ -24,15 +35,17 @@ "install": "node scripts/install.js", "install-from-source": "yarn clean-deps && yarn && yarn build-addon-from-source", "link-local": "yalc link", + "link-master": "../scripts/link-master.js", "lint": "tslint -p . -t verbose", "prep": "cd node_modules/@tensorflow/tfjs-core && yarn && yarn build", "publish-local": "yarn prep && yalc push", - "test": "ts-node src/run_tests.ts", + "test": "yarn link-master && yarn && yarn build-core && yarn build-layers && yarn build-converter && yarn build-data && yarn build-union && ts-node src/run_tests.ts", "test-ci": "./scripts/test-ci.sh", "test-ts-integration": "./scripts/test-ts-integration.sh", "upload-windows-addon": "./scripts/build-and-upload-windows-addon.bat" }, "devDependencies": { + "@tensorflow/tfjs-layers": "link:../tfjs-layers", "@types/jasmine": "~2.8.6", "@types/node": "^10.5.1", "@types/progress": "^2.0.1", @@ -51,8 +64,8 @@ "yargs": "^14.2.0" }, "dependencies": { - "@tensorflow/tfjs": "1.7.0", - "@tensorflow/tfjs-core": "1.7.0", + "@tensorflow/tfjs": "link:../tfjs", + "@tensorflow/tfjs-core": "link:../tfjs-core", "adm-zip": "^0.4.11", "google-protobuf": "^3.9.2", "https-proxy-agent": "^2.2.1", diff --git a/tfjs-node/scripts/test-ci.sh b/tfjs-node/scripts/test-ci.sh index 3f5ff4d95cb..3a53d02037b 100755 --- a/tfjs-node/scripts/test-ci.sh +++ b/tfjs-node/scripts/test-ci.sh @@ -10,6 +10,6 @@ set -e yarn build-addon-from-source -yarn build +yarn build-ci yarn lint yarn test diff --git a/tfjs-node/yarn.lock b/tfjs-node/yarn.lock index f55f50dde1d..2f2b7d8da14 100644 --- a/tfjs-node/yarn.lock +++ b/tfjs-node/yarn.lock @@ -90,45 +90,25 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" -"@tensorflow/tfjs-converter@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.7.0.tgz#4dcfeffa0bfa4e26e8b64e15a24a6683645945cc" - integrity sha512-cFXLDKVEjEtFv/C0wETXpIeJNa25chC6nvFm06dB/ShvrGYZpDsGlWVNiCu4v5/VtrSZEQPZ2QdkpTpURbvAqQ== - -"@tensorflow/tfjs-core@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf" - integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw== - dependencies: - "@types/offscreencanvas" "~2019.3.0" - "@types/seedrandom" "2.4.27" - "@types/webgl-ext" "0.0.30" - "@types/webgl2" "0.0.4" - node-fetch "~2.1.2" - seedrandom "2.4.3" - -"@tensorflow/tfjs-data@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.7.0.tgz#6b5f91e328d1fdd577bc67b1c800197f34ae3f91" - integrity sha512-i3pPpCTN76cVArzQ1vby+YFDcxC7APOTW2NGcHr3VxWf9ZCMgjJv/s2z71U8OHoCzw/lTXYue8/l4j4q+D3PMg== - dependencies: - "@types/node-fetch" "^2.1.2" - node-fetch "~2.1.2" - -"@tensorflow/tfjs-layers@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.0.tgz#7d1f7246ac3f6f23d0923b7d69d7a97a0890a35d" - integrity sha512-sRdzuPc2CeLSxctqXdLTckvitSBjsjL8H6MSrvrbOfPEckKdAeNpojB0ayM+76Pc3AsS0/AI6F1R2lT9qoH9/g== - -"@tensorflow/tfjs@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-1.7.0.tgz#1b9b10240e18c4e6b34e7de76a5db00327210d14" - integrity sha512-lN4wSCb/pFFa60R4Ii8Znn+3Q42Ad8bDrqrIPvsxFQYFXd9BSgXXIgizRoSkyMsLVzJokuLLuElHGggF2VNnug== - dependencies: - "@tensorflow/tfjs-converter" "1.7.0" - "@tensorflow/tfjs-core" "1.7.0" - "@tensorflow/tfjs-data" "1.7.0" - "@tensorflow/tfjs-layers" "1.7.0" +"@tensorflow/tfjs-converter@link:../tfjs-converter": + version "0.0.0" + uid "" + +"@tensorflow/tfjs-core@link:../tfjs-core": + version "0.0.0" + uid "" + +"@tensorflow/tfjs-data@link:../tfjs-data": + version "0.0.0" + uid "" + +"@tensorflow/tfjs-layers@link:../tfjs-layers": + version "0.0.0" + uid "" + +"@tensorflow/tfjs@link:../tfjs": + version "0.0.0" + uid "" "@types/events@*": version "3.0.0" diff --git a/tfjs/package.json b/tfjs/package.json index 2e14066cc09..b54472ef77f 100644 --- a/tfjs/package.json +++ b/tfjs/package.json @@ -69,9 +69,9 @@ "test-ci": "./scripts/test-ci.sh" }, "dependencies": { - "@tensorflow/tfjs-converter": "1.7.0", - "@tensorflow/tfjs-core": "1.7.0", - "@tensorflow/tfjs-data": "1.7.0", - "@tensorflow/tfjs-layers": "1.7.0" + "@tensorflow/tfjs-converter": "link:../tfjs-converter", + "@tensorflow/tfjs-core": "link:../tfjs-core", + "@tensorflow/tfjs-data": "link:../tfjs-data", + "@tensorflow/tfjs-layers": "link:../tfjs-layers" } } diff --git a/tfjs/yarn.lock b/tfjs/yarn.lock index 55102cfcdb1..af47ed96dfc 100644 --- a/tfjs/yarn.lock +++ b/tfjs/yarn.lock @@ -2,35 +2,21 @@ # yarn lockfile v1 -"@tensorflow/tfjs-converter@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.7.0.tgz#4dcfeffa0bfa4e26e8b64e15a24a6683645945cc" - integrity sha512-cFXLDKVEjEtFv/C0wETXpIeJNa25chC6nvFm06dB/ShvrGYZpDsGlWVNiCu4v5/VtrSZEQPZ2QdkpTpURbvAqQ== - -"@tensorflow/tfjs-core@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.0.tgz#9207c8f2481c52a6a40135a6aaf21a9bb0339bdf" - integrity sha512-uwQdiklNjqBnHPeseOdG0sGxrI3+d6lybaKu2+ou3ajVeKdPEwpWbgqA6iHjq1iylnOGkgkbbnQ6r2lwkiIIHw== - dependencies: - "@types/offscreencanvas" "~2019.3.0" - "@types/seedrandom" "2.4.27" - "@types/webgl-ext" "0.0.30" - "@types/webgl2" "0.0.4" - node-fetch "~2.1.2" - seedrandom "2.4.3" - -"@tensorflow/tfjs-data@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.7.0.tgz#6b5f91e328d1fdd577bc67b1c800197f34ae3f91" - integrity sha512-i3pPpCTN76cVArzQ1vby+YFDcxC7APOTW2NGcHr3VxWf9ZCMgjJv/s2z71U8OHoCzw/lTXYue8/l4j4q+D3PMg== - dependencies: - "@types/node-fetch" "^2.1.2" - node-fetch "~2.1.2" - -"@tensorflow/tfjs-layers@1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.0.tgz#7d1f7246ac3f6f23d0923b7d69d7a97a0890a35d" - integrity sha512-sRdzuPc2CeLSxctqXdLTckvitSBjsjL8H6MSrvrbOfPEckKdAeNpojB0ayM+76Pc3AsS0/AI6F1R2lT9qoH9/g== +"@tensorflow/tfjs-converter@link:../tfjs-converter": + version "0.0.0" + uid "" + +"@tensorflow/tfjs-core@link:../tfjs-core": + version "0.0.0" + uid "" + +"@tensorflow/tfjs-data@link:../tfjs-data": + version "0.0.0" + uid "" + +"@tensorflow/tfjs-layers@link:../tfjs-layers": + version "0.0.0" + uid "" "@types/estree@0.0.38": version "0.0.38"