From 960c1b276ac72ec788bf80766d50b5cb3308c9ac Mon Sep 17 00:00:00 2001 From: Yannick Assogba Date: Tue, 12 Mar 2019 21:34:45 -0400 Subject: [PATCH] Update examples to tfjs vis 1.0.3 (#246) --- addition-rnn/index.js | 5 +- addition-rnn/package.json | 2 +- addition-rnn/yarn.lock | 100 +++++++++--------- boston-housing/package.json | 2 +- boston-housing/yarn.lock | 100 +++++++++--------- cart-pole/package.json | 2 +- cart-pole/ui.js | 2 +- cart-pole/yarn.lock | 100 +++++++++--------- data-generator/package.json | 2 +- data-generator/yarn.lock | 80 +++++--------- date-conversion-attention/index.js | 2 +- date-conversion-attention/package.json | 4 +- date-conversion-attention/yarn.lock | 121 +++++++++++---------- iris-fitDataset/index.js | 2 +- iris-fitDataset/package.json | 2 +- iris-fitDataset/yarn.lock | 95 +++++++++-------- iris/index.js | 3 +- iris/package.json | 2 +- iris/yarn.lock | 100 +++++++++--------- lstm-text-generation/package.json | 4 +- lstm-text-generation/yarn.lock | 141 ++++++++++++++++--------- mnist-core/package.json | 2 +- mnist-core/ui.js | 2 +- mnist-core/yarn.lock | 100 +++++++++--------- mnist-transfer-cnn/package.json | 2 +- mnist-transfer-cnn/yarn.lock | 100 +++++++++--------- mnist/package.json | 2 +- mnist/ui.js | 5 +- mnist/yarn.lock | 100 +++++++++--------- website-phishing/package.json | 2 +- website-phishing/ui.js | 2 +- website-phishing/yarn.lock | 100 +++++++++--------- 32 files changed, 666 insertions(+), 622 deletions(-) diff --git a/addition-rnn/index.js b/addition-rnn/index.js index c2c4057b..3febd2a0 100644 --- a/addition-rnn/index.js +++ b/addition-rnn/index.js @@ -284,7 +284,7 @@ class AdditionRNNDemo { iterations}: Model fit time ${modelFitTime.toFixed(6)} (seconds)`; const lossContainer = document.getElementById('lossChart'); tfvis.render.linechart( - {values: lossValues, series: ['train', 'validation']}, lossContainer, + lossContainer, {values: lossValues, series: ['train', 'validation']}, { width: 420, height: 300, @@ -294,9 +294,8 @@ class AdditionRNNDemo { const accuracyContainer = document.getElementById('accuracyChart'); tfvis.render.linechart( - {values: accuracyValues, series: ['train', 'validation']}, accuracyContainer, - { + {values: accuracyValues, series: ['train', 'validation']}, { width: 420, height: 300, xLabel: 'epoch', diff --git a/addition-rnn/package.json b/addition-rnn/package.json index 62baf601..87a6bf99 100644 --- a/addition-rnn/package.json +++ b/addition-rnn/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tensorflow/tfjs": "^1.0.0", - "@tensorflow/tfjs-vis": "^0.4.2" + "@tensorflow/tfjs-vis": "^1.0.3" }, "scripts": { "watch": "cross-env NODE_ENV=development parcel index.html --no-hmr --open", diff --git a/addition-rnn/yarn.lock b/addition-rnn/yarn.lock index 5ddc4005..1ae32da0 100644 --- a/addition-rnn/yarn.lock +++ b/addition-rnn/yarn.lock @@ -671,19 +671,17 @@ resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.0.0.tgz#e4344e9221001850eb1615184fa5ca2499f75254" integrity sha512-+RB5TKM/L7qLn17ic8da/G2qg8EFhRvZIoRA6uCCs5OMUJAUQqhDqBNaoWiy0pYtXDzfZJu3ZOkDbAg2Xv2YOQ== -"@tensorflow/tfjs-vis@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-0.4.2.tgz#6d4f81e26dc6c3d8c06345f18e80c2d52c6b551f" - integrity sha512-WMe6Xr3WIeKm4lme2Hz4IRwPnObTOD/eyBUc5vTS2DIXGqK2N9KjzundW3DS2UOFXDicN85bEyHqq6xBaLsNyg== +"@tensorflow/tfjs-vis@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-1.0.3.tgz#624bafaa900920e0cf8d00d1047497fd86ac1d91" + integrity sha512-WHyqN7l8M/luTdQNk7VpGrcrEBUSTYNPkK2fHCoxLjhqSnbr5yFEohgHgHnySneW0GUomGjz2C4LjBLlomDTCw== dependencies: d3-format "^1.3.0" d3-selection "^1.3.0" glamor "^2.20.40" glamor-tachyons "^1.0.0-alpha.1" preact "^8.2.9" - vega-embed "3.28.0" - vega-lib "4.4.0" - vega-lite "3.0.0-rc10" + vega-embed "3.30.0" "@tensorflow/tfjs@^1.0.0": version "1.0.0" @@ -695,6 +693,11 @@ "@tensorflow/tfjs-data" "1.0.0" "@tensorflow/tfjs-layers" "1.0.0" +"@types/clone@^0.1.30": + version "0.1.30" + resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614" + integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ= + "@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" @@ -1843,7 +1846,7 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clone@^2.1.1: +clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -2407,11 +2410,16 @@ d3-scale@^2.1.2: d3-time "1" d3-time-format "2" -d3-selection@^1.3.0, d3-selection@^1.3.2: +d3-selection@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.2.tgz#6e70a9df60801c8af28ac24d10072d82cbfdf652" integrity sha512-OoXdv1nZ7h2aKMVg3kaUFbLLK5jXUFAMLD/Tu5JA96mjf8f2a9ZUESGY+C36t8R1WFeWk/e55hy54Ml2I62CRQ== +d3-selection@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" + integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== + d3-shape@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.2.tgz#f9dba3777a5825f9a8ce8bc928da08c17679e9a7" @@ -2894,6 +2902,11 @@ fast-glob@^2.2.2: merge2 "^1.2.3" micromatch "^3.1.10" +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -3741,18 +3754,16 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= - dependencies: - jsonify "~0.0.0" - json-stringify-pretty-compact@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -3779,11 +3790,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -6392,19 +6398,19 @@ vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0: vega-loader "^3.1.0" vega-util "^1.7.0" -vega-embed@3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.28.0.tgz#f00373ddf3d83c501de3b8a0396951a32648f175" - integrity sha512-qIHNKPk7rwuID8/dHthXPMQrEhA6AjLiiVqD3Ols8Ff80GLOgXggjxwwyAI8DrKhOVNFbQwsTgx5E8cH0X5y6w== +vega-embed@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.30.0.tgz#2ed625cc7d0c7a0aa54160f35a7b29076130c168" + integrity sha512-+90hd4iqu6fpfgOAFZ/9QZVxoGKX3lFghm70XlkKeaUjVAxzM2mW4jiQ5VTqY1+5dhBgmjbWMrrC2Uh3n0jzLg== dependencies: - d3-selection "^1.3.2" - json-stringify-pretty-compact "^1.2.0" + d3-selection "^1.4.0" + json-stringify-pretty-compact "^2.0.0" semver "^5.6.0" vega-lib "^4.4.0" - vega-lite "^3.0.0-rc10 || ^2.6.0" + vega-lite "3.0.0-rc12 || ^2.6.0" vega-schema-url-parser "^1.1.0" vega-themes "^2.2.0" - vega-tooltip "^0.15.0" + vega-tooltip "^0.16.0" vega-encode@^3.2.2: version "3.2.2" @@ -6461,7 +6467,7 @@ vega-hierarchy@^3.1.0: vega-dataflow "^4.0.4" vega-util "^1.7.0" -vega-lib@4.4.0, vega-lib@^4.4.0: +vega-lib@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880" integrity sha512-bfOsO5wks+ctnJ94fIPWH/B0qocdFs4WZ8teIgjF7m5XE+EVln+1nq9Z+sV7wdw7vftzGg0GAx9UH/kJxyopKg== @@ -6489,18 +6495,21 @@ vega-lib@4.4.0, vega-lib@^4.4.0: vega-voronoi "^3.0.0" vega-wordcloud "^3.0.0" -vega-lite@3.0.0-rc10, "vega-lite@^3.0.0-rc10 || ^2.6.0": - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc10.tgz#06738975a23bb4e61cfaf5a64779453a5cdf5a3e" - integrity sha512-xgoOXmVdd2j89D6i44JHjozUy7Z4Mw9bcqFySzm77JDUV0BWLrnM61QmaS8ZwAZQbMcmdCTCJ//HgClH2gFZoQ== +"vega-lite@3.0.0-rc12 || ^2.6.0": + version "3.0.0-rc12" + resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc12.tgz#48a1a8dc6b499ed3efdcff8b9807e6df4214de70" + integrity sha512-/J7pyYFzL6rod+fBRZ9k6EQBMr7VXRmhQ/DqKPm2wGgtzqxDorBrvwZ0sqi2zWZ1o1vHIehbfl+/JMotuIoEeg== dependencies: + "@types/clone" "^0.1.30" + clone "^2.1.2" fast-deep-equal "^2.0.1" - json-stable-stringify "^1.0.1" + fast-json-stable-stringify "^2.0.0" json-stringify-pretty-compact "^1.2.0" tslib "^1.9.3" vega-event-selector "^2.0.0" - vega-typings "0.3.51" - vega-util "^1.7.0" + vega-expression "^2.4.0" + vega-typings "0.3.53" + vega-util "^1.7.1" yargs "^12.0.5" vega-loader@^3.0.1, vega-loader@^3.1.0: @@ -6589,10 +6598,10 @@ vega-themes@^2.2.0: dependencies: vega-typings "^0.3.51" -vega-tooltip@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.15.0.tgz#2606a95b46f0aa6a70f03d18f919dc13696c4d44" - integrity sha512-xfac+5I7YR1ZKfip2i9xlEHuNrl5YpQnZAmTc9dzQcnkoo5MmGVIhH01tEGOr8keVC9UbYU1AREezwv8Mpajhw== +vega-tooltip@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.16.0.tgz#fc9badb96aed437b8225d0a7216ec6d1e768ac6f" + integrity sha512-A3hZ3B06n8anAp5ReOKmPeGlZaE2kVT0rN0IGLV8jWR54mNUKH/H9TacsyvLA9gq9OO0NrbpQ4NyfxU3uS8EYg== dependencies: vega-util "^1.7.1" @@ -6606,20 +6615,13 @@ vega-transforms@^2.3.1: vega-statistics "^1.2.3" vega-util "^1.7.0" -vega-typings@*, vega-typings@^0.3.51: +vega-typings@*, vega-typings@0.3.53, vega-typings@^0.3.51: version "0.3.53" resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.53.tgz#a70b9730ebe1e4c557019ccccc5fd98035b0aab0" integrity sha512-XQRd66eL62ll6tHENQIJHtdwXemqXoB4KnVVbGUwGJIHjQkHHluCbkoWVRvPYuRd+OLM1RXVc+EBxA015hJ1SQ== dependencies: vega-util "^1.7.0" -vega-typings@0.3.51: - version "0.3.51" - resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.51.tgz#1e7a84ae3af4fcc0784b80d50a3e1df432b18141" - integrity sha512-8UJnlGIZLDYzlLgMJVHO8Yb8yU7pYeNGnW8J7nxgyXqurowovmPM9fV+V49vzbQnZl4/Qq14wGqm9yM7iqZl8g== - dependencies: - vega-util "^1.7.0" - vega-util@^1.7.0, vega-util@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/vega-util/-/vega-util-1.7.1.tgz#0b95bbe6058895c332596c215247507caa68ab61" diff --git a/boston-housing/package.json b/boston-housing/package.json index 6072d95e..2db4aaa0 100644 --- a/boston-housing/package.json +++ b/boston-housing/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tensorflow/tfjs": "^1.0.0", - "@tensorflow/tfjs-vis": "^0.4.2", + "@tensorflow/tfjs-vis": "^1.0.3", "papaparse": "^4.5.0" }, "scripts": { diff --git a/boston-housing/yarn.lock b/boston-housing/yarn.lock index e8321e54..ee9b5692 100644 --- a/boston-housing/yarn.lock +++ b/boston-housing/yarn.lock @@ -681,19 +681,17 @@ resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.0.0.tgz#e4344e9221001850eb1615184fa5ca2499f75254" integrity sha512-+RB5TKM/L7qLn17ic8da/G2qg8EFhRvZIoRA6uCCs5OMUJAUQqhDqBNaoWiy0pYtXDzfZJu3ZOkDbAg2Xv2YOQ== -"@tensorflow/tfjs-vis@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-0.4.2.tgz#6d4f81e26dc6c3d8c06345f18e80c2d52c6b551f" - integrity sha512-WMe6Xr3WIeKm4lme2Hz4IRwPnObTOD/eyBUc5vTS2DIXGqK2N9KjzundW3DS2UOFXDicN85bEyHqq6xBaLsNyg== +"@tensorflow/tfjs-vis@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-1.0.3.tgz#624bafaa900920e0cf8d00d1047497fd86ac1d91" + integrity sha512-WHyqN7l8M/luTdQNk7VpGrcrEBUSTYNPkK2fHCoxLjhqSnbr5yFEohgHgHnySneW0GUomGjz2C4LjBLlomDTCw== dependencies: d3-format "^1.3.0" d3-selection "^1.3.0" glamor "^2.20.40" glamor-tachyons "^1.0.0-alpha.1" preact "^8.2.9" - vega-embed "3.28.0" - vega-lib "4.4.0" - vega-lite "3.0.0-rc10" + vega-embed "3.30.0" "@tensorflow/tfjs@^1.0.0": version "1.0.0" @@ -705,6 +703,11 @@ "@tensorflow/tfjs-data" "1.0.0" "@tensorflow/tfjs-layers" "1.0.0" +"@types/clone@^0.1.30": + version "0.1.30" + resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614" + integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ= + "@types/node-fetch@^2.1.2": version "2.1.4" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.1.4.tgz#093d1beae11541aef25999d70aa09286fd025b1a" @@ -1772,7 +1775,7 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clone@^2.1.1: +clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -2336,11 +2339,16 @@ d3-scale@^2.1.2: d3-time "1" d3-time-format "2" -d3-selection@^1.3.0, d3-selection@^1.3.2: +d3-selection@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.2.tgz#6e70a9df60801c8af28ac24d10072d82cbfdf652" integrity sha512-OoXdv1nZ7h2aKMVg3kaUFbLLK5jXUFAMLD/Tu5JA96mjf8f2a9ZUESGY+C36t8R1WFeWk/e55hy54Ml2I62CRQ== +d3-selection@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" + integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== + d3-shape@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.2.tgz#f9dba3777a5825f9a8ce8bc928da08c17679e9a7" @@ -2816,6 +2824,11 @@ fast-glob@^2.2.2: merge2 "^1.2.3" micromatch "^3.1.10" +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -3643,18 +3656,16 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= - dependencies: - jsonify "~0.0.0" - json-stringify-pretty-compact@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" @@ -3676,11 +3687,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -6270,19 +6276,19 @@ vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0: vega-loader "^3.1.0" vega-util "^1.7.0" -vega-embed@3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.28.0.tgz#f00373ddf3d83c501de3b8a0396951a32648f175" - integrity sha512-qIHNKPk7rwuID8/dHthXPMQrEhA6AjLiiVqD3Ols8Ff80GLOgXggjxwwyAI8DrKhOVNFbQwsTgx5E8cH0X5y6w== +vega-embed@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.30.0.tgz#2ed625cc7d0c7a0aa54160f35a7b29076130c168" + integrity sha512-+90hd4iqu6fpfgOAFZ/9QZVxoGKX3lFghm70XlkKeaUjVAxzM2mW4jiQ5VTqY1+5dhBgmjbWMrrC2Uh3n0jzLg== dependencies: - d3-selection "^1.3.2" - json-stringify-pretty-compact "^1.2.0" + d3-selection "^1.4.0" + json-stringify-pretty-compact "^2.0.0" semver "^5.6.0" vega-lib "^4.4.0" - vega-lite "^3.0.0-rc10 || ^2.6.0" + vega-lite "3.0.0-rc12 || ^2.6.0" vega-schema-url-parser "^1.1.0" vega-themes "^2.2.0" - vega-tooltip "^0.15.0" + vega-tooltip "^0.16.0" vega-encode@^3.2.2: version "3.2.2" @@ -6339,7 +6345,7 @@ vega-hierarchy@^3.1.0: vega-dataflow "^4.0.4" vega-util "^1.7.0" -vega-lib@4.4.0, vega-lib@^4.4.0: +vega-lib@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880" integrity sha512-bfOsO5wks+ctnJ94fIPWH/B0qocdFs4WZ8teIgjF7m5XE+EVln+1nq9Z+sV7wdw7vftzGg0GAx9UH/kJxyopKg== @@ -6367,18 +6373,21 @@ vega-lib@4.4.0, vega-lib@^4.4.0: vega-voronoi "^3.0.0" vega-wordcloud "^3.0.0" -vega-lite@3.0.0-rc10, "vega-lite@^3.0.0-rc10 || ^2.6.0": - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc10.tgz#06738975a23bb4e61cfaf5a64779453a5cdf5a3e" - integrity sha512-xgoOXmVdd2j89D6i44JHjozUy7Z4Mw9bcqFySzm77JDUV0BWLrnM61QmaS8ZwAZQbMcmdCTCJ//HgClH2gFZoQ== +"vega-lite@3.0.0-rc12 || ^2.6.0": + version "3.0.0-rc12" + resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc12.tgz#48a1a8dc6b499ed3efdcff8b9807e6df4214de70" + integrity sha512-/J7pyYFzL6rod+fBRZ9k6EQBMr7VXRmhQ/DqKPm2wGgtzqxDorBrvwZ0sqi2zWZ1o1vHIehbfl+/JMotuIoEeg== dependencies: + "@types/clone" "^0.1.30" + clone "^2.1.2" fast-deep-equal "^2.0.1" - json-stable-stringify "^1.0.1" + fast-json-stable-stringify "^2.0.0" json-stringify-pretty-compact "^1.2.0" tslib "^1.9.3" vega-event-selector "^2.0.0" - vega-typings "0.3.51" - vega-util "^1.7.0" + vega-expression "^2.4.0" + vega-typings "0.3.53" + vega-util "^1.7.1" yargs "^12.0.5" vega-loader@^3.0.1, vega-loader@^3.1.0: @@ -6467,10 +6476,10 @@ vega-themes@^2.2.0: dependencies: vega-typings "^0.3.51" -vega-tooltip@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.15.0.tgz#2606a95b46f0aa6a70f03d18f919dc13696c4d44" - integrity sha512-xfac+5I7YR1ZKfip2i9xlEHuNrl5YpQnZAmTc9dzQcnkoo5MmGVIhH01tEGOr8keVC9UbYU1AREezwv8Mpajhw== +vega-tooltip@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.16.0.tgz#fc9badb96aed437b8225d0a7216ec6d1e768ac6f" + integrity sha512-A3hZ3B06n8anAp5ReOKmPeGlZaE2kVT0rN0IGLV8jWR54mNUKH/H9TacsyvLA9gq9OO0NrbpQ4NyfxU3uS8EYg== dependencies: vega-util "^1.7.1" @@ -6484,20 +6493,13 @@ vega-transforms@^2.3.1: vega-statistics "^1.2.3" vega-util "^1.7.0" -vega-typings@*, vega-typings@^0.3.51: +vega-typings@*, vega-typings@0.3.53, vega-typings@^0.3.51: version "0.3.53" resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.53.tgz#a70b9730ebe1e4c557019ccccc5fd98035b0aab0" integrity sha512-XQRd66eL62ll6tHENQIJHtdwXemqXoB4KnVVbGUwGJIHjQkHHluCbkoWVRvPYuRd+OLM1RXVc+EBxA015hJ1SQ== dependencies: vega-util "^1.7.0" -vega-typings@0.3.51: - version "0.3.51" - resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.51.tgz#1e7a84ae3af4fcc0784b80d50a3e1df432b18141" - integrity sha512-8UJnlGIZLDYzlLgMJVHO8Yb8yU7pYeNGnW8J7nxgyXqurowovmPM9fV+V49vzbQnZl4/Qq14wGqm9yM7iqZl8g== - dependencies: - vega-util "^1.7.0" - vega-util@^1.7.0, vega-util@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/vega-util/-/vega-util-1.7.1.tgz#0b95bbe6058895c332596c215247507caa68ab61" diff --git a/cart-pole/package.json b/cart-pole/package.json index ea7fa34b..3bbd361a 100644 --- a/cart-pole/package.json +++ b/cart-pole/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tensorflow/tfjs": "^1.0.0", - "@tensorflow/tfjs-vis": "^0.4.2" + "@tensorflow/tfjs-vis": "^1.0.3" }, "scripts": { "build": "cross-env NODE_ENV=production parcel build index.html --no-minify --public-url ./", diff --git a/cart-pole/ui.js b/cart-pole/ui.js index 804da5f9..0c5a324b 100644 --- a/cart-pole/ui.js +++ b/cart-pole/ui.js @@ -102,7 +102,7 @@ function onIterationEnd(iterationCount, totalIterations) { // Objects and function to support the plotting of game steps during training. let meanStepValues = []; function plotSteps() { - tfvis.render.linechart({values: meanStepValues}, stepsContainer, { + tfvis.render.linechart(stepsContainer, {values: meanStepValues}, { xLabel: 'Training Iteration', yLabel: 'Mean Steps Per Game', width: 400, diff --git a/cart-pole/yarn.lock b/cart-pole/yarn.lock index 2309d1d5..372d7cbe 100644 --- a/cart-pole/yarn.lock +++ b/cart-pole/yarn.lock @@ -681,19 +681,17 @@ resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.0.0.tgz#e4344e9221001850eb1615184fa5ca2499f75254" integrity sha512-+RB5TKM/L7qLn17ic8da/G2qg8EFhRvZIoRA6uCCs5OMUJAUQqhDqBNaoWiy0pYtXDzfZJu3ZOkDbAg2Xv2YOQ== -"@tensorflow/tfjs-vis@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-0.4.2.tgz#6d4f81e26dc6c3d8c06345f18e80c2d52c6b551f" - integrity sha512-WMe6Xr3WIeKm4lme2Hz4IRwPnObTOD/eyBUc5vTS2DIXGqK2N9KjzundW3DS2UOFXDicN85bEyHqq6xBaLsNyg== +"@tensorflow/tfjs-vis@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-1.0.3.tgz#624bafaa900920e0cf8d00d1047497fd86ac1d91" + integrity sha512-WHyqN7l8M/luTdQNk7VpGrcrEBUSTYNPkK2fHCoxLjhqSnbr5yFEohgHgHnySneW0GUomGjz2C4LjBLlomDTCw== dependencies: d3-format "^1.3.0" d3-selection "^1.3.0" glamor "^2.20.40" glamor-tachyons "^1.0.0-alpha.1" preact "^8.2.9" - vega-embed "3.28.0" - vega-lib "4.4.0" - vega-lite "3.0.0-rc10" + vega-embed "3.30.0" "@tensorflow/tfjs@^1.0.0": version "1.0.0" @@ -705,6 +703,11 @@ "@tensorflow/tfjs-data" "1.0.0" "@tensorflow/tfjs-layers" "1.0.0" +"@types/clone@^0.1.30": + version "0.1.30" + resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614" + integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ= + "@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" @@ -1777,7 +1780,7 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clone@^2.1.1: +clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -2351,11 +2354,16 @@ d3-scale@^2.1.2: d3-time "1" d3-time-format "2" -d3-selection@^1.3.0, d3-selection@^1.3.2: +d3-selection@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.2.tgz#6e70a9df60801c8af28ac24d10072d82cbfdf652" integrity sha512-OoXdv1nZ7h2aKMVg3kaUFbLLK5jXUFAMLD/Tu5JA96mjf8f2a9ZUESGY+C36t8R1WFeWk/e55hy54Ml2I62CRQ== +d3-selection@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" + integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== + d3-shape@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.2.tgz#f9dba3777a5825f9a8ce8bc928da08c17679e9a7" @@ -2853,6 +2861,11 @@ fast-glob@^2.2.2: merge2 "^1.2.3" micromatch "^3.1.10" +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -3715,18 +3728,16 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= - dependencies: - jsonify "~0.0.0" - json-stringify-pretty-compact@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" @@ -3748,11 +3759,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -6396,19 +6402,19 @@ vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0: vega-loader "^3.1.0" vega-util "^1.7.0" -vega-embed@3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.28.0.tgz#f00373ddf3d83c501de3b8a0396951a32648f175" - integrity sha512-qIHNKPk7rwuID8/dHthXPMQrEhA6AjLiiVqD3Ols8Ff80GLOgXggjxwwyAI8DrKhOVNFbQwsTgx5E8cH0X5y6w== +vega-embed@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.30.0.tgz#2ed625cc7d0c7a0aa54160f35a7b29076130c168" + integrity sha512-+90hd4iqu6fpfgOAFZ/9QZVxoGKX3lFghm70XlkKeaUjVAxzM2mW4jiQ5VTqY1+5dhBgmjbWMrrC2Uh3n0jzLg== dependencies: - d3-selection "^1.3.2" - json-stringify-pretty-compact "^1.2.0" + d3-selection "^1.4.0" + json-stringify-pretty-compact "^2.0.0" semver "^5.6.0" vega-lib "^4.4.0" - vega-lite "^3.0.0-rc10 || ^2.6.0" + vega-lite "3.0.0-rc12 || ^2.6.0" vega-schema-url-parser "^1.1.0" vega-themes "^2.2.0" - vega-tooltip "^0.15.0" + vega-tooltip "^0.16.0" vega-encode@^3.2.2: version "3.2.2" @@ -6465,7 +6471,7 @@ vega-hierarchy@^3.1.0: vega-dataflow "^4.0.4" vega-util "^1.7.0" -vega-lib@4.4.0, vega-lib@^4.4.0: +vega-lib@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880" integrity sha512-bfOsO5wks+ctnJ94fIPWH/B0qocdFs4WZ8teIgjF7m5XE+EVln+1nq9Z+sV7wdw7vftzGg0GAx9UH/kJxyopKg== @@ -6493,18 +6499,21 @@ vega-lib@4.4.0, vega-lib@^4.4.0: vega-voronoi "^3.0.0" vega-wordcloud "^3.0.0" -vega-lite@3.0.0-rc10, "vega-lite@^3.0.0-rc10 || ^2.6.0": - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc10.tgz#06738975a23bb4e61cfaf5a64779453a5cdf5a3e" - integrity sha512-xgoOXmVdd2j89D6i44JHjozUy7Z4Mw9bcqFySzm77JDUV0BWLrnM61QmaS8ZwAZQbMcmdCTCJ//HgClH2gFZoQ== +"vega-lite@3.0.0-rc12 || ^2.6.0": + version "3.0.0-rc12" + resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc12.tgz#48a1a8dc6b499ed3efdcff8b9807e6df4214de70" + integrity sha512-/J7pyYFzL6rod+fBRZ9k6EQBMr7VXRmhQ/DqKPm2wGgtzqxDorBrvwZ0sqi2zWZ1o1vHIehbfl+/JMotuIoEeg== dependencies: + "@types/clone" "^0.1.30" + clone "^2.1.2" fast-deep-equal "^2.0.1" - json-stable-stringify "^1.0.1" + fast-json-stable-stringify "^2.0.0" json-stringify-pretty-compact "^1.2.0" tslib "^1.9.3" vega-event-selector "^2.0.0" - vega-typings "0.3.51" - vega-util "^1.7.0" + vega-expression "^2.4.0" + vega-typings "0.3.53" + vega-util "^1.7.1" yargs "^12.0.5" vega-loader@^3.0.1, vega-loader@^3.1.0: @@ -6593,10 +6602,10 @@ vega-themes@^2.2.0: dependencies: vega-typings "^0.3.51" -vega-tooltip@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.15.0.tgz#2606a95b46f0aa6a70f03d18f919dc13696c4d44" - integrity sha512-xfac+5I7YR1ZKfip2i9xlEHuNrl5YpQnZAmTc9dzQcnkoo5MmGVIhH01tEGOr8keVC9UbYU1AREezwv8Mpajhw== +vega-tooltip@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.16.0.tgz#fc9badb96aed437b8225d0a7216ec6d1e768ac6f" + integrity sha512-A3hZ3B06n8anAp5ReOKmPeGlZaE2kVT0rN0IGLV8jWR54mNUKH/H9TacsyvLA9gq9OO0NrbpQ4NyfxU3uS8EYg== dependencies: vega-util "^1.7.1" @@ -6610,20 +6619,13 @@ vega-transforms@^2.3.1: vega-statistics "^1.2.3" vega-util "^1.7.0" -vega-typings@*, vega-typings@^0.3.51: +vega-typings@*, vega-typings@0.3.53, vega-typings@^0.3.51: version "0.3.53" resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.53.tgz#a70b9730ebe1e4c557019ccccc5fd98035b0aab0" integrity sha512-XQRd66eL62ll6tHENQIJHtdwXemqXoB4KnVVbGUwGJIHjQkHHluCbkoWVRvPYuRd+OLM1RXVc+EBxA015hJ1SQ== dependencies: vega-util "^1.7.0" -vega-typings@0.3.51: - version "0.3.51" - resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.51.tgz#1e7a84ae3af4fcc0784b80d50a3e1df432b18141" - integrity sha512-8UJnlGIZLDYzlLgMJVHO8Yb8yU7pYeNGnW8J7nxgyXqurowovmPM9fV+V49vzbQnZl4/Qq14wGqm9yM7iqZl8g== - dependencies: - vega-util "^1.7.0" - vega-util@^1.7.0, vega-util@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/vega-util/-/vega-util-1.7.1.tgz#0b95bbe6058895c332596c215247507caa68ab61" diff --git a/data-generator/package.json b/data-generator/package.json index cddc311f..04ac54dd 100644 --- a/data-generator/package.json +++ b/data-generator/package.json @@ -7,7 +7,7 @@ "dependencies": { "@babel/plugin-transform-runtime": "^7.2.0", "@tensorflow/tfjs": "^1.0.0", - "@tensorflow/tfjs-vis": "^0.4.2" + "@tensorflow/tfjs-vis": "^1.0.3" }, "scripts": { "link-local": "yalc link", diff --git a/data-generator/yarn.lock b/data-generator/yarn.lock index 7438ab32..7339de50 100644 --- a/data-generator/yarn.lock +++ b/data-generator/yarn.lock @@ -727,19 +727,17 @@ resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.0.0.tgz#e4344e9221001850eb1615184fa5ca2499f75254" integrity sha512-+RB5TKM/L7qLn17ic8da/G2qg8EFhRvZIoRA6uCCs5OMUJAUQqhDqBNaoWiy0pYtXDzfZJu3ZOkDbAg2Xv2YOQ== -"@tensorflow/tfjs-vis@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-0.4.2.tgz#6d4f81e26dc6c3d8c06345f18e80c2d52c6b551f" - integrity sha512-WMe6Xr3WIeKm4lme2Hz4IRwPnObTOD/eyBUc5vTS2DIXGqK2N9KjzundW3DS2UOFXDicN85bEyHqq6xBaLsNyg== +"@tensorflow/tfjs-vis@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-1.0.3.tgz#624bafaa900920e0cf8d00d1047497fd86ac1d91" + integrity sha512-WHyqN7l8M/luTdQNk7VpGrcrEBUSTYNPkK2fHCoxLjhqSnbr5yFEohgHgHnySneW0GUomGjz2C4LjBLlomDTCw== dependencies: d3-format "^1.3.0" d3-selection "^1.3.0" glamor "^2.20.40" glamor-tachyons "^1.0.0-alpha.1" preact "^8.2.9" - vega-embed "3.28.0" - vega-lib "4.4.0" - vega-lite "3.0.0-rc10" + vega-embed "3.30.0" "@tensorflow/tfjs@^1.0.0": version "1.0.0" @@ -2463,7 +2461,7 @@ d3-scale@^2.1.2: d3-time "1" d3-time-format "2" -d3-selection@^1.3.0, d3-selection@^1.3.2: +d3-selection@^1.3.0, d3-selection@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== @@ -3800,18 +3798,16 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= - dependencies: - jsonify "~0.0.0" - json-stringify-pretty-compact@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -3838,11 +3834,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -6488,19 +6479,19 @@ vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0: vega-loader "^3.1.0" vega-util "^1.7.0" -vega-embed@3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.28.0.tgz#f00373ddf3d83c501de3b8a0396951a32648f175" - integrity sha512-qIHNKPk7rwuID8/dHthXPMQrEhA6AjLiiVqD3Ols8Ff80GLOgXggjxwwyAI8DrKhOVNFbQwsTgx5E8cH0X5y6w== +vega-embed@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.30.0.tgz#2ed625cc7d0c7a0aa54160f35a7b29076130c168" + integrity sha512-+90hd4iqu6fpfgOAFZ/9QZVxoGKX3lFghm70XlkKeaUjVAxzM2mW4jiQ5VTqY1+5dhBgmjbWMrrC2Uh3n0jzLg== dependencies: - d3-selection "^1.3.2" - json-stringify-pretty-compact "^1.2.0" + d3-selection "^1.4.0" + json-stringify-pretty-compact "^2.0.0" semver "^5.6.0" vega-lib "^4.4.0" - vega-lite "^3.0.0-rc10 || ^2.6.0" + vega-lite "3.0.0-rc12 || ^2.6.0" vega-schema-url-parser "^1.1.0" vega-themes "^2.2.0" - vega-tooltip "^0.15.0" + vega-tooltip "^0.16.0" vega-encode@^3.2.2: version "3.2.2" @@ -6557,7 +6548,7 @@ vega-hierarchy@^3.1.0: vega-dataflow "^4.0.4" vega-util "^1.7.0" -vega-lib@4.4.0, vega-lib@^4.4.0: +vega-lib@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880" integrity sha512-bfOsO5wks+ctnJ94fIPWH/B0qocdFs4WZ8teIgjF7m5XE+EVln+1nq9Z+sV7wdw7vftzGg0GAx9UH/kJxyopKg== @@ -6585,21 +6576,7 @@ vega-lib@4.4.0, vega-lib@^4.4.0: vega-voronoi "^3.0.0" vega-wordcloud "^3.0.0" -vega-lite@3.0.0-rc10: - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc10.tgz#06738975a23bb4e61cfaf5a64779453a5cdf5a3e" - integrity sha512-xgoOXmVdd2j89D6i44JHjozUy7Z4Mw9bcqFySzm77JDUV0BWLrnM61QmaS8ZwAZQbMcmdCTCJ//HgClH2gFZoQ== - dependencies: - fast-deep-equal "^2.0.1" - json-stable-stringify "^1.0.1" - json-stringify-pretty-compact "^1.2.0" - tslib "^1.9.3" - vega-event-selector "^2.0.0" - vega-typings "0.3.51" - vega-util "^1.7.0" - yargs "^12.0.5" - -"vega-lite@^3.0.0-rc10 || ^2.6.0": +"vega-lite@3.0.0-rc12 || ^2.6.0": version "3.0.0-rc12" resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc12.tgz#48a1a8dc6b499ed3efdcff8b9807e6df4214de70" integrity sha512-/J7pyYFzL6rod+fBRZ9k6EQBMr7VXRmhQ/DqKPm2wGgtzqxDorBrvwZ0sqi2zWZ1o1vHIehbfl+/JMotuIoEeg== @@ -6702,10 +6679,10 @@ vega-themes@^2.2.0: dependencies: vega-typings "^0.3.51" -vega-tooltip@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.15.0.tgz#2606a95b46f0aa6a70f03d18f919dc13696c4d44" - integrity sha512-xfac+5I7YR1ZKfip2i9xlEHuNrl5YpQnZAmTc9dzQcnkoo5MmGVIhH01tEGOr8keVC9UbYU1AREezwv8Mpajhw== +vega-tooltip@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.16.0.tgz#fc9badb96aed437b8225d0a7216ec6d1e768ac6f" + integrity sha512-A3hZ3B06n8anAp5ReOKmPeGlZaE2kVT0rN0IGLV8jWR54mNUKH/H9TacsyvLA9gq9OO0NrbpQ4NyfxU3uS8EYg== dependencies: vega-util "^1.7.1" @@ -6726,13 +6703,6 @@ vega-typings@*, vega-typings@0.3.53, vega-typings@^0.3.51: dependencies: vega-util "^1.7.0" -vega-typings@0.3.51: - version "0.3.51" - resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.51.tgz#1e7a84ae3af4fcc0784b80d50a3e1df432b18141" - integrity sha512-8UJnlGIZLDYzlLgMJVHO8Yb8yU7pYeNGnW8J7nxgyXqurowovmPM9fV+V49vzbQnZl4/Qq14wGqm9yM7iqZl8g== - dependencies: - vega-util "^1.7.0" - vega-util@^1.7.0, vega-util@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/vega-util/-/vega-util-1.7.1.tgz#0b95bbe6058895c332596c215247507caa68ab61" diff --git a/date-conversion-attention/index.js b/date-conversion-attention/index.js index d6f30d64..f9836003 100644 --- a/date-conversion-attention/index.js +++ b/date-conversion-attention/index.js @@ -71,7 +71,7 @@ inputDateString.addEventListener('change', async () => { } } await tfvis.render.heatmap( - {values: attention.squeeze([0]), xLabels, yLabels}, attentionHeatmap, { + attentionHeatmap, {values: attention.squeeze([0]), xLabels, yLabels}, { width: 600, height: 360, xLabel: 'Output characters', diff --git a/date-conversion-attention/package.json b/date-conversion-attention/package.json index 33192d15..b5fa0d32 100644 --- a/date-conversion-attention/package.json +++ b/date-conversion-attention/package.json @@ -15,8 +15,8 @@ "watch": "cross-env NODE_ENV=development parcel index.html --no-hmr --open" }, "dependencies": { - "@tensorflow/tfjs": "^0.15.3", - "@tensorflow/tfjs-vis": "^0.5.0" + "@tensorflow/tfjs": "^1.0.0", + "@tensorflow/tfjs-vis": "1.0.3" }, "devDependencies": { "@tensorflow/tfjs-node": "^0.3.1", diff --git a/date-conversion-attention/yarn.lock b/date-conversion-attention/yarn.lock index 18075e2a..26050678 100644 --- a/date-conversion-attention/yarn.lock +++ b/date-conversion-attention/yarn.lock @@ -712,6 +712,11 @@ "@types/long" "~3.0.32" protobufjs "~6.8.6" +"@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-core@0.15.4": version "0.15.4" resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-0.15.4.tgz#aaf52acd209476ebde7bd9a37a7c60ec9d067b65" @@ -722,6 +727,16 @@ "@types/webgl2" "0.0.4" seedrandom "2.4.3" +"@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== + dependencies: + "@types/seedrandom" "2.4.27" + "@types/webgl-ext" "0.0.30" + "@types/webgl2" "0.0.4" + seedrandom "2.4.3" + "@tensorflow/tfjs-data@0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-0.2.3.tgz#67c0cd505485c9b0b6a83cb1c8a24559c5adfa68" @@ -731,11 +746,25 @@ node-fetch "~2.1.2" seedrandom "~2.4.3" +"@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== + dependencies: + "@types/node-fetch" "^2.1.2" + node-fetch "~2.1.2" + seedrandom "~2.4.3" + "@tensorflow/tfjs-layers@0.10.3": version "0.10.3" resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-0.10.3.tgz#cf4001b5b7566b1526e65e615439e85070a1012c" integrity sha512-Xhaz4+ZuL2SEm3S0u4x04dMYMrcG4w4dhMOjoQW8GhAJU4p7LkmP9TmwMEHp7CIVJiJzzQy7Hg8E5fESEnJinA== +"@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-node-gpu@^0.3.1": version "0.3.1" resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-node-gpu/-/tfjs-node-gpu-0.3.1.tgz#79f7f3f25a2320531ad4faeb4e106f02cb18a4f0" @@ -764,21 +793,29 @@ rimraf "^2.6.2" tar "^4.4.6" -"@tensorflow/tfjs-vis@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-0.5.0.tgz#5c88955bc19ecf070bf5aba06ae6ca58198f2073" - integrity sha512-SKuiZ9bt2dSTzD91OqMAaqUPJ4FhFRbpNsLPL9HpIfMsR3EDwlIX+ybGt3ZxCA62RK9gInTxPZSUEaKQfKwhag== +"@tensorflow/tfjs-vis@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-1.0.3.tgz#624bafaa900920e0cf8d00d1047497fd86ac1d91" + integrity sha512-WHyqN7l8M/luTdQNk7VpGrcrEBUSTYNPkK2fHCoxLjhqSnbr5yFEohgHgHnySneW0GUomGjz2C4LjBLlomDTCw== dependencies: d3-format "^1.3.0" d3-selection "^1.3.0" glamor "^2.20.40" glamor-tachyons "^1.0.0-alpha.1" preact "^8.2.9" - vega-embed "3.28.0" - vega-lib "4.4.0" - vega-lite "3.0.0-rc10" + vega-embed "3.30.0" -"@tensorflow/tfjs@^0.15.3", "@tensorflow/tfjs@~0.15.3": +"@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== + 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@~0.15.3": version "0.15.3" resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-0.15.3.tgz#6608833952858c8984f20962eb86624f99196f06" integrity sha512-NBAs+iGBNBxprm98mk488EfTDl2kA/lzNguoQGEMeIPWVHTbadSn2QV5xXKAf/fcOat+JwVfqe2vxHBbTjHMOw== @@ -2619,7 +2656,7 @@ d3-scale@^2.1.2: d3-time "1" d3-time-format "2" -d3-selection@^1.3.0, d3-selection@^1.3.2: +d3-selection@^1.3.0, d3-selection@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== @@ -4126,18 +4163,16 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= - dependencies: - jsonify "~0.0.0" - json-stringify-pretty-compact@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -4164,11 +4199,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -6937,19 +6967,19 @@ vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0: vega-loader "^3.1.0" vega-util "^1.7.0" -vega-embed@3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.28.0.tgz#f00373ddf3d83c501de3b8a0396951a32648f175" - integrity sha512-qIHNKPk7rwuID8/dHthXPMQrEhA6AjLiiVqD3Ols8Ff80GLOgXggjxwwyAI8DrKhOVNFbQwsTgx5E8cH0X5y6w== +vega-embed@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.30.0.tgz#2ed625cc7d0c7a0aa54160f35a7b29076130c168" + integrity sha512-+90hd4iqu6fpfgOAFZ/9QZVxoGKX3lFghm70XlkKeaUjVAxzM2mW4jiQ5VTqY1+5dhBgmjbWMrrC2Uh3n0jzLg== dependencies: - d3-selection "^1.3.2" - json-stringify-pretty-compact "^1.2.0" + d3-selection "^1.4.0" + json-stringify-pretty-compact "^2.0.0" semver "^5.6.0" vega-lib "^4.4.0" - vega-lite "^3.0.0-rc10 || ^2.6.0" + vega-lite "3.0.0-rc12 || ^2.6.0" vega-schema-url-parser "^1.1.0" vega-themes "^2.2.0" - vega-tooltip "^0.15.0" + vega-tooltip "^0.16.0" vega-encode@^3.2.2: version "3.2.2" @@ -7006,7 +7036,7 @@ vega-hierarchy@^3.1.0: vega-dataflow "^4.0.4" vega-util "^1.7.0" -vega-lib@4.4.0, vega-lib@^4.4.0: +vega-lib@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880" integrity sha512-bfOsO5wks+ctnJ94fIPWH/B0qocdFs4WZ8teIgjF7m5XE+EVln+1nq9Z+sV7wdw7vftzGg0GAx9UH/kJxyopKg== @@ -7034,21 +7064,7 @@ vega-lib@4.4.0, vega-lib@^4.4.0: vega-voronoi "^3.0.0" vega-wordcloud "^3.0.0" -vega-lite@3.0.0-rc10: - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc10.tgz#06738975a23bb4e61cfaf5a64779453a5cdf5a3e" - integrity sha512-xgoOXmVdd2j89D6i44JHjozUy7Z4Mw9bcqFySzm77JDUV0BWLrnM61QmaS8ZwAZQbMcmdCTCJ//HgClH2gFZoQ== - dependencies: - fast-deep-equal "^2.0.1" - json-stable-stringify "^1.0.1" - json-stringify-pretty-compact "^1.2.0" - tslib "^1.9.3" - vega-event-selector "^2.0.0" - vega-typings "0.3.51" - vega-util "^1.7.0" - yargs "^12.0.5" - -"vega-lite@^3.0.0-rc10 || ^2.6.0": +"vega-lite@3.0.0-rc12 || ^2.6.0": version "3.0.0-rc12" resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc12.tgz#48a1a8dc6b499ed3efdcff8b9807e6df4214de70" integrity sha512-/J7pyYFzL6rod+fBRZ9k6EQBMr7VXRmhQ/DqKPm2wGgtzqxDorBrvwZ0sqi2zWZ1o1vHIehbfl+/JMotuIoEeg== @@ -7151,10 +7167,10 @@ vega-themes@^2.2.0: dependencies: vega-typings "^0.3.51" -vega-tooltip@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.15.0.tgz#2606a95b46f0aa6a70f03d18f919dc13696c4d44" - integrity sha512-xfac+5I7YR1ZKfip2i9xlEHuNrl5YpQnZAmTc9dzQcnkoo5MmGVIhH01tEGOr8keVC9UbYU1AREezwv8Mpajhw== +vega-tooltip@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.16.0.tgz#fc9badb96aed437b8225d0a7216ec6d1e768ac6f" + integrity sha512-A3hZ3B06n8anAp5ReOKmPeGlZaE2kVT0rN0IGLV8jWR54mNUKH/H9TacsyvLA9gq9OO0NrbpQ4NyfxU3uS8EYg== dependencies: vega-util "^1.7.1" @@ -7175,13 +7191,6 @@ vega-typings@*, vega-typings@0.3.53, vega-typings@^0.3.51: dependencies: vega-util "^1.7.0" -vega-typings@0.3.51: - version "0.3.51" - resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.51.tgz#1e7a84ae3af4fcc0784b80d50a3e1df432b18141" - integrity sha512-8UJnlGIZLDYzlLgMJVHO8Yb8yU7pYeNGnW8J7nxgyXqurowovmPM9fV+V49vzbQnZl4/Qq14wGqm9yM7iqZl8g== - dependencies: - vega-util "^1.7.0" - vega-util@^1.7.0, vega-util@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/vega-util/-/vega-util-1.7.1.tgz#0b95bbe6058895c332596c215247507caa68ab61" diff --git a/iris-fitDataset/index.js b/iris-fitDataset/index.js index e4bdc62c..5e9169d4 100644 --- a/iris-fitDataset/index.js +++ b/iris-fitDataset/index.js @@ -132,7 +132,7 @@ async function calculateAndDrawConfusionMatrix(model, xTest, yTest) { const confMatrixData = await tfvis.metrics.confusionMatrix(labels, preds); const container = document.getElementById('confusion-matrix'); tfvis.render.confusionMatrix( - {values: confMatrixData, labels: data.IRIS_CLASSES}, container, + container, {values: confMatrixData, labels: data.IRIS_CLASSES}, {shadeDiagonal: true}, ); diff --git a/iris-fitDataset/package.json b/iris-fitDataset/package.json index c98a492a..43ee52ae 100644 --- a/iris-fitDataset/package.json +++ b/iris-fitDataset/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tensorflow/tfjs": "^1.0.0", - "@tensorflow/tfjs-vis": "^0.4.2" + "@tensorflow/tfjs-vis": "^1.0.3" }, "scripts": { "build": "cross-env NODE_ENV=production parcel build index.html --no-minify --public-url ./", diff --git a/iris-fitDataset/yarn.lock b/iris-fitDataset/yarn.lock index b24d359e..77bb3b5d 100644 --- a/iris-fitDataset/yarn.lock +++ b/iris-fitDataset/yarn.lock @@ -598,19 +598,17 @@ resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.0.0.tgz#e4344e9221001850eb1615184fa5ca2499f75254" integrity sha512-+RB5TKM/L7qLn17ic8da/G2qg8EFhRvZIoRA6uCCs5OMUJAUQqhDqBNaoWiy0pYtXDzfZJu3ZOkDbAg2Xv2YOQ== -"@tensorflow/tfjs-vis@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-0.4.2.tgz#6d4f81e26dc6c3d8c06345f18e80c2d52c6b551f" - integrity sha512-WMe6Xr3WIeKm4lme2Hz4IRwPnObTOD/eyBUc5vTS2DIXGqK2N9KjzundW3DS2UOFXDicN85bEyHqq6xBaLsNyg== +"@tensorflow/tfjs-vis@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-1.0.3.tgz#624bafaa900920e0cf8d00d1047497fd86ac1d91" + integrity sha512-WHyqN7l8M/luTdQNk7VpGrcrEBUSTYNPkK2fHCoxLjhqSnbr5yFEohgHgHnySneW0GUomGjz2C4LjBLlomDTCw== dependencies: d3-format "^1.3.0" d3-selection "^1.3.0" glamor "^2.20.40" glamor-tachyons "^1.0.0-alpha.1" preact "^8.2.9" - vega-embed "3.28.0" - vega-lib "4.4.0" - vega-lite "3.0.0-rc10" + vega-embed "3.30.0" "@tensorflow/tfjs@^1.0.0": version "1.0.0" @@ -622,6 +620,11 @@ "@tensorflow/tfjs-data" "1.0.0" "@tensorflow/tfjs-layers" "1.0.0" +"@types/clone@^0.1.30": + version "0.1.30" + resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614" + integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ= + "@types/node-fetch@^2.1.2": version "2.1.4" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.1.4.tgz#093d1beae11541aef25999d70aa09286fd025b1a" @@ -1622,9 +1625,10 @@ clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" -clone@^2.1.1: +clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= clones@^1.2.0: version "1.2.0" @@ -2121,10 +2125,15 @@ d3-scale@^2.1.2: d3-time "1" d3-time-format "2" -d3-selection@^1.3.0, d3-selection@^1.3.2: +d3-selection@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.2.tgz#6e70a9df60801c8af28ac24d10072d82cbfdf652" +d3-selection@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" + integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== + d3-shape@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.2.tgz#f9dba3777a5825f9a8ce8bc928da08c17679e9a7" @@ -2558,6 +2567,11 @@ fast-glob@^2.2.2: merge2 "^1.2.3" micromatch "^3.1.10" +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -3307,16 +3321,15 @@ json-parse-better-errors@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - dependencies: - jsonify "~0.0.0" - json-stringify-pretty-compact@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -3339,10 +3352,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -5644,18 +5653,19 @@ vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0: vega-loader "^3.1.0" vega-util "^1.7.0" -vega-embed@3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.28.0.tgz#f00373ddf3d83c501de3b8a0396951a32648f175" +vega-embed@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.30.0.tgz#2ed625cc7d0c7a0aa54160f35a7b29076130c168" + integrity sha512-+90hd4iqu6fpfgOAFZ/9QZVxoGKX3lFghm70XlkKeaUjVAxzM2mW4jiQ5VTqY1+5dhBgmjbWMrrC2Uh3n0jzLg== dependencies: - d3-selection "^1.3.2" - json-stringify-pretty-compact "^1.2.0" + d3-selection "^1.4.0" + json-stringify-pretty-compact "^2.0.0" semver "^5.6.0" vega-lib "^4.4.0" - vega-lite "^3.0.0-rc10 || ^2.6.0" + vega-lite "3.0.0-rc12 || ^2.6.0" vega-schema-url-parser "^1.1.0" vega-themes "^2.2.0" - vega-tooltip "^0.15.0" + vega-tooltip "^0.16.0" vega-encode@^3.2.2: version "3.2.2" @@ -5706,7 +5716,7 @@ vega-hierarchy@^3.1.0: vega-dataflow "^4.0.4" vega-util "^1.7.0" -vega-lib@4.4.0, vega-lib@^4.4.0: +vega-lib@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880" dependencies: @@ -5733,17 +5743,21 @@ vega-lib@4.4.0, vega-lib@^4.4.0: vega-voronoi "^3.0.0" vega-wordcloud "^3.0.0" -vega-lite@3.0.0-rc10, "vega-lite@^3.0.0-rc10 || ^2.6.0": - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc10.tgz#06738975a23bb4e61cfaf5a64779453a5cdf5a3e" +"vega-lite@3.0.0-rc12 || ^2.6.0": + version "3.0.0-rc12" + resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc12.tgz#48a1a8dc6b499ed3efdcff8b9807e6df4214de70" + integrity sha512-/J7pyYFzL6rod+fBRZ9k6EQBMr7VXRmhQ/DqKPm2wGgtzqxDorBrvwZ0sqi2zWZ1o1vHIehbfl+/JMotuIoEeg== dependencies: + "@types/clone" "^0.1.30" + clone "^2.1.2" fast-deep-equal "^2.0.1" - json-stable-stringify "^1.0.1" + fast-json-stable-stringify "^2.0.0" json-stringify-pretty-compact "^1.2.0" tslib "^1.9.3" vega-event-selector "^2.0.0" - vega-typings "0.3.51" - vega-util "^1.7.0" + vega-expression "^2.4.0" + vega-typings "0.3.53" + vega-util "^1.7.1" yargs "^12.0.5" vega-loader@^3.0.1, vega-loader@^3.1.0: @@ -5823,9 +5837,10 @@ vega-themes@^2.2.0: dependencies: vega-typings "^0.3.51" -vega-tooltip@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.15.0.tgz#2606a95b46f0aa6a70f03d18f919dc13696c4d44" +vega-tooltip@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.16.0.tgz#fc9badb96aed437b8225d0a7216ec6d1e768ac6f" + integrity sha512-A3hZ3B06n8anAp5ReOKmPeGlZaE2kVT0rN0IGLV8jWR54mNUKH/H9TacsyvLA9gq9OO0NrbpQ4NyfxU3uS8EYg== dependencies: vega-util "^1.7.1" @@ -5838,18 +5853,12 @@ vega-transforms@^2.3.1: vega-statistics "^1.2.3" vega-util "^1.7.0" -vega-typings@*, vega-typings@^0.3.51: +vega-typings@*, vega-typings@0.3.53, vega-typings@^0.3.51: version "0.3.53" resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.53.tgz#a70b9730ebe1e4c557019ccccc5fd98035b0aab0" dependencies: vega-util "^1.7.0" -vega-typings@0.3.51: - version "0.3.51" - resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.51.tgz#1e7a84ae3af4fcc0784b80d50a3e1df432b18141" - dependencies: - vega-util "^1.7.0" - vega-util@^1.7.0, vega-util@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/vega-util/-/vega-util-1.7.1.tgz#0b95bbe6058895c332596c215247507caa68ab61" diff --git a/iris/index.js b/iris/index.js index fb080c44..97499754 100644 --- a/iris/index.js +++ b/iris/index.js @@ -126,7 +126,8 @@ async function calculateAndDrawConfusionMatrix(model, xTest, yTest) { const confMatrixData = await tfvis.metrics.confusionMatrix(labels, preds); const container = document.getElementById('confusion-matrix'); tfvis.render.confusionMatrix( - {values: confMatrixData, labels: data.IRIS_CLASSES}, container, + container, + {values: confMatrixData, labels: data.IRIS_CLASSES}, {shadeDiagonal: true}, ); diff --git a/iris/package.json b/iris/package.json index c98a492a..43ee52ae 100644 --- a/iris/package.json +++ b/iris/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tensorflow/tfjs": "^1.0.0", - "@tensorflow/tfjs-vis": "^0.4.2" + "@tensorflow/tfjs-vis": "^1.0.3" }, "scripts": { "build": "cross-env NODE_ENV=production parcel build index.html --no-minify --public-url ./", diff --git a/iris/yarn.lock b/iris/yarn.lock index 28520416..c567f052 100644 --- a/iris/yarn.lock +++ b/iris/yarn.lock @@ -671,19 +671,17 @@ resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.0.0.tgz#e4344e9221001850eb1615184fa5ca2499f75254" integrity sha512-+RB5TKM/L7qLn17ic8da/G2qg8EFhRvZIoRA6uCCs5OMUJAUQqhDqBNaoWiy0pYtXDzfZJu3ZOkDbAg2Xv2YOQ== -"@tensorflow/tfjs-vis@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-0.4.2.tgz#6d4f81e26dc6c3d8c06345f18e80c2d52c6b551f" - integrity sha512-WMe6Xr3WIeKm4lme2Hz4IRwPnObTOD/eyBUc5vTS2DIXGqK2N9KjzundW3DS2UOFXDicN85bEyHqq6xBaLsNyg== +"@tensorflow/tfjs-vis@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-1.0.3.tgz#624bafaa900920e0cf8d00d1047497fd86ac1d91" + integrity sha512-WHyqN7l8M/luTdQNk7VpGrcrEBUSTYNPkK2fHCoxLjhqSnbr5yFEohgHgHnySneW0GUomGjz2C4LjBLlomDTCw== dependencies: d3-format "^1.3.0" d3-selection "^1.3.0" glamor "^2.20.40" glamor-tachyons "^1.0.0-alpha.1" preact "^8.2.9" - vega-embed "3.28.0" - vega-lib "4.4.0" - vega-lite "3.0.0-rc10" + vega-embed "3.30.0" "@tensorflow/tfjs@^1.0.0": version "1.0.0" @@ -695,6 +693,11 @@ "@tensorflow/tfjs-data" "1.0.0" "@tensorflow/tfjs-layers" "1.0.0" +"@types/clone@^0.1.30": + version "0.1.30" + resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614" + integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ= + "@types/node-fetch@^2.1.2": version "2.1.4" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.1.4.tgz#093d1beae11541aef25999d70aa09286fd025b1a" @@ -1838,7 +1841,7 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clone@^2.1.1: +clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -2412,11 +2415,16 @@ d3-scale@^2.1.2: d3-time "1" d3-time-format "2" -d3-selection@^1.3.0, d3-selection@^1.3.2: +d3-selection@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.2.tgz#6e70a9df60801c8af28ac24d10072d82cbfdf652" integrity sha512-OoXdv1nZ7h2aKMVg3kaUFbLLK5jXUFAMLD/Tu5JA96mjf8f2a9ZUESGY+C36t8R1WFeWk/e55hy54Ml2I62CRQ== +d3-selection@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" + integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== + d3-shape@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.2.tgz#f9dba3777a5825f9a8ce8bc928da08c17679e9a7" @@ -2921,6 +2929,11 @@ fast-glob@^2.2.2: merge2 "^1.2.3" micromatch "^3.1.10" +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -3803,18 +3816,16 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= - dependencies: - jsonify "~0.0.0" - json-stringify-pretty-compact@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -3841,11 +3852,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -6508,19 +6514,19 @@ vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0: vega-loader "^3.1.0" vega-util "^1.7.0" -vega-embed@3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.28.0.tgz#f00373ddf3d83c501de3b8a0396951a32648f175" - integrity sha512-qIHNKPk7rwuID8/dHthXPMQrEhA6AjLiiVqD3Ols8Ff80GLOgXggjxwwyAI8DrKhOVNFbQwsTgx5E8cH0X5y6w== +vega-embed@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.30.0.tgz#2ed625cc7d0c7a0aa54160f35a7b29076130c168" + integrity sha512-+90hd4iqu6fpfgOAFZ/9QZVxoGKX3lFghm70XlkKeaUjVAxzM2mW4jiQ5VTqY1+5dhBgmjbWMrrC2Uh3n0jzLg== dependencies: - d3-selection "^1.3.2" - json-stringify-pretty-compact "^1.2.0" + d3-selection "^1.4.0" + json-stringify-pretty-compact "^2.0.0" semver "^5.6.0" vega-lib "^4.4.0" - vega-lite "^3.0.0-rc10 || ^2.6.0" + vega-lite "3.0.0-rc12 || ^2.6.0" vega-schema-url-parser "^1.1.0" vega-themes "^2.2.0" - vega-tooltip "^0.15.0" + vega-tooltip "^0.16.0" vega-encode@^3.2.2: version "3.2.2" @@ -6577,7 +6583,7 @@ vega-hierarchy@^3.1.0: vega-dataflow "^4.0.4" vega-util "^1.7.0" -vega-lib@4.4.0, vega-lib@^4.4.0: +vega-lib@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880" integrity sha512-bfOsO5wks+ctnJ94fIPWH/B0qocdFs4WZ8teIgjF7m5XE+EVln+1nq9Z+sV7wdw7vftzGg0GAx9UH/kJxyopKg== @@ -6605,18 +6611,21 @@ vega-lib@4.4.0, vega-lib@^4.4.0: vega-voronoi "^3.0.0" vega-wordcloud "^3.0.0" -vega-lite@3.0.0-rc10, "vega-lite@^3.0.0-rc10 || ^2.6.0": - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc10.tgz#06738975a23bb4e61cfaf5a64779453a5cdf5a3e" - integrity sha512-xgoOXmVdd2j89D6i44JHjozUy7Z4Mw9bcqFySzm77JDUV0BWLrnM61QmaS8ZwAZQbMcmdCTCJ//HgClH2gFZoQ== +"vega-lite@3.0.0-rc12 || ^2.6.0": + version "3.0.0-rc12" + resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc12.tgz#48a1a8dc6b499ed3efdcff8b9807e6df4214de70" + integrity sha512-/J7pyYFzL6rod+fBRZ9k6EQBMr7VXRmhQ/DqKPm2wGgtzqxDorBrvwZ0sqi2zWZ1o1vHIehbfl+/JMotuIoEeg== dependencies: + "@types/clone" "^0.1.30" + clone "^2.1.2" fast-deep-equal "^2.0.1" - json-stable-stringify "^1.0.1" + fast-json-stable-stringify "^2.0.0" json-stringify-pretty-compact "^1.2.0" tslib "^1.9.3" vega-event-selector "^2.0.0" - vega-typings "0.3.51" - vega-util "^1.7.0" + vega-expression "^2.4.0" + vega-typings "0.3.53" + vega-util "^1.7.1" yargs "^12.0.5" vega-loader@^3.0.1, vega-loader@^3.1.0: @@ -6705,10 +6714,10 @@ vega-themes@^2.2.0: dependencies: vega-typings "^0.3.51" -vega-tooltip@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.15.0.tgz#2606a95b46f0aa6a70f03d18f919dc13696c4d44" - integrity sha512-xfac+5I7YR1ZKfip2i9xlEHuNrl5YpQnZAmTc9dzQcnkoo5MmGVIhH01tEGOr8keVC9UbYU1AREezwv8Mpajhw== +vega-tooltip@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.16.0.tgz#fc9badb96aed437b8225d0a7216ec6d1e768ac6f" + integrity sha512-A3hZ3B06n8anAp5ReOKmPeGlZaE2kVT0rN0IGLV8jWR54mNUKH/H9TacsyvLA9gq9OO0NrbpQ4NyfxU3uS8EYg== dependencies: vega-util "^1.7.1" @@ -6722,20 +6731,13 @@ vega-transforms@^2.3.1: vega-statistics "^1.2.3" vega-util "^1.7.0" -vega-typings@*, vega-typings@^0.3.51: +vega-typings@*, vega-typings@0.3.53, vega-typings@^0.3.51: version "0.3.53" resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.53.tgz#a70b9730ebe1e4c557019ccccc5fd98035b0aab0" integrity sha512-XQRd66eL62ll6tHENQIJHtdwXemqXoB4KnVVbGUwGJIHjQkHHluCbkoWVRvPYuRd+OLM1RXVc+EBxA015hJ1SQ== dependencies: vega-util "^1.7.0" -vega-typings@0.3.51: - version "0.3.51" - resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.51.tgz#1e7a84ae3af4fcc0784b80d50a3e1df432b18141" - integrity sha512-8UJnlGIZLDYzlLgMJVHO8Yb8yU7pYeNGnW8J7nxgyXqurowovmPM9fV+V49vzbQnZl4/Qq14wGqm9yM7iqZl8g== - dependencies: - vega-util "^1.7.0" - vega-util@^1.7.0, vega-util@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/vega-util/-/vega-util-1.7.1.tgz#0b95bbe6058895c332596c215247507caa68ab61" diff --git a/lstm-text-generation/package.json b/lstm-text-generation/package.json index db8fbef9..6357b19b 100644 --- a/lstm-text-generation/package.json +++ b/lstm-text-generation/package.json @@ -9,8 +9,8 @@ "node": ">=8.9.0" }, "dependencies": { - "@tensorflow/tfjs": "^0.15.3", - "@tensorflow/tfjs-vis": "^0.4.2" + "@tensorflow/tfjs": "^1.0.0", + "@tensorflow/tfjs-vis": "^1.0.3" }, "scripts": { "watch": "cross-env NODE_ENV=development parcel index.html --no-hmr --open", diff --git a/lstm-text-generation/yarn.lock b/lstm-text-generation/yarn.lock index 23d501cf..f985a5e8 100644 --- a/lstm-text-generation/yarn.lock +++ b/lstm-text-generation/yarn.lock @@ -703,6 +703,11 @@ "@types/long" "~3.0.32" protobufjs "~6.8.6" +"@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-core@0.15.4": version "0.15.4" resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-0.15.4.tgz#aaf52acd209476ebde7bd9a37a7c60ec9d067b65" @@ -713,6 +718,16 @@ "@types/webgl2" "0.0.4" seedrandom "2.4.3" +"@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== + dependencies: + "@types/seedrandom" "2.4.27" + "@types/webgl-ext" "0.0.30" + "@types/webgl2" "0.0.4" + seedrandom "2.4.3" + "@tensorflow/tfjs-data@0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-data/-/tfjs-data-0.2.3.tgz#67c0cd505485c9b0b6a83cb1c8a24559c5adfa68" @@ -722,11 +737,25 @@ node-fetch "~2.1.2" seedrandom "~2.4.3" +"@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== + dependencies: + "@types/node-fetch" "^2.1.2" + node-fetch "~2.1.2" + seedrandom "~2.4.3" + "@tensorflow/tfjs-layers@0.10.3": version "0.10.3" resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-0.10.3.tgz#cf4001b5b7566b1526e65e615439e85070a1012c" integrity sha512-Xhaz4+ZuL2SEm3S0u4x04dMYMrcG4w4dhMOjoQW8GhAJU4p7LkmP9TmwMEHp7CIVJiJzzQy7Hg8E5fESEnJinA== +"@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-node-gpu@0.3.1": version "0.3.1" resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-node-gpu/-/tfjs-node-gpu-0.3.1.tgz#79f7f3f25a2320531ad4faeb4e106f02cb18a4f0" @@ -755,21 +784,29 @@ rimraf "^2.6.2" tar "^4.4.6" -"@tensorflow/tfjs-vis@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-0.4.2.tgz#6d4f81e26dc6c3d8c06345f18e80c2d52c6b551f" - integrity sha512-WMe6Xr3WIeKm4lme2Hz4IRwPnObTOD/eyBUc5vTS2DIXGqK2N9KjzundW3DS2UOFXDicN85bEyHqq6xBaLsNyg== +"@tensorflow/tfjs-vis@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-1.0.3.tgz#624bafaa900920e0cf8d00d1047497fd86ac1d91" + integrity sha512-WHyqN7l8M/luTdQNk7VpGrcrEBUSTYNPkK2fHCoxLjhqSnbr5yFEohgHgHnySneW0GUomGjz2C4LjBLlomDTCw== dependencies: d3-format "^1.3.0" d3-selection "^1.3.0" glamor "^2.20.40" glamor-tachyons "^1.0.0-alpha.1" preact "^8.2.9" - vega-embed "3.28.0" - vega-lib "4.4.0" - vega-lite "3.0.0-rc10" + vega-embed "3.30.0" -"@tensorflow/tfjs@^0.15.3", "@tensorflow/tfjs@~0.15.3": +"@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== + 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@~0.15.3": version "0.15.3" resolved "https://registry.yarnpkg.com/@tensorflow/tfjs/-/tfjs-0.15.3.tgz#6608833952858c8984f20962eb86624f99196f06" integrity sha512-NBAs+iGBNBxprm98mk488EfTDl2kA/lzNguoQGEMeIPWVHTbadSn2QV5xXKAf/fcOat+JwVfqe2vxHBbTjHMOw== @@ -779,6 +816,11 @@ "@tensorflow/tfjs-data" "0.2.3" "@tensorflow/tfjs-layers" "0.10.3" +"@types/clone@^0.1.30": + version "0.1.30" + resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614" + integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ= + "@types/long@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz#719551d2352d301ac8b81db732acb6bdc28dbdef" @@ -2021,7 +2063,7 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clone@^2.1.1: +clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -2590,11 +2632,16 @@ d3-scale@^2.1.2: d3-time "1" d3-time-format "2" -d3-selection@^1.3.0, d3-selection@^1.3.2: +d3-selection@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.2.tgz#6e70a9df60801c8af28ac24d10072d82cbfdf652" integrity sha512-OoXdv1nZ7h2aKMVg3kaUFbLLK5jXUFAMLD/Tu5JA96mjf8f2a9ZUESGY+C36t8R1WFeWk/e55hy54Ml2I62CRQ== +d3-selection@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" + integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== + d3-shape@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.2.tgz#f9dba3777a5825f9a8ce8bc928da08c17679e9a7" @@ -3122,6 +3169,11 @@ fast-glob@^2.2.2: merge2 "^1.2.3" micromatch "^3.1.10" +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -4087,18 +4139,16 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= - dependencies: - jsonify "~0.0.0" - json-stringify-pretty-compact@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -4125,11 +4175,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -6851,19 +6896,19 @@ vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0: vega-loader "^3.1.0" vega-util "^1.7.0" -vega-embed@3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.28.0.tgz#f00373ddf3d83c501de3b8a0396951a32648f175" - integrity sha512-qIHNKPk7rwuID8/dHthXPMQrEhA6AjLiiVqD3Ols8Ff80GLOgXggjxwwyAI8DrKhOVNFbQwsTgx5E8cH0X5y6w== +vega-embed@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.30.0.tgz#2ed625cc7d0c7a0aa54160f35a7b29076130c168" + integrity sha512-+90hd4iqu6fpfgOAFZ/9QZVxoGKX3lFghm70XlkKeaUjVAxzM2mW4jiQ5VTqY1+5dhBgmjbWMrrC2Uh3n0jzLg== dependencies: - d3-selection "^1.3.2" - json-stringify-pretty-compact "^1.2.0" + d3-selection "^1.4.0" + json-stringify-pretty-compact "^2.0.0" semver "^5.6.0" vega-lib "^4.4.0" - vega-lite "^3.0.0-rc10 || ^2.6.0" + vega-lite "3.0.0-rc12 || ^2.6.0" vega-schema-url-parser "^1.1.0" vega-themes "^2.2.0" - vega-tooltip "^0.15.0" + vega-tooltip "^0.16.0" vega-encode@^3.2.2: version "3.2.2" @@ -6920,7 +6965,7 @@ vega-hierarchy@^3.1.0: vega-dataflow "^4.0.4" vega-util "^1.7.0" -vega-lib@4.4.0, vega-lib@^4.4.0: +vega-lib@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880" integrity sha512-bfOsO5wks+ctnJ94fIPWH/B0qocdFs4WZ8teIgjF7m5XE+EVln+1nq9Z+sV7wdw7vftzGg0GAx9UH/kJxyopKg== @@ -6948,18 +6993,21 @@ vega-lib@4.4.0, vega-lib@^4.4.0: vega-voronoi "^3.0.0" vega-wordcloud "^3.0.0" -vega-lite@3.0.0-rc10, "vega-lite@^3.0.0-rc10 || ^2.6.0": - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc10.tgz#06738975a23bb4e61cfaf5a64779453a5cdf5a3e" - integrity sha512-xgoOXmVdd2j89D6i44JHjozUy7Z4Mw9bcqFySzm77JDUV0BWLrnM61QmaS8ZwAZQbMcmdCTCJ//HgClH2gFZoQ== +"vega-lite@3.0.0-rc12 || ^2.6.0": + version "3.0.0-rc12" + resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc12.tgz#48a1a8dc6b499ed3efdcff8b9807e6df4214de70" + integrity sha512-/J7pyYFzL6rod+fBRZ9k6EQBMr7VXRmhQ/DqKPm2wGgtzqxDorBrvwZ0sqi2zWZ1o1vHIehbfl+/JMotuIoEeg== dependencies: + "@types/clone" "^0.1.30" + clone "^2.1.2" fast-deep-equal "^2.0.1" - json-stable-stringify "^1.0.1" + fast-json-stable-stringify "^2.0.0" json-stringify-pretty-compact "^1.2.0" tslib "^1.9.3" vega-event-selector "^2.0.0" - vega-typings "0.3.51" - vega-util "^1.7.0" + vega-expression "^2.4.0" + vega-typings "0.3.53" + vega-util "^1.7.1" yargs "^12.0.5" vega-loader@^3.0.1, vega-loader@^3.1.0: @@ -7048,10 +7096,10 @@ vega-themes@^2.2.0: dependencies: vega-typings "^0.3.51" -vega-tooltip@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.15.0.tgz#2606a95b46f0aa6a70f03d18f919dc13696c4d44" - integrity sha512-xfac+5I7YR1ZKfip2i9xlEHuNrl5YpQnZAmTc9dzQcnkoo5MmGVIhH01tEGOr8keVC9UbYU1AREezwv8Mpajhw== +vega-tooltip@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.16.0.tgz#fc9badb96aed437b8225d0a7216ec6d1e768ac6f" + integrity sha512-A3hZ3B06n8anAp5ReOKmPeGlZaE2kVT0rN0IGLV8jWR54mNUKH/H9TacsyvLA9gq9OO0NrbpQ4NyfxU3uS8EYg== dependencies: vega-util "^1.7.1" @@ -7065,20 +7113,13 @@ vega-transforms@^2.3.1: vega-statistics "^1.2.3" vega-util "^1.7.0" -vega-typings@*, vega-typings@^0.3.51: +vega-typings@*, vega-typings@0.3.53, vega-typings@^0.3.51: version "0.3.53" resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.53.tgz#a70b9730ebe1e4c557019ccccc5fd98035b0aab0" integrity sha512-XQRd66eL62ll6tHENQIJHtdwXemqXoB4KnVVbGUwGJIHjQkHHluCbkoWVRvPYuRd+OLM1RXVc+EBxA015hJ1SQ== dependencies: vega-util "^1.7.0" -vega-typings@0.3.51: - version "0.3.51" - resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.51.tgz#1e7a84ae3af4fcc0784b80d50a3e1df432b18141" - integrity sha512-8UJnlGIZLDYzlLgMJVHO8Yb8yU7pYeNGnW8J7nxgyXqurowovmPM9fV+V49vzbQnZl4/Qq14wGqm9yM7iqZl8g== - dependencies: - vega-util "^1.7.0" - vega-util@^1.7.0, vega-util@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/vega-util/-/vega-util-1.7.1.tgz#0b95bbe6058895c332596c215247507caa68ab61" diff --git a/mnist-core/package.json b/mnist-core/package.json index 3d737240..5432a83a 100644 --- a/mnist-core/package.json +++ b/mnist-core/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tensorflow/tfjs": "^1.0.0", - "@tensorflow/tfjs-vis": "^0.4.2" + "@tensorflow/tfjs-vis": "^1.0.3" }, "scripts": { "watch": "cross-env NODE_ENV=development parcel index.html --no-hmr --open", diff --git a/mnist-core/ui.js b/mnist-core/ui.js index d437bf90..f6a0a2f2 100644 --- a/mnist-core/ui.js +++ b/mnist-core/ui.js @@ -35,7 +35,7 @@ export function trainingLog(loss, iteration) { yLavel: 'Loss', }; const data = {values: lossArr, series: ['loss']}; - tfvis.render.linechart(data, container, options); + tfvis.render.linechart(container, data, options); } export function showTestResults(batch, predictions, labels) { diff --git a/mnist-core/yarn.lock b/mnist-core/yarn.lock index 3afb9159..d620fc8e 100644 --- a/mnist-core/yarn.lock +++ b/mnist-core/yarn.lock @@ -681,19 +681,17 @@ resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.0.0.tgz#e4344e9221001850eb1615184fa5ca2499f75254" integrity sha512-+RB5TKM/L7qLn17ic8da/G2qg8EFhRvZIoRA6uCCs5OMUJAUQqhDqBNaoWiy0pYtXDzfZJu3ZOkDbAg2Xv2YOQ== -"@tensorflow/tfjs-vis@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-0.4.2.tgz#6d4f81e26dc6c3d8c06345f18e80c2d52c6b551f" - integrity sha512-WMe6Xr3WIeKm4lme2Hz4IRwPnObTOD/eyBUc5vTS2DIXGqK2N9KjzundW3DS2UOFXDicN85bEyHqq6xBaLsNyg== +"@tensorflow/tfjs-vis@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-1.0.3.tgz#624bafaa900920e0cf8d00d1047497fd86ac1d91" + integrity sha512-WHyqN7l8M/luTdQNk7VpGrcrEBUSTYNPkK2fHCoxLjhqSnbr5yFEohgHgHnySneW0GUomGjz2C4LjBLlomDTCw== dependencies: d3-format "^1.3.0" d3-selection "^1.3.0" glamor "^2.20.40" glamor-tachyons "^1.0.0-alpha.1" preact "^8.2.9" - vega-embed "3.28.0" - vega-lib "4.4.0" - vega-lite "3.0.0-rc10" + vega-embed "3.30.0" "@tensorflow/tfjs@^1.0.0": version "1.0.0" @@ -705,6 +703,11 @@ "@tensorflow/tfjs-data" "1.0.0" "@tensorflow/tfjs-layers" "1.0.0" +"@types/clone@^0.1.30": + version "0.1.30" + resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614" + integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ= + "@types/node-fetch@^2.1.2": version "2.1.4" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.1.4.tgz#093d1beae11541aef25999d70aa09286fd025b1a" @@ -1772,7 +1775,7 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clone@^2.1.1: +clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -2336,11 +2339,16 @@ d3-scale@^2.1.2: d3-time "1" d3-time-format "2" -d3-selection@^1.3.0, d3-selection@^1.3.2: +d3-selection@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.2.tgz#6e70a9df60801c8af28ac24d10072d82cbfdf652" integrity sha512-OoXdv1nZ7h2aKMVg3kaUFbLLK5jXUFAMLD/Tu5JA96mjf8f2a9ZUESGY+C36t8R1WFeWk/e55hy54Ml2I62CRQ== +d3-selection@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" + integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== + d3-shape@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.2.tgz#f9dba3777a5825f9a8ce8bc928da08c17679e9a7" @@ -2816,6 +2824,11 @@ fast-glob@^2.2.2: merge2 "^1.2.3" micromatch "^3.1.10" +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -3643,18 +3656,16 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= - dependencies: - jsonify "~0.0.0" - json-stringify-pretty-compact@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" @@ -3676,11 +3687,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -6265,19 +6271,19 @@ vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0: vega-loader "^3.1.0" vega-util "^1.7.0" -vega-embed@3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.28.0.tgz#f00373ddf3d83c501de3b8a0396951a32648f175" - integrity sha512-qIHNKPk7rwuID8/dHthXPMQrEhA6AjLiiVqD3Ols8Ff80GLOgXggjxwwyAI8DrKhOVNFbQwsTgx5E8cH0X5y6w== +vega-embed@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.30.0.tgz#2ed625cc7d0c7a0aa54160f35a7b29076130c168" + integrity sha512-+90hd4iqu6fpfgOAFZ/9QZVxoGKX3lFghm70XlkKeaUjVAxzM2mW4jiQ5VTqY1+5dhBgmjbWMrrC2Uh3n0jzLg== dependencies: - d3-selection "^1.3.2" - json-stringify-pretty-compact "^1.2.0" + d3-selection "^1.4.0" + json-stringify-pretty-compact "^2.0.0" semver "^5.6.0" vega-lib "^4.4.0" - vega-lite "^3.0.0-rc10 || ^2.6.0" + vega-lite "3.0.0-rc12 || ^2.6.0" vega-schema-url-parser "^1.1.0" vega-themes "^2.2.0" - vega-tooltip "^0.15.0" + vega-tooltip "^0.16.0" vega-encode@^3.2.2: version "3.2.2" @@ -6334,7 +6340,7 @@ vega-hierarchy@^3.1.0: vega-dataflow "^4.0.4" vega-util "^1.7.0" -vega-lib@4.4.0, vega-lib@^4.4.0: +vega-lib@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880" integrity sha512-bfOsO5wks+ctnJ94fIPWH/B0qocdFs4WZ8teIgjF7m5XE+EVln+1nq9Z+sV7wdw7vftzGg0GAx9UH/kJxyopKg== @@ -6362,18 +6368,21 @@ vega-lib@4.4.0, vega-lib@^4.4.0: vega-voronoi "^3.0.0" vega-wordcloud "^3.0.0" -vega-lite@3.0.0-rc10, "vega-lite@^3.0.0-rc10 || ^2.6.0": - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc10.tgz#06738975a23bb4e61cfaf5a64779453a5cdf5a3e" - integrity sha512-xgoOXmVdd2j89D6i44JHjozUy7Z4Mw9bcqFySzm77JDUV0BWLrnM61QmaS8ZwAZQbMcmdCTCJ//HgClH2gFZoQ== +"vega-lite@3.0.0-rc12 || ^2.6.0": + version "3.0.0-rc12" + resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc12.tgz#48a1a8dc6b499ed3efdcff8b9807e6df4214de70" + integrity sha512-/J7pyYFzL6rod+fBRZ9k6EQBMr7VXRmhQ/DqKPm2wGgtzqxDorBrvwZ0sqi2zWZ1o1vHIehbfl+/JMotuIoEeg== dependencies: + "@types/clone" "^0.1.30" + clone "^2.1.2" fast-deep-equal "^2.0.1" - json-stable-stringify "^1.0.1" + fast-json-stable-stringify "^2.0.0" json-stringify-pretty-compact "^1.2.0" tslib "^1.9.3" vega-event-selector "^2.0.0" - vega-typings "0.3.51" - vega-util "^1.7.0" + vega-expression "^2.4.0" + vega-typings "0.3.53" + vega-util "^1.7.1" yargs "^12.0.5" vega-loader@^3.0.1, vega-loader@^3.1.0: @@ -6462,10 +6471,10 @@ vega-themes@^2.2.0: dependencies: vega-typings "^0.3.51" -vega-tooltip@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.15.0.tgz#2606a95b46f0aa6a70f03d18f919dc13696c4d44" - integrity sha512-xfac+5I7YR1ZKfip2i9xlEHuNrl5YpQnZAmTc9dzQcnkoo5MmGVIhH01tEGOr8keVC9UbYU1AREezwv8Mpajhw== +vega-tooltip@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.16.0.tgz#fc9badb96aed437b8225d0a7216ec6d1e768ac6f" + integrity sha512-A3hZ3B06n8anAp5ReOKmPeGlZaE2kVT0rN0IGLV8jWR54mNUKH/H9TacsyvLA9gq9OO0NrbpQ4NyfxU3uS8EYg== dependencies: vega-util "^1.7.1" @@ -6479,20 +6488,13 @@ vega-transforms@^2.3.1: vega-statistics "^1.2.3" vega-util "^1.7.0" -vega-typings@*, vega-typings@^0.3.51: +vega-typings@*, vega-typings@0.3.53, vega-typings@^0.3.51: version "0.3.53" resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.53.tgz#a70b9730ebe1e4c557019ccccc5fd98035b0aab0" integrity sha512-XQRd66eL62ll6tHENQIJHtdwXemqXoB4KnVVbGUwGJIHjQkHHluCbkoWVRvPYuRd+OLM1RXVc+EBxA015hJ1SQ== dependencies: vega-util "^1.7.0" -vega-typings@0.3.51: - version "0.3.51" - resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.51.tgz#1e7a84ae3af4fcc0784b80d50a3e1df432b18141" - integrity sha512-8UJnlGIZLDYzlLgMJVHO8Yb8yU7pYeNGnW8J7nxgyXqurowovmPM9fV+V49vzbQnZl4/Qq14wGqm9yM7iqZl8g== - dependencies: - vega-util "^1.7.0" - vega-util@^1.7.0, vega-util@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/vega-util/-/vega-util-1.7.1.tgz#0b95bbe6058895c332596c215247507caa68ab61" diff --git a/mnist-transfer-cnn/package.json b/mnist-transfer-cnn/package.json index 0f36fc73..e4f40011 100644 --- a/mnist-transfer-cnn/package.json +++ b/mnist-transfer-cnn/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tensorflow/tfjs": "^1.0.0", - "@tensorflow/tfjs-vis": "^0.4.2" + "@tensorflow/tfjs-vis": "^1.0.3" }, "scripts": { "watch": "./serve.sh", diff --git a/mnist-transfer-cnn/yarn.lock b/mnist-transfer-cnn/yarn.lock index e3070806..e3ffb56d 100644 --- a/mnist-transfer-cnn/yarn.lock +++ b/mnist-transfer-cnn/yarn.lock @@ -671,19 +671,17 @@ resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.0.0.tgz#e4344e9221001850eb1615184fa5ca2499f75254" integrity sha512-+RB5TKM/L7qLn17ic8da/G2qg8EFhRvZIoRA6uCCs5OMUJAUQqhDqBNaoWiy0pYtXDzfZJu3ZOkDbAg2Xv2YOQ== -"@tensorflow/tfjs-vis@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-0.4.2.tgz#6d4f81e26dc6c3d8c06345f18e80c2d52c6b551f" - integrity sha512-WMe6Xr3WIeKm4lme2Hz4IRwPnObTOD/eyBUc5vTS2DIXGqK2N9KjzundW3DS2UOFXDicN85bEyHqq6xBaLsNyg== +"@tensorflow/tfjs-vis@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-1.0.3.tgz#624bafaa900920e0cf8d00d1047497fd86ac1d91" + integrity sha512-WHyqN7l8M/luTdQNk7VpGrcrEBUSTYNPkK2fHCoxLjhqSnbr5yFEohgHgHnySneW0GUomGjz2C4LjBLlomDTCw== dependencies: d3-format "^1.3.0" d3-selection "^1.3.0" glamor "^2.20.40" glamor-tachyons "^1.0.0-alpha.1" preact "^8.2.9" - vega-embed "3.28.0" - vega-lib "4.4.0" - vega-lite "3.0.0-rc10" + vega-embed "3.30.0" "@tensorflow/tfjs@^1.0.0": version "1.0.0" @@ -695,6 +693,11 @@ "@tensorflow/tfjs-data" "1.0.0" "@tensorflow/tfjs-layers" "1.0.0" +"@types/clone@^0.1.30": + version "0.1.30" + resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614" + integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ= + "@types/node-fetch@^2.1.2": version "2.1.4" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.1.4.tgz#093d1beae11541aef25999d70aa09286fd025b1a" @@ -1838,7 +1841,7 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clone@^2.1.1: +clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -2412,11 +2415,16 @@ d3-scale@^2.1.2: d3-time "1" d3-time-format "2" -d3-selection@^1.3.0, d3-selection@^1.3.2: +d3-selection@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.2.tgz#6e70a9df60801c8af28ac24d10072d82cbfdf652" integrity sha512-OoXdv1nZ7h2aKMVg3kaUFbLLK5jXUFAMLD/Tu5JA96mjf8f2a9ZUESGY+C36t8R1WFeWk/e55hy54Ml2I62CRQ== +d3-selection@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" + integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== + d3-shape@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.2.tgz#f9dba3777a5825f9a8ce8bc928da08c17679e9a7" @@ -2921,6 +2929,11 @@ fast-glob@^2.2.2: merge2 "^1.2.3" micromatch "^3.1.10" +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -3803,18 +3816,16 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= - dependencies: - jsonify "~0.0.0" - json-stringify-pretty-compact@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" @@ -3841,11 +3852,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -6508,19 +6514,19 @@ vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0: vega-loader "^3.1.0" vega-util "^1.7.0" -vega-embed@3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.28.0.tgz#f00373ddf3d83c501de3b8a0396951a32648f175" - integrity sha512-qIHNKPk7rwuID8/dHthXPMQrEhA6AjLiiVqD3Ols8Ff80GLOgXggjxwwyAI8DrKhOVNFbQwsTgx5E8cH0X5y6w== +vega-embed@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.30.0.tgz#2ed625cc7d0c7a0aa54160f35a7b29076130c168" + integrity sha512-+90hd4iqu6fpfgOAFZ/9QZVxoGKX3lFghm70XlkKeaUjVAxzM2mW4jiQ5VTqY1+5dhBgmjbWMrrC2Uh3n0jzLg== dependencies: - d3-selection "^1.3.2" - json-stringify-pretty-compact "^1.2.0" + d3-selection "^1.4.0" + json-stringify-pretty-compact "^2.0.0" semver "^5.6.0" vega-lib "^4.4.0" - vega-lite "^3.0.0-rc10 || ^2.6.0" + vega-lite "3.0.0-rc12 || ^2.6.0" vega-schema-url-parser "^1.1.0" vega-themes "^2.2.0" - vega-tooltip "^0.15.0" + vega-tooltip "^0.16.0" vega-encode@^3.2.2: version "3.2.2" @@ -6577,7 +6583,7 @@ vega-hierarchy@^3.1.0: vega-dataflow "^4.0.4" vega-util "^1.7.0" -vega-lib@4.4.0, vega-lib@^4.4.0: +vega-lib@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880" integrity sha512-bfOsO5wks+ctnJ94fIPWH/B0qocdFs4WZ8teIgjF7m5XE+EVln+1nq9Z+sV7wdw7vftzGg0GAx9UH/kJxyopKg== @@ -6605,18 +6611,21 @@ vega-lib@4.4.0, vega-lib@^4.4.0: vega-voronoi "^3.0.0" vega-wordcloud "^3.0.0" -vega-lite@3.0.0-rc10, "vega-lite@^3.0.0-rc10 || ^2.6.0": - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc10.tgz#06738975a23bb4e61cfaf5a64779453a5cdf5a3e" - integrity sha512-xgoOXmVdd2j89D6i44JHjozUy7Z4Mw9bcqFySzm77JDUV0BWLrnM61QmaS8ZwAZQbMcmdCTCJ//HgClH2gFZoQ== +"vega-lite@3.0.0-rc12 || ^2.6.0": + version "3.0.0-rc12" + resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc12.tgz#48a1a8dc6b499ed3efdcff8b9807e6df4214de70" + integrity sha512-/J7pyYFzL6rod+fBRZ9k6EQBMr7VXRmhQ/DqKPm2wGgtzqxDorBrvwZ0sqi2zWZ1o1vHIehbfl+/JMotuIoEeg== dependencies: + "@types/clone" "^0.1.30" + clone "^2.1.2" fast-deep-equal "^2.0.1" - json-stable-stringify "^1.0.1" + fast-json-stable-stringify "^2.0.0" json-stringify-pretty-compact "^1.2.0" tslib "^1.9.3" vega-event-selector "^2.0.0" - vega-typings "0.3.51" - vega-util "^1.7.0" + vega-expression "^2.4.0" + vega-typings "0.3.53" + vega-util "^1.7.1" yargs "^12.0.5" vega-loader@^3.0.1, vega-loader@^3.1.0: @@ -6705,10 +6714,10 @@ vega-themes@^2.2.0: dependencies: vega-typings "^0.3.51" -vega-tooltip@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.15.0.tgz#2606a95b46f0aa6a70f03d18f919dc13696c4d44" - integrity sha512-xfac+5I7YR1ZKfip2i9xlEHuNrl5YpQnZAmTc9dzQcnkoo5MmGVIhH01tEGOr8keVC9UbYU1AREezwv8Mpajhw== +vega-tooltip@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.16.0.tgz#fc9badb96aed437b8225d0a7216ec6d1e768ac6f" + integrity sha512-A3hZ3B06n8anAp5ReOKmPeGlZaE2kVT0rN0IGLV8jWR54mNUKH/H9TacsyvLA9gq9OO0NrbpQ4NyfxU3uS8EYg== dependencies: vega-util "^1.7.1" @@ -6722,20 +6731,13 @@ vega-transforms@^2.3.1: vega-statistics "^1.2.3" vega-util "^1.7.0" -vega-typings@*, vega-typings@^0.3.51: +vega-typings@*, vega-typings@0.3.53, vega-typings@^0.3.51: version "0.3.53" resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.53.tgz#a70b9730ebe1e4c557019ccccc5fd98035b0aab0" integrity sha512-XQRd66eL62ll6tHENQIJHtdwXemqXoB4KnVVbGUwGJIHjQkHHluCbkoWVRvPYuRd+OLM1RXVc+EBxA015hJ1SQ== dependencies: vega-util "^1.7.0" -vega-typings@0.3.51: - version "0.3.51" - resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.51.tgz#1e7a84ae3af4fcc0784b80d50a3e1df432b18141" - integrity sha512-8UJnlGIZLDYzlLgMJVHO8Yb8yU7pYeNGnW8J7nxgyXqurowovmPM9fV+V49vzbQnZl4/Qq14wGqm9yM7iqZl8g== - dependencies: - vega-util "^1.7.0" - vega-util@^1.7.0, vega-util@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/vega-util/-/vega-util-1.7.1.tgz#0b95bbe6058895c332596c215247507caa68ab61" diff --git a/mnist/package.json b/mnist/package.json index f08026c3..a80d6d9f 100644 --- a/mnist/package.json +++ b/mnist/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tensorflow/tfjs": "^1.0.0", - "@tensorflow/tfjs-vis": "^0.4.2" + "@tensorflow/tfjs-vis": "^1.0.3" }, "scripts": { "watch": "cross-env NODE_ENV=development parcel index.html --no-hmr --open", diff --git a/mnist/ui.js b/mnist/ui.js index c1cf799d..d0eb1fd2 100644 --- a/mnist/ui.js +++ b/mnist/ui.js @@ -67,7 +67,7 @@ export function plotLoss(batch, loss, set) { lossValues[series].push({x: batch, y: loss}); const lossContainer = document.getElementById('loss-canvas'); tfvis.render.linechart( - {values: lossValues, series: ['train', 'validation']}, lossContainer, { + lossContainer, {values: lossValues, series: ['train', 'validation']}, { xLabel: 'Batch #', yLabel: 'Loss', width: 400, @@ -82,9 +82,8 @@ export function plotAccuracy(batch, accuracy, set) { const series = set === 'train' ? 0 : 1; accuracyValues[series].push({x: batch, y: accuracy}); tfvis.render.linechart( - {values: accuracyValues, series: ['train', 'validation']}, accuracyContainer, - { + {values: accuracyValues, series: ['train', 'validation']}, { xLabel: 'Batch #', yLabel: 'Accuracy', width: 400, diff --git a/mnist/yarn.lock b/mnist/yarn.lock index 3afb9159..d620fc8e 100644 --- a/mnist/yarn.lock +++ b/mnist/yarn.lock @@ -681,19 +681,17 @@ resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.0.0.tgz#e4344e9221001850eb1615184fa5ca2499f75254" integrity sha512-+RB5TKM/L7qLn17ic8da/G2qg8EFhRvZIoRA6uCCs5OMUJAUQqhDqBNaoWiy0pYtXDzfZJu3ZOkDbAg2Xv2YOQ== -"@tensorflow/tfjs-vis@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-0.4.2.tgz#6d4f81e26dc6c3d8c06345f18e80c2d52c6b551f" - integrity sha512-WMe6Xr3WIeKm4lme2Hz4IRwPnObTOD/eyBUc5vTS2DIXGqK2N9KjzundW3DS2UOFXDicN85bEyHqq6xBaLsNyg== +"@tensorflow/tfjs-vis@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-1.0.3.tgz#624bafaa900920e0cf8d00d1047497fd86ac1d91" + integrity sha512-WHyqN7l8M/luTdQNk7VpGrcrEBUSTYNPkK2fHCoxLjhqSnbr5yFEohgHgHnySneW0GUomGjz2C4LjBLlomDTCw== dependencies: d3-format "^1.3.0" d3-selection "^1.3.0" glamor "^2.20.40" glamor-tachyons "^1.0.0-alpha.1" preact "^8.2.9" - vega-embed "3.28.0" - vega-lib "4.4.0" - vega-lite "3.0.0-rc10" + vega-embed "3.30.0" "@tensorflow/tfjs@^1.0.0": version "1.0.0" @@ -705,6 +703,11 @@ "@tensorflow/tfjs-data" "1.0.0" "@tensorflow/tfjs-layers" "1.0.0" +"@types/clone@^0.1.30": + version "0.1.30" + resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614" + integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ= + "@types/node-fetch@^2.1.2": version "2.1.4" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.1.4.tgz#093d1beae11541aef25999d70aa09286fd025b1a" @@ -1772,7 +1775,7 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clone@^2.1.1: +clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -2336,11 +2339,16 @@ d3-scale@^2.1.2: d3-time "1" d3-time-format "2" -d3-selection@^1.3.0, d3-selection@^1.3.2: +d3-selection@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.2.tgz#6e70a9df60801c8af28ac24d10072d82cbfdf652" integrity sha512-OoXdv1nZ7h2aKMVg3kaUFbLLK5jXUFAMLD/Tu5JA96mjf8f2a9ZUESGY+C36t8R1WFeWk/e55hy54Ml2I62CRQ== +d3-selection@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" + integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== + d3-shape@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.2.tgz#f9dba3777a5825f9a8ce8bc928da08c17679e9a7" @@ -2816,6 +2824,11 @@ fast-glob@^2.2.2: merge2 "^1.2.3" micromatch "^3.1.10" +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -3643,18 +3656,16 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= - dependencies: - jsonify "~0.0.0" - json-stringify-pretty-compact@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" @@ -3676,11 +3687,6 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -6265,19 +6271,19 @@ vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0: vega-loader "^3.1.0" vega-util "^1.7.0" -vega-embed@3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.28.0.tgz#f00373ddf3d83c501de3b8a0396951a32648f175" - integrity sha512-qIHNKPk7rwuID8/dHthXPMQrEhA6AjLiiVqD3Ols8Ff80GLOgXggjxwwyAI8DrKhOVNFbQwsTgx5E8cH0X5y6w== +vega-embed@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.30.0.tgz#2ed625cc7d0c7a0aa54160f35a7b29076130c168" + integrity sha512-+90hd4iqu6fpfgOAFZ/9QZVxoGKX3lFghm70XlkKeaUjVAxzM2mW4jiQ5VTqY1+5dhBgmjbWMrrC2Uh3n0jzLg== dependencies: - d3-selection "^1.3.2" - json-stringify-pretty-compact "^1.2.0" + d3-selection "^1.4.0" + json-stringify-pretty-compact "^2.0.0" semver "^5.6.0" vega-lib "^4.4.0" - vega-lite "^3.0.0-rc10 || ^2.6.0" + vega-lite "3.0.0-rc12 || ^2.6.0" vega-schema-url-parser "^1.1.0" vega-themes "^2.2.0" - vega-tooltip "^0.15.0" + vega-tooltip "^0.16.0" vega-encode@^3.2.2: version "3.2.2" @@ -6334,7 +6340,7 @@ vega-hierarchy@^3.1.0: vega-dataflow "^4.0.4" vega-util "^1.7.0" -vega-lib@4.4.0, vega-lib@^4.4.0: +vega-lib@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880" integrity sha512-bfOsO5wks+ctnJ94fIPWH/B0qocdFs4WZ8teIgjF7m5XE+EVln+1nq9Z+sV7wdw7vftzGg0GAx9UH/kJxyopKg== @@ -6362,18 +6368,21 @@ vega-lib@4.4.0, vega-lib@^4.4.0: vega-voronoi "^3.0.0" vega-wordcloud "^3.0.0" -vega-lite@3.0.0-rc10, "vega-lite@^3.0.0-rc10 || ^2.6.0": - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc10.tgz#06738975a23bb4e61cfaf5a64779453a5cdf5a3e" - integrity sha512-xgoOXmVdd2j89D6i44JHjozUy7Z4Mw9bcqFySzm77JDUV0BWLrnM61QmaS8ZwAZQbMcmdCTCJ//HgClH2gFZoQ== +"vega-lite@3.0.0-rc12 || ^2.6.0": + version "3.0.0-rc12" + resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc12.tgz#48a1a8dc6b499ed3efdcff8b9807e6df4214de70" + integrity sha512-/J7pyYFzL6rod+fBRZ9k6EQBMr7VXRmhQ/DqKPm2wGgtzqxDorBrvwZ0sqi2zWZ1o1vHIehbfl+/JMotuIoEeg== dependencies: + "@types/clone" "^0.1.30" + clone "^2.1.2" fast-deep-equal "^2.0.1" - json-stable-stringify "^1.0.1" + fast-json-stable-stringify "^2.0.0" json-stringify-pretty-compact "^1.2.0" tslib "^1.9.3" vega-event-selector "^2.0.0" - vega-typings "0.3.51" - vega-util "^1.7.0" + vega-expression "^2.4.0" + vega-typings "0.3.53" + vega-util "^1.7.1" yargs "^12.0.5" vega-loader@^3.0.1, vega-loader@^3.1.0: @@ -6462,10 +6471,10 @@ vega-themes@^2.2.0: dependencies: vega-typings "^0.3.51" -vega-tooltip@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.15.0.tgz#2606a95b46f0aa6a70f03d18f919dc13696c4d44" - integrity sha512-xfac+5I7YR1ZKfip2i9xlEHuNrl5YpQnZAmTc9dzQcnkoo5MmGVIhH01tEGOr8keVC9UbYU1AREezwv8Mpajhw== +vega-tooltip@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.16.0.tgz#fc9badb96aed437b8225d0a7216ec6d1e768ac6f" + integrity sha512-A3hZ3B06n8anAp5ReOKmPeGlZaE2kVT0rN0IGLV8jWR54mNUKH/H9TacsyvLA9gq9OO0NrbpQ4NyfxU3uS8EYg== dependencies: vega-util "^1.7.1" @@ -6479,20 +6488,13 @@ vega-transforms@^2.3.1: vega-statistics "^1.2.3" vega-util "^1.7.0" -vega-typings@*, vega-typings@^0.3.51: +vega-typings@*, vega-typings@0.3.53, vega-typings@^0.3.51: version "0.3.53" resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.53.tgz#a70b9730ebe1e4c557019ccccc5fd98035b0aab0" integrity sha512-XQRd66eL62ll6tHENQIJHtdwXemqXoB4KnVVbGUwGJIHjQkHHluCbkoWVRvPYuRd+OLM1RXVc+EBxA015hJ1SQ== dependencies: vega-util "^1.7.0" -vega-typings@0.3.51: - version "0.3.51" - resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.51.tgz#1e7a84ae3af4fcc0784b80d50a3e1df432b18141" - integrity sha512-8UJnlGIZLDYzlLgMJVHO8Yb8yU7pYeNGnW8J7nxgyXqurowovmPM9fV+V49vzbQnZl4/Qq14wGqm9yM7iqZl8g== - dependencies: - vega-util "^1.7.0" - vega-util@^1.7.0, vega-util@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/vega-util/-/vega-util-1.7.1.tgz#0b95bbe6058895c332596c215247507caa68ab61" diff --git a/website-phishing/package.json b/website-phishing/package.json index 4b5e893d..78bf6539 100644 --- a/website-phishing/package.json +++ b/website-phishing/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@tensorflow/tfjs": "^1.0.0", - "@tensorflow/tfjs-vis": "^0.4.2", + "@tensorflow/tfjs-vis": "^1.0.3", "papaparse": "^4.5.0" }, "scripts": { diff --git a/website-phishing/ui.js b/website-phishing/ui.js index 5a4e68de..4eb55258 100644 --- a/website-phishing/ui.js +++ b/website-phishing/ui.js @@ -70,8 +70,8 @@ export async function plotROC(fprs, tprs, epoch) { rocValues.push(newSeries); return tfvis.render.linechart( - {values: rocValues, series: rocSeries}, document.getElementById('rocCurve'), + {values: rocValues, series: rocSeries}, { width: 450, height: 320, diff --git a/website-phishing/yarn.lock b/website-phishing/yarn.lock index c56a4591..4ef2659c 100644 --- a/website-phishing/yarn.lock +++ b/website-phishing/yarn.lock @@ -681,19 +681,17 @@ resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-layers/-/tfjs-layers-1.0.0.tgz#e4344e9221001850eb1615184fa5ca2499f75254" integrity sha512-+RB5TKM/L7qLn17ic8da/G2qg8EFhRvZIoRA6uCCs5OMUJAUQqhDqBNaoWiy0pYtXDzfZJu3ZOkDbAg2Xv2YOQ== -"@tensorflow/tfjs-vis@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-0.4.2.tgz#6d4f81e26dc6c3d8c06345f18e80c2d52c6b551f" - integrity sha512-WMe6Xr3WIeKm4lme2Hz4IRwPnObTOD/eyBUc5vTS2DIXGqK2N9KjzundW3DS2UOFXDicN85bEyHqq6xBaLsNyg== +"@tensorflow/tfjs-vis@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-vis/-/tfjs-vis-1.0.3.tgz#624bafaa900920e0cf8d00d1047497fd86ac1d91" + integrity sha512-WHyqN7l8M/luTdQNk7VpGrcrEBUSTYNPkK2fHCoxLjhqSnbr5yFEohgHgHnySneW0GUomGjz2C4LjBLlomDTCw== dependencies: d3-format "^1.3.0" d3-selection "^1.3.0" glamor "^2.20.40" glamor-tachyons "^1.0.0-alpha.1" preact "^8.2.9" - vega-embed "3.28.0" - vega-lib "4.4.0" - vega-lite "3.0.0-rc10" + vega-embed "3.30.0" "@tensorflow/tfjs@^1.0.0": version "1.0.0" @@ -705,6 +703,11 @@ "@tensorflow/tfjs-data" "1.0.0" "@tensorflow/tfjs-layers" "1.0.0" +"@types/clone@^0.1.30": + version "0.1.30" + resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614" + integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ= + "@types/node-fetch@^2.1.2": version "2.1.4" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.1.4.tgz#093d1beae11541aef25999d70aa09286fd025b1a" @@ -1736,7 +1739,7 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clone@^2.1.1: +clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -2300,11 +2303,16 @@ d3-scale@^2.1.2: d3-time "1" d3-time-format "2" -d3-selection@^1.3.0, d3-selection@^1.3.2: +d3-selection@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.2.tgz#6e70a9df60801c8af28ac24d10072d82cbfdf652" integrity sha512-OoXdv1nZ7h2aKMVg3kaUFbLLK5jXUFAMLD/Tu5JA96mjf8f2a9ZUESGY+C36t8R1WFeWk/e55hy54Ml2I62CRQ== +d3-selection@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" + integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg== + d3-shape@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.2.tgz#f9dba3777a5825f9a8ce8bc928da08c17679e9a7" @@ -2767,6 +2775,11 @@ fast-glob@^2.2.2: merge2 "^1.2.3" micromatch "^3.1.10" +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -3519,18 +3532,16 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8= - dependencies: - jsonify "~0.0.0" - json-stringify-pretty-compact@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== +json-stringify-pretty-compact@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885" + integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ== + json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" @@ -3545,11 +3556,6 @@ json5@^2.1.0: dependencies: minimist "^1.2.0" -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -5981,19 +5987,19 @@ vega-dataflow@^4.0.0, vega-dataflow@^4.0.4, vega-dataflow@^4.1.0: vega-loader "^3.1.0" vega-util "^1.7.0" -vega-embed@3.28.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.28.0.tgz#f00373ddf3d83c501de3b8a0396951a32648f175" - integrity sha512-qIHNKPk7rwuID8/dHthXPMQrEhA6AjLiiVqD3Ols8Ff80GLOgXggjxwwyAI8DrKhOVNFbQwsTgx5E8cH0X5y6w== +vega-embed@3.30.0: + version "3.30.0" + resolved "https://registry.yarnpkg.com/vega-embed/-/vega-embed-3.30.0.tgz#2ed625cc7d0c7a0aa54160f35a7b29076130c168" + integrity sha512-+90hd4iqu6fpfgOAFZ/9QZVxoGKX3lFghm70XlkKeaUjVAxzM2mW4jiQ5VTqY1+5dhBgmjbWMrrC2Uh3n0jzLg== dependencies: - d3-selection "^1.3.2" - json-stringify-pretty-compact "^1.2.0" + d3-selection "^1.4.0" + json-stringify-pretty-compact "^2.0.0" semver "^5.6.0" vega-lib "^4.4.0" - vega-lite "^3.0.0-rc10 || ^2.6.0" + vega-lite "3.0.0-rc12 || ^2.6.0" vega-schema-url-parser "^1.1.0" vega-themes "^2.2.0" - vega-tooltip "^0.15.0" + vega-tooltip "^0.16.0" vega-encode@^3.2.2: version "3.2.2" @@ -6050,7 +6056,7 @@ vega-hierarchy@^3.1.0: vega-dataflow "^4.0.4" vega-util "^1.7.0" -vega-lib@4.4.0, vega-lib@^4.4.0: +vega-lib@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/vega-lib/-/vega-lib-4.4.0.tgz#37d99514c5496a0ce001033bdacb504361ef6880" integrity sha512-bfOsO5wks+ctnJ94fIPWH/B0qocdFs4WZ8teIgjF7m5XE+EVln+1nq9Z+sV7wdw7vftzGg0GAx9UH/kJxyopKg== @@ -6078,18 +6084,21 @@ vega-lib@4.4.0, vega-lib@^4.4.0: vega-voronoi "^3.0.0" vega-wordcloud "^3.0.0" -vega-lite@3.0.0-rc10, "vega-lite@^3.0.0-rc10 || ^2.6.0": - version "3.0.0-rc10" - resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc10.tgz#06738975a23bb4e61cfaf5a64779453a5cdf5a3e" - integrity sha512-xgoOXmVdd2j89D6i44JHjozUy7Z4Mw9bcqFySzm77JDUV0BWLrnM61QmaS8ZwAZQbMcmdCTCJ//HgClH2gFZoQ== +"vega-lite@3.0.0-rc12 || ^2.6.0": + version "3.0.0-rc12" + resolved "https://registry.yarnpkg.com/vega-lite/-/vega-lite-3.0.0-rc12.tgz#48a1a8dc6b499ed3efdcff8b9807e6df4214de70" + integrity sha512-/J7pyYFzL6rod+fBRZ9k6EQBMr7VXRmhQ/DqKPm2wGgtzqxDorBrvwZ0sqi2zWZ1o1vHIehbfl+/JMotuIoEeg== dependencies: + "@types/clone" "^0.1.30" + clone "^2.1.2" fast-deep-equal "^2.0.1" - json-stable-stringify "^1.0.1" + fast-json-stable-stringify "^2.0.0" json-stringify-pretty-compact "^1.2.0" tslib "^1.9.3" vega-event-selector "^2.0.0" - vega-typings "0.3.51" - vega-util "^1.7.0" + vega-expression "^2.4.0" + vega-typings "0.3.53" + vega-util "^1.7.1" yargs "^12.0.5" vega-loader@^3.0.1, vega-loader@^3.1.0: @@ -6178,10 +6187,10 @@ vega-themes@^2.2.0: dependencies: vega-typings "^0.3.51" -vega-tooltip@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.15.0.tgz#2606a95b46f0aa6a70f03d18f919dc13696c4d44" - integrity sha512-xfac+5I7YR1ZKfip2i9xlEHuNrl5YpQnZAmTc9dzQcnkoo5MmGVIhH01tEGOr8keVC9UbYU1AREezwv8Mpajhw== +vega-tooltip@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vega-tooltip/-/vega-tooltip-0.16.0.tgz#fc9badb96aed437b8225d0a7216ec6d1e768ac6f" + integrity sha512-A3hZ3B06n8anAp5ReOKmPeGlZaE2kVT0rN0IGLV8jWR54mNUKH/H9TacsyvLA9gq9OO0NrbpQ4NyfxU3uS8EYg== dependencies: vega-util "^1.7.1" @@ -6195,20 +6204,13 @@ vega-transforms@^2.3.1: vega-statistics "^1.2.3" vega-util "^1.7.0" -vega-typings@*, vega-typings@^0.3.51: +vega-typings@*, vega-typings@0.3.53, vega-typings@^0.3.51: version "0.3.53" resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.53.tgz#a70b9730ebe1e4c557019ccccc5fd98035b0aab0" integrity sha512-XQRd66eL62ll6tHENQIJHtdwXemqXoB4KnVVbGUwGJIHjQkHHluCbkoWVRvPYuRd+OLM1RXVc+EBxA015hJ1SQ== dependencies: vega-util "^1.7.0" -vega-typings@0.3.51: - version "0.3.51" - resolved "https://registry.yarnpkg.com/vega-typings/-/vega-typings-0.3.51.tgz#1e7a84ae3af4fcc0784b80d50a3e1df432b18141" - integrity sha512-8UJnlGIZLDYzlLgMJVHO8Yb8yU7pYeNGnW8J7nxgyXqurowovmPM9fV+V49vzbQnZl4/Qq14wGqm9yM7iqZl8g== - dependencies: - vega-util "^1.7.0" - vega-util@^1.7.0, vega-util@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/vega-util/-/vega-util-1.7.1.tgz#0b95bbe6058895c332596c215247507caa68ab61"