Skip to content

[tfjs] integrate_tests: Update npm and Python dependencies #2145

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 9 commits into from
Oct 8, 2019
Merged

[tfjs] integrate_tests: Update npm and Python dependencies #2145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e8bac07
[tfjs] integrate_tests: Update npm and Python dependencies
caisq Oct 4, 2019
8ebdfb3
Merge branch 'master' into benchmarks-1.2.10
caisq Oct 6, 2019
7b71f35
Merge branch 'master' into benchmarks-1.2.10
caisq Oct 7, 2019
d893992
Merge branch 'master' into benchmarks-1.2.10
caisq Oct 7, 2019
315d5fa
Merge branch 'master' into benchmarks-1.2.10
caisq Oct 8, 2019
8907bc7
Upgrade to 1.2.11
caisq Oct 8, 2019
bf41a72
Update tfjs-node-gpu benchmark script
caisq Oct 8, 2019
d718f08
Merge branch 'master' into benchmarks-1.2.10
caisq Oct 8, 2019
de25b1d
Merge branch 'master' into benchmarks-1.2.10
caisq Oct 8, 2019
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
1 change: 1 addition & 0 deletions tfjs/integration_tests/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ tfjs-core/
tfjs-data/
tfjs-layers/
tfjs-node/
tfjs-node-gpu/
data/
coverage/
31 changes: 19 additions & 12 deletions tfjs/integration_tests/benchmark_layers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,35 +51,39 @@ yarn upgrade \
@tensorflow/tfjs

if [[ "${IS_TFJS_NODE}" == "1" ]]; then
rm -rf tfjs-node/
cp -r ../../tfjs-node .
rm -rf tfjs-node/ tfjs-node-gpu
cp -r ../../tfjs-node ../../tfjs-node-gpu .

if [[ "${IS_TFJS_NODE_GPU}" == "1" ]]; then
pushd tfjs-node-gpu
else
# The Python library for comparison may contain both the CPU and GPU
# kernels. The line below prevent the GPU from being used during CPU
# benchmarks.
export CUDA_VISIBLE_DEVICES=""
pushd tfjs-node
fi

pushd tfjs-node
HASH_NODE="$(git rev-parse HEAD)"
rm -rf dist/
yarn
rm -f tensorflow-tfjs-*.tgz

if [[ "${IS_TFJS_NODE_GPU}" == "1" ]]; then
yarn build-npm-gpu
TAR_BALL="$(find ./ -name "tensorflow-tfjs-node-gpu-*.tgz")"
else
yarn build-npm
TAR_BALL="$(find ./ -name "tensorflow-tfjs-node-*.tgz")"
fi
yarn build-npm

TAR_BALL_COUNT="$(ls tensorflow-tfjs-*.tgz | wc -w)"
TAR_BALL_COUNT="$(ls tensorflow-tfjs-node-*.tgz | wc -w)"
if [[ "${TAR_BALL_COUNT}" != "1" ]]; then
echo "ERROR: Expected to find exactly one tensorflow-tfjs-node-* tar ball"
echo " But found ${TAR_BALL_COUNT}."
exit 1
fi

TAR_BALL="$(find ./ -name "tensorflow-tfjs-node-*.tgz")"
if [[ -z "${TAR_BALL}" ]]; then
echo "Unable to find the tar ball built by `yarn build-npm`."
exit 1
fi
echo "Find built tar ball at: ${TAR_BALL}"
echo "Found built tar ball at: ${TAR_BALL}"

rm -rf ../node_modules/@tensorflow/tfjs-node/*
tar xvzf "${TAR_BALL}" --directory ../node_modules/@tensorflow/tfjs-node
Expand All @@ -95,6 +99,9 @@ if [[ "${IS_TFJS_NODE}" == "1" ]]; then
popd
popd
else
# NOTE: Browser benchmarks are compared with Python CPU.
export CUDA_VISIBLE_DEVICES=""

# Copy the tfjs repositories, build them, and link them.
rm -rf tfjs-core/
cp -r ../../tfjs-core .
Expand Down
12 changes: 6 additions & 6 deletions tfjs/integration_tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
"url": "https://github.com/tensorflow/tfjs"
},
"devDependencies": {
"@tensorflow/tfjs": "1.2.9",
"@tensorflow/tfjs-converter": "1.2.9",
"@tensorflow/tfjs-core": "1.2.9",
"@tensorflow/tfjs-data": "1.2.9",
"@tensorflow/tfjs-layers": "1.2.9",
"@tensorflow/tfjs-node": "1.2.9",
"@tensorflow/tfjs": "1.2.11",
"@tensorflow/tfjs-converter": "1.2.11",
"@tensorflow/tfjs-core": "1.2.11",
"@tensorflow/tfjs-data": "1.2.11",
"@tensorflow/tfjs-layers": "1.2.11",
"@tensorflow/tfjs-node": "1.2.11",
"@types/detect-browser": "^4.0.0",
"@types/jasmine": "~2.5.53",
"@types/mathjs": "^5.0.1",
Expand Down
2 changes: 1 addition & 1 deletion tfjs/integration_tests/python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
tensorflowjs>=1.2.9
tf-nightly>=2.0.0.dev20190614
tf-nightly>=2.1.0.dev20191008
2 changes: 1 addition & 1 deletion tfjs/integration_tests/python/requirements_gpu.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
tensorflowjs>=1.2.9
tf-nightly-gpu-2.0-preview>=2.0.0.dev20190614
tf-nightly>=2.1.0.dev20191008
64 changes: 32 additions & 32 deletions tfjs/integration_tests/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,15 +334,15 @@
resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=

"@tensorflow/[email protected].9":
version "1.2.9"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.2.9.tgz#4774dd9447ac81c0c6776f9fd186374b9fa3bf1a"
integrity sha512-OKmiuZicIgadT3Bv9BvM+oom7wRz9eC5rTglQnuv7VN9H0syFVuhf5oD1Ff70tGDhJjJgL+cPz01fZRxTXjRWA==
"@tensorflow/[email protected].11":
version "1.2.11"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.2.11.tgz#c81a8bde669179e20e676dba790eeca61fa6ce0a"
integrity sha512-3Qg3k6x9ZbAFSCJTSC2anaM40Fs04+PGFw/uRvupWHmns6D5ni9RzTH2thef9hzBT2V/UHnlnHs7RYJqQNTThA==

"@tensorflow/[email protected].9":
version "1.2.9"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.2.9.tgz#125830270a0bdd0e856914778a300c4ad6f51e21"
integrity sha512-s0hHZSx6rGTlkkB8u8gs5n7sIPv1GXDNHmISRy+kqGzmlpkfI2kr6WXqOWQy6wFgjzopRD8cJQjBZ9USPZnYTQ==
"@tensorflow/[email protected].11":
version "1.2.11"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.2.11.tgz#6bd870338cece217610613600ed4c20fdd13e201"
integrity sha512-guqqD5bb5BTaTvUVWhG1xCXB0NuA5rv0indSEEOpMfqqBvtSwKp02heDGDcPOSUnmdB8V/HJbcyX2wRBXztQpA==
dependencies:
"@types/offscreencanvas" "~2019.3.0"
"@types/seedrandom" "2.4.27"
Expand All @@ -351,41 +351,41 @@
node-fetch "~2.1.2"
seedrandom "2.4.3"

"@tensorflow/[email protected].9":
version "1.2.9"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.2.9.tgz#54030a7990eb58d20288cab099d966d496710760"
integrity sha512-Ti9Cj3pte9butuEsK5OPq0Lcqdi4wVUdtQXm0o7iYOZ0umseRzfbIb6zbdqucc2MQzOMTnRoxN+FL7LZmncsHg==
"@tensorflow/[email protected].11":
version "1.2.11"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.2.11.tgz#408fcb1f00cf4fc6f6bf8ea9504e3b9528251490"
integrity sha512-xrRekVbwWgW1Cyaqh+1x0Tq3CQkePm/G94eGLcH6IbcoBp0syKKUCD0vHkaGn7GkUGFJkej5yHXsh0ujrbxd+A==
dependencies:
"@types/node-fetch" "^2.1.2"
node-fetch "~2.1.2"

"@tensorflow/[email protected].9":
version "1.2.9"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.2.9.tgz#d30d1bdfed228a07a3d4e9dcb9a6884031ae56e7"
integrity sha512-OlXYaIb1rCk5dYmpaNsPEkO7R+T0oxfS3vQGIztNJB+YxrN8mwCu3hqgpbdKhAITiP+jxO0o+7bny8MsOCkOSQ==
"@tensorflow/[email protected].11":
version "1.2.11"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.2.11.tgz#55d44374a05af2aad1d6d6621e92c7ec52fddf80"
integrity sha512-Ye/b0pwB9KVW5IbRP9UNSXPUvizP8VdaKVFzT2C6JJpUE97LznItbYDJjO60ND/Cl0uj7ttvxPwlYb7HYo+e6g==

"@tensorflow/[email protected].9":
version "1.2.9"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-node/-/tfjs-node-1.2.9.tgz#490e50ddc4c786e949de3d4fead3efccab750c97"
integrity sha512-IGD4plBGy+2rQpYiI2LI/RC0nzyLKunJ2cPIx4etJ+V6n40mvEDOVXvUZCz/a72gKUKNPfx5uSsvImfRikWNjw==
"@tensorflow/[email protected].11":
version "1.2.11"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-node/-/tfjs-node-1.2.11.tgz#f7dde1c005f7ee61fa3fbb75a0aaa0e121cd6b38"
integrity sha512-aqwYP1XK3dGOkcozh3sg9uusw6cHBlEKFJjejOBDPk68tr3Jtij0XcXN0F/9NRU9Qg7hxZPJj4OIrUdC8CBn5Q==
dependencies:
"@tensorflow/tfjs" "1.2.9"
"@tensorflow/tfjs" "1.2.11"
adm-zip "^0.4.11"
https-proxy-agent "^2.2.1"
node-pre-gyp "0.13.0"
progress "^2.0.0"
rimraf "^2.6.2"
tar "^4.4.6"

"@tensorflow/[email protected].9":
version "1.2.9"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-1.2.9.tgz#120f55a2826f71a5816e02b5bc0311fd583beedb"
integrity sha512-9UAQnSp638FyM5eedYEM+j2R7VcNajiFmkeT5EXtf7YIurmMFNEm1sbajKJx7/ckz31YcYrVoUPc/iLhhDQl2A==
"@tensorflow/[email protected].11":
version "1.2.11"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-1.2.11.tgz#3d5a6e535069fc6139e778d28e02a84331eb753c"
integrity sha512-q1SIEMiR+Vqq8Fnmt/YGBC5tNq97LXDvUEl8SwWedhLtK1GJCpLMJXQA54JrkFXGLv5hK4dEb+1dx28TJUET2g==
dependencies:
"@tensorflow/tfjs-converter" "1.2.9"
"@tensorflow/tfjs-core" "1.2.9"
"@tensorflow/tfjs-data" "1.2.9"
"@tensorflow/tfjs-layers" "1.2.9"
"@tensorflow/tfjs-converter" "1.2.11"
"@tensorflow/tfjs-core" "1.2.11"
"@tensorflow/tfjs-data" "1.2.11"
"@tensorflow/tfjs-layers" "1.2.11"

"@types/caseless@*":
version "0.12.2"
Expand Down Expand Up @@ -424,9 +424,9 @@
"@types/node" "*"

"@types/node@*":
version "12.7.8"
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.8.tgz#cb1bf6800238898bc2ff6ffa5702c3cadd350708"
integrity sha512-FMdVn84tJJdV+xe+53sYiZS4R5yn1mAIxfj+DVoNiQjTYz1+OYmjwEZr1ev9nU0axXwda0QDbYl06QHanRVH3A==
version "12.7.11"
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.11.tgz#be879b52031cfb5d295b047f5462d8ef1a716446"
integrity sha512-Otxmr2rrZLKRYIybtdG/sgeO+tHY20GxeDjcGmUnmmlCWyEnv2a2x1ZXBo3BTec4OiTXMQCiazB8NMBf0iRlFw==

"@types/node@^10.1.0":
version "10.14.13"
Expand Down