diff --git a/mindspore/lite/src/runtime/kernel/arm/base/matmul_base.cc b/mindspore/lite/src/runtime/kernel/arm/base/matmul_base.cc index 6cbc991d71..dbcbecd3e4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/matmul_base.cc +++ b/mindspore/lite/src/runtime/kernel/arm/base/matmul_base.cc @@ -35,9 +35,7 @@ kernel::LiteKernel *CpuMatmulKernelCreator(const std::vector &in auto *weight_tensor = inputs.at(kWeightIndex); auto *restore_data = weight_tensor->data_c(); - auto is_const_quant_weight = - (restore_data != nullptr) && - (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant); + auto is_const_quant_weight = (restore_data != nullptr) && (weight_tensor->data_type() == kNumberTypeInt8); if (is_const_quant_weight) { auto *dequant_weight = kernel::LiteKernelUtil::DequantWeight(weight_tensor); if (dequant_weight == nullptr) { 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 2c2b060a7a..177708b18e 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 @@ -145,7 +145,7 @@ kernel::LiteKernel *CpuConvDwFp16KernelCreator(const std::vector auto *weight_tensor = inputs.at(kWeightIndex); auto *restore_data = weight_tensor->MutableData(); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { auto *dequant_weight = kernel::LiteKernelUtil::DequantWeight(weight_tensor); if (dequant_weight == nullptr) { MS_LOG(ERROR) << "dequant data is nullptr."; @@ -165,7 +165,7 @@ kernel::LiteKernel *CpuConvDwFp16KernelCreator(const std::vector } if (kernel == nullptr) { MS_LOG(ERROR) << "kernel is nullptr."; - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->set_data_type(kNumberTypeInt8); weight_tensor->SetData(restore_data); @@ -177,14 +177,14 @@ kernel::LiteKernel *CpuConvDwFp16KernelCreator(const std::vector delete kernel; MS_LOG(ERROR) << "Init kernel failed, name: " << opParameter->name_ << ", type: " << schema::EnumNamePrimitiveType(static_cast(opParameter->type_)); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->set_data_type(kNumberTypeInt8); weight_tensor->SetData(restore_data); } return nullptr; } - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->set_data_type(kNumberTypeInt8); weight_tensor->SetData(restore_data); diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc index ca61d26254..db56b14ea3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc @@ -189,7 +189,7 @@ kernel::LiteKernel *CpuConvFp16KernelCreator(const std::vector & auto *weight_tensor = inputs.at(kWeightIndex); auto *restore_data = weight_tensor->MutableData(); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { auto *dequant_weight = kernel::LiteKernelUtil::DequantWeight(weight_tensor); if (dequant_weight == nullptr) { MS_LOG(ERROR) << "dequant data is nullptr."; @@ -224,7 +224,7 @@ kernel::LiteKernel *CpuConvFp16KernelCreator(const std::vector & } if (kernel == nullptr) { MS_LOG(DEBUG) << "Create conv fp16 kernel failed."; - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->set_data_type(kNumberTypeInt8); weight_tensor->SetData(restore_data); @@ -236,14 +236,14 @@ kernel::LiteKernel *CpuConvFp16KernelCreator(const std::vector & delete kernel; MS_LOG(INFO) << "Init fp16 kernel failed, name: " << opParameter->name_ << ", type: " << schema::EnumNamePrimitiveType(static_cast(opParameter->type_)); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->set_data_type(kNumberTypeInt8); weight_tensor->SetData(restore_data); } return nullptr; } - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->set_data_type(kNumberTypeInt8); weight_tensor->SetData(restore_data); 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 6c1b6b5844..ffe8ef37c2 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 @@ -204,7 +204,7 @@ kernel::LiteKernel *CpuDeconvDwFp16KernelCreator(const std::vectorMutableData(); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { auto *dequant_weight = kernel::LiteKernelUtil::DequantWeight(weight_tensor); if (dequant_weight == nullptr) { MS_LOG(ERROR) << "dequant data is nullptr."; @@ -217,7 +217,7 @@ kernel::LiteKernel *CpuDeconvDwFp16KernelCreator(const std::vectordata_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->set_data_type(kNumberTypeInt8); weight_tensor->SetData(restore_data); @@ -229,14 +229,14 @@ kernel::LiteKernel *CpuDeconvDwFp16KernelCreator(const std::vectorname_ << ", type: " << schema::EnumNamePrimitiveType(static_cast(opParameter->type_)); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->set_data_type(kNumberTypeInt8); weight_tensor->SetData(restore_data); } return nullptr; } - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->set_data_type(kNumberTypeInt8); weight_tensor->SetData(restore_data); diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_fp16.cc index cb1e52bfc6..a46bcfcb6d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_fp16.cc @@ -211,7 +211,7 @@ kernel::LiteKernel *CpuDeConvFp16KernelCreator(const std::vector auto *weight_tensor = inputs.at(kWeightIndex); auto *restore_data = weight_tensor->MutableData(); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { auto *dequant_weight = kernel::LiteKernelUtil::DequantWeight(weight_tensor); if (dequant_weight == nullptr) { MS_LOG(ERROR) << "dequant data is nullptr."; @@ -224,7 +224,7 @@ kernel::LiteKernel *CpuDeConvFp16KernelCreator(const std::vector auto kernel = new (std::nothrow) DeConvolutionFp16CPUKernel(opParameter, inputs, outputs, ctx, primitive); if (kernel == nullptr) { MS_LOG(ERROR) << "kernel is nullptr."; - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->set_data_type(kNumberTypeInt8); weight_tensor->SetData(restore_data); @@ -236,14 +236,14 @@ kernel::LiteKernel *CpuDeConvFp16KernelCreator(const std::vector delete kernel; MS_LOG(ERROR) << "Init kernel failed, name: " << opParameter->name_ << ", type: " << schema::EnumNamePrimitiveType(static_cast(opParameter->type_)); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->set_data_type(kNumberTypeInt8); weight_tensor->SetData(restore_data); } return nullptr; } - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->set_data_type(kNumberTypeInt8); weight_tensor->SetData(restore_data); diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc index 221257171a..ea2cc3d724 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc @@ -186,7 +186,7 @@ kernel::LiteKernel *CpuConvFp32KernelCreator(const std::vector & auto *weight_tensor = inputs.at(kWeightIndex); auto *restore_data = weight_tensor->MutableData(); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { auto *dequant_weight = kernel::LiteKernelUtil::DequantWeight(weight_tensor); if (dequant_weight == nullptr) { MS_LOG(ERROR) << "dequant data is nullptr."; @@ -206,7 +206,7 @@ kernel::LiteKernel *CpuConvFp32KernelCreator(const std::vector & } if (kernel == nullptr) { MS_LOG(ERROR) << "kernel is nullptr."; - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->SetData(restore_data); } @@ -217,14 +217,14 @@ kernel::LiteKernel *CpuConvFp32KernelCreator(const std::vector & delete kernel; MS_LOG(ERROR) << "Init kernel failed, name: " << op_parameter->name_ << ", type: " << schema::EnumNamePrimitiveType(static_cast(op_parameter->type_)); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->SetData(restore_data); } return nullptr; } - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->SetData(restore_data); } diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise.cc index f8c612e88c..f022bdd653 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise.cc @@ -133,7 +133,7 @@ kernel::LiteKernel *CpuConvDwFp32KernelCreator(const std::vector auto *weight_tensor = inputs.at(kWeightIndex); auto *restore_data = weight_tensor->MutableData(); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { auto *dequant_weight = kernel::LiteKernelUtil::DequantWeight(weight_tensor); if (dequant_weight == nullptr) { MS_LOG(ERROR) << "dequant data is nullptr."; @@ -151,7 +151,7 @@ kernel::LiteKernel *CpuConvDwFp32KernelCreator(const std::vector } if (kernel == nullptr) { MS_LOG(ERROR) << "kernel is nullptr."; - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->SetData(restore_data); } @@ -162,14 +162,14 @@ kernel::LiteKernel *CpuConvDwFp32KernelCreator(const std::vector delete kernel; MS_LOG(ERROR) << "Init kernel failed, name: " << opParameter->name_ << ", type: " << schema::EnumNamePrimitiveType(static_cast(opParameter->type_)); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->SetData(restore_data); } return nullptr; } - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->SetData(restore_data); } diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution.cc index 6b047dd3b0..1e3b824de5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution.cc @@ -237,7 +237,7 @@ kernel::LiteKernel *CpuDeConvFp32KernelCreator(const std::vector MS_ASSERT(desc.type == schema::PrimitiveType_DeConv2D); auto *weight_tensor = inputs.at(kWeightIndex); auto *restore_data = weight_tensor->MutableData(); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { auto *dequant_weight = kernel::LiteKernelUtil::DequantWeight(weight_tensor); if (dequant_weight == nullptr) { MS_LOG(ERROR) << "dequant data is nullptr."; @@ -248,7 +248,7 @@ kernel::LiteKernel *CpuDeConvFp32KernelCreator(const std::vector auto kernel = new (std::nothrow) kernel::DeConvolutionCPUKernel(opParameter, inputs, outputs, ctx, primitive); if (kernel == nullptr) { MS_LOG(ERROR) << "kernel is nullptr."; - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->SetData(restore_data); } @@ -259,14 +259,14 @@ kernel::LiteKernel *CpuDeConvFp32KernelCreator(const std::vector delete kernel; MS_LOG(ERROR) << "Init kernel failed, name: " << opParameter->name_ << ", type: " << schema::EnumNamePrimitiveType(static_cast(opParameter->type_)); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->SetData(restore_data); } return nullptr; } - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->SetData(restore_data); } diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise.cc index 1a08ecf343..fda740d99c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise.cc @@ -201,7 +201,7 @@ kernel::LiteKernel *CpuDeconvDwFp32KernelCreator(const std::vectorMutableData(); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { auto *dequant_weight = kernel::LiteKernelUtil::DequantWeight(weight_tensor); if (dequant_weight == nullptr) { MS_LOG(ERROR) << "dequant data is nullptr."; @@ -213,7 +213,7 @@ kernel::LiteKernel *CpuDeconvDwFp32KernelCreator(const std::vectordata_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->SetData(restore_data); } @@ -224,13 +224,13 @@ kernel::LiteKernel *CpuDeconvDwFp32KernelCreator(const std::vectorname_ << ", type: " << schema::EnumNamePrimitiveType(static_cast(opParameter->type_)); - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->SetData(restore_data); } return nullptr; } - if (weight_tensor->data_type() == kNumberTypeInt8 || primitive->GetQuantType() == schema::QuantType_WeightQuant) { + if (weight_tensor->data_type() == kNumberTypeInt8) { weight_tensor->FreeData(); weight_tensor->SetData(restore_data); }