Skip to content
This repository has been archived by the owner on Dec 7, 2021. It is now read-only.

feat: Active Learning Updates #778

Merged
merged 99 commits into from
Apr 24, 2019
Merged
Show file tree
Hide file tree
Changes from 96 commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
0919ce9
Add TensorFlow.js dependencies
JacopoMangiavacchi Mar 13, 2019
c102d65
Add Toolbar item for AL and load TF.js Model
JacopoMangiavacchi Mar 13, 2019
4592e52
Removed un-needed ToolbarItem subclass
JacopoMangiavacchi Mar 13, 2019
8a5c832
Call TF model for prediction and add Regions with Tag name
JacopoMangiavacchi Mar 13, 2019
8faeb6c
(WIP) feat: Add auto-labeling and auto-tagging active learning settin…
PIC123 Mar 24, 2019
04583e0
Detect only new regions
JacopoMangiavacchi Mar 25, 2019
1e110f8
Remove TF.JS cocoSSD package and move Object Detection code under ele…
JacopoMangiavacchi Mar 28, 2019
32baaef
WIP adding Active Learning provider proxy
JacopoMangiavacchi Mar 28, 2019
0f01dc3
Test custom Proxy method
JacopoMangiavacchi Mar 28, 2019
c0ae9d7
Load TF model in the main electron process
JacopoMangiavacchi Mar 29, 2019
87a55b7
WIP: loading model on electron with node.js support and proxy imagedata
JacopoMangiavacchi Mar 29, 2019
45d1417
Simplify ImageData creation
JacopoMangiavacchi Mar 30, 2019
6b64616
Testing node-canvas
JacopoMangiavacchi Mar 30, 2019
bb0b36a
Testing pixel-util package
JacopoMangiavacchi Mar 30, 2019
c1286cb
Converting image to 3D TF Tensor
JacopoMangiavacchi Mar 30, 2019
022bf38
decode JPG to 3D Tensor
JacopoMangiavacchi Mar 30, 2019
2d73ee0
Make proxy method async
JacopoMangiavacchi Mar 30, 2019
d9fdd89
Removed passing width/weight to proxy
JacopoMangiavacchi Mar 30, 2019
fe4bd50
Implement TF.io.IOHandler to proxy model loading from filesystem
JacopoMangiavacchi Apr 2, 2019
da12e44
Load Model from http url or filesystem electron proxy
JacopoMangiavacchi Apr 2, 2019
39fe192
Dynamic load the model class labels from Json file
JacopoMangiavacchi Apr 2, 2019
e5b338c
Load model classes from http url or filesystem proxy
JacopoMangiavacchi Apr 2, 2019
929cff5
Add toast when loading model
JacopoMangiavacchi Apr 2, 2019
a853565
Add model path to project settings and config
JacopoMangiavacchi Apr 3, 2019
ef81a71
Rename and reorder AL project settings
JacopoMangiavacchi Apr 3, 2019
cdf8bf1
Get Electron installation path
JacopoMangiavacchi Apr 3, 2019
002033f
Add local pre-trained model and model path type config
JacopoMangiavacchi Apr 3, 2019
a9ead2e
handle file: protocol and distribute model in electron bundle
JacopoMangiavacchi Apr 4, 2019
215559f
Distinguish production vs debug to correctly load default model from …
JacopoMangiavacchi Apr 4, 2019
c511bc6
Minor fix due to rebase
JacopoMangiavacchi Apr 4, 2019
b37ec61
Get asset buffer directly from asset
JacopoMangiavacchi Apr 5, 2019
6febd7c
Calculate region with correct ratio between canvas and original image…
JacopoMangiavacchi Apr 5, 2019
e16f2e7
Add check if running on Electron environment
JacopoMangiavacchi Apr 5, 2019
9792e69
Dinamically show/hide model path/url config
JacopoMangiavacchi Apr 6, 2019
484d2b3
Add ui:widget localFolderPicker for model path settings
JacopoMangiavacchi Apr 6, 2019
4a9a700
Add select folder widget for custom model settings
JacopoMangiavacchi Apr 8, 2019
bac52fe
Handle loading custom model from file or handle
JacopoMangiavacchi Apr 8, 2019
8bd190a
Handle model loading error
JacopoMangiavacchi Apr 8, 2019
6c47f6d
Remove save method in TF.IOHandler
JacopoMangiavacchi Apr 8, 2019
b09791f
Add TF IOHandler test
JacopoMangiavacchi Apr 8, 2019
f7fa9a2
Add ObjectDetection model load from filesystem
JacopoMangiavacchi Apr 8, 2019
03bb32e
WIP test TF model http loading
JacopoMangiavacchi Apr 10, 2019
1042fd7
Fix test loading model from http
JacopoMangiavacchi Apr 10, 2019
702b7e1
Remove comments
JacopoMangiavacchi Apr 10, 2019
e6c27fb
Fix issues on region detected with unknown tag
JacopoMangiavacchi Apr 10, 2019
7b2ca7f
test instanbul comment
JacopoMangiavacchi Apr 10, 2019
24b78fc
Add test for detect on fake model
JacopoMangiavacchi Apr 11, 2019
0b08561
fix after rebase
JacopoMangiavacchi Apr 11, 2019
597e427
Fix SonarCloud suggestions
JacopoMangiavacchi Apr 11, 2019
43f43c2
add mock to electron.remote
JacopoMangiavacchi Apr 11, 2019
ac19ad4
wrap active learning click on test
JacopoMangiavacchi Apr 11, 2019
9f95af1
Mock ObjectDetection in AL detect test
JacopoMangiavacchi Apr 11, 2019
127d628
fix getter mock method for model loaded property
JacopoMangiavacchi Apr 11, 2019
e6da0f8
Separated image detection code from canvas image extractor
JacopoMangiavacchi Apr 12, 2019
631b0a1
Add mock for canvas getBlob
JacopoMangiavacchi Apr 12, 2019
e711467
Simulate/Mock image detection on test
JacopoMangiavacchi Apr 12, 2019
dc75981
WIP refactoring mockFactory methods
JacopoMangiavacchi Apr 12, 2019
6459bcd
Refactored htmlFileReader asset mock factory methods
JacopoMangiavacchi Apr 12, 2019
50c6d34
Reuse mockFactory asset mocks in editorPage test
JacopoMangiavacchi Apr 12, 2019
04930b9
Test result for detection
JacopoMangiavacchi Apr 13, 2019
54e8e6f
Add Ctrl-D accellerator
JacopoMangiavacchi Apr 13, 2019
4a2b401
Un-block while loading model
JacopoMangiavacchi Apr 13, 2019
28a6bec
Fix loading model from web
JacopoMangiavacchi Apr 13, 2019
efe3a1d
Add Cors setting to img/video to get blob data in browser
JacopoMangiavacchi Apr 14, 2019
8f45e68
Protect canvas.toBlob cors exceptions
JacopoMangiavacchi Apr 14, 2019
d97f879
Add net detected tag to project tag list
JacopoMangiavacchi Apr 14, 2019
ebfe189
Remove console.log
JacopoMangiavacchi Apr 14, 2019
074477d
Temporary comment add new detected tags to project as causing an iss…
JacopoMangiavacchi Apr 14, 2019
05ee723
Temporary comments
JacopoMangiavacchi Apr 14, 2019
66ffa92
Resolved some feedback from PR
JacopoMangiavacchi Apr 15, 2019
d7ba5ec
Resolved some feedback from PR
JacopoMangiavacchi Apr 15, 2019
d506081
Resolved some feedback from PR
JacopoMangiavacchi Apr 15, 2019
1d6cc03
Resolved some feedback from PR
JacopoMangiavacchi Apr 15, 2019
5d86684
Resolved some feedback from PR
JacopoMangiavacchi Apr 15, 2019
1d87541
Resolved some feedback from PR
JacopoMangiavacchi Apr 15, 2019
26fd054
Resolved some feedback from PR
JacopoMangiavacchi Apr 15, 2019
e04e8b5
Fix SonarCloud warnings
JacopoMangiavacchi Apr 15, 2019
82ff670
WIP Refactoring editorPage detect methods
JacopoMangiavacchi Apr 15, 2019
4064ad8
WIP Refactoring editorPage detect methods
JacopoMangiavacchi Apr 15, 2019
a801d60
Refactoring ObjectDetection main detect method
JacopoMangiavacchi Apr 16, 2019
2d96197
WIP adding new test to ObjectDetection
JacopoMangiavacchi Apr 16, 2019
c96dd93
Moved logic to add new tags in the Save Project reducer
JacopoMangiavacchi Apr 17, 2019
a7dbd63
fix: Rebased and resolved merge conflicts
wbreza Apr 19, 2019
404378b
feat: Added active learning page / form
wbreza Apr 19, 2019
2abf70e
test: Verify active learning form component
wbreza Apr 20, 2019
d1bd0dc
test: Verify active learning page
wbreza Apr 22, 2019
8bd81ae
test: Verify active learning service
wbreza Apr 22, 2019
cc6a06a
test: Updated expected count in sidebar
wbreza Apr 22, 2019
0962b1e
test: Refactor active learning editor page tests
wbreza Apr 22, 2019
f666d68
fix: Move default project settings to project service
wbreza Apr 22, 2019
de64765
test: Moved project requirement checks into project service
wbreza Apr 22, 2019
f8836d1
fix: Added toast messages while model is loading
wbreza Apr 23, 2019
0952612
fix: Fixed issue where error loading model was not triggering correct…
wbreza Apr 23, 2019
80b2e19
test: Updated unit tests for model loading short circuit
wbreza Apr 23, 2019
3e41057
fix: Addressed PR feedback
wbreza Apr 23, 2019
7fb3470
fix: Add default settings for active learning / export when loading p…
wbreza Apr 23, 2019
87001c5
fix: Removed console.log statements
wbreza Apr 23, 2019
0f249d3
test: Moved new tags test from editor page to current project reducer
wbreza Apr 24, 2019
4808e2d
fix: Addressed PR feedback
wbreza Apr 24, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cocoSSDModel/classes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"name":"/m/01g317","id":1,"displayName":"person"},{"name":"/m/0199g","id":2,"displayName":"bicycle"},{"name":"/m/0k4j","id":3,"displayName":"car"},{"name":"/m/04_sv","id":4,"displayName":"motorcycle"},{"name":"/m/05czz6l","id":5,"displayName":"airplane"},{"name":"/m/01bjv","id":6,"displayName":"bus"},{"name":"/m/07jdr","id":7,"displayName":"train"},{"name":"/m/07r04","id":8,"displayName":"truck"},{"name":"/m/019jd","id":9,"displayName":"boat"},{"name":"/m/015qff","id":10,"displayName":"traffic light"},{"name":"/m/01pns0","id":11,"displayName":"fire hydrant"},{"name":"/m/02pv19","id":13,"displayName":"stop sign"},{"name":"/m/015qbp","id":14,"displayName":"parking meter"},{"name":"/m/0cvnqh","id":15,"displayName":"bench"},{"name":"/m/015p6","id":16,"displayName":"bird"},{"name":"/m/01yrx","id":17,"displayName":"cat"},{"name":"/m/0bt9lr","id":18,"displayName":"dog"},{"name":"/m/03k3r","id":19,"displayName":"horse"},{"name":"/m/07bgp","id":20,"displayName":"sheep"},{"name":"/m/01xq0k1","id":21,"displayName":"cow"},{"name":"/m/0bwd_0j","id":22,"displayName":"elephant"},{"name":"/m/01dws","id":23,"displayName":"bear"},{"name":"/m/0898b","id":24,"displayName":"zebra"},{"name":"/m/03bk1","id":25,"displayName":"giraffe"},{"name":"/m/01940j","id":27,"displayName":"backpack"},{"name":"/m/0hnnb","id":28,"displayName":"umbrella"},{"name":"/m/080hkjn","id":31,"displayName":"handbag"},{"name":"/m/01rkbr","id":32,"displayName":"tie"},{"name":"/m/01s55n","id":33,"displayName":"suitcase"},{"name":"/m/02wmf","id":34,"displayName":"frisbee"},{"name":"/m/071p9","id":35,"displayName":"skis"},{"name":"/m/06__v","id":36,"displayName":"snowboard"},{"name":"/m/018xm","id":37,"displayName":"sports ball"},{"name":"/m/02zt3","id":38,"displayName":"kite"},{"name":"/m/03g8mr","id":39,"displayName":"baseball bat"},{"name":"/m/03grzl","id":40,"displayName":"baseball glove"},{"name":"/m/06_fw","id":41,"displayName":"skateboard"},{"name":"/m/019w40","id":42,"displayName":"surfboard"},{"name":"/m/0dv9c","id":43,"displayName":"tennis racket"},{"name":"/m/04dr76w","id":44,"displayName":"bottle"},{"name":"/m/09tvcd","id":46,"displayName":"wine glass"},{"name":"/m/08gqpm","id":47,"displayName":"cup"},{"name":"/m/0dt3t","id":48,"displayName":"fork"},{"name":"/m/04ctx","id":49,"displayName":"knife"},{"name":"/m/0cmx8","id":50,"displayName":"spoon"},{"name":"/m/04kkgm","id":51,"displayName":"bowl"},{"name":"/m/09qck","id":52,"displayName":"banana"},{"name":"/m/014j1m","id":53,"displayName":"apple"},{"name":"/m/0l515","id":54,"displayName":"sandwich"},{"name":"/m/0cyhj_","id":55,"displayName":"orange"},{"name":"/m/0hkxq","id":56,"displayName":"broccoli"},{"name":"/m/0fj52s","id":57,"displayName":"carrot"},{"name":"/m/01b9xk","id":58,"displayName":"hot dog"},{"name":"/m/0663v","id":59,"displayName":"pizza"},{"name":"/m/0jy4k","id":60,"displayName":"donut"},{"name":"/m/0fszt","id":61,"displayName":"cake"},{"name":"/m/01mzpv","id":62,"displayName":"chair"},{"name":"/m/02crq1","id":63,"displayName":"couch"},{"name":"/m/03fp41","id":64,"displayName":"potted plant"},{"name":"/m/03ssj5","id":65,"displayName":"bed"},{"name":"/m/04bcr3","id":67,"displayName":"dining table"},{"name":"/m/09g1w","id":70,"displayName":"toilet"},{"name":"/m/07c52","id":72,"displayName":"tv"},{"name":"/m/01c648","id":73,"displayName":"laptop"},{"name":"/m/020lf","id":74,"displayName":"mouse"},{"name":"/m/0qjjc","id":75,"displayName":"remote"},{"name":"/m/01m2v","id":76,"displayName":"keyboard"},{"name":"/m/050k8","id":77,"displayName":"cell phone"},{"name":"/m/0fx9l","id":78,"displayName":"microwave"},{"name":"/m/029bxz","id":79,"displayName":"oven"},{"name":"/m/01k6s3","id":80,"displayName":"toaster"},{"name":"/m/0130jx","id":81,"displayName":"sink"},{"name":"/m/040b_t","id":82,"displayName":"refrigerator"},{"name":"/m/0bt_c3","id":84,"displayName":"book"},{"name":"/m/01x3z","id":85,"displayName":"clock"},{"name":"/m/02s195","id":86,"displayName":"vase"},{"name":"/m/01lsmm","id":87,"displayName":"scissors"},{"name":"/m/0kmg4","id":88,"displayName":"teddy bear"},{"name":"/m/03wvsk","id":89,"displayName":"hair drier"},{"name":"/m/012xff","id":90,"displayName":"toothbrush"}]
Binary file added cocoSSDModel/group1-shard1of5
Binary file not shown.
Binary file added cocoSSDModel/group1-shard2of5
Binary file not shown.
Binary file added cocoSSDModel/group1-shard3of5
Binary file not shown.
Binary file added cocoSSDModel/group1-shard4of5
Binary file not shown.
Binary file added cocoSSDModel/group1-shard5of5
Binary file not shown.
Loading