Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
正统之独孤求败
mindspore
提交
fe9008f7
M
mindspore
项目概览
正统之独孤求败
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mindspore
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fe9008f7
编写于
4月 26, 2020
作者:
V
VectorSL
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix codex for gpu conv2d
上级
eefb6edd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
51 addition
and
44 deletion
+51
-44
mindspore/ccsrc/kernel/gpu/nn/conv2d_gpu_kernel.h
mindspore/ccsrc/kernel/gpu/nn/conv2d_gpu_kernel.h
+19
-17
mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_filter_gpu_kernel.h
...spore/ccsrc/kernel/gpu/nn/conv2d_grad_filter_gpu_kernel.h
+16
-14
mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_input_gpu_kernel.h
mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_input_gpu_kernel.h
+16
-13
未找到文件。
mindspore/ccsrc/kernel/gpu/nn/conv2d_gpu_kernel.h
浏览文件 @
fe9008f7
...
...
@@ -114,23 +114,7 @@ class Conv2dGpuFwdKernel : public GpuKernel {
pad_height_
=
GetAttr
<
int
>
(
kernel_node
,
"pad"
);
pad_width_
=
pad_height_
;
pad_mode_
=
GetAttr
<
std
::
string
>
(
kernel_node
,
"pad_mode"
);
auto
stride_ori
=
AnfAlgo
::
GetNodeAttr
<
std
::
vector
<
int
>>
(
kernel_node
,
"stride"
);
auto
dilation_ori
=
AnfAlgo
::
GetNodeAttr
<
std
::
vector
<
int
>>
(
kernel_node
,
"dilation"
);
if
(
stride_ori
.
size
()
!=
4
||
stride_ori
[
2
]
!=
stride_ori
[
3
])
{
MS_LOG
(
EXCEPTION
)
<<
"conv2d only support equal stride, and stride must be 4d!"
;
}
if
(
stride_ori
[
0
]
!=
1
||
stride_ori
[
1
]
!=
1
)
{
MS_LOG
(
EXCEPTION
)
<<
"conv2d stride only support 1 in N axis and C axis!"
;
}
if
(
dilation_ori
.
size
()
!=
4
||
dilation_ori
[
2
]
!=
dilation_ori
[
3
])
{
MS_LOG
(
EXCEPTION
)
<<
"conv2d only support equal dilation, and dilation must be 4d!"
;
}
if
(
dilation_ori
[
0
]
!=
1
||
dilation_ori
[
1
]
!=
1
)
{
MS_LOG
(
EXCEPTION
)
<<
"conv2d dilation only support 1 in N axis and C axis!"
;
}
stride_
=
stride_ori
[
2
];
dilation_
=
dilation_ori
[
2
];
SetStrideAndDilation
(
kernel_node
);
cudnnTensorDescriptor_t
input_descriptor_real
=
nullptr
;
if
(
pad_mode_
==
kSamePadModeUpperCase
||
pad_mode_
==
kSamePadModeLowerCase
)
{
SetPad
(
in_shape
,
kernel_node
);
...
...
@@ -277,6 +261,24 @@ class Conv2dGpuFwdKernel : public GpuKernel {
conv_algorithm_
=
perf_results
.
algo
;
}
}
void
SetStrideAndDilation
(
const
CNodePtr
&
kernel_node
)
{
auto
stride_ori
=
AnfAlgo
::
GetNodeAttr
<
std
::
vector
<
int
>>
(
kernel_node
,
"stride"
);
auto
dilation_ori
=
AnfAlgo
::
GetNodeAttr
<
std
::
vector
<
int
>>
(
kernel_node
,
"dilation"
);
if
(
stride_ori
.
size
()
!=
4
||
stride_ori
[
2
]
!=
stride_ori
[
3
])
{
MS_LOG
(
EXCEPTION
)
<<
"conv2d only support equal stride, and stride must be 4d!"
;
}
if
(
stride_ori
[
0
]
!=
1
||
stride_ori
[
1
]
!=
1
)
{
MS_LOG
(
EXCEPTION
)
<<
"conv2d stride only support 1 in N axis and C axis!"
;
}
if
(
dilation_ori
.
size
()
!=
4
||
dilation_ori
[
2
]
!=
dilation_ori
[
3
])
{
MS_LOG
(
EXCEPTION
)
<<
"conv2d only support equal dilation, and dilation must be 4d!"
;
}
if
(
dilation_ori
[
0
]
!=
1
||
dilation_ori
[
1
]
!=
1
)
{
MS_LOG
(
EXCEPTION
)
<<
"conv2d dilation only support 1 in N axis and C axis!"
;
}
stride_
=
stride_ori
[
2
];
dilation_
=
dilation_ori
[
2
];
}
cudnnHandle_t
cudnn_handle_
;
cudnnTensorDescriptor_t
input_desc_
;
cudnnTensorDescriptor_t
output_desc_
;
...
...
mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_filter_gpu_kernel.h
浏览文件 @
fe9008f7
...
...
@@ -117,19 +117,7 @@ class ConvGradFilterGpuBkwKernel : public GpuKernel {
pad_height_
=
GetAttr
<
int
>
(
kernel_node
,
"pad"
);
pad_width_
=
pad_height_
;
pad_mode_
=
GetAttr
<
std
::
string
>
(
kernel_node
,
"pad_mode"
);
auto
stride_ori
=
AnfAlgo
::
GetNodeAttr
<
std
::
vector
<
int
>>
(
kernel_node
,
"stride"
);
auto
dilation_ori
=
AnfAlgo
::
GetNodeAttr
<
std
::
vector
<
int
>>
(
kernel_node
,
"dilation"
);
if
(
stride_ori
.
size
()
!=
2
||
stride_ori
[
0
]
!=
stride_ori
[
1
])
{
MS_LOG
(
EXCEPTION
)
<<
"ConvGradFilterGpuBkwKernel only support equal stride, and stride must be 2d!"
;
}
if
(
dilation_ori
.
size
()
!=
4
||
dilation_ori
[
2
]
!=
dilation_ori
[
3
])
{
MS_LOG
(
EXCEPTION
)
<<
"ConvGradFilterGpuBkwKernel only support equal dilation, and dilation must be 4d!"
;
}
if
(
dilation_ori
[
0
]
!=
1
||
dilation_ori
[
1
]
!=
1
)
{
MS_LOG
(
EXCEPTION
)
<<
"ConvGradFilterGpuBkwKernel dilation only support 1 in N axis and C axis!"
;
}
stride_
=
stride_ori
[
0
];
dilation_
=
dilation_ori
[
2
];
SetStrideAndDilation
(
kernel_node
);
cudnnTensorDescriptor_t
x_desc_real
=
nullptr
;
if
(
pad_mode_
==
kSamePadModeUpperCase
||
pad_mode_
==
kSamePadModeLowerCase
)
{
SetPad
(
in_shape
,
kernel_node
);
...
...
@@ -281,7 +269,21 @@ class ConvGradFilterGpuBkwKernel : public GpuKernel {
SizeToInt
(
in_shape
[
1
]),
SizeToInt
(
in_shape
[
2
]),
SizeToInt
(
in_shape
[
3
])),
"SetTensor4dDescriptor failed"
);
}
void
SetStrideAndDilation
(
const
CNodePtr
&
kernel_node
)
{
auto
stride_ori
=
AnfAlgo
::
GetNodeAttr
<
std
::
vector
<
int
>>
(
kernel_node
,
"stride"
);
auto
dilation_ori
=
AnfAlgo
::
GetNodeAttr
<
std
::
vector
<
int
>>
(
kernel_node
,
"dilation"
);
if
(
stride_ori
.
size
()
!=
2
||
stride_ori
[
0
]
!=
stride_ori
[
1
])
{
MS_LOG
(
EXCEPTION
)
<<
"ConvGradFilterGpuBkwKernel only support equal stride, and stride must be 2d!"
;
}
if
(
dilation_ori
.
size
()
!=
4
||
dilation_ori
[
2
]
!=
dilation_ori
[
3
])
{
MS_LOG
(
EXCEPTION
)
<<
"ConvGradFilterGpuBkwKernel only support equal dilation, and dilation must be 4d!"
;
}
if
(
dilation_ori
[
0
]
!=
1
||
dilation_ori
[
1
]
!=
1
)
{
MS_LOG
(
EXCEPTION
)
<<
"ConvGradFilterGpuBkwKernel dilation only support 1 in N axis and C axis!"
;
}
stride_
=
stride_ori
[
0
];
dilation_
=
dilation_ori
[
2
];
}
cudnnHandle_t
cudnn_handle_
;
cudnnFilterDescriptor_t
dw_desc_
;
cudnnConvolutionDescriptor_t
conv_desc_
;
...
...
mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_input_gpu_kernel.h
浏览文件 @
fe9008f7
...
...
@@ -118,19 +118,7 @@ class ConvGradInputGpuBkwKernel : public GpuKernel {
pad_height_
=
GetAttr
<
int
>
(
kernel_node
,
"pad"
);
pad_width_
=
pad_height_
;
pad_mode_
=
GetAttr
<
std
::
string
>
(
kernel_node
,
"pad_mode"
);
auto
stride_ori
=
AnfAlgo
::
GetNodeAttr
<
std
::
vector
<
int
>>
(
kernel_node
,
"stride"
);
auto
dilation_ori
=
AnfAlgo
::
GetNodeAttr
<
std
::
vector
<
int
>>
(
kernel_node
,
"dilation"
);
if
(
stride_ori
.
size
()
!=
2
||
stride_ori
[
0
]
!=
stride_ori
[
1
])
{
MS_LOG
(
EXCEPTION
)
<<
"ConvGradInputGpuBkwKernel only support equal stride, and stride must be 2d!"
;
}
if
(
dilation_ori
.
size
()
!=
4
||
dilation_ori
[
2
]
!=
dilation_ori
[
3
])
{
MS_LOG
(
EXCEPTION
)
<<
"ConvGradInputGpuBkwKernel only support equal dilation, and dilation must be 4d!"
;
}
if
(
dilation_ori
[
0
]
!=
1
||
dilation_ori
[
1
]
!=
1
)
{
MS_LOG
(
EXCEPTION
)
<<
"ConvGradInputGpuBkwKernel dilation only support 1 in N axis and C axis!"
;
}
stride_
=
stride_ori
[
0
];
dilation_
=
dilation_ori
[
2
];
SetStrideAndDilation
(
kernel_node
);
cudnnTensorDescriptor_t
dx_desc_real
=
nullptr
;
if
(
pad_mode_
==
kSamePadModeUpperCase
||
pad_mode_
==
kSamePadModeLowerCase
)
{
SetPad
(
input_shape
,
kernel_node
);
...
...
@@ -279,6 +267,21 @@ class ConvGradInputGpuBkwKernel : public GpuKernel {
input_shape
[
2
],
input_shape
[
3
]),
"SetTensor4dDescriptor failed"
);
}
void
SetStrideAndDilation
(
const
CNodePtr
&
kernel_node
)
{
auto
stride_ori
=
AnfAlgo
::
GetNodeAttr
<
std
::
vector
<
int
>>
(
kernel_node
,
"stride"
);
auto
dilation_ori
=
AnfAlgo
::
GetNodeAttr
<
std
::
vector
<
int
>>
(
kernel_node
,
"dilation"
);
if
(
stride_ori
.
size
()
!=
2
||
stride_ori
[
0
]
!=
stride_ori
[
1
])
{
MS_LOG
(
EXCEPTION
)
<<
"ConvGradInputGpuBkwKernel only support equal stride, and stride must be 2d!"
;
}
if
(
dilation_ori
.
size
()
!=
4
||
dilation_ori
[
2
]
!=
dilation_ori
[
3
])
{
MS_LOG
(
EXCEPTION
)
<<
"ConvGradInputGpuBkwKernel only support equal dilation, and dilation must be 4d!"
;
}
if
(
dilation_ori
[
0
]
!=
1
||
dilation_ori
[
1
]
!=
1
)
{
MS_LOG
(
EXCEPTION
)
<<
"ConvGradInputGpuBkwKernel dilation only support 1 in N axis and C axis!"
;
}
stride_
=
stride_ori
[
0
];
dilation_
=
dilation_ori
[
2
];
}
cudnnHandle_t
cudnn_handle_
;
cudnnFilterDescriptor_t
w_desc_
;
cudnnConvolutionDescriptor_t
conv_desc_
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录