Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
adbb7555
M
mindspore
项目概览
magicwindyyd
/
mindspore
与 Fork 源项目一致
Fork自
MindSpore / mindspore
通知
1
Star
1
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看板
提交
adbb7555
编写于
8月 26, 2020
作者:
M
mindspore-ci-bot
提交者:
Gitee
8月 26, 2020
浏览文件
操作
浏览文件
下载
差异文件
!4778 Added type support for Reshape gpu kernel for faster RCNN
Merge pull request !4778 from Peilin/reshape-gpu-kernel-type-support
上级
ea29183f
b7a43137
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
132 addition
and
2 deletion
+132
-2
mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.cc
...csrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.cc
+6
-2
tests/st/ops/gpu/test_reshape_op.py
tests/st/ops/gpu/test_reshape_op.py
+126
-0
未找到文件。
mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.cc
浏览文件 @
adbb7555
...
...
@@ -26,10 +26,14 @@ MS_REG_GPU_KERNEL_ONE(Flatten, KernelAttr().AddInputAttr(kNumberTypeFloat16).Add
FlattenGpuFwdKernel
,
half
)
MS_REG_GPU_KERNEL_ONE
(
Reshape
,
KernelAttr
().
AddInputAttr
(
kNumberTypeFloat32
).
AddOutputAttr
(
kNumberTypeFloat32
),
FlattenGpuFwdKernel
,
float
)
MS_REG_GPU_KERNEL_ONE
(
Reshape
,
KernelAttr
().
AddInputAttr
(
kNumberTypeInt32
).
AddOutputAttr
(
kNumberTypeInt32
),
FlattenGpuFwdKernel
,
int
)
MS_REG_GPU_KERNEL_ONE
(
Reshape
,
KernelAttr
().
AddInputAttr
(
kNumberTypeFloat16
).
AddOutputAttr
(
kNumberTypeFloat16
),
FlattenGpuFwdKernel
,
half
)
MS_REG_GPU_KERNEL_ONE
(
Reshape
,
KernelAttr
().
AddInputAttr
(
kNumberTypeInt32
).
AddOutputAttr
(
kNumberTypeInt32
),
FlattenGpuFwdKernel
,
int
)
MS_REG_GPU_KERNEL_ONE
(
Reshape
,
KernelAttr
().
AddInputAttr
(
kNumberTypeUInt8
).
AddOutputAttr
(
kNumberTypeUInt8
),
FlattenGpuFwdKernel
,
uchar
)
MS_REG_GPU_KERNEL_ONE
(
Reshape
,
KernelAttr
().
AddInputAttr
(
kNumberTypeBool
).
AddOutputAttr
(
kNumberTypeBool
),
FlattenGpuFwdKernel
,
bool
)
MS_REG_GPU_KERNEL_ONE
(
ExpandDims
,
KernelAttr
().
AddInputAttr
(
kNumberTypeFloat32
).
AddOutputAttr
(
kNumberTypeFloat32
),
FlattenGpuFwdKernel
,
float
)
MS_REG_GPU_KERNEL_ONE
(
ExpandDims
,
KernelAttr
().
AddInputAttr
(
kNumberTypeFloat16
).
AddOutputAttr
(
kNumberTypeFloat16
),
...
...
tests/st/ops/gpu/test_reshape_op.py
0 → 100644
浏览文件 @
adbb7555
# Copyright 2019 Huawei Technologies Co., Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ============================================================================
import
numpy
as
np
import
pytest
import
mindspore.context
as
context
from
mindspore
import
Tensor
from
mindspore.ops
import
operations
as
P
def
reshape
(
nptype
):
context
.
set_context
(
mode
=
context
.
GRAPH_MODE
,
device_target
=
"GPU"
)
reshape_op
=
P
.
Reshape
()
data
=
np
.
array
([
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
,
11
]).
astype
(
nptype
)
input_tensor
=
Tensor
(
np
.
array
(
data
))
new_shape
=
(
2
,
6
)
output_tensor
=
reshape_op
(
input_tensor
,
new_shape
)
assert
new_shape
==
output_tensor
.
shape
np
.
testing
.
assert_array_equal
(
output_tensor
.
asnumpy
().
flatten
(),
data
)
new_shape
=
(
6
,
2
)
output_tensor
=
reshape_op
(
input_tensor
,
new_shape
)
assert
new_shape
==
output_tensor
.
shape
np
.
testing
.
assert_array_equal
(
output_tensor
.
asnumpy
().
flatten
(),
data
)
new_shape
=
(
3
,
4
)
output_tensor
=
reshape_op
(
input_tensor
,
new_shape
)
assert
new_shape
==
output_tensor
.
shape
np
.
testing
.
assert_array_equal
(
output_tensor
.
asnumpy
().
flatten
(),
data
)
new_shape
=
(
4
,
3
)
output_tensor
=
reshape_op
(
input_tensor
,
new_shape
)
assert
new_shape
==
output_tensor
.
shape
np
.
testing
.
assert_array_equal
(
output_tensor
.
asnumpy
().
flatten
(),
data
)
new_shape
=
(
1
,
12
)
output_tensor
=
reshape_op
(
input_tensor
,
new_shape
)
assert
new_shape
==
output_tensor
.
shape
np
.
testing
.
assert_array_equal
(
output_tensor
.
asnumpy
().
flatten
(),
data
)
new_shape
=
(
12
,
1
)
output_tensor
=
reshape_op
(
input_tensor
,
new_shape
)
assert
new_shape
==
output_tensor
.
shape
np
.
testing
.
assert_array_equal
(
output_tensor
.
asnumpy
().
flatten
(),
data
)
def
reshape_bool
():
context
.
set_context
(
mode
=
context
.
GRAPH_MODE
,
device_target
=
"GPU"
)
reshape_op
=
P
.
Reshape
()
data
=
np
.
array
([
True
,
True
,
False
,
True
,
False
,
False
,
True
,
False
,
False
,
False
,
False
,
False
])
input_tensor
=
Tensor
(
np
.
array
(
data
))
new_shape
=
(
2
,
6
)
output_tensor
=
reshape_op
(
input_tensor
,
new_shape
)
assert
new_shape
==
output_tensor
.
shape
np
.
testing
.
assert_array_equal
(
output_tensor
.
asnumpy
().
flatten
(),
data
)
new_shape
=
(
6
,
2
)
output_tensor
=
reshape_op
(
input_tensor
,
new_shape
)
assert
new_shape
==
output_tensor
.
shape
np
.
testing
.
assert_array_equal
(
output_tensor
.
asnumpy
().
flatten
(),
data
)
new_shape
=
(
3
,
4
)
output_tensor
=
reshape_op
(
input_tensor
,
new_shape
)
assert
new_shape
==
output_tensor
.
shape
np
.
testing
.
assert_array_equal
(
output_tensor
.
asnumpy
().
flatten
(),
data
)
new_shape
=
(
4
,
3
)
output_tensor
=
reshape_op
(
input_tensor
,
new_shape
)
assert
new_shape
==
output_tensor
.
shape
np
.
testing
.
assert_array_equal
(
output_tensor
.
asnumpy
().
flatten
(),
data
)
new_shape
=
(
1
,
12
)
output_tensor
=
reshape_op
(
input_tensor
,
new_shape
)
assert
new_shape
==
output_tensor
.
shape
np
.
testing
.
assert_array_equal
(
output_tensor
.
asnumpy
().
flatten
(),
data
)
new_shape
=
(
12
,
1
)
output_tensor
=
reshape_op
(
input_tensor
,
new_shape
)
assert
new_shape
==
output_tensor
.
shape
np
.
testing
.
assert_array_equal
(
output_tensor
.
asnumpy
().
flatten
(),
data
)
@
pytest
.
mark
.
level0
@
pytest
.
mark
.
platform_x86_gpu_training
@
pytest
.
mark
.
env_onecard
def
test_reshape_float
():
reshape
(
np
.
float32
)
@
pytest
.
mark
.
level0
@
pytest
.
mark
.
platform_x86_gpu_training
@
pytest
.
mark
.
env_onecard
def
test_reshape_float16
():
reshape
(
np
.
float16
)
@
pytest
.
mark
.
level0
@
pytest
.
mark
.
platform_x86_gpu_training
@
pytest
.
mark
.
env_onecard
def
test_reshape_int32
():
reshape
(
np
.
int32
)
@
pytest
.
mark
.
level0
@
pytest
.
mark
.
platform_x86_gpu_training
@
pytest
.
mark
.
env_onecard
def
test_reshape_uint8
():
reshape
(
np
.
uint8
)
@
pytest
.
mark
.
level0
@
pytest
.
mark
.
platform_x86_gpu_training
@
pytest
.
mark
.
env_onecard
def
test_reshape_bool
():
reshape_bool
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录