Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
magicwindyyd
mindspore
提交
f3bc9b2f
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看板
提交
f3bc9b2f
编写于
8月 31, 2020
作者:
M
mindspore-ci-bot
提交者:
Gitee
8月 31, 2020
浏览文件
操作
浏览文件
下载
差异文件
!5563 Fix C++ coding standard problem
Merge pull request !5563 from yeyunpeng2020/master
上级
591fc859
2f1d04dd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
19 deletion
+16
-19
mindspore/lite/java/native/runtime/ms_tensor.cpp
mindspore/lite/java/native/runtime/ms_tensor.cpp
+1
-1
mindspore/lite/tools/converter/parser/tflite/tflite_util.cc
mindspore/lite/tools/converter/parser/tflite/tflite_util.cc
+15
-18
未找到文件。
mindspore/lite/java/native/runtime/ms_tensor.cpp
浏览文件 @
f3bc9b2f
...
...
@@ -227,7 +227,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_mindspore_lite_MSTensor_setByteBu
jobject
buffer
)
{
jbyte
*
p_data
=
reinterpret_cast
<
jbyte
*>
(
env
->
GetDirectBufferAddress
(
buffer
));
// get buffer poiter
jlong
data_len
=
env
->
GetDirectBufferCapacity
(
buffer
);
// get buffer capacity
if
(
!
p_data
)
{
if
(
p_data
==
nullptr
)
{
MS_LOGE
(
"GetDirectBufferAddress return null"
);
return
NULL
;
}
...
...
mindspore/lite/tools/converter/parser/tflite/tflite_util.cc
浏览文件 @
f3bc9b2f
...
...
@@ -126,14 +126,10 @@ std::map<tflite::ActivationFunctionType, schema::ActivationType> tfMsActivationF
};
std
::
map
<
int
,
TypeId
>
type_map
=
{
{
tflite
::
TensorType_FLOAT64
,
TypeId
::
kNumberTypeFloat64
},
{
tflite
::
TensorType_FLOAT32
,
TypeId
::
kNumberTypeFloat32
},
{
tflite
::
TensorType_FLOAT16
,
TypeId
::
kNumberTypeFloat16
},
{
tflite
::
TensorType_INT32
,
TypeId
::
kNumberTypeInt32
},
{
tflite
::
TensorType_INT16
,
TypeId
::
kNumberTypeInt16
},
{
tflite
::
TensorType_INT8
,
TypeId
::
kNumberTypeInt8
},
{
tflite
::
TensorType_INT64
,
TypeId
::
kNumberTypeInt64
},
{
tflite
::
TensorType_UINT8
,
TypeId
::
kNumberTypeUInt8
},
{
tflite
::
TensorType_FLOAT64
,
TypeId
::
kNumberTypeFloat64
},
{
tflite
::
TensorType_FLOAT32
,
TypeId
::
kNumberTypeFloat32
},
{
tflite
::
TensorType_FLOAT16
,
TypeId
::
kNumberTypeFloat16
},
{
tflite
::
TensorType_INT32
,
TypeId
::
kNumberTypeInt32
},
{
tflite
::
TensorType_INT16
,
TypeId
::
kNumberTypeInt16
},
{
tflite
::
TensorType_INT8
,
TypeId
::
kNumberTypeInt8
},
{
tflite
::
TensorType_INT64
,
TypeId
::
kNumberTypeInt64
},
{
tflite
::
TensorType_UINT8
,
TypeId
::
kNumberTypeUInt8
},
{
tflite
::
TensorType_BOOL
,
TypeId
::
kNumberTypeBool
},
};
...
...
@@ -190,11 +186,8 @@ size_t GetDataTypeSize(const TypeId &data_type) {
}
}
STATUS
getPaddingParam
(
const
std
::
unique_ptr
<
tflite
::
TensorT
>
&
tensor
,
schema
::
PadMode
pad_mode
,
int
strideH
,
int
strideW
,
int
windowH
,
int
windowW
,
std
::
vector
<
int
>
*
params
)
{
STATUS
getPaddingParam
(
const
std
::
unique_ptr
<
tflite
::
TensorT
>
&
tensor
,
schema
::
PadMode
pad_mode
,
int
strideH
,
int
strideW
,
int
windowH
,
int
windowW
,
std
::
vector
<
int
>
*
params
)
{
if
(
tensor
==
nullptr
)
{
MS_LOG
(
ERROR
)
<<
"the input tensor is null"
;
return
RET_ERROR
;
...
...
@@ -208,12 +201,18 @@ STATUS getPaddingParam(const std::unique_ptr<tflite::TensorT> &tensor,
auto
shape
=
tensor
->
shape
;
int
H_input
=
shape
.
at
(
1
);
int
W_input
=
shape
.
at
(
2
);
if
(
strideH
==
0
)
{
MS_LOG
(
ERROR
)
<<
"strideH is zero"
;
return
RET_ERROR
;
}
int
H_output
=
ceil
(
H_input
*
1.0
/
strideH
);
int
pad_needed_H
=
(
H_output
-
1
)
*
strideH
+
windowH
-
H_input
;
padUp
=
floor
(
pad_needed_H
/
2.0
);
padDown
=
pad_needed_H
-
padUp
;
if
(
strideW
==
0
)
{
MS_LOG
(
ERROR
)
<<
"strideW is zero"
;
return
RET_ERROR
;
}
int
W_output
=
ceil
(
W_input
*
1.0
/
strideW
);
int
pad_needed_W
=
(
W_output
-
1
)
*
strideW
+
windowW
-
W_input
;
padLeft
=
floor
(
pad_needed_W
/
2.0
);
...
...
@@ -227,9 +226,7 @@ STATUS getPaddingParam(const std::unique_ptr<tflite::TensorT> &tensor,
return
RET_OK
;
}
void
Split
(
const
std
::
string
&
src_str
,
std
::
vector
<
std
::
string
>
*
dst_str
,
const
std
::
string
&
chr
)
{
void
Split
(
const
std
::
string
&
src_str
,
std
::
vector
<
std
::
string
>
*
dst_str
,
const
std
::
string
&
chr
)
{
std
::
string
::
size_type
p1
=
0
,
p2
=
src_str
.
find
(
chr
);
while
(
std
::
string
::
npos
!=
p2
)
{
dst_str
->
push_back
(
src_str
.
substr
(
p1
,
p2
-
p1
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录