Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
b964e890
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看板
提交
b964e890
编写于
8月 24, 2020
作者:
M
mindspore-ci-bot
提交者:
Gitee
8月 24, 2020
浏览文件
操作
浏览文件
下载
差异文件
!4962 fix bug
Merge pull request !4962 from 徐安越/master
上级
0b46e5bc
a0ef03cc
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
25 addition
and
7 deletion
+25
-7
build.sh
build.sh
+2
-0
mindspore/lite/include/version.h
mindspore/lite/include/version.h
+9
-0
mindspore/lite/src/ops/unsqueeze.cc
mindspore/lite/src/ops/unsqueeze.cc
+1
-1
mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise.cc
...lite/src/runtime/kernel/arm/fp32/convolution_depthwise.cc
+1
-1
mindspore/lite/tools/anf_exporter/anf_exporter.cc
mindspore/lite/tools/anf_exporter/anf_exporter.cc
+8
-2
mindspore/lite/tools/converter/parser/caffe/CMakeLists.txt
mindspore/lite/tools/converter/parser/caffe/CMakeLists.txt
+2
-1
mindspore/lite/tools/converter/parser/caffe/caffe_tanh_parser.cc
...re/lite/tools/converter/parser/caffe/caffe_tanh_parser.cc
+1
-1
mindspore/lite/tools/converter/parser/onnx/onnx_slice_parser.cc
...ore/lite/tools/converter/parser/onnx/onnx_slice_parser.cc
+1
-1
未找到文件。
build.sh
浏览文件 @
b964e890
...
@@ -618,10 +618,12 @@ build_lite()
...
@@ -618,10 +618,12 @@ build_lite()
if
[[
"
${
COMPILE_RET
}
"
-ne
0
]]
;
then
if
[[
"
${
COMPILE_RET
}
"
-ne
0
]]
;
then
echo
"---------------- mindspore lite: build failed ----------------"
echo
"---------------- mindspore lite: build failed ----------------"
exit
1
else
else
mv
${
BASEPATH
}
/output/tmp/
*
.tar.gz
*
${
BASEPATH
}
/output/
mv
${
BASEPATH
}
/output/tmp/
*
.tar.gz
*
${
BASEPATH
}
/output/
rm
-rf
${
BASEPATH
}
/output/tmp/
rm
-rf
${
BASEPATH
}
/output/tmp/
echo
"---------------- mindspore lite: build success ----------------"
echo
"---------------- mindspore lite: build success ----------------"
exit
0
fi
fi
}
}
...
...
mindspore/lite/include/version.h
浏览文件 @
b964e890
...
@@ -24,6 +24,15 @@ namespace lite {
...
@@ -24,6 +24,15 @@ namespace lite {
/// \brief Global method to get a version string.
/// \brief Global method to get a version string.
///
///
/// \return The version string of MindSpore Lite.
/// \return The version string of MindSpore Lite.
#ifndef MS_VERSION_MAJOY
#define MS_VERSION_MAJOY 0
#endif
#ifndef MS_VERSION_MINOR
#define MS_VERSION_MINOR 7
#endif
#ifndef MS_VERSION_REVISION
#define MS_VERSION_REVISION 0
#endif
std
::
string
Version
()
{
std
::
string
Version
()
{
return
"MindSpore Lite "
+
std
::
to_string
(
MS_VERSION_MAJOY
)
+
"."
+
std
::
to_string
(
MS_VERSION_MINOR
)
+
"."
+
return
"MindSpore Lite "
+
std
::
to_string
(
MS_VERSION_MAJOY
)
+
"."
+
std
::
to_string
(
MS_VERSION_MINOR
)
+
"."
+
std
::
to_string
(
MS_VERSION_REVISION
);
std
::
to_string
(
MS_VERSION_REVISION
);
...
...
mindspore/lite/src/ops/unsqueeze.cc
浏览文件 @
b964e890
...
@@ -53,7 +53,7 @@ int Unsqueeze::InferShape(std::vector<tensor::Tensor *> inputs_, std::vector<ten
...
@@ -53,7 +53,7 @@ int Unsqueeze::InferShape(std::vector<tensor::Tensor *> inputs_, std::vector<ten
return
RET_OK
;
return
RET_OK
;
}
}
auto
dims
=
GetAxis
()
.
data
()
;
auto
dims
=
GetAxis
();
auto
in_shape
=
input
->
shape
();
auto
in_shape
=
input
->
shape
();
auto
in_rank
=
in_shape
.
size
();
auto
in_rank
=
in_shape
.
size
();
auto
dim_rank
=
GetAxis
().
size
();
auto
dim_rank
=
GetAxis
().
size
();
...
...
mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise.cc
浏览文件 @
b964e890
...
@@ -30,7 +30,7 @@ using mindspore::schema::PrimitiveType_DepthwiseConv2D;
...
@@ -30,7 +30,7 @@ using mindspore::schema::PrimitiveType_DepthwiseConv2D;
namespace
mindspore
::
kernel
{
namespace
mindspore
::
kernel
{
ConvolutionDepthwiseCPUKernel
::~
ConvolutionDepthwiseCPUKernel
()
{
ConvolutionDepthwiseCPUKernel
::~
ConvolutionDepthwiseCPUKernel
()
{
if
(
packed_weight_
!=
nullptr
)
{
if
(
packed_weight_
!=
nullptr
)
{
delete
packed_weight_
;
free
(
packed_weight_
)
;
packed_weight_
=
nullptr
;
packed_weight_
=
nullptr
;
}
}
}
}
...
...
mindspore/lite/tools/anf_exporter/anf_exporter.cc
浏览文件 @
b964e890
...
@@ -142,7 +142,10 @@ void AnfExporter::SetGraphoutputIndex(const CNodePtr &cnode, const std::unique_p
...
@@ -142,7 +142,10 @@ void AnfExporter::SetGraphoutputIndex(const CNodePtr &cnode, const std::unique_p
MS_ASSERT
(
nullptr
!=
return_node
);
MS_ASSERT
(
nullptr
!=
return_node
);
for
(
size_t
i
=
1
;
i
<
cnode
->
inputs
().
size
();
i
++
)
{
for
(
size_t
i
=
1
;
i
<
cnode
->
inputs
().
size
();
i
++
)
{
auto
input_node
=
cnode
->
input
(
i
);
auto
input_node
=
cnode
->
input
(
i
);
if
(
input_node
->
isa
<
CNode
>
())
{
if
(
input_node
==
nullptr
)
{
MS_LOG
(
ERROR
)
<<
"output node is nullptr"
;
return
;
}
else
if
(
input_node
->
isa
<
CNode
>
())
{
auto
ret
=
ConvertInputCNode
(
input_node
,
return_node
);
auto
ret
=
ConvertInputCNode
(
input_node
,
return_node
);
if
(
ret
!=
RET_OK
)
{
if
(
ret
!=
RET_OK
)
{
MS_LOG
(
ERROR
)
<<
"obtain outputs failed"
;
MS_LOG
(
ERROR
)
<<
"obtain outputs failed"
;
...
@@ -175,7 +178,10 @@ schema::MetaGraphT *AnfExporter::Export(const FuncGraphPtr &func_graph) {
...
@@ -175,7 +178,10 @@ schema::MetaGraphT *AnfExporter::Export(const FuncGraphPtr &func_graph) {
RemoveIfMakeTuple
(
cnode
);
RemoveIfMakeTuple
(
cnode
);
auto
node
=
std
::
make_unique
<
schema
::
CNodeT
>
();
auto
node
=
std
::
make_unique
<
schema
::
CNodeT
>
();
if
(
node
==
nullptr
)
{
MS_LOG
(
ERROR
)
<<
"object failed to be constructed"
;
return
nullptr
;
}
if
(
primT
->
value
.
type
==
schema
::
PrimitiveType_Return
)
{
if
(
primT
->
value
.
type
==
schema
::
PrimitiveType_Return
)
{
node
->
name
=
"return_node"
;
node
->
name
=
"return_node"
;
SetGraphoutputIndex
(
cnode
,
meta_graphT
,
node
.
get
());
SetGraphoutputIndex
(
cnode
,
meta_graphT
,
node
.
get
());
...
...
mindspore/lite/tools/converter/parser/caffe/CMakeLists.txt
浏览文件 @
b964e890
...
@@ -28,4 +28,5 @@ add_library(caffe_parser_mid OBJECT
...
@@ -28,4 +28,5 @@ add_library(caffe_parser_mid OBJECT
${
CMAKE_CURRENT_SOURCE_DIR
}
/caffe_inspector.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/caffe_inspector.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/caffe_interp_parser.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/caffe_interp_parser.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/caffe_permute_parser.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/caffe_permute_parser.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/caffe_tile_parser.cc
)
${
CMAKE_CURRENT_SOURCE_DIR
}
/caffe_tile_parser.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/caffe_tanh_parser.cc
)
mindspore/lite/tools/converter/parser/caffe/caffe_tanh_parser.cc
浏览文件 @
b964e890
...
@@ -32,7 +32,7 @@ STATUS CaffeTanhParser::Parse(const caffe::LayerParameter &proto,
...
@@ -32,7 +32,7 @@ STATUS CaffeTanhParser::Parse(const caffe::LayerParameter &proto,
return
RET_OK
;
return
RET_OK
;
}
}
CaffeNodeRegistrar
g_caffeTanhParser
(
"Tan
h
"
,
new
CaffeTanhParser
());
CaffeNodeRegistrar
g_caffeTanhParser
(
"Tan
H
"
,
new
CaffeTanhParser
());
}
// namespace lite
}
// namespace lite
}
// namespace mindspore
}
// namespace mindspore
mindspore/lite/tools/converter/parser/onnx/onnx_slice_parser.cc
浏览文件 @
b964e890
...
@@ -42,7 +42,7 @@ STATUS OnnxSliceParser::Parse(const onnx::GraphProto &onnx_graph, const onnx::No
...
@@ -42,7 +42,7 @@ STATUS OnnxSliceParser::Parse(const onnx::GraphProto &onnx_graph, const onnx::No
const
auto
&
attribute_name
=
onnx_node_attr
.
name
();
const
auto
&
attribute_name
=
onnx_node_attr
.
name
();
if
(
attribute_name
==
"starts"
)
{
if
(
attribute_name
==
"starts"
)
{
const
int
size
=
onnx_node_attr
.
ints_size
();
const
int
size
=
onnx_node_attr
.
ints_size
();
MS_LOG
(
ERROR
)
<<
"SLICE starts size "
<<
size
;
MS_LOG
(
INFO
)
<<
"SLICE starts size "
<<
size
;
for
(
int
i
=
0
;
i
<
size
;
++
i
)
{
for
(
int
i
=
0
;
i
<
size
;
++
i
)
{
attr
->
begin
.
emplace_back
(
static_cast
<
int32_t
>
(
onnx_node_attr
.
ints
(
i
)));
attr
->
begin
.
emplace_back
(
static_cast
<
int32_t
>
(
onnx_node_attr
.
ints
(
i
)));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录