Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
未来在这儿
X2Paddle
提交
dbc32e66
X
X2Paddle
项目概览
未来在这儿
/
X2Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / X2Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
X2Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
dbc32e66
编写于
9月 18, 2019
作者:
J
Jason
提交者:
GitHub
9月 18, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #147 from mamingjie-China/develop
modify the output
上级
b04dcff4
30737bff
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
0 addition
and
6 deletion
+0
-6
x2paddle/op_mapper/caffe_custom_layer/register.py
x2paddle/op_mapper/caffe_custom_layer/register.py
+0
-1
x2paddle/op_mapper/caffe_op_mapper.py
x2paddle/op_mapper/caffe_op_mapper.py
+0
-4
x2paddle/op_mapper/onnx_custom_layer/register.py
x2paddle/op_mapper/onnx_custom_layer/register.py
+0
-1
未找到文件。
x2paddle/op_mapper/caffe_custom_layer/register.py
浏览文件 @
dbc32e66
...
@@ -31,7 +31,6 @@ def register(kind, shape, layer, weights):
...
@@ -31,7 +31,6 @@ def register(kind, shape, layer, weights):
k
)
is
str
,
'invalid param "kind" for register, not a list of str'
k
)
is
str
,
'invalid param "kind" for register, not a list of str'
assert
k
not
in
g_custom_layers
,
'this type[%s] has already been registered'
%
(
assert
k
not
in
g_custom_layers
,
'this type[%s] has already been registered'
%
(
k
)
k
)
print
(
'register layer[%s]'
%
(
k
))
g_custom_layers
[
k
]
=
{
g_custom_layers
[
k
]
=
{
'shape'
:
shape
,
'shape'
:
shape
,
'layer'
:
layer
,
'layer'
:
layer
,
...
...
x2paddle/op_mapper/caffe_op_mapper.py
浏览文件 @
dbc32e66
...
@@ -124,9 +124,6 @@ class CaffeOpMapper(OpMapper):
...
@@ -124,9 +124,6 @@ class CaffeOpMapper(OpMapper):
data
[
idx
]
=
np
.
squeeze
(
d
,
axis
=
sq_axis
)
data
[
idx
]
=
np
.
squeeze
(
d
,
axis
=
sq_axis
)
shape_new
=
data
[
idx
].
shape
shape_new
=
data
[
idx
].
shape
if
len
(
shape_old
)
!=
shape_new
:
print
(
'squeeze idx:%d, with kind:%s,name:%s'
%
\
(
idx
,
node
.
layer_type
,
node
.
layer
.
name
))
return
data
return
data
def
get_kernel_parameters
(
self
,
kind
,
params
):
def
get_kernel_parameters
(
self
,
kind
,
params
):
...
@@ -956,7 +953,6 @@ class CaffeOpMapper(OpMapper):
...
@@ -956,7 +953,6 @@ class CaffeOpMapper(OpMapper):
input
=
self
.
graph
.
get_bottom_node
(
node
,
idx
=
i
,
copy
=
True
)
input
=
self
.
graph
.
get_bottom_node
(
node
,
idx
=
i
,
copy
=
True
)
if
i
==
1
and
op
==
'DetectionOutput'
:
if
i
==
1
and
op
==
'DetectionOutput'
:
input
=
self
.
graph
.
get_bottom_node
(
node
,
idx
=
i
,
copy
=
True
)
input
=
self
.
graph
.
get_bottom_node
(
node
,
idx
=
i
,
copy
=
True
)
print
(
input
.
layer_type
)
while
input
is
not
None
and
input
.
layer_type
!=
'Softmax'
:
while
input
is
not
None
and
input
.
layer_type
!=
'Softmax'
:
input
=
self
.
graph
.
get_bottom_node
(
input
,
idx
=
0
,
copy
=
True
)
input
=
self
.
graph
.
get_bottom_node
(
input
,
idx
=
0
,
copy
=
True
)
assert
input
is
not
None
,
'This kind of DetectionOutput is not supported!'
assert
input
is
not
None
,
'This kind of DetectionOutput is not supported!'
...
...
x2paddle/op_mapper/onnx_custom_layer/register.py
浏览文件 @
dbc32e66
...
@@ -44,7 +44,6 @@ def register(kind, shape, layer, child_func, weights):
...
@@ -44,7 +44,6 @@ def register(kind, shape, layer, child_func, weights):
k
)
is
str
,
'invalid param "kind" for register, not a list of str'
k
)
is
str
,
'invalid param "kind" for register, not a list of str'
assert
k
not
in
g_custom_layers
,
'this type[%s] has already been registered'
%
(
assert
k
not
in
g_custom_layers
,
'this type[%s] has already been registered'
%
(
k
)
k
)
print
(
'register layer[%s]'
%
(
k
))
g_custom_layers
[
k
]
=
{
g_custom_layers
[
k
]
=
{
'shape'
:
shape
,
'shape'
:
shape
,
'layer'
:
layer
,
'layer'
:
layer
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录