Browse Source

!9879 [lite]fix reshape infershape with input is null

From: @xu_anyue
Reviewed-by: @hangangqiang,@zhanghaibo5
Signed-off-by: @hangangqiang
tags/v1.1.0
mindspore-ci-bot Gitee 5 years ago
parent
commit
49baf0bc2c
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      mindspore/lite/src/ops/reshape.cc
  2. +1
    -1
      mindspore/lite/tools/anf_exporter/anf_exporter.cc

+ 2
- 2
mindspore/lite/src/ops/reshape.cc View File

@@ -179,8 +179,8 @@ int Reshape::InferShape(std::vector<Tensor *> inputs_, std::vector<Tensor *> out
std::vector<int> out_shape;
if (inputs_.size() == kDoubleNum) {
auto shape_tensor = inputs_.at(1);
if (input->ElementsNum() == 1) {
if (shape_tensor->shape().empty()) {
if (shape_tensor->IsConst()) {
if (shape_tensor->data_c() == nullptr || (shape_tensor->shape().size() == 1 && shape_tensor->shape()[0] == 0)) {
MS_LOG(DEBUG) << "reshape to a scalar.";
output->set_shape(out_shape);
return RET_OK;


+ 1
- 1
mindspore/lite/tools/anf_exporter/anf_exporter.cc View File

@@ -390,7 +390,7 @@ int AnfExporter::ConvertInputParameter(const std::shared_ptr<AnfNode> &input_ano
[](const int64_t &value) { return static_cast<int32_t>(value); });
paramTensor->dims = dims;
auto paramValue = std::dynamic_pointer_cast<ParamValueLite>(paramNode->default_param());
if (paramValue != nullptr) {
if (paramValue != nullptr && paramValue->tensor_size() != 0) {
paramTensor->data.resize(paramValue->tensor_size());
paramTensor->format = schema::Format(paramValue->format());
if (EOK != memcpy_s(paramTensor->data.data(), paramTensor->data.size(), paramValue->tensor_addr(),


Loading…
Cancel
Save