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

S2VT network support #38

Merged
merged 14 commits into from
Mar 9, 2017
Merged

Conversation

Omarito2412
Copy link
Contributor

In reference to #36
Here I've added the required layers required to support the prototxt file for the network.

@@ -32,7 +30,8 @@ function allocatePosition(layerId, preferredPosition){
if (!map.hasOwnProperty(preferredPosition[0])) {
map[preferredPosition[0]] = [];
}

console.log(layerId);
Copy link
Member

Choose a reason for hiding this comment

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

remove console.log statements

@@ -69,7 +68,7 @@ let i = null, layerId = null, parentId = null, inputLength = null, outputLength

// finding the input layers to start DFS
Object.keys(net).forEach(layerId => {
if (net[layerId].info.type === 'Data' || net[layerId].info.type === 'Input') {
if (net[layerId].info.type === 'Data' || net[layerId].info.type === 'Input' || net[layerId].info.type === 'HDF5Data' || net[layerId].info.type === 'Reshape') {
stack.push(layerId);
Copy link
Member

Choose a reason for hiding this comment

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

Can you explain in what scenario will reshape layer be the starting layer?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It won't be the first layer, but as in this network it is the first layer after the Data layers.
When I tried to run the prototxt file without adding Reshape as an input it failed, I assumed this is because Reshape is a special layer like Inputs.

@dexter1691
Copy link
Member

Good Job @Omarito2412 ! This is brilliant!

@Omarito2412
Copy link
Contributor Author

Thank you @dexter1691
I liked the idea of Fabrik being a Deep learning enthusiast myself and I find it appealing to contribute to this tool, luckily I have experience in Deep learning and its frameworks along with Django and React 💃

@dexter1691
Copy link
Member

Did you try exporting the layers back to a prototxt?
And I think you also need to add these layers into the dropdown menu.

@Omarito2412
Copy link
Contributor Author

Sure, I'm working on it.

@Omarito2412
Copy link
Contributor Author

I've added the requested functionalities.
I've also discovered a bug with Dropout that is fixed in this PR (ref: #41)

if 'inplace' in layerParams.keys():
inplace = layerParams['inplace']
else:
inplace = False
Copy link
Member

Choose a reason for hiding this comment

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

Good stuff! Thanks for fixing this!

@@ -40,7 +40,7 @@ def isProcessPossible(layerId):

# finding the data layer
for layerId in net:
if(net[layerId]['info']['type'] == 'Data' or net[layerId]['info']['type'] == 'Input'):
if(net[layerId]['info']['type'] == 'Data' or net[layerId]['info']['type'] == 'Input' or net[layerId]['info']['type'] == 'HDF5Data'):
stack.append(layerId)
Copy link
Member

@dexter1691 dexter1691 Mar 8, 2017

Choose a reason for hiding this comment

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

Can you split this into two lines please?

include={
'phase': int(layerPhase)
}))
#*([ns[x] for x in blobNames[layerId]['bottom']] + [ns.label])))
Copy link
Member

Choose a reason for hiding this comment

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

Remove unnecessary comments!

@Omarito2412
Copy link
Contributor Author

Done

@dexter1691
Copy link
Member

@Omarito2412 : Can you rebuild the bundle.js and resolve the conflicts?

@Omarito2412
Copy link
Contributor Author

@dexter1691 These changes should solve the conflict.

@dexter1691
Copy link
Member

Sorry! but you will have to resolve the conflict one by one again.
I think bundle.js shouldn't be part of git but should be built while cloning. But for now please resolve the conflict.

@Omarito2412
Copy link
Contributor Author

@dexter1691 This should fix all the conflicts

@dexter1691 dexter1691 merged commit cb3a3fd into Cloud-CV:master Mar 9, 2017
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

2 participants