Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for new keras layers #91

Merged
merged 27 commits into from Jul 22, 2017
Merged

Support for new keras layers #91

merged 27 commits into from Jul 22, 2017

Conversation

utsavgarg
Copy link
Contributor

No description provided.

* Changed `setParams` to allow greying out parameters
* Added a flag to each parameter value to indicate whether to disable or not
* Added 1D and 3D conv options to conv dropdown
* Modified shape calculation to handle different dimensional data
* Added import and export of Conv1D and Conv3D to keras support
@coveralls
Copy link

Coverage Status

Coverage decreased (-3.1%) to 82.791% when pulling 4c7ac82 on utsavgarg:keras into 230fae1 on Cloud-CV:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-6.5%) to 79.404% when pulling ce9a99d on utsavgarg:keras into 230fae1 on Cloud-CV:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-8.08%) to 77.816% when pulling 171f106 on utsavgarg:keras into 230fae1 on Cloud-CV:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-9.9%) to 76.013% when pulling 0ab0001 on utsavgarg:keras into 230fae1 on Cloud-CV:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-9.9%) to 76.011% when pulling 10d0e2b on utsavgarg:keras into 230fae1 on Cloud-CV:master.

* Added ThresholdedReLU, selu, softplus, softsign and hard sigmoid
@coveralls
Copy link

Coverage Status

Coverage decreased (-10.3%) to 75.643% when pulling 7bbda56 on utsavgarg:keras into 230fae1 on Cloud-CV:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-10.3%) to 75.643% when pulling da46ecb on utsavgarg:keras into 230fae1 on Cloud-CV:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-11.07%) to 74.828% when pulling 75413af on utsavgarg:keras into 230fae1 on Cloud-CV:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-11.7%) to 74.195% when pulling 8f40583 on utsavgarg:keras into 230fae1 on Cloud-CV:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-11.7%) to 74.195% when pulling 51d079e on utsavgarg:keras into 230fae1 on Cloud-CV:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-11.7%) to 74.195% when pulling 74beae0 on utsavgarg:keras into 230fae1 on Cloud-CV:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-11.7%) to 74.24% when pulling b7883b1 on utsavgarg:keras into 230fae1 on Cloud-CV:master.

Copy link
Contributor

@virajprabhu virajprabhu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks very good overall. Great job!

@@ -185,7 +185,7 @@ class Canvas extends React.Component {
layer.connection = { input: [], output: [] };
layer.params = {};
Object.keys(data[type].params).forEach(j => {
layer.params[j] = data[type].params[j].value;
layer.params[j] = [data[type].params[j].value, false];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment mentioning that true maps to disabled?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its there in content.js line 287

@@ -185,7 +185,7 @@ class Canvas extends React.Component {
layer.connection = { input: [], output: [] };
layer.params = {};
Object.keys(data[type].params).forEach(j => {
layer.params[j] = data[type].params[j].value;
layer.params[j] = [data[type].params[j].value, false];
});
// l.props = JSON.parse(JSON.stringify(data[type].props));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its required I think

}
});
if (type == 'Convolution' || type == 'Pooling' || type == 'Upsample' || type == 'LocallyConnected' || type == 'Eltwise'){
layer = this.adjustParameters(layer, 'layer_type', layer.params['layer_type'][0]);
}
// layer.props = JSON.parse(JSON.stringify(data[type].props));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can remove this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you want to send all layers to adjustParameters ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind, some issue with the review interface

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind, some issue with the review interface

@virajprabhu virajprabhu merged commit d30c6c9 into Cloud-CV:master Jul 22, 2017
@utsavgarg utsavgarg deleted the keras branch July 23, 2017 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants