-
Notifications
You must be signed in to change notification settings - Fork 235
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
Conversation
ide/static/js/netLayout.js
Outdated
@@ -32,7 +30,8 @@ function allocatePosition(layerId, preferredPosition){ | |||
if (!map.hasOwnProperty(preferredPosition[0])) { | |||
map[preferredPosition[0]] = []; | |||
} | |||
|
|||
console.log(layerId); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove console.log statements
ide/static/js/netLayout.js
Outdated
@@ -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); |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
Good Job @Omarito2412 ! This is brilliant! |
Thank you @dexter1691 |
Did you try exporting the layers back to a prototxt? |
Sure, I'm working on it. |
I've added the requested functionalities. |
if 'inplace' in layerParams.keys(): | ||
inplace = layerParams['inplace'] | ||
else: | ||
inplace = False |
There was a problem hiding this comment.
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!
ide/utils/jsonToPrototxt.py
Outdated
@@ -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) |
There was a problem hiding this comment.
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?
ide/utils/jsonToPrototxt.py
Outdated
include={ | ||
'phase': int(layerPhase) | ||
})) | ||
#*([ns[x] for x in blobNames[layerId]['bottom']] + [ns.label]))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove unnecessary comments!
Done |
@Omarito2412 : Can you rebuild the bundle.js and resolve the conflicts? |
@dexter1691 These changes should solve the conflict. |
Sorry! but you will have to resolve the conflict one by one again. |
@dexter1691 This should fix all the conflicts |
In reference to #36
Here I've added the required layers required to support the prototxt file for the network.