Skip to content

add functionality to name tops in python-net spec #2842

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add functionality to name tops in python-net spec #2842

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions python/caffe/net_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,25 @@ def __init__(self, type_name, inputs, params):
self.inputs = inputs
self.params = params
self.ntop = self.params.get('ntop', 1)
if not 'ntop' in self.params and 'top' in self.params:
self.ntop = len(self.params['top'])
# use del to make sure kwargs are not double-processed as layer params
if 'ntop' in self.params:
del self.params['ntop']
self.in_place = self.params.get('in_place', False)
if 'in_place' in self.params:
del self.params['in_place']
self.tops = tuple(Top(self, n) for n in range(self.ntop))
# print self.tops

def _get_name(self, top, names, autonames):
def _get_name(self, top, names, autonames,i=0):
if top not in names:
n = autonames.setdefault(top.fn.type_name, 1)
autonames[top.fn.type_name] += 1
names[top] = top.fn.type_name + str(n)
if 'top' in self.params and len(self.params['top']) > i:
names[top] = self.params['top'][i]
else:
n = autonames.setdefault(top.fn.type_name, 1)
autonames[top.fn.type_name] += 1
names[top] = top.fn.type_name + str(n)
return names[top]

def _to_proto(self, layers, names, autonames):
Expand All @@ -128,8 +134,10 @@ def _to_proto(self, layers, names, autonames):
if self.in_place:
layer.top.extend(layer.bottom)
else:
for top in self.tops:
layer.top.append(self._get_name(top, names, autonames))
for i,top in enumerate(self.tops):
layer.top.append(self._get_name(top, names, autonames,i))
if 'top' in self.params:
del self.params['top']
layer.name = self._get_name(self.tops[0], names, autonames)

for k, v in six.iteritems(self.params):
Expand Down