Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
b618b734
P
Paddle-Lite
项目概览
PaddlePaddle
/
Paddle-Lite
通知
331
Star
4
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
271
列表
看板
标记
里程碑
合并请求
78
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle-Lite
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
271
Issue
271
列表
看板
标记
里程碑
合并请求
78
合并请求
78
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
b618b734
编写于
3月 08, 2019
作者:
H
Houjiang Chen
提交者:
GitHub
3月 08, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1477 from smilejames/develop
1.修复arm_linux平台编译问题;2.关闭线上log
上级
3c59af2e
e935d589
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
2 deletion
+5
-2
CMakeLists.txt
CMakeLists.txt
+1
-1
src/io/ios_io/PaddleMobileCPU.mm
src/io/ios_io/PaddleMobileCPU.mm
+1
-0
src/operators/kernel/arm/quantize_kernel.cpp
src/operators/kernel/arm/quantize_kernel.cpp
+1
-1
src/operators/kernel/logical_kernel.h
src/operators/kernel/logical_kernel.h
+2
-0
未找到文件。
CMakeLists.txt
浏览文件 @
b618b734
...
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0.0)
...
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0.0)
option
(
USE_OPENMP
"build with openmp support"
ON
)
option
(
USE_OPENMP
"build with openmp support"
ON
)
option
(
USE_EXCEPTION
"build with exception"
ON
)
option
(
USE_EXCEPTION
"build with exception"
ON
)
option
(
WITH_LOGGING
"print logging for debug"
O
N
)
option
(
WITH_LOGGING
"print logging for debug"
O
FF
)
option
(
WITH_SYMBOL
"build with all symbols"
ON
)
# turn off if use jni or ios io
option
(
WITH_SYMBOL
"build with all symbols"
ON
)
# turn off if use jni or ios io
option
(
WITH_PROFILE
"print op profile for debug"
OFF
)
option
(
WITH_PROFILE
"print op profile for debug"
OFF
)
option
(
WITH_TEST
"build with unit tests"
ON
)
option
(
WITH_TEST
"build with unit tests"
ON
)
...
...
src/io/ios_io/PaddleMobileCPU.mm
浏览文件 @
b618b734
...
@@ -343,6 +343,7 @@ static std::mutex shared_mutex;
...
@@ -343,6 +343,7 @@ static std::mutex shared_mutex;
[
cpuResult
toSetDim
:
ocDim
];
[
cpuResult
toSetDim
:
ocDim
];
[
cpuResult
toSetOutputSize
:
output_tensor
->
numel
()];
[
cpuResult
toSetOutputSize
:
output_tensor
->
numel
()];
free
(
output
);
CFRelease
(
cfData
);
CFRelease
(
cfData
);
cfData
=
NULL
;
cfData
=
NULL
;
...
...
src/operators/kernel/arm/quantize_kernel.cpp
浏览文件 @
b618b734
...
@@ -167,7 +167,7 @@ float find_abs_max(const Tensor *input) {
...
@@ -167,7 +167,7 @@ float find_abs_max(const Tensor *input) {
max_abs
=
vmaxvq_f32
(
__max
);
max_abs
=
vmaxvq_f32
(
__max
);
#endif
#endif
for
(
size_t
i
=
0
;
i
<
remain
;
++
i
)
{
for
(
size_t
i
=
0
;
i
<
remain
;
++
i
)
{
max_abs
=
std
::
max
(
max_abs
,
fabs
(
x
[
i
]
));
max_abs
=
std
::
max
(
max_abs
,
static_cast
<
float
>
(
fabs
(
x
[
i
])
));
}
}
return
max_abs
;
return
max_abs
;
}
}
...
...
src/operators/kernel/logical_kernel.h
浏览文件 @
b618b734
...
@@ -14,6 +14,8 @@ limitations under the License. */
...
@@ -14,6 +14,8 @@ limitations under the License. */
#pragma once
#pragma once
#include <algorithm>
#include "framework/operator.h"
#include "framework/operator.h"
#include "operators/op_param.h"
#include "operators/op_param.h"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录