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

Added missing parameters in existing layers #88

Merged
merged 12 commits into from Jul 12, 2017
Merged

Added missing parameters in existing layers #88

merged 12 commits into from Jul 12, 2017

Conversation

utsavgarg
Copy link
Contributor

Added union of parameters from Keras and Caffe for Conv layer

@utsavgarg utsavgarg changed the title Added missing parameters for Conv layer Added missing parameters in existing layers Jul 10, 2017
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.3%) to 85.895% when pulling 5ba3111 on utsavgarg:current into 45662a2 on Cloud-CV:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.3%) to 85.895% when pulling 4f01cef on utsavgarg:current into 45662a2 on Cloud-CV:master.

weight_filler: {
name: 'Weight filler',
value: 'constant',
type: 'select',
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear'],
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear', 'Zeros', 'Ones', 'Constant', 'RandomNormal',
Copy link
Contributor

Choose a reason for hiding this comment

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

Separate by framework and add comments

required: false
},
bias_filler: {
name: 'Bias filler',
value: 'constant',
type: 'select',
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear'],
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear', 'Zeros', 'Ones', 'Constant', 'RandomNormal',
Copy link
Contributor

Choose a reason for hiding this comment

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

Document

},
weight_filler: {
name: 'Weight filler',
value: 'constant',
type: 'select',
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear'],
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear', 'Zeros', 'Ones', 'Constant', 'RandomNormal',
Copy link
Contributor

Choose a reason for hiding this comment

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

Document

required: false
},
bias_filler: {
name: 'Bias filler',
value: 'constant',
type: 'select',
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear'],
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear', 'Zeros', 'Ones', 'Constant', 'RandomNormal',
Copy link
Contributor

Choose a reason for hiding this comment

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

Document

@@ -761,14 +874,18 @@ export default {
name: 'Weight filler',
value: 'constant',
type: 'select',
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear'],
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear', 'Zeros', 'Ones', 'Constant', 'RandomNormal',
Copy link
Contributor

Choose a reason for hiding this comment

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

Document

required: false
},
bias_filler: {
name: 'Bias filler',
value: 'constant',
type: 'select',
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear'],
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear', 'Zeros', 'Ones', 'Constant', 'RandomNormal',
Copy link
Contributor

Choose a reason for hiding this comment

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

Document

weight_filler: {
name: 'Weight filler',
value: 'constant',
type: 'select',
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear'],
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear', 'Zeros', 'Ones', 'Constant', 'RandomNormal',
Copy link
Contributor

Choose a reason for hiding this comment

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

Document

name: 'Filler',
value: 'constant',
type: 'select',
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear', 'Zeros', 'Ones', 'Constant', 'RandomNormal',
Copy link
Contributor

Choose a reason for hiding this comment

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

Document

name: 'Bias Filler',
value: 'constant',
type: 'select',
options: ['constant', 'gaussian', 'positive_unitball', 'uniform', 'xavier', 'msra', 'bilinear', 'Zeros', 'Ones', 'Constant', 'RandomNormal',
Copy link
Contributor

Choose a reason for hiding this comment

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

Document

eps = 0.0001 # In Keras the max epsilon allowed in 1e-5
moving_mean_initializer = layer['params']['moving_mean_initializer']
moving_variance_initializer = layer['params']['moving_variance_initializer']
if (nextLayer['info']['type'] == 'Scale'):
Copy link
Contributor

Choose a reason for hiding this comment

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

Explain 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.

I have explained it in export_json.py

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.3%) to 85.895% when pulling 0fe00b7 on utsavgarg:current into 45662a2 on Cloud-CV:master.

type: 'number',
required: false
},
weight_filler: { // Keras(kernel_initializer)
Copy link
Contributor

Choose a reason for hiding this comment

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

Change this to "Maps to: kernel_initializer (Keras)"? Otherwise it might imply that this is a Keras only layer. Follow this convention everywhere.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.3%) to 85.895% when pulling d6eace5 on utsavgarg:current into 45662a2 on Cloud-CV:master.

@virajprabhu virajprabhu merged commit 2576f2b into Cloud-CV:master Jul 12, 2017
@utsavgarg utsavgarg deleted the current branch July 12, 2017 10:32
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