Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
74bb5675
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看板
提交
74bb5675
编写于
8月 10, 2020
作者:
M
mindspore-ci-bot
提交者:
Gitee
8月 10, 2020
浏览文件
操作
浏览文件
下载
差异文件
!4222 when caffe model has flatten op, it will be converted failed. This code fix this bug
Merge pull request !4222 from zhaodezan/master
上级
9a1b81df
346ea4c5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
75 addition
and
1 deletion
+75
-1
mindspore/lite/src/runtime/kernel/arm/fp32/flatten.h
mindspore/lite/src/runtime/kernel/arm/fp32/flatten.h
+1
-1
mindspore/lite/tools/converter/parser/caffe/caffe_flatten_parser.cc
...lite/tools/converter/parser/caffe/caffe_flatten_parser.cc
+38
-0
mindspore/lite/tools/converter/parser/caffe/caffe_flatten_parser.h
.../lite/tools/converter/parser/caffe/caffe_flatten_parser.h
+36
-0
未找到文件。
mindspore/lite/src/runtime/kernel/arm/fp32/flatten.h
浏览文件 @
74bb5675
...
...
@@ -33,7 +33,7 @@ class FlattenCPUKernel : public LiteKernel {
:
LiteKernel
(
parameter
,
inputs
,
outputs
,
ctx
,
primitive
)
{
flatten_param_
=
reinterpret_cast
<
FlattenParameter
*>
(
parameter
);
}
~
FlattenCPUKernel
()
override
{
delete
flatten_param_
;
}
~
FlattenCPUKernel
()
override
=
default
;;
int
Init
()
override
;
int
ReSize
()
override
;
...
...
mindspore/lite/tools/converter/parser/caffe/caffe_flatten_parser.cc
0 → 100644
浏览文件 @
74bb5675
/**
* Copyright 2020 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.
*/
#include <memory>
#include "mindspore/lite/tools/converter/parser/caffe/caffe_flatten_parser.h"
namespace
mindspore
{
namespace
lite
{
STATUS
CaffeFlattenParser
::
Parse
(
const
caffe
::
LayerParameter
&
proto
,
const
caffe
::
LayerParameter
&
weight
,
schema
::
CNodeT
*
op
,
std
::
vector
<
schema
::
TensorT
*>
*
weightVec
)
{
if
(
op
==
nullptr
)
{
// MS_LOGE("null pointer dereferencing.");
return
RET_NULL_PTR
;
}
std
::
unique_ptr
<
schema
::
ReshapeT
>
attr
(
new
schema
::
ReshapeT
());
attr
->
format
=
schema
::
Format_NCHW
;
op
->
primitive
=
std
::
make_unique
<
schema
::
PrimitiveT
>
();
op
->
primitive
->
value
.
type
=
schema
::
PrimitiveType_Flatten
;
op
->
primitive
->
value
.
value
=
attr
.
release
();
return
RET_OK
;
}
CaffeNodeRegistrar
g_CaffeFlattenParser
(
"Flatten"
,
new
CaffeFlattenParser
());
}
// namespace lite
}
// namespace mindspore
mindspore/lite/tools/converter/parser/caffe/caffe_flatten_parser.h
0 → 100644
浏览文件 @
74bb5675
/**
* Copyright 2020 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.
*/
#ifndef PREDICT_CONVERTER_PARSER_CAFFE_CAFFE_FLATTEN_PARSER_H_
#define PREDICT_CONVERTER_PARSER_CAFFE_CAFFE_FLATTEN_PARSER_H_
#include <vector>
#include "mindspore/lite/tools/converter/parser/caffe/caffe_node_parser.h"
#include "mindspore/lite/tools/converter/parser/caffe/caffe_node_parser_registry.h"
namespace
mindspore
{
namespace
lite
{
class
CaffeFlattenParser
:
public
CaffeNodeParser
{
public:
CaffeFlattenParser
()
:
CaffeNodeParser
(
"flatten"
)
{}
STATUS
Parse
(
const
caffe
::
LayerParameter
&
proto
,
const
caffe
::
LayerParameter
&
weight
,
schema
::
CNodeT
*
op
,
std
::
vector
<
schema
::
TensorT
*>
*
weightVec
)
override
;
};
}
// namespace lite
}
// namespace mindspore
#endif // PREDICT_CONVERTER_PARSER_CAFFE_CAFFE_FLATTEN_PARSER_H_
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录