Update to deeplearn 0.5.1 and general refactor #97
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
updates dev and non dev dependencies to match dl 0.5.0 and resolve the potential security vulnerability in the ssri package
add webpack-cli
This commit adds support the the new dl api. It also updates the squeezneet dependency and mobilenet and removes the pre image process bc dl has a new method to handle that now.
Besides updating the KNN Image Classifier this commit also changes the its api. Now you can construct the classifier and pass it a optinal HTML videl elt (or in p5 a video.elt) and then you can call addImageFromVideo() to train it on that specific video and predictFromVideo() to predict from that video. This allows for the user to create a video of any size and ml5 will handle the resize. If the video elt is not given, then addImage() and predictFromImage() can still be called givin image or video as the first argument
Updating the LSTM generator to the new dl 0.5 api. updating how cells are generated and how they are combined in multiRNNCell.
Updated Word2Vec to match dl 0.5
Updating the TransformNet method to dl.05. This commit also changes the name of this method to FastStyle instead of TransformNet and the predict() methods is now called transfer(). The class has been redesign so the transfer methods just handles outputing the desire result. Some static methods have also been addded. The transfer() method now returns a HTMLImage element instead of raw pixels, so no need to do array3DtoImage in the sketch.
Removing YOLO and Neural Network class since they are not ready for use yet. YOLO needs some updates from dl and Neural Network needs to be updated to be more efficient (it was just a toy example). I'm effectively removing them from this series of commit and moving it to a WIP branch
…l5. This updates MobileNet depe
Adding a callback to the LSTM methods in order to know when the model is loaded and ready to use
…ith all the previous commits
shiffman
reviewed
Mar 10, 2018
src/FastStyle/index.js
Outdated
| constructor(model, callback) { | ||
| this.ready = false; | ||
| this.variableDictionary = {}; | ||
| this.timesScalar = dl.tensor(150); |
There was a problem hiding this comment.
Is there a reason why we are calling tensor() here over scalar()?
shiffman
reviewed
Mar 10, 2018
| @@ -19,7 +17,7 @@ class Word2Vec { | |||
| .then(response => response.json()) | |||
| .then((json) => { | |||
| Object.keys(json.vectors).forEach((word) => { | |||
| this.model[word] = Array1D.new(json.vectors[word]); | |||
| this.model[word] = tensor(json.vectors[word]); | |||
There was a problem hiding this comment.
The docs specify tensor1d(), tensor2d(), etc. are preferred.
In general, we recommend using this method as it makes code more readable
This probably comes from the codebase being in typsecript but maybe makes sense to carry over for readability?
There was a problem hiding this comment.
Sounds good, I'll update all reference to scalars.
…leTransfer Updating the scalar notation to tensor in LSTM and Word2Vec. This also changes FastStyle name to StyleTransefer.
|
Woohoo! |
This was referenced Mar 13, 2018
joeyklee
pushed a commit
that referenced
this pull request
Jun 2, 2019
Update to deeplearn 0.5.1 and general refactor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Major updates!
Following the proposed Boston Milestone, this PR update ML5 to match the new deeplearn.js API (0.5.1) and introduces new updated to the api too!
I tried to follow @dariusk and left as much comments as possible in each of the individual commits.
Some major changes are introduce to the KNN Image Classifier changing slightly the internal api to make it more accessible: See feat(KNUpdate the KNN Image Classifier to match the dl 0.5
TransformNet has also been updated and renamed FastStyle. See refactor(TransformNet): update the TransformNet to dl 0.5 which I think describes better what this class does. Also, the predict() function has been renamed to transfer()
The Neural Network was removed until we resolve #47 and I also remove the unfinished YOLO into a separate branch.
This PR related to: #57, #89 , #78, #70, #67 and #27.
The ml5-examples repo has another PR that addresses all this changes!
Some comments: