From a00d54165abd1721756d4caea60b945e339c1d5c Mon Sep 17 00:00:00 2001 From: Jay Wong Date: Sun, 3 May 2020 16:58:26 -0400 Subject: [PATCH 01/28] Relax conda package constraints --- tiny-vgg/environment.yaml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tiny-vgg/environment.yaml b/tiny-vgg/environment.yaml index 8d377d04..69deef59 100644 --- a/tiny-vgg/environment.yaml +++ b/tiny-vgg/environment.yaml @@ -2,23 +2,23 @@ name: tiny-vgg channels: - defaults dependencies: - - ca-certificates=2020.1.1=0 - - certifi=2020.4.5.1=py36_0 - - libcxx=4.0.1=hcfea43d_1 - - libcxxabi=4.0.1=hcfea43d_1 - - libedit=3.1.20181209=hb402a30_0 - - libffi=3.2.1=h0a44026_6 - - ncurses=6.2=h0a44026_1 - - openssl=1.1.1g=h1de35cc_0 - - pip=20.0.2=py36_1 - - python=3.6.10=hc70fcce_1 - - readline=8.0=h1de35cc_0 - - setuptools=46.1.3=py36_0 - - sqlite=3.31.1=h5c1f38d_1 - - tk=8.6.8=ha441bb4_0 - - wheel=0.34.2=py36_0 - - xz=5.2.5=h1de35cc_0 - - zlib=1.2.11=h1de35cc_3 + - ca-certificates=2020.1.1 + - certifi=2020.4.5.1 + - libcxx=4.0.1 + - libcxxabi=4.0.1 + - libedit=3.1.20181209 + - libffi=3.2.1 + - ncurses=6.2 + - openssl=1.1.1g + - pip=20.0.2 + - python=3.6.10 + - readline=8.0 + - setuptools=46.1.3 + - sqlite=3.31.1 + - tk=8.6.8 + - wheel=0.34.2 + - xz=5.2.5 + - zlib=1.2.11 - pip: - absl-py==0.9.0 - astor==0.8.1 From 056a812e67d715cf6e7b23f2dbe14e3fafe69ea3 Mon Sep 17 00:00:00 2001 From: Jay Wong Date: Sun, 3 May 2020 22:39:03 -0400 Subject: [PATCH 02/28] Remove non-essential dependencies --- tiny-vgg/environment.yaml | 50 +-------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/tiny-vgg/environment.yaml b/tiny-vgg/environment.yaml index 69deef59..1920b329 100644 --- a/tiny-vgg/environment.yaml +++ b/tiny-vgg/environment.yaml @@ -2,61 +2,13 @@ name: tiny-vgg channels: - defaults dependencies: - - ca-certificates=2020.1.1 - - certifi=2020.4.5.1 - - libcxx=4.0.1 - - libcxxabi=4.0.1 - - libedit=3.1.20181209 - - libffi=3.2.1 - - ncurses=6.2 - - openssl=1.1.1g - pip=20.0.2 - python=3.6.10 - - readline=8.0 - - setuptools=46.1.3 - - sqlite=3.31.1 - - tk=8.6.8 - - wheel=0.34.2 - - xz=5.2.5 - - zlib=1.2.11 - pip: - - absl-py==0.9.0 - - astor==0.8.1 - - cachetools==4.1.0 - - chardet==3.0.4 - - gast==0.2.2 - - google-auth==1.14.1 - - google-auth-oauthlib==0.4.1 - - google-pasta==0.2.0 - - grpcio==1.28.1 - h5py==2.10.0 - - idna==2.9 - - keras-applications==1.0.8 - - keras-preprocessing==1.1.0 - - markdown==3.2.1 - numpy==1.18.3 - - oauthlib==3.1.0 - - opt-einsum==3.2.1 - - prompt-toolkit==1.0.14 - - protobuf==3.11.3 - - pyasn1==0.4.8 - - pyasn1-modules==0.2.8 - - pygments==2.6.1 - - pyinquirer==1.0.3 - - regex==2020.4.4 - - requests==2.23.0 - - requests-oauthlib==1.3.0 - - rsa==4.0 + - pandas==1.0.3 - scipy==1.4.1 - - six==1.14.0 - - tensorboard==2.1.1 - tensorflow==2.1.0 - tensorflow-cpu==2.1.0 - - tensorflow-estimator==2.1.0 - - tensorflow-hub==0.7.0 - tensorflowjs==1.7.4 - - termcolor==1.1.0 - - urllib3==1.25.9 - - wcwidth==0.1.9 - - werkzeug==1.0.1 - - wrapt==1.12.1 From 13f1ece42176e51a88feb0309fd9990400770fc2 Mon Sep 17 00:00:00 2001 From: Tien-Thanh Nguyen Date: Fri, 8 May 2020 23:57:35 +0200 Subject: [PATCH 03/28] Update README.md --- tiny-vgg/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tiny-vgg/README.md b/tiny-vgg/README.md index e1dff7c4..9907dc40 100644 --- a/tiny-vgg/README.md +++ b/tiny-vgg/README.md @@ -77,7 +77,7 @@ Before loading the model using *tensorflow.js*, you want to convert the model fi from Keras `h5` format to [tensorflow.js format](https://www.tensorflow.org/js/tutorials/conversion/import_keras). ``` -ensorflowjs_converter --input_format keras trained_vgg_best.h5 ./ +tensorflowjs_converter --input_format keras trained_vgg_best.h5 ./ ``` Then you can put the output file `group1-shard1of1.bin` in `/public/data` and use From 3402b9ba2c663111e06015311cb5fcb4eb163be0 Mon Sep 17 00:00:00 2001 From: Jay Wong Date: Wed, 29 Jul 2020 03:36:24 -0400 Subject: [PATCH 04/28] Fix first time image-uploading issue --- src/overview/Modal.svelte | 4 ++-- src/overview/Overview.svelte | 1 + src/overview/flatten-draw.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/overview/Modal.svelte b/src/overview/Modal.svelte index e3cce2a2..004182e1 100644 --- a/src/overview/Modal.svelte +++ b/src/overview/Modal.svelte @@ -178,8 +178,8 @@