From 18dbc8ad0237caa1defaafcedbf6ab734a09cbf9 Mon Sep 17 00:00:00 2001 From: Na Li Date: Fri, 3 Apr 2020 12:50:46 -0700 Subject: [PATCH 1/2] Update tfjs-node, tfjs-node-gpu to 1.7.2, 1.7.2. --- tfjs-node-gpu/package.json | 6 ++-- tfjs-node-gpu/yarn.lock | 52 +++++++++++++++++++++++++--------- tfjs-node/package.json | 6 ++-- tfjs-node/src/version.ts | 2 +- tfjs-node/yarn.lock | 58 +++++++++++++++++++++++++------------- 5 files changed, 84 insertions(+), 40 deletions(-) diff --git a/tfjs-node-gpu/package.json b/tfjs-node-gpu/package.json index 00ce30945b4..d20b5530530 100644 --- a/tfjs-node-gpu/package.json +++ b/tfjs-node-gpu/package.json @@ -1,6 +1,6 @@ { "name": "@tensorflow/tfjs-node-gpu", - "version": "0.0.0", + "version": "1.7.2", "main": "dist/index.js", "types": "dist/index.d.ts", "gypfile": true, @@ -69,8 +69,8 @@ "yargs": "^14.2.0" }, "dependencies": { - "@tensorflow/tfjs": "link:../tfjs", - "@tensorflow/tfjs-core": "link:../tfjs-core", + "@tensorflow/tfjs": "1.7.2", + "@tensorflow/tfjs-core": "1.7.2", "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 1e32ee3b870..ce985809e71 100644 --- a/tfjs-node-gpu/yarn.lock +++ b/tfjs-node-gpu/yarn.lock @@ -90,25 +90,49 @@ lodash "^4.17.13" to-fast-properties "^2.0.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-converter@1.7.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.7.2.tgz#a2bb479f271aa9a5bb2909b3b8d90c431996893d" + integrity sha512-6ckNQ3n36X20/+YDCTictfKftPH3urf5I+wc0QNlsSJhik3QiliYJy+v5hmjQGSJ4ow2oyW5T2lUsy9aNoNaTg== + +"@tensorflow/tfjs-core@1.7.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.2.tgz#c7b4ac37a7b8bd7226766ee9bcd930274bf8e019" + integrity sha512-2o5jjXLHrMY4f+r7aOfJZbKqrchEYrRk2mhlFD3RgKqtSKUpfv15YLQr4uc0uMbNSwuZbjWwrmaL9yyaBWYSAQ== + 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.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.7.2.tgz#6a3ab4d2c1fd1cfdf768f9774b108fb6477c75a0" + integrity sha512-kvYM4JfQKOnzkqb6e40N860NS9rBkxL710AX7U6uxcZzMtbVdsD9yFNxQrevgpv62hSCogiRsVFSSkcYZFuIsg== + dependencies: + "@types/node-fetch" "^2.1.2" + node-fetch "~2.1.2" + +"@tensorflow/tfjs-layers@1.7.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.2.tgz#b76e73042e999e1ea755869c1764503e43cf60f5" + integrity sha512-hfaEmENp+5V4lJ/+Y5PuwK52lD49qNsE82BaPREEbIUuk607B+fLCJW/AssdZf2uR/mKDejQTcURrNnPK1jlqA== "@tensorflow/tfjs-layers@link:../tfjs-layers": version "0.0.0" uid "" -"@tensorflow/tfjs@link:../tfjs": - version "0.0.0" - uid "" +"@tensorflow/tfjs@1.7.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-1.7.2.tgz#25a152246017c996948bde18f5a2cac16995e232" + integrity sha512-2+30hIezShVrxhmgqvSWOPk2v62QC2/voGjy4of4oVil3h7hBFZf2u4OVEpTVFKQruJ34MUOItJyDXkJHuJtsg== + dependencies: + "@tensorflow/tfjs-converter" "1.7.2" + "@tensorflow/tfjs-core" "1.7.2" + "@tensorflow/tfjs-data" "1.7.2" + "@tensorflow/tfjs-layers" "1.7.2" "@types/events@*": version "3.0.0" diff --git a/tfjs-node/package.json b/tfjs-node/package.json index 16dd6f64de8..bdf2875ea7c 100644 --- a/tfjs-node/package.json +++ b/tfjs-node/package.json @@ -1,6 +1,6 @@ { "name": "@tensorflow/tfjs-node", - "version": "0.0.0", + "version": "1.7.2", "main": "dist/index.js", "types": "dist/index.d.ts", "gypfile": true, @@ -65,8 +65,8 @@ "yargs": "^14.2.0" }, "dependencies": { - "@tensorflow/tfjs": "link:../tfjs", - "@tensorflow/tfjs-core": "link:../tfjs-core", + "@tensorflow/tfjs": "1.7.2", + "@tensorflow/tfjs-core": "1.7.2", "adm-zip": "^0.4.11", "google-protobuf": "^3.9.2", "https-proxy-agent": "^2.2.1", diff --git a/tfjs-node/src/version.ts b/tfjs-node/src/version.ts index 5fa574e7da4..a9e05df594a 100644 --- a/tfjs-node/src/version.ts +++ b/tfjs-node/src/version.ts @@ -1,5 +1,5 @@ /** @license See the LICENSE file. */ // This code is auto-generated, do not modify this file! -const version = '0.0.0'; +const version = '1.7.2'; export {version}; diff --git a/tfjs-node/yarn.lock b/tfjs-node/yarn.lock index 2f2b7d8da14..e84cf9a61cd 100644 --- a/tfjs-node/yarn.lock +++ b/tfjs-node/yarn.lock @@ -90,25 +90,45 @@ lodash "^4.17.13" to-fast-properties "^2.0.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 "" +"@tensorflow/tfjs-converter@1.7.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.7.2.tgz#a2bb479f271aa9a5bb2909b3b8d90c431996893d" + integrity sha512-6ckNQ3n36X20/+YDCTictfKftPH3urf5I+wc0QNlsSJhik3QiliYJy+v5hmjQGSJ4ow2oyW5T2lUsy9aNoNaTg== + +"@tensorflow/tfjs-core@1.7.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.7.2.tgz#c7b4ac37a7b8bd7226766ee9bcd930274bf8e019" + integrity sha512-2o5jjXLHrMY4f+r7aOfJZbKqrchEYrRk2mhlFD3RgKqtSKUpfv15YLQr4uc0uMbNSwuZbjWwrmaL9yyaBWYSAQ== + 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.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.7.2.tgz#6a3ab4d2c1fd1cfdf768f9774b108fb6477c75a0" + integrity sha512-kvYM4JfQKOnzkqb6e40N860NS9rBkxL710AX7U6uxcZzMtbVdsD9yFNxQrevgpv62hSCogiRsVFSSkcYZFuIsg== + dependencies: + "@types/node-fetch" "^2.1.2" + node-fetch "~2.1.2" + +"@tensorflow/tfjs-layers@1.7.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.2.tgz#b76e73042e999e1ea755869c1764503e43cf60f5" + integrity sha512-hfaEmENp+5V4lJ/+Y5PuwK52lD49qNsE82BaPREEbIUuk607B+fLCJW/AssdZf2uR/mKDejQTcURrNnPK1jlqA== + +"@tensorflow/tfjs@1.7.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-1.7.2.tgz#25a152246017c996948bde18f5a2cac16995e232" + integrity sha512-2+30hIezShVrxhmgqvSWOPk2v62QC2/voGjy4of4oVil3h7hBFZf2u4OVEpTVFKQruJ34MUOItJyDXkJHuJtsg== + dependencies: + "@tensorflow/tfjs-converter" "1.7.2" + "@tensorflow/tfjs-core" "1.7.2" + "@tensorflow/tfjs-data" "1.7.2" + "@tensorflow/tfjs-layers" "1.7.2" "@types/events@*": version "3.0.0" From 526a006a6f501eb70917838d2eec71d852f9f24c Mon Sep 17 00:00:00 2001 From: Na Li Date: Fri, 3 Apr 2020 13:03:53 -0700 Subject: [PATCH 2/2] Remove layers symlink in node-gpu. --- tfjs-node-gpu/package.json | 1 - tfjs-node-gpu/yarn.lock | 4 ---- 2 files changed, 5 deletions(-) diff --git a/tfjs-node-gpu/package.json b/tfjs-node-gpu/package.json index d20b5530530..8983277438e 100644 --- a/tfjs-node-gpu/package.json +++ b/tfjs-node-gpu/package.json @@ -49,7 +49,6 @@ "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", diff --git a/tfjs-node-gpu/yarn.lock b/tfjs-node-gpu/yarn.lock index ce985809e71..10243b1ecf1 100644 --- a/tfjs-node-gpu/yarn.lock +++ b/tfjs-node-gpu/yarn.lock @@ -120,10 +120,6 @@ resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.7.2.tgz#b76e73042e999e1ea755869c1764503e43cf60f5" integrity sha512-hfaEmENp+5V4lJ/+Y5PuwK52lD49qNsE82BaPREEbIUuk607B+fLCJW/AssdZf2uR/mKDejQTcURrNnPK1jlqA== -"@tensorflow/tfjs-layers@link:../tfjs-layers": - version "0.0.0" - uid "" - "@tensorflow/tfjs@1.7.2": version "1.7.2" resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-1.7.2.tgz#25a152246017c996948bde18f5a2cac16995e232"