diff --git a/mindspore/__init__.py b/mindspore/__init__.py old mode 100755 new mode 100644 diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.cc index bbdfca301ee3a36edc89a69517ae855fa4413aca..84eeda7eca0f16acb73ad5b599fa9e556c4f6d47 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.cc @@ -152,7 +152,7 @@ void ArithmeticFP16CPUKernel::TileConstTensor(const void *in_data, void *out_dat in_shape, in_strides, out_strides, multiple); } -int ArithmeticFP16CPUKernel::Execute(const void *input0, const void *input1, void *output, int size, bool is_opt) { +int ArithmeticFP16CPUKernel::DoExecute(const void *input0, const void *input1, void *output, int size, bool is_opt) { int ret = RET_OK; if (is_opt) { CHECK_NULL_RETURN(arithmetic_opt_func_); diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.h index a0c746cce86cf4fdee323b1a116e90b41b09679f..24bdf23e5a203f98a815612a01855b896e5faf1c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.h @@ -49,7 +49,7 @@ class ArithmeticFP16CPUKernel : public ArithmeticCPUKernel { int ConstTensorBroadCast() override; void TileConstTensor(const void *in_data, void *out_data, size_t ndim, const int *in_shape, const int *in_strides, const int *out_strides, const int *multiple) override; - int Execute(const void *input0, const void *input1, void *output, int size, bool is_opt) override; + int DoExecute(const void *input0, const void *input1, void *output, int size, bool is_opt) override; void FreeFp16Buffer(); ArithmeticFuncFp16 arithmetic_func_ = nullptr; ArithmeticOptFuncFp16 arithmetic_opt_func_ = nullptr; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_3x3_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_3x3_fp16.cc index 8cd8f62b7c9d13b99312485dabcd651a9038d047..679447dad4cd8376dd592490068a685c446a3a5f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_3x3_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_3x3_fp16.cc @@ -94,7 +94,7 @@ int ConvolutionDepthwise3x3Fp16CPUKernel::ReSize() { return RET_OK; } -int ConvolutionDepthwise3x3Fp16CPUKernel::Execute(int task_id) { +int ConvolutionDepthwise3x3Fp16CPUKernel::DoExecute(int task_id) { int units = UP_DIV(conv_param_->output_w_, C2NUM); // F(2, 3) contains 2 conv units int c8 = UP_ROUND(conv_param_->input_channel_, C8NUM); auto buffer = buffer_ + C12NUM * c8 * units * task_id; @@ -108,7 +108,7 @@ int ConvolutionDepthwise3x3Fp16CPUKernel::Execute(int task_id) { int ConvDw3x3Fp16Run(void *cdata, int task_id, float lhs_scale, float rhs_scale) { auto conv_dw = reinterpret_cast(cdata); - auto ret = conv_dw->Execute(task_id); + auto ret = conv_dw->DoExecute(task_id); if (ret != RET_OK) { MS_LOG(ERROR) << "ConvolutionDepthwise3x3Run error task_id[" << task_id << "] error_code[" << ret << "]"; return RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_3x3_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_3x3_fp16.h index 82e3a6c14e47ddd3d9ce8e2a8789204a6642573c..2987231b6fa0b491fea86eb757af8de08e903db7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_3x3_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_3x3_fp16.h @@ -36,7 +36,7 @@ class ConvolutionDepthwise3x3Fp16CPUKernel : public ConvolutionBaseCPUKernel { int ReSize() override; int Run() override; - int Execute(int task_id); + int DoExecute(int task_id); private: void PackWeight() override; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.cc index 97d5dca48b388c050560031958c9cc08e2784a91..a3716fd9de5a75204a820de3e8bde1107d59b10d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.cc @@ -87,7 +87,7 @@ int ConvolutionDepthwiseFp16CPUKernel::ReSize() { return RET_OK; } -int ConvolutionDepthwiseFp16CPUKernel::Execute(int task_id) { +int ConvolutionDepthwiseFp16CPUKernel::DoExecute(int task_id) { auto input_ptr = reinterpret_cast(in_tensors_.at(0)->data()); auto output_ptr = reinterpret_cast(out_tensors_.at(0)->data()); MS_ASSERT(input_ptr != nullptr); @@ -103,7 +103,7 @@ int ConvolutionDepthwiseFp16CPUKernel::Execute(int task_id) { static int ConvDwFp16Run(void *cdata, int task_id, float lhs_scale, float rhs_scale) { auto conv_dw_fp16 = reinterpret_cast(cdata); - auto ret = conv_dw_fp16->Execute(task_id); + auto ret = conv_dw_fp16->DoExecute(task_id); if (ret != RET_OK) { MS_LOG(ERROR) << "ConvolutionDepthwiseFp16Run error task_id[" << task_id << "] error_code[" << ret << "]"; return RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.h index 19e70bc82a327f0974273c0b6b1d4b13ea736f76..7cc31da449fbf8b27a49b4be91ce6df8a55689b2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.h @@ -44,7 +44,7 @@ class ConvolutionDepthwiseFp16CPUKernel : public ConvolutionBaseCPUKernel { int ReSize() override; int Run() override; - int Execute(int task_id); + int DoExecute(int task_id); private: void PackWeight() override; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_slidewindow_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_slidewindow_fp16.cc index 2d237ddb44187bd0bdbbb340ee64c7fb3abf2288..0df113df0e6ae789b6461668044276bedbaf4a14 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_slidewindow_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_slidewindow_fp16.cc @@ -129,7 +129,7 @@ int ConvolutionDepthwiseSWFp16CPUKernel::ReSize() { return RET_OK; } -int ConvolutionDepthwiseSWFp16CPUKernel::Execute(int task_id) { +int ConvolutionDepthwiseSWFp16CPUKernel::DoExecute(int task_id) { ConvDwC8Fp16(packed_output_, packed_input_, reinterpret_cast(packed_weight_), reinterpret_cast(bias_data_), conv_param_, sliding_, task_id); return RET_OK; @@ -137,7 +137,7 @@ int ConvolutionDepthwiseSWFp16CPUKernel::Execute(int task_id) { static int ConvDwSWFp16Run(void *cdata, int task_id, float lhs_scale, float rhs_scale) { auto conv_dw_fp16 = reinterpret_cast(cdata); - auto ret = conv_dw_fp16->Execute(task_id); + auto ret = conv_dw_fp16->DoExecute(task_id); if (ret != RET_OK) { MS_LOG(ERROR) << "ConvolutionDepthwiseSWFp16Run error task_id[" << task_id << "] error_code[" << ret << "]"; return RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_slidewindow_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_slidewindow_fp16.h index 5e7c9c9318018a1382955330d8629a677775a3c7..d505d099a2689d4dad6a7d8a09f03e7ec81b2ced 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_slidewindow_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_slidewindow_fp16.h @@ -46,7 +46,7 @@ class ConvolutionDepthwiseSWFp16CPUKernel : public ConvolutionBaseCPUKernel { int Run() override; int InitPackedInputOutput(); - int Execute(int task_id); + int DoExecute(int task_id); private: void PackWeight() override; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.cc index ddaeaed99601ee853d035a4e3ee4784a2c2727bd..a1e9ddbb1bc1325e78308d0cf3df763dbe5d8967 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.cc @@ -148,7 +148,7 @@ int DeconvolutionDepthwiseFp16CPUKernel::ReSize() { return RET_OK; } -int DeconvolutionDepthwiseFp16CPUKernel::Execute(int task_id) { +int DeconvolutionDepthwiseFp16CPUKernel::DoExecute(int task_id) { DeconvDwC8Fp16(packed_output_, packed_input_, reinterpret_cast(packed_weight_), reinterpret_cast(bias_data_), conv_param_, sliding_, task_id); return RET_OK; @@ -156,7 +156,7 @@ int DeconvolutionDepthwiseFp16CPUKernel::Execute(int task_id) { static int DeconvDwFp16Run(void *cdata, int task_id, float lhs_scale, float rhs_scale) { auto deconv_dw_fp16 = reinterpret_cast(cdata); - auto ret = deconv_dw_fp16->Execute(task_id); + auto ret = deconv_dw_fp16->DoExecute(task_id); if (ret != RET_OK) { MS_LOG(ERROR) << "DeconvolutionDepthwiseFp16Run error task_id[" << task_id << "] error_code[" << ret << "]"; return RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.h index 6ae5af1e3ffbb88f3dd07a9998c163f63757ca71..d4607a1087708df1a79028f406998e705767a818 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.h @@ -48,7 +48,7 @@ class DeconvolutionDepthwiseFp16CPUKernel : public ConvolutionBaseCPUKernel { int InitPackedInputOutput(); int InitSlideParam(); - int Execute(int task_id); + int DoExecute(int task_id); private: int MallocWeightBiasData() override; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/stack_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/stack_fp16.cc index 7d4f44cf7269dbdd68a69f9963112a0ce7beb901..945839e914854beb1131d46650869fb71cd2edf6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/stack_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/stack_fp16.cc @@ -83,7 +83,7 @@ int StackFp16CPUKernel::Init() { return ReSize(); } -int StackFp16CPUKernel::Execute(int task_id) { +int StackFp16CPUKernel::DoExecute(int task_id) { auto inputs = buffers_.data(); void *output_data = reinterpret_cast(out_buffer_); auto step = UP_DIV(outer_size_, num_threads_); @@ -99,7 +99,7 @@ int StackFp16CPUKernel::Execute(int task_id) { static int StackRun(void *cdata, int task_id, float lhs_scale, float rhs_scale) { auto stack = reinterpret_cast(cdata); - if (stack->Execute(task_id) != RET_OK) { + if (stack->DoExecute(task_id) != RET_OK) { return RET_ERROR; } return RET_OK; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/stack_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/stack_fp16.h index 320186cca3d4ee0b86d918d0fadb5b6e494fde00..8380b6755f340674d88fef878c466aac9abdf1c4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/stack_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/stack_fp16.h @@ -29,7 +29,7 @@ class StackFp16CPUKernel : public StackBaseCPUKernel { ~StackFp16CPUKernel() override = default; int Init() override; int Run() override; - int Execute(int task_id); + int DoExecute(int task_id); private: void InitMallocFlags();