Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
正统之独孤求败
mindspore
提交
59683a1d
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,发现更多精彩内容 >>
提交
59683a1d
编写于
5月 30, 2020
作者:
M
mindspore-ci-bot
提交者:
Gitee
5月 30, 2020
浏览文件
操作
浏览文件
下载
差异文件
!1692 Fix topk bug for fasterrcnn
Merge pull request !1692 from meixiaowei/master
上级
6f92c4a1
1778ec01
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
19 addition
and
5 deletion
+19
-5
mindspore/ccsrc/pre_activate/ascend/ir_fission/topk_split.cc
mindspore/ccsrc/pre_activate/ascend/ir_fission/topk_split.cc
+13
-2
model_zoo/faster_rcnn/scripts/run_distribute_train.sh
model_zoo/faster_rcnn/scripts/run_distribute_train.sh
+1
-0
model_zoo/faster_rcnn/scripts/run_eval.sh
model_zoo/faster_rcnn/scripts/run_eval.sh
+1
-0
model_zoo/faster_rcnn/scripts/run_standalone_train.sh
model_zoo/faster_rcnn/scripts/run_standalone_train.sh
+1
-0
model_zoo/faster_rcnn/src/config.py
model_zoo/faster_rcnn/src/config.py
+1
-1
model_zoo/faster_rcnn/src/dataset.py
model_zoo/faster_rcnn/src/dataset.py
+1
-1
tests/ut/cpp/pre_activate/ascend/ir_fission/topk_split_test.cc
.../ut/cpp/pre_activate/ascend/ir_fission/topk_split_test.cc
+1
-1
未找到文件。
mindspore/ccsrc/pre_activate/ascend/ir_fission/topk_split.cc
浏览文件 @
59683a1d
...
...
@@ -35,7 +35,7 @@ tensor::TensorPtr CreateTensor(const AnfNodePtr &node) {
// 1 create tensor
auto
shape
=
AnfAlgo
::
GetPrevNodeOutputInferShape
(
node
,
0
);
auto
last_dim
=
shape
[
shape
.
size
()
-
1
];
std
::
vector
<
int
>
indices_shape
=
{
SizeToInt
(
last_dim
)};
std
::
vector
<
int
>
indices_shape
=
{
SizeToInt
(
last_dim
*
2
)};
TensorTypePtr
tensor_type
=
std
::
make_shared
<
TensorType
>
(
kFloat16
);
MS_EXCEPTION_IF_NULL
(
tensor_type
);
tensor
::
DeviceInfo
device_info
{
kOpFormat_DEFAULT
,
tensor_type
};
...
...
@@ -50,7 +50,11 @@ tensor::TensorPtr CreateTensor(const AnfNodePtr &node) {
for
(
size_t
i
=
0
;
i
<
last_dim
;
++
i
)
{
half_data
.
emplace_back
(
Eigen
::
half
(
static_cast
<
float
>
(
i
)));
}
auto
elem_num
=
last_dim
*
kFloat16Len
;
for
(
size_t
i
=
0
;
i
<
last_dim
;
++
i
)
{
auto
gap
=
static_cast
<
int
>
(
i
)
-
static_cast
<
int
>
(
Eigen
::
half
(
static_cast
<
float
>
(
i
)));
half_data
.
emplace_back
(
Eigen
::
half
(
static_cast
<
float
>
(
gap
)));
}
auto
elem_num
=
last_dim
*
kFloat16Len
*
2
;
auto
ret_code
=
memcpy_s
(
data_ptr
,
static_cast
<
size_t
>
(
indices_tensor
->
data
().
nbytes
()),
half_data
.
data
(),
elem_num
);
if
(
ret_code
!=
0
)
{
MS_LOG
(
ERROR
)
<<
"Failed to copy data into Tensor."
;
...
...
@@ -108,6 +112,13 @@ const AnfNodePtr TopKSplit::Process(const FuncGraphPtr &func_graph, const AnfNod
MS_LOG
(
INFO
)
<<
"The input k of topk has been converted to attr"
;
return
nullptr
;
}
auto
shape
=
AnfAlgo
::
GetPrevNodeOutputInferShape
(
node
,
0
);
auto
last_dim
=
shape
[
shape
.
size
()
-
1
];
const
size_t
kMaxFloat16
=
65500
;
if
(
last_dim
>
kMaxFloat16
)
{
MS_LOG
(
INFO
)
<<
"The last dim is more than 65500, switch to aicpu ops."
;
return
nullptr
;
}
// Copy a new node to check supported.
std
::
vector
<
AnfNodePtr
>
new_inputs
{
NewValueNode
(
std
::
make_shared
<
Primitive
>
(
kTopKOpName
))};
new_inputs
.
insert
(
new_inputs
.
end
(),
cnode
->
inputs
().
begin
()
+
1
,
cnode
->
inputs
().
end
());
...
...
model_zoo/faster_rcnn/scripts/run_distribute_train.sh
浏览文件 @
59683a1d
...
...
@@ -59,6 +59,7 @@ do
mkdir
./train_parallel
$i
cp
../
*
.py ./train_parallel
$i
cp
*
.sh ./train_parallel
$i
cp
-r
../src ./train_parallel
$i
cd
./train_parallel
$i
||
exit
echo
"start training for rank
$RANK_ID
, device
$DEVICE_ID
"
env
>
env.log
...
...
model_zoo/faster_rcnn/scripts/run_eval.sh
浏览文件 @
59683a1d
...
...
@@ -57,6 +57,7 @@ fi
mkdir
./eval
cp
../
*
.py ./eval
cp
*
.sh ./eval
cp
-r
../src ./eval
cd
./eval
||
exit
env
>
env.log
echo
"start eval for device
$DEVICE_ID
"
...
...
model_zoo/faster_rcnn/scripts/run_standalone_train.sh
浏览文件 @
59683a1d
...
...
@@ -49,6 +49,7 @@ fi
mkdir
./train
cp
../
*
.py ./train
cp
*
.sh ./train
cp
-r
../src ./train
cd
./train
||
exit
echo
"start training for device
$DEVICE_ID
"
env
>
env.log
...
...
model_zoo/faster_rcnn/src/config.py
浏览文件 @
59683a1d
...
...
@@ -134,7 +134,7 @@ config = ed({
"keep_checkpoint_max"
:
10
,
"save_checkpoint_path"
:
"./checkpoint"
,
"mindrecord_dir"
:
"../MindReco
i
d_COCO_TRAIN"
,
"mindrecord_dir"
:
"../MindReco
r
d_COCO_TRAIN"
,
"coco_root"
:
"./cocodataset/"
,
"train_data_type"
:
"train2017"
,
"val_data_type"
:
"val2017"
,
...
...
model_zoo/faster_rcnn/src/dataset.py
浏览文件 @
59683a1d
...
...
@@ -24,7 +24,7 @@ import mmcv
import
mindspore.dataset
as
de
import
mindspore.dataset.transforms.vision.c_transforms
as
C
from
mindspore.mindrecord
import
FileWriter
from
config
import
config
from
src.
config
import
config
def
bbox_overlaps
(
bboxes1
,
bboxes2
,
mode
=
'iou'
):
...
...
tests/ut/cpp/pre_activate/ascend/ir_fission/topk_split_test.cc
浏览文件 @
59683a1d
...
...
@@ -90,7 +90,7 @@ TEST_F(TestHWTopKSplit, test_topk_split) {
EXPECT_TRUE
(
value_node
->
value
()
->
isa
<
tensor
::
Tensor
>
());
auto
tensor
=
value_node
->
value
()
->
cast
<
tensor
::
TensorPtr
>
();
EXPECT_EQ
(
tensor
->
shape
().
size
(),
1
);
EXPECT_EQ
(
tensor
->
shape
()[
0
],
4
);
EXPECT_EQ
(
tensor
->
shape
()[
0
],
8
);
}
TEST_F
(
TestHWTopKSplit
,
test_topk_no_split
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录