m53297601
/
mindspore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean building warnings for arm64 platform.

Browse Source
pull/5044/head
wsc 5 years ago
parent 226f019e45
commit b0f9b5dc59
40 changed files with 63 additions and 114 deletions
Show Stats Download Patch File Download Diff File

3
mindspore/core/utils/log_adapter.h
Unescape View File

@ -147,7 +147,7 @@ class LogWriter {
LogWriter(const LocationInfo &location, MsLogLevel log_level, SubModuleId submodule,
ExceptionType excp_type = NoExceptionType)
: location_(location), log_level_(log_level), submodule_(submodule), exception_type_(excp_type) {}
: location_(location), log_level_(log_level), exception_type_(excp_type) {}
~LogWriter() = default;
void operator<(const LogStream &stream) const noexcept __attribute__((visibility("default")));
@ -161,7 +161,6 @@ class LogWriter {
LocationInfo location_;
MsLogLevel log_level_;
SubModuleId submodule_;
ExceptionType exception_type_;
inline static ExceptionHandler exception_handler_ = nullptr;

31
mindspore/lite/CMakeLists.txt
Unescape View File

@ -65,22 +65,21 @@ set(CMAKE_VERBOSE_MAKEFILE on)
add_compile_definitions(USE_ANDROID_LOG)
add_compile_definitions(NO_DLIB)
add_compile_options(-fPIC)
if (NOT PLATFORM_ARM64 AND NOT PLATFORM_ARM32)
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDebug -g")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDebug -g")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=default")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default")
else ()
## enable for binscope for release
set(CMAKE_C_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes -Wno-deprecated-declarations ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes -Wno-deprecated-declarations ${CMAKE_CXX_FLAGS}")
if (NOT WIN32)
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,relro,-z,now -Wl,-z,noexecstack ${CMAKE_SHARED_LINKER_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now -Wl,-z,noexecstack ${CMAKE_EXE_LINKER_FLAGS}")
endif()
string(REPLACE " -g " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif ()
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDebug -g")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDebug -g")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=default")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default")
else ()
## enable for binscope for release
set(CMAKE_C_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes -Wno-deprecated-declarations -Wno-missing-braces -Wno-overloaded-virtual ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes -Wno-deprecated-declarations -Wno-missing-braces -Wno-overloaded-virtual ${CMAKE_CXX_FLAGS}")
if (NOT WIN32)
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,relro,-z,now -Wl,-z,noexecstack ${CMAKE_SHARED_LINKER_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now -Wl,-z,noexecstack ${CMAKE_EXE_LINKER_FLAGS}")
endif()
string(REPLACE " -g " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif ()
if (BUILD_DEVICE)

2
mindspore/lite/nnacl/arithmetic_common.h
Unescape View File

@ -51,6 +51,8 @@ void TileOneDimension(float *inData, float *outData, int dim, size_t ndim, int *
int *outStrides, int *multiple);
void ComputeStrides(int *shape, int *strides, int ndim);
void CalcMultiplesAndStrides(ArithmeticParameter *param);
void TileDimensions(float *data0, float *data1, float *tile_data0, float *tile_data1, ArithmeticParameter *param);
void TileDimensionsUint8(uint8_t *data0, uint8_t *data1, uint8_t *tile_data0, uint8_t *tile_data1,
ArithmeticParameter *param);

1
mindspore/lite/nnacl/fp16/conv_fp16.c
Unescape View File

@ -395,7 +395,6 @@ void Conv3x3Fp16(float16_t *input_data, float16_t *transed_weight, const float16
int input_batch = conv_param->input_batch_;
for (int batch = 0; batch < input_batch; batch++) {
int in_batch_offset = batch * ic4 * C4NUM * conv_param->input_h_ * conv_param->input_w_;
int tmp_out_batch_offset = batch * oc8 * C8NUM * out_w_block * out_h_block * output_unit * output_unit;
for (int thread_id = task_id; thread_id < output_tile_count; thread_id += thread_count) {
int start_index = thread_id * tile_num;

1
mindspore/lite/nnacl/fp16/pack_fp16.c
Unescape View File

@ -55,7 +55,6 @@ void Im2ColPackUnitFp16(float16_t *input_data, ConvParameter *conv_param, float1
int in_w = conv_param->input_w_;
int out_w = conv_param->output_w_;
int channel_block = UP_DIV(in_channel, 4);
int kernel_plane = kernel_h * kernel_w;
for (int i = 0; i < real_cal_num; i++) {
int block_start = block_index + i;

2
mindspore/lite/nnacl/fp16/winograd_transform_fp16.c
Unescape View File

@ -607,7 +607,7 @@ void WinogradInputTransformFp16(const float16_t *input_data, float16_t *trans_in
for (int j = 0; j < (interval_x_e - interval_x_s); j++) {
int src_x_offset = src_y_offset + j * ic8 * C8NUM;
int dst_x_offset = dst_y_offset + j * C8NUM;
float16_t *src_addr = input_data + src_x_offset;
const float16_t *src_addr = input_data + src_x_offset;
float16_t *dst_addr = tmp_data + dst_x_offset;
#ifdef ENABLE_NEON
vst1q_f16(dst_addr, vld1q_f16(src_addr));

3
mindspore/lite/nnacl/int8/conv_int8.c
Unescape View File

@ -28,7 +28,7 @@ void IndirectGemmInt8(int8_t *dst, int32_t *tmp_dst, const int8_t *src, const in
int32_t out_zp = conv_param->conv_quant_arg_.output_quant_args_[0].zp_;
int32_t act_min = conv_param->conv_quant_arg_.out_act_min_[0];
int32_t act_max = conv_param->conv_quant_arg_.out_act_max_[0];
int oc4 = UP_DIV(output_channel, C4NUM);
#ifdef ENABLE_ARM64
size_t asymmetric = conv_param->conv_quant_arg_.asymmetric_ & FILTER_ASYMMETRIC;
size_t per_channel = conv_param->conv_quant_arg_.per_channel_ & FILTER_PER_CHANNEL;
@ -36,6 +36,7 @@ void IndirectGemmInt8(int8_t *dst, int32_t *tmp_dst, const int8_t *src, const in
output_channel * sizeof(int8_t), input_sum, act_min, act_max, out_zp, out_multiplier,
shift_before, shift_after, asymmetric, per_channel);
#else
int oc4 = UP_DIV(output_channel, C4NUM);
int tile_num = conv_param->tile_num_;
int plane_c4 = UP_DIV(kernel_plane, C4NUM);
for (int oc = 0; oc < output_channel; oc++) {

11
mindspore/lite/nnacl/int8/matmul_int8.c
Unescape View File

@ -63,16 +63,17 @@ void RowMajor2Row16x4MajorInt8(void *src_ptr, void *dst_ptr, int row, int col) {
for (int ri = 0; ri < row_4div; ri += C4NUM) {
for (int ci = 0; ci < col_16div; ci += C16NUM) {
#ifdef ENABLE_ARM64
size_t col_offset = col;
int8_t *src_c = src_r + ci;
int8_t *dst_c = dst_r + ci * C4NUM;
asm volatile(
"mov x10, %[src_c] \n"
"mov x11, %[dst_c] \n"
"ld1 {v0.16b}, [x10], %[col]\n"
"ld1 {v1.16b}, [x10], %[col]\n"
"ld1 {v2.16b}, [x10], %[col]\n"
"ld1 {v3.16b}, [x10], %[col]\n"
"ld1 {v0.16b}, [x10], %[col_offset]\n"
"ld1 {v1.16b}, [x10], %[col_offset]\n"
"ld1 {v2.16b}, [x10], %[col_offset]\n"
"ld1 {v3.16b}, [x10], %[col_offset]\n"
"st1 {v0.16b}, [x11], #16\n"
"st1 {v1.16b}, [x11], #16\n"
@ -80,7 +81,7 @@ void RowMajor2Row16x4MajorInt8(void *src_ptr, void *dst_ptr, int row, int col) {
"st1 {v3.16b}, [x11], #16\n"
:
: [ dst_c ] "r"(dst_c), [ src_c ] "r"(src_c), [ col ] "r"(col)
: [ dst_c ] "r"(dst_c), [ src_c ] "r"(src_c), [ col_offset ] "r"(col_offset)
: "x10", "x11", "v0", "v1", "v2", "v3");
#else
MatrixPack4x16UnitInt8(src_r + ci, dst_r + ci * C4NUM, C4NUM, C16NUM, col);

6
mindspore/lite/nnacl/winograd_transform.c
Unescape View File

@ -1225,9 +1225,9 @@ void Conv3x3Uint8OutputUnit(const int32_t *gemm_out, const int32_t *bias_data, i
ls = vld1q_s32(left_shift);
rs = vld1q_s32(right_shift);
} else {
out_multiplier = vdupq_n_s32(quant_multiplier);
ls = vdupq_n_s32(left_shift);
rs = vdupq_n_s32(right_shift);
out_multiplier = vdupq_n_s32(quant_multiplier[0]);
ls = vdupq_n_s32(left_shift[0]);
rs = vdupq_n_s32(right_shift[0]);
}
int32x4_t out_zp = vdupq_n_s32(output_zp);
int32x4_t output_min = vdupq_n_s32(out_min);

4
mindspore/lite/src/common/graph_util.cc
Unescape View File

@ -43,7 +43,7 @@ std::vector<size_t> GetGraphInputNodes(const schema::MetaGraph *meta_graph) {
}
}
}
return std::move(ret);
return ret;
}
std::vector<size_t> GetGraphOutputNodes(const schema::MetaGraph *meta_graph) {
@ -64,7 +64,7 @@ std::vector<size_t> GetGraphOutputNodes(const schema::MetaGraph *meta_graph) {
}
}
}
return std::move(ret);
return ret;
}
// NODE_ID OpNode::ID() { return id; }

5
mindspore/lite/src/ops/resize.cc
Unescape View File

@ -54,7 +54,10 @@ int Resize::InferShape(std::vector<lite::tensor::Tensor *> inputs_, std::vector<
if (input == nullptr) {
return 1;
}
MS_ASSERT(input->shape().size() == kInputRank);
if (input->shape().size() != kInputRank) {
MS_LOG(ERROR) << "Size of input shape is wrong.";
return RET_ERROR;
}
auto output = outputs_.front();
if (output == nullptr) {

10
mindspore/lite/src/runtime/kernel/arm/base/prior_box.cc
Unescape View File

@ -40,8 +40,14 @@ int PriorBoxCPUKernel::Init() {
return RET_NULL_PTR;
}
MS_ASSERT(in_tensors_.size() == kInputNum);
MS_ASSERT(out_tensors_.size() == kOutputNum);
if (in_tensors_.size() != kInputNum) {
MS_LOG(ERROR) << "Size of input tensors is wrong.";
return RET_ERROR;
}
if (in_tensors_.size() != kOutputNum) {
MS_LOG(ERROR) << "Size of input tensors is wrong.";
return RET_ERROR;
}
if (!InferShapeDone()) {
return RET_OK;

1
mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.h
Unescape View File

@ -46,7 +46,6 @@ class ArithmeticFP16CPUKernel : public LiteKernel {
private:
void FreeTmpBuffer();
int break_pos_;
int outside_;
int out_thread_stride_;
int out_count_;
float16_t *tile_data0_ = nullptr;

1
mindspore/lite/src/runtime/kernel/arm/fp16/reduce_fp16.h
Unescape View File

@ -44,7 +44,6 @@ class ReduceFp16CPUKernel : public ReduceBaseCPUKernel {
private:
Reducer reducer_ = nullptr;
std::vector<float16_t *> data_buffers_;
const float *src_data_ = nullptr;
float *dst_data_ = nullptr;
float16_t *fp16_input_ = nullptr;
const float16_t *fp16_src_data_ = nullptr;

2
mindspore/lite/src/runtime/kernel/arm/fp16/split_fp16.cc
Unescape View File

@ -111,8 +111,8 @@ int SplitFp16CPUKernel::Run() {
context_->allocator->Free(output_ptr_[i]);
output_ptr_[i] = nullptr;
}
return RET_OK;
}
return RET_OK;
}
kernel::LiteKernel *CpuSplitFp16KernelCreator(const std::vector<lite::tensor::Tensor *> &inputs,

4
mindspore/lite/src/runtime/kernel/arm/fp16/transpose_fp16.cc
Unescape View File

@ -30,10 +30,6 @@ using mindspore::lite::RET_OP_EXECUTE_FAILURE;
using mindspore::schema::PrimitiveType_Transpose;
namespace mindspore::kernel {
namespace {
constexpr int kTransposeInputNum = 1;
constexpr int kTransposeOutputNum = 1;
} // namespace
int TransposeFp16CPUKernel::Init() {
TransposeParameter *param = reinterpret_cast<TransposeParameter *>(this->op_parameter_);
num_unit_ = static_cast<int>(in_tensors_[kInputIndex]->shape().at(param->perm_[kNHWC_H]));

3
mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_self.h
Unescape View File

@ -46,7 +46,7 @@ class ArithmeticSelfCPUKernel : public LiteKernel {
explicit ArithmeticSelfCPUKernel(OpParameter *parameter, const std::vector<lite::tensor::Tensor *> &inputs,
const std::vector<lite::tensor::Tensor *> &outputs, const lite::Context *ctx,
const mindspore::lite::PrimitiveC *primitive)
: LiteKernel(parameter, inputs, outputs, ctx, primitive), ctx_(ctx), thread_count_(ctx->thread_num_) {
: LiteKernel(parameter, inputs, outputs, ctx, primitive), thread_count_(ctx->thread_num_) {
switch (parameter->type_) {
case PrimitiveType_Abs:
arithmeticSelf_run_ = ElementAbs;
@ -102,7 +102,6 @@ class ArithmeticSelfCPUKernel : public LiteKernel {
size_t data_size_;
ArithmeticSelfParameter *arithmeticSelfParameter_;
ArithmeticSelfRun arithmeticSelf_run_;
const Context *ctx_;
int thread_count_;
float *in_ptr_;
float *out_ptr_;

6
mindspore/lite/src/runtime/kernel/arm/fp32/constant_of_shape.cc
Unescape View File

@ -28,12 +28,6 @@ using mindspore::lite::RET_OK;
using mindspore::schema::PrimitiveType_ConstantOfShape;
namespace mindspore::kernel {
namespace {
constexpr int kInputNum = 1;
constexpr int kOutputNum = 1;
} // namespace
int ConstantOfShapeCPUKernel::Init() { return RET_OK; }
int ConstantOfShapeCPUKernel::ReSize() { return RET_OK; }

3
mindspore/lite/src/runtime/kernel/arm/fp32/expandDims.h
Unescape View File

@ -32,7 +32,7 @@ class ExpandDimsCPUKernel : public LiteKernel {
ExpandDimsCPUKernel(OpParameter *parameter, const std::vector<lite::tensor::Tensor *> &inputs,
const std::vector<lite::tensor::Tensor *> &outputs, const lite::Context *ctx,
const mindspore::lite::PrimitiveC *primitive)
: LiteKernel(parameter, inputs, outputs, ctx, primitive), ctx_(ctx), thread_count_(ctx->thread_num_) {}
: LiteKernel(parameter, inputs, outputs, ctx, primitive), thread_count_(ctx->thread_num_) {}
~ExpandDimsCPUKernel() override = default;
int Init() override;
@ -46,7 +46,6 @@ class ExpandDimsCPUKernel : public LiteKernel {
size_t data_size_;
float *in_ptr_;
float *out_ptr_;
const Context *ctx_;
int thread_count_;
};
} // namespace mindspore::kernel

6
mindspore/lite/src/runtime/kernel/arm/fp32/fill.cc
Unescape View File

@ -28,12 +28,6 @@ using mindspore::lite::RET_OK;
using mindspore::schema::PrimitiveType_Fill;
namespace mindspore::kernel {
namespace {
constexpr int kInputNum = 1;
constexpr int kOutputNum = 1;
} // namespace
int FillCPUKernel::Init() {
if (!InferShapeDone()) {
return RET_OK;

3
mindspore/lite/src/runtime/kernel/arm/fp32/fill.h
Unescape View File

@ -30,7 +30,7 @@ class FillCPUKernel : public LiteKernel {
FillCPUKernel(OpParameter *parameter, const std::vector<lite::tensor::Tensor *> &inputs,
const std::vector<lite::tensor::Tensor *> &outputs, const lite::Context *ctx,
const mindspore::lite::PrimitiveC *primitive)
: LiteKernel(parameter, inputs, outputs, ctx, primitive), ctx_(ctx), thread_count_(ctx->thread_num_) {}
: LiteKernel(parameter, inputs, outputs, ctx, primitive), thread_count_(ctx->thread_num_) {}
~FillCPUKernel() override = default;
int Init() override;
@ -44,7 +44,6 @@ class FillCPUKernel : public LiteKernel {
int data_size_;
float src_data_;
float *out_ptr_;
const Context *ctx_;
int thread_count_;
};
} // namespace mindspore::kernel

3
mindspore/lite/src/runtime/kernel/arm/fp32/gatherNd.h
Unescape View File

@ -32,7 +32,7 @@ class GatherNdCPUKernel : public LiteKernel {
GatherNdCPUKernel(OpParameter *parameter, const std::vector<lite::tensor::Tensor *> &inputs,
const std::vector<lite::tensor::Tensor *> &outputs, const Context *ctx,
const mindspore::lite::PrimitiveC *primitive)
: LiteKernel(parameter, inputs, outputs, ctx, primitive), ctx_(ctx), thread_count_(ctx->thread_num_) {}
: LiteKernel(parameter, inputs, outputs, ctx, primitive), thread_count_(ctx->thread_num_) {}
~GatherNdCPUKernel() override;
int Init() override;
@ -48,7 +48,6 @@ class GatherNdCPUKernel : public LiteKernel {
int *in_offset_ = nullptr;
float *in_ptr_;
float *out_ptr_;
const Context *ctx_;
int thread_count_;
};
} // namespace mindspore::kernel

2
mindspore/lite/src/runtime/kernel/arm/fp32/power.h
Unescape View File

@ -30,7 +30,6 @@ class PowerCPUKernel : public PowerBaseCPUKernel {
const std::vector<lite::tensor::Tensor *> &outputs, const lite::Context *ctx,
const mindspore::lite::PrimitiveC *primitive)
: PowerBaseCPUKernel(param, inputs, outputs, ctx, primitive),
ctx_(ctx),
thread_count_(ctx->thread_num_),
power_(reinterpret_cast<PowerParameter *>(op_parameter_)->power_),
scale_(reinterpret_cast<PowerParameter *>(op_parameter_)->scale_),
@ -43,7 +42,6 @@ class PowerCPUKernel : public PowerBaseCPUKernel {
int RunImpl(int task_id);
private:
const lite::Context *ctx_;
int thread_count_;
float power_;
float scale_;

6
mindspore/lite/src/runtime/kernel/arm/fp32/range.cc
Unescape View File

@ -27,12 +27,6 @@ using mindspore::lite::RET_OK;
using mindspore::schema::PrimitiveType_Range;
namespace mindspore::kernel {
namespace {
constexpr int kInputNum = 0;
constexpr int kOutputNum = 1;
} // namespace
int RangeCPUKernel::Init() { return RET_OK; }
int RangeCPUKernel::ReSize() { return RET_OK; }

6
mindspore/lite/src/runtime/kernel/arm/fp32/rank.cc
Unescape View File

@ -27,12 +27,6 @@ using mindspore::lite::RET_OK;
using mindspore::schema::PrimitiveType_Rank;
namespace mindspore::kernel {
namespace {
constexpr int kInputNum = 1;
constexpr int kOutputNum = 1;
} // namespace
int RankCPUKernel::Init() { return RET_OK; }
int RankCPUKernel::ReSize() { return RET_OK; }

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save