Skip to content

Fix integration test. #2899

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 4 commits into from
Mar 14, 2020
Merged

Fix integration test. #2899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8501ef9
Fix integration test.
lina128 Mar 14, 2020
c5b652e
Refactor.
lina128 Mar 14, 2020
4d5ca5f
Fix.
lina128 Mar 14, 2020
55961d8
Make the same change to tfjs-node-gpu.
lina128 Mar 14, 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
42 changes: 1 addition & 41 deletions tfjs-node-gpu/cloudbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,53 +13,13 @@ 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: ['build-union']
waitFor: ['yarn-common']

# Unit tests.
- name: 'node:10'
Expand Down
4 changes: 3 additions & 1 deletion tfjs-node-gpu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
"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-deps": "yarn build-core && yarn build-layers && yarn build-converter && yarn build-data && yarn build-union",
"build-deps-ci": "yarn build-core-ci && yarn build-layers-ci && yarn build-converter-ci && yarn build-data-ci && yarn build-union-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 @@ -41,7 +43,7 @@
"prep-gpu": "./prep-gpu.sh",
"prep-gpu-windows": "./prep-gpu-windows.bat",
"publish-local": "yarn prep && yalc push",
"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": "yarn link-master && yarn && yarn build-deps && 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"
Expand Down
42 changes: 1 addition & 41 deletions tfjs-node/cloudbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,53 +5,13 @@ 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: ['build-union']
waitFor: ['yarn-common']

# Unit tests.
- name: 'node:10'
Expand Down
4 changes: 3 additions & 1 deletion tfjs-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
"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-deps": "yarn build-core && yarn build-layers && yarn build-converter && yarn build-data && yarn build-union",
"build-deps-ci": "yarn build-core-ci && yarn build-layers-ci && yarn build-converter-ci && yarn build-data-ci && yarn build-union-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",
Expand All @@ -39,7 +41,7 @@
"lint": "tslint -p . -t verbose",
"prep": "cd node_modules/@tensorflow/tfjs-core && yarn && yarn build",
"publish-local": "yarn prep && yalc push",
"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": "yarn link-master && yarn && yarn build-deps && 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"
Expand Down
1 change: 1 addition & 0 deletions tfjs-node/scripts/test-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
set -e

yarn build-addon-from-source
yarn build-deps-ci
yarn build-ci
yarn lint
yarn test