Skip to content

permute op may have more than 4 dims #110

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
bailiqun wants to merge 2 commits into
base: master
Choose a base branch
from
Open

permute op may have more than 4 dims #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e432cfd
Update pytorch_to_caffe.py
bailiqun May 12, 2021
9359148
Update layer_param.py
bailiqun May 12, 2021
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
6 changes: 3 additions & 3 deletions Caffe/layer_param.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def norm_param(self, eps):
self.param.norm_param.CopyFrom(l2norm_param)


def permute_param(self, order1, order2, order3, order4):
def permute_param(self, order):
"""
add a conv_param layer if you spec the layer type "Convolution"
Args:
Expand All @@ -105,7 +105,7 @@ def permute_param(self, order1, order2, order3, order4):
Returns:
"""
permute_param = pb.PermuteParameter()
permute_param.order.extend([order1, order2, order3, order4])
permute_param.order.extend(*order)

self.param.permute_param.CopyFrom(permute_param)

Expand Down Expand Up @@ -180,4 +180,4 @@ def copy_from(self,layer_param):
pass

def set_enum(param,key,value):
setattr(param,key,param.Value(value))
setattr(param,key,param.Value(value))
6 changes: 1 addition & 5 deletions pytorch_to_caffe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,12 +607,8 @@ def _permute(input, *args):
log.add_blobs([x], name='permute_blob')
layer = caffe_net.Layer_param(name=name, type='Permute',
bottom=[log.blobs(input)], top=[log.blobs(x)])
order1 = args[0]
order2 = args[1]
order3 = args[2]
order4 = args[3]

layer.permute_param(order1, order2, order3, order4)
layer.permute_param(*args)
log.cnet.add_layer(layer)
return x

Expand Down