Skip to content
Permalink
Browse files

Upgrade speech-commands to tfjs 1.1 (#193)

Upgrade all models to depend on tfjs 1.1 and typescript 3.3.3333
  • Loading branch information...
dsmilkov committed Apr 22, 2019
1 parent 260d04f commit a256145d7216c2ffdb1e3d8564adc5020f9fe829
Showing with 968 additions and 606 deletions.
  1. +1 −1 body-pix/demos/package.json
  2. +3 −3 body-pix/package.json
  3. +2 −2 body-pix/src/body_pix_test.ts
  4. +69 −40 body-pix/yarn.lock
  5. +1 −1 coco-ssd/demo/package.json
  6. +3 −3 coco-ssd/package.json
  7. +5 −4 coco-ssd/src/ssd_test.ts
  8. +69 −40 coco-ssd/yarn.lock
  9. +2 −2 knn-classifier/demo/package.json
  10. +3 −3 knn-classifier/package.json
  11. +2 −2 knn-classifier/src/index_test.ts
  12. +69 −40 knn-classifier/yarn.lock
  13. +3 −3 mobilenet/package.json
  14. +2 −2 mobilenet/src/index_test.ts
  15. +70 −36 mobilenet/yarn.lock
  16. +1 −1 package.json
  17. +1 −1 posenet/demos/package.json
  18. +2 −2 posenet/package.json
  19. +2 −2 posenet/src/posenet_test.ts
  20. +62 −27 posenet/yarn.lock
  21. +0 −1 speech-commands/.gitignore
  22. +26 −0 speech-commands/.vscode/settings.json
  23. +1 −1 speech-commands/demo/package.json
  24. +60 −36 speech-commands/demo/yarn.lock
  25. +3 −3 speech-commands/package.json
  26. +2 −2 speech-commands/src/browser_fft_extractor_test.ts
  27. +7 −8 speech-commands/src/browser_fft_recognizer_test.ts
  28. +30 −29 speech-commands/src/browser_fft_utils.ts
  29. +3 −3 speech-commands/src/training_utils_test.ts
  30. +3 −3 speech-commands/training/audio_model.ts
  31. +4 −4 speech-commands/training/browser-fft/package.json
  32. +3 −3 speech-commands/training/package.json
  33. +3 −3 speech-commands/training/utils/audio_utils.ts
  34. +1 −1 speech-commands/training/wav_file_feature_extractor.ts
  35. +182 −104 speech-commands/training/yarn.lock
  36. +2 −1 speech-commands/tsconfig.json
  37. +73 −44 speech-commands/yarn.lock
  38. +3 −3 test_util.ts
  39. +1 −1 toxicity/demo/package.json
  40. +3 −3 toxicity/package.json
  41. +3 −4 toxicity/src/util_test.ts
  42. +69 −40 toxicity/yarn.lock
  43. +1 −1 universal-sentence-encoder/demo/package.json
  44. +3 −3 universal-sentence-encoder/package.json
  45. +21 −25 universal-sentence-encoder/src/tokenizer_test.ts
  46. +16 −21 universal-sentence-encoder/src/trie_test.ts
  47. +69 −40 universal-sentence-encoder/yarn.lock
  48. +4 −4 yarn.lock
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tensorflow-models/body-pix": "1.0.0",
"@tensorflow/tfjs": "1.0.0",
"@tensorflow/tfjs": "1.1.0",
"stats.js": "0.17.0"
},
"scripts": {
@@ -13,10 +13,10 @@
"url": "https://github.com/tensorflow/tfjs-models.git"
},
"peerDependencies": {
"@tensorflow/tfjs": "^1.0.0"
"@tensorflow/tfjs": "^1.1.0"
},
"devDependencies": {
"@tensorflow/tfjs": "^1.0.0",
"@tensorflow/tfjs": "^1.1.0",
"@types/jasmine": "~2.5.53",
"jasmine": "~3.2.0",
"jasmine-core": "~3.1.0",
@@ -27,7 +27,7 @@
"rollup-plugin-uglify": "~3.0.0",
"ts-node": "~5.0.0",
"tslint": "~5.8.0",
"typescript": "2.9.2",
"typescript": "3.3.3333",
"yalc": "^1.0.0-pre.27"
},
"scripts": {
@@ -16,11 +16,11 @@
*/

import * as tf from '@tensorflow/tfjs';
import {describeWithFlags} from '@tensorflow/tfjs-core/dist/jasmine_util';
import {describeWithFlags, NODE_ENVS} from '@tensorflow/tfjs-core/dist/jasmine_util';

import {BodyPix, load, mobilenetLoader} from './body_pix_model';

describeWithFlags('BodyPix', tf.test_util.NODE_ENVS, () => {
describeWithFlags('BodyPix', NODE_ENVS, () => {
let net: BodyPix;

beforeAll((done) => {
@@ -2,44 +2,46 @@
# yarn lockfile v1


"@tensorflow/tfjs-converter@1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.0.0.tgz#cdd7bbf9f39fde93156fb1bddeac16a8ab157d6d"
integrity sha512-BGiR2U2BEKL+Gwf2Pqu7fZZw+z3ptMORTeS/rIxVnpIbeb7jsD7q25ibvfX1yuk21GM7igfZ53c4FPwqa24G9Q==
"@tensorflow/tfjs-converter@1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-converter/-/tfjs-converter-1.1.0.tgz#1d6f58347e9b3826c02090e06e6590b0c4df2d4e"
integrity sha512-gUkoRoYm9yrVVQNp8nD+pEWOPUNhayCSrUHNItSfIm8Lzbgx6brVxVdz5T8V0kT0yh67Pp9Er/LIlf54p7KikA==

"@tensorflow/tfjs-core@1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.0.0.tgz#1be6240efc5b2f270f90a032713dfac666fa1533"
integrity sha512-YiGjDJODPXI9S9AEizf6rdkYFFFCBCqwOmFqBY2MderPaDJ71rqhTzWQkWCMXV4Jhz5J+TEqtr8ishl3Zyid6A==
"@tensorflow/tfjs-core@1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.1.0.tgz#028c69291e19c328c4c30e18d29b09135c22cb44"
integrity sha512-loPpHGVjiyEb+Ixlsj8prQ/r4exekITn7vM4WEyHUouFKx0/CuoB2FQ0m6DSb/6ApvucxTWGGNTRRo4HK4Ma0Q==
dependencies:
"@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"
optionalDependencies:
rollup-plugin-visualizer "~1.1.1"

"@tensorflow/tfjs-data@1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.0.0.tgz#ccdc4fe713ca903cdc61135f7c361effaea4e670"
integrity sha512-pWn0OH5x67Qa98FWiBO1UvcglEsDFf57Tv7amtC+WxlMrH5hUHSaR30dBaW1qpdOEJkDRJtUg6tNTG2av6mqVQ==
"@tensorflow/tfjs-data@1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-1.1.0.tgz#8d9a0175497930061532c8d43b419b25b26b9bbf"
integrity sha512-0+PfAsaZs/pmaxiLunb4c1rPRdu47+CYe5kxpu2P8Xn3k+vhlBYMu+zsVgs5RrTRFLWVzVeH9muA1SJLkMGZPA==
dependencies:
"@types/node-fetch" "^2.1.2"
node-fetch "~2.1.2"
seedrandom "~2.4.3"

"@tensorflow/tfjs-layers@1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.0.0.tgz#e4344e9221001850eb1615184fa5ca2499f75254"
integrity sha512-+RB5TKM/L7qLn17ic8da/G2qg8EFhRvZIoRA6uCCs5OMUJAUQqhDqBNaoWiy0pYtXDzfZJu3ZOkDbAg2Xv2YOQ==
"@tensorflow/tfjs-layers@1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.1.0.tgz#fd221c254d2fca13e93e83669bdde3140e7a0434"
integrity sha512-a0gXjOWvGi9gc2q8/gK79zfD5WqEZnAhZfpm6b7AoKXjDUBq4GgdbbWCfv2nYBlmMoXgRSRSV44UmJVExep0uw==

"@tensorflow/tfjs@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-1.0.0.tgz#a4a181c59e1b82ad8b09b5d1da5cafc9a457b83a"
integrity sha512-ZnX4GvIpKBywybBCOXi0ym04LVosJwvZN2hOKatvO6/P1HkOw5Qfu+rwQLuKsZMrcdzJXzNN8L0NiJiPu6AStw==
"@tensorflow/tfjs@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-1.1.0.tgz#77809dc336655a7ff0bbf76527cc3d7b9e68e330"
integrity sha512-CxcFzl2KtknO3f12xuuv8kq8usMA7xGWpJajubIlYBp4KoBDhiDimP/DwBlTvFZq5RT5riHGtA4BWjMj6rnDcw==
dependencies:
"@tensorflow/tfjs-converter" "1.0.0"
"@tensorflow/tfjs-core" "1.0.0"
"@tensorflow/tfjs-data" "1.0.0"
"@tensorflow/tfjs-layers" "1.0.0"
"@tensorflow/tfjs-converter" "1.1.0"
"@tensorflow/tfjs-core" "1.1.0"
"@tensorflow/tfjs-data" "1.1.0"
"@tensorflow/tfjs-layers" "1.1.0"

"@types/estree@0.0.38":
version "0.0.38"
@@ -52,16 +54,16 @@
integrity sha512-B9YofFbUljs19g5gBKUYeLIulsh31U5AK70F41BImQRHEZQGm4GcN922UvnYwkduMqbC/NH+9fruWa/zrqvHIg==

"@types/node-fetch@^2.1.2":
version "2.1.6"
resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.1.6.tgz#4326288b49f352a142f03c63526ebce0f4c50877"
integrity sha512-Hv1jgh3pfpUEl2F2mqUd1AfLSk1YbUCeBJFaP36t7esAO617dErqdxWb5cdG2NfJGOofkmBW36fdx0dVewxDRg==
version "2.3.2"
resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.3.2.tgz#e01893b176c6fa1367743726380d65bce5d6576b"
integrity sha512-yW0EOebSsQme9yKu09XbdDfle4/SmWZMK4dfteWcSLCYNQQcF+YOv0kIrvm+9pO11/ghA4E6A+RNQqvYj4Nr3A==
dependencies:
"@types/node" "*"

"@types/node@*":
version "11.10.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-11.10.4.tgz#3f5fc4f0f322805f009e00ab35a2ff3d6b778e42"
integrity sha512-wa09itaLE8L705aXd8F80jnFpxz3Y1/KRHfKsYL2bPc0XF+wEWu8sR9n5bmeu8Ba1N9z2GRNzm/YdHcghLkLKg==
version "11.13.6"
resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.6.tgz#37ec75690830acb0d74ce3c6c43caab787081e85"
integrity sha512-Xoo/EBzEe8HxTSwaZNLZjaW6M6tA/+GmD3/DZ6uo8qSaolE/9Oarko0oV1fVfrLqOz0tx0nXJB4rdD5c+vixLw==

"@types/seedrandom@2.4.27":
version "2.4.27"
@@ -731,6 +733,11 @@ is-windows@^1.0.2:
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==

is-wsl@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=

isarray@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -978,6 +985,13 @@ once@^1.3.0:
dependencies:
wrappy "1"

opn@^5.4.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
dependencies:
is-wsl "^1.1.0"

os-homedir@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
@@ -1150,6 +1164,16 @@ rollup-plugin-uglify@~3.0.0:
dependencies:
uglify-es "^3.3.7"

rollup-plugin-visualizer@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/rollup-plugin-visualizer/-/rollup-plugin-visualizer-1.1.1.tgz#454ae0aed23845407ebfb81cc52114af308d6d90"
integrity sha512-7xkSKp+dyJmSC7jg2LXqViaHuOnF1VvIFCnsZEKjrgT5ZVyiLLSbeszxFcQSfNJILphqgAEmWAUz0Z4xYScrRw==
dependencies:
mkdirp "^0.5.1"
opn "^5.4.0"
source-map "^0.7.3"
typeface-oswald "0.0.54"

rollup-pluginutils@^2.0.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.4.1.tgz#de43ab54965bbf47843599a7f3adceb723de38db"
@@ -1178,11 +1202,6 @@ seedrandom@2.4.3:
resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.3.tgz#2438504dad33917314bff18ac4d794f16d6aaecc"
integrity sha1-JDhQTa0zkXMUv/GKxNeU8W1qrsw=

seedrandom@~2.4.3:
version "2.4.4"
resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz#b25ea98632c73e45f58b77cfaa931678df01f9ba"
integrity sha512-9A+PDmgm+2du77B5i0Ip2cxOqqHjgNxnBgglxLcX78A2D6c2rTo61z4jnVABpF4cKeDMDG+cmXXvdnqse2VqMA==

"semver@2 || 3 || 4 || 5", semver@^5.3.0:
version "5.6.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
@@ -1277,6 +1296,11 @@ source-map@^0.6.0, source-map@~0.6.1:
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==

source-map@^0.7.3:
version "0.7.3"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==

spdx-correct@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
@@ -1421,10 +1445,15 @@ tsutils@^2.12.1:
dependencies:
tslib "^1.8.1"

typescript@2.9.2:
version "2.9.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
typeface-oswald@0.0.54:
version "0.0.54"
resolved "https://registry.yarnpkg.com/typeface-oswald/-/typeface-oswald-0.0.54.tgz#1e253011622cdd50f580c04e7d625e7f449763d7"
integrity sha512-U1WMNp4qfy4/3khIfHMVAIKnNu941MXUfs3+H9R8PFgnoz42Hh9pboSFztWr86zut0eXC8byalmVhfkiKON/8Q==

typescript@3.3.3333:
version "3.3.3333"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==

uglify-es@^3.3.7:
version "3.3.9"
@@ -10,7 +10,7 @@
},
"dependencies": {
"@tensorflow-models/coco-ssd": "1.0.0",
"@tensorflow/tfjs": "1.0.0",
"@tensorflow/tfjs": "1.1.0",
"stats.js": "^0.17.0"
},
"scripts": {
@@ -13,10 +13,10 @@
"url": "https://github.com/tensorflow/tfjs-models.git"
},
"peerDependencies": {
"@tensorflow/tfjs": "^1.0.0"
"@tensorflow/tfjs": "^1.1.0"
},
"devDependencies": {
"@tensorflow/tfjs": "^1.0.0",
"@tensorflow/tfjs": "^1.1.0",
"@types/jasmine": "~2.8.8",
"babel-core": "~6.26.0",
"babel-plugin-transform-runtime": "~6.23.0",
@@ -28,7 +28,7 @@
"rollup-plugin-uglify": "~3.0.0",
"ts-node": "~5.0.0",
"tslint": "~5.10.0",
"typescript": "2.9.2",
"typescript": "3.3.3333",
"yalc": "~1.0.0-pre.21"
},
"scripts": {
@@ -15,15 +15,16 @@
* =============================================================================
*/
import * as tf from '@tensorflow/tfjs';
import {describeWithFlags} from '@tensorflow/tfjs-core/dist/jasmine_util';
import {describeWithFlags, NODE_ENVS} from '@tensorflow/tfjs-core/dist/jasmine_util';
import {load} from './index';

describeWithFlags('ObjectDetection', tf.test_util.NODE_ENVS, () => {
describeWithFlags('ObjectDetection', NODE_ENVS, () => {
beforeEach(() => {
spyOn(tf, 'loadGraphModel').and.callFake(() => {
const model = {
executeAsync:
(x: tf.Tensor) => [tf.ones([1, 1917, 90]), tf.ones([1, 1917, 1, 4])]
executeAsync: (
x: tf
.Tensor) => [tf.ones([1, 1917, 90]), tf.ones([1, 1917, 1, 4])]
};
return model;
});
Oops, something went wrong.

0 comments on commit a256145

Please sign in to comment.
You can’t perform that action at this time.