Skip to content

[node]Test against head. #2854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Mar 10, 2020
Merged

[node]Test against head. #2854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3feb54d
[node]Test against head.
lina128 Mar 9, 2020
d063ffc
Fix typo.
lina128 Mar 9, 2020
12caed5
Add build to cloudbuild.yml.
lina128 Mar 9, 2020
7e8e5df
Add commands to package.json.
lina128 Mar 9, 2020
9808b89
Change main entry and types for converter.
lina128 Mar 9, 2020
dd8274e
Add back code.
lina128 Mar 9, 2020
edb5c04
Add the same to node-gpu
lina128 Mar 10, 2020
930062b
Add the same to node-gpu
lina128 Mar 10, 2020
70fc64d
Add the same to node-gpu
lina128 Mar 10, 2020
adfd8c5
.
lina128 Mar 10, 2020
225c733
.
lina128 Mar 10, 2020
a5cb0e7
Change to symlink.
lina128 Mar 10, 2020
58d0240
Add layers to devDependency because file_system_test uses it.
lina128 Mar 10, 2020
18740d0
Add layers to devDependency because file_system_test uses it.
lina128 Mar 10, 2020
a7e7049
Temporarily remove link-master for Node build, because it is used to …
lina128 Mar 10, 2020
22dccaf
Temporarily remove link-master for Node build, because it is used to …
lina128 Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tfjs-converter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions tfjs-converter/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"allowUnreachableCode": false
},
"include": [
"src/",
"scripts/"
"src/"
]
}
14 changes: 3 additions & 11 deletions tfjs-converter/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions tfjs-data/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
21 changes: 6 additions & 15 deletions tfjs-data/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tfjs-layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -57,6 +57,6 @@
"lint": "tslint -p . -t verbose"
},
"peerDependencies": {
"@tensorflow/tfjs-core": "1.7.0"
"@tensorflow/tfjs-core": "link:../tfjs-core"
}
}
14 changes: 3 additions & 11 deletions tfjs-layers/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
42 changes: 41 additions & 1 deletion tfjs-node-gpu/cloudbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
19 changes: 16 additions & 3 deletions tfjs-node-gpu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
58 changes: 19 additions & 39 deletions tfjs-node-gpu/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
42 changes: 41 additions & 1 deletion tfjs-node/cloudbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading