From a80e0cd111257dd75e5a8ef5bfc48924d616d0e5 Mon Sep 17 00:00:00 2001 From: zhangz0911gm Date: Wed, 12 Aug 2020 03:52:08 -0400 Subject: [PATCH] Fixing bugs --- mindspore/lite/src/model_impl.cc | 4 ++-- mindspore/lite/src/runtime/kernel/arm/base/prelu_base.h | 3 +-- mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc | 6 +++--- mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.h | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mindspore/lite/src/model_impl.cc b/mindspore/lite/src/model_impl.cc index 17db09b239..f5d65ee2fd 100644 --- a/mindspore/lite/src/model_impl.cc +++ b/mindspore/lite/src/model_impl.cc @@ -179,9 +179,9 @@ lite::Primitive *ModelImpl::CopyPrimitive(const schema::Primitive *src_prim) { case schema::PrimitiveType_StridedSlice: return new lite::StridedSlice(const_cast(src_prim)); case schema::PrimitiveType_Prelu: - return new lite::Prelu(const_cast(srcPrim)); + return new lite::Prelu(const_cast(src_prim)); case schema::PrimitiveType_CaffePReLU: - return new lite::CaffePReLU(const_cast(srcPrim)); + return new lite::CaffePReLU(const_cast(src_prim)); case schema::PrimitiveType_Round: return new lite::Round(const_cast(src_prim)); case schema::PrimitiveType_Reverse: diff --git a/mindspore/lite/src/runtime/kernel/arm/base/prelu_base.h b/mindspore/lite/src/runtime/kernel/arm/base/prelu_base.h index 6e16d5ba1b..817219707d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/prelu_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/prelu_base.h @@ -31,8 +31,7 @@ class PreluBaseCPUKernel : public LiteKernel { const std::vector &outputs, const Context *ctx, const lite::Primitive *primitive) : LiteKernel(parameter, inputs, outputs, ctx, primitive), ctx_(ctx) { - opParameter->thread_num_ = ctx->thread_num_; - prelu_param_ = reinterpret_cast(opParameter); + prelu_param_ = reinterpret_cast(op_parameter_); } ~PreluBaseCPUKernel() = default; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc index b87601e951..7026e90238 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.cc @@ -51,12 +51,12 @@ int CaffePReluCPUKernel::Run() { MS_LOG(ERROR) << "Prepare fail!ret: " << prepare_ret; return prepare_ret; } - auto input = inputs_.at(0); - auto input1 = inputs_.at(1); + auto input = in_tensors_[0]; + auto input1 = in_tensors_[1]; prelu_param_->input_num_ = input->ElementsNum(); input_data = reinterpret_cast(input->Data()); - output_data = reinterpret_cast(outputs_.at(0)->Data()); + output_data = reinterpret_cast(out_tensors_[0]->Data()); auto channels = input->shape(); prelu_param_->negtive_slope_ = reinterpret_cast(input1->Data()); prelu_param_->channel_num_ = channels.at(channels.size() - 1); diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.h b/mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.h index d18befad49..b4c169d508 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/caffeprelu.h @@ -32,7 +32,7 @@ class CaffePReluCPUKernel : public LiteKernel { const std::vector &outputs, const lite::Context *ctx, const lite::Primitive *primitive) : LiteKernel(parameter, inputs, outputs, ctx, primitive), ctx_(ctx), thread_count_(ctx->thread_num_) { - prelu_param_ = (reinterpret_cast(opParameter)); + prelu_param_ = reinterpret_cast(op_parameter_); primitive_ = primitive; } ~CaffePReluCPUKernel() = default;