Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
64c67a93
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
64c67a93
编写于
9月 02, 2020
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18246 from YashasSamaga:dnn-permute-fix-unwanted-ocl-init
上级
154380cc
1df533c9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
18 deletion
+22
-18
modules/dnn/src/layers/permute_layer.cpp
modules/dnn/src/layers/permute_layer.cpp
+19
-15
modules/dnn/test/test_layers.cpp
modules/dnn/test/test_layers.cpp
+3
-3
未找到文件。
modules/dnn/src/layers/permute_layer.cpp
浏览文件 @
64c67a93
...
...
@@ -174,21 +174,9 @@ public:
computeStrides
(
shape
(
inputs
[
0
]),
shape
(
outputs
[
0
]));
#ifdef HAVE_OPENCL
if
(
uorder
.
empty
())
{
std
::
vector
<
int
>
orderVec
(
_order
.
begin
(),
_order
.
end
());;
Mat
morder
(
1
,
orderVec
.
size
(),
CV_32SC1
,
&
orderVec
[
0
]);
std
::
vector
<
int
>
oldStrideVec
(
_oldStride
.
begin
(),
_oldStride
.
end
());
Mat
mold_stride
(
1
,
_oldStride
.
size
(),
CV_32SC1
,
&
oldStrideVec
[
0
]);
std
::
vector
<
int
>
newStrideVec
(
_newStride
.
begin
(),
_newStride
.
end
());
Mat
mnew_stride
(
1
,
newStrideVec
.
size
(),
CV_32SC1
,
&
newStrideVec
[
0
]);
morder
.
copyTo
(
uorder
);
mold_stride
.
copyTo
(
uold_stride
);
mnew_stride
.
copyTo
(
unew_stride
);
}
uorder
.
release
();
uold_stride
.
release
();
unew_stride
.
release
();
#endif
}
...
...
@@ -276,6 +264,22 @@ public:
if
(
!
_needsPermute
)
return
false
;
if
(
uorder
.
empty
())
{
std
::
vector
<
int
>
orderVec
(
_order
.
begin
(),
_order
.
end
());;
Mat
morder
(
1
,
orderVec
.
size
(),
CV_32SC1
,
&
orderVec
[
0
]);
std
::
vector
<
int
>
oldStrideVec
(
_oldStride
.
begin
(),
_oldStride
.
end
());
Mat
mold_stride
(
1
,
_oldStride
.
size
(),
CV_32SC1
,
&
oldStrideVec
[
0
]);
std
::
vector
<
int
>
newStrideVec
(
_newStride
.
begin
(),
_newStride
.
end
());
Mat
mnew_stride
(
1
,
newStrideVec
.
size
(),
CV_32SC1
,
&
newStrideVec
[
0
]);
morder
.
copyTo
(
uorder
);
mold_stride
.
copyTo
(
uold_stride
);
mnew_stride
.
copyTo
(
unew_stride
);
}
bool
use_half
=
(
inps
.
depth
()
==
CV_16S
);
String
opts
=
format
(
"-DDtype=%s"
,
use_half
?
"half"
:
"float"
);
for
(
size_t
i
=
0
;
i
<
inputs
.
size
();
i
++
)
...
...
modules/dnn/test/test_layers.cpp
浏览文件 @
64c67a93
...
...
@@ -2343,7 +2343,7 @@ TEST_P(ConvolutionEltwiseActivationFusion, Accuracy)
if
(
eltwiseOp
!=
"sum"
&&
weightedEltwise
)
throw
SkipTestException
(
"weighted eltwise not supported"
);
LayerParams
eltwiseParams
;
TestLayerFusion
::
makeDefaultTestEltwiseLayer
(
eltwiseParams
,
eltwiseOp
,
fal
se
);
TestLayerFusion
::
makeDefaultTestEltwiseLayer
(
eltwiseParams
,
eltwiseOp
,
weightedEltwi
se
);
std
::
string
actType
=
get
<
3
>
(
GetParam
());
LayerParams
activationParams
;
...
...
@@ -2353,7 +2353,7 @@ TEST_P(ConvolutionEltwiseActivationFusion, Accuracy)
Target
targetId
=
get
<
1
>
(
get
<
4
>
(
GetParam
()));
// bug: https://github.com/opencv/opencv/issues/17945
if
(
eltwiseOp
!=
"sum"
&&
backendId
==
DNN_BACKEND_OPENCV
&&
(
targetId
==
DNN_TARGET_OPENCL
||
targetId
==
DNN_TARGET_OPENCL_FP16
))
if
(
(
eltwiseOp
!=
"sum"
||
weightedEltwise
)
&&
backendId
==
DNN_BACKEND_OPENCV
&&
(
targetId
==
DNN_TARGET_OPENCL
||
targetId
==
DNN_TARGET_OPENCL_FP16
))
applyTestTag
(
CV_TEST_TAG_DNN_SKIP_OPENCL
);
// bug: https://github.com/opencv/opencv/issues/17953
...
...
@@ -2440,7 +2440,7 @@ TEST_P(ConvolutionActivationEltwiseFusion, Accuracy)
if
(
eltwiseOp
!=
"sum"
&&
weightedEltwise
)
throw
SkipTestException
(
"weighted eltwise not supported"
);
LayerParams
eltwiseParams
;
TestLayerFusion
::
makeDefaultTestEltwiseLayer
(
eltwiseParams
,
eltwiseOp
,
fal
se
);
TestLayerFusion
::
makeDefaultTestEltwiseLayer
(
eltwiseParams
,
eltwiseOp
,
weightedEltwi
se
);
Backend
backendId
=
get
<
0
>
(
get
<
4
>
(
GetParam
()));
Target
targetId
=
get
<
1
>
(
get
<
4
>
(
GetParam
()));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录