未验证 提交 b618b734 编写于 作者: H Houjiang Chen 提交者: GitHub

Merge pull request #1477 from smilejames/develop

1.修复arm_linux平台编译问题;2.关闭线上log
...@@ -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" ON) option(WITH_LOGGING "print logging for debug" OFF)
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)
......
...@@ -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;
......
...@@ -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;
} }
......
...@@ -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.
先完成此消息的编辑!
想要评论请 注册