From 179603ec72a879da89e2ed0f62aa627bda8333fa Mon Sep 17 00:00:00 2001
From: sunsuodong <sunsuodong@huawei.com>
Date: Tue, 4 Aug 2020 21:15:40 +0800
Subject: [PATCH] fix compile warning

---
 mindspore/lite/src/executor.cc                              | 2 ++
 mindspore/lite/src/ops/scatter_nd.cc                        | 2 +-
 mindspore/lite/src/ops/shape.cc                             | 2 +-
 mindspore/lite/src/runtime/kernel/arm/fp32/opt_momentum.h   | 6 +++---
 .../lite/src/runtime/kernel/arm/fp32/space_to_depth.cc      | 1 +
 .../src/runtime/kernel/arm/opclib/quantization/quantize.h   | 2 +-
 .../runtime/kernel/arm/fp32/space_to_batch_fp32_tests.cc    | 4 ++--
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mindspore/lite/src/executor.cc b/mindspore/lite/src/executor.cc
index 27289dfa0..c464eb8fb 100644
--- a/mindspore/lite/src/executor.cc
+++ b/mindspore/lite/src/executor.cc
@@ -82,6 +82,8 @@ int Executor::TransformTensorLayout(tensor::Tensor *tensor, schema::Format dst_f
       return TransformTensorLayoutUint8(tensor, dst_format, allocator);
     case kNumberTypeFloat32:
       return TransformTensorLayoutFp32(tensor, dst_format, allocator);
+    default:
+      return RET_ERROR;
   }
   return RET_OK;
 }
diff --git a/mindspore/lite/src/ops/scatter_nd.cc b/mindspore/lite/src/ops/scatter_nd.cc
index 446a37d87..5384edbf9 100644
--- a/mindspore/lite/src/ops/scatter_nd.cc
+++ b/mindspore/lite/src/ops/scatter_nd.cc
@@ -54,7 +54,7 @@ int ScatterND::InferShape(std::vector<tensor::Tensor *> inputs_, std::vector<ten
   }
   auto output = outputs_.front();
   auto shape_data = reinterpret_cast<int *>(shape->Data());
-  std::vector<int> out_shape(shape_data, shape_data + sizeof(shape_data) / sizeof(shape_data[0]));
+  std::vector<int> out_shape(shape_data, shape_data + shape->DataSize());
   output->set_shape(out_shape);
   output->set_data_type(update->data_type());
   output->SetFormat(update->GetFormat());
diff --git a/mindspore/lite/src/ops/shape.cc b/mindspore/lite/src/ops/shape.cc
index 8ca3416d7..6c4c23935 100644
--- a/mindspore/lite/src/ops/shape.cc
+++ b/mindspore/lite/src/ops/shape.cc
@@ -45,7 +45,7 @@ int Shape::InferShape(std::vector<tensor::Tensor *> inputs_, std::vector<tensor:
     MS_LOG(ERROR) << "Set shape fails.";
     return RET_ERROR;
   }
-  auto ret_dtype = out_tensor->set_data_type({in_tensor->data_type()});
+  auto ret_dtype = out_tensor->set_data_type(in_tensor->data_type());
   if (ret_dtype != in_tensor->data_type()) {
     MS_LOG(ERROR) << "Set datatype fails.";
     return RET_ERROR;
diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/opt_momentum.h b/mindspore/lite/src/runtime/kernel/arm/fp32/opt_momentum.h
index 6746b5bf0..ccc287177 100644
--- a/mindspore/lite/src/runtime/kernel/arm/fp32/opt_momentum.h
+++ b/mindspore/lite/src/runtime/kernel/arm/fp32/opt_momentum.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef MINDSPORE_LITE_SRC_BACKEND_ARM_FP32_OPT_MOMENTUM_H_
-#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPT_MOMENTUM_H_
+#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_OPT_MOMENTUM_H_
+#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_OPT_MOMENTUM_H_
 
 #include <vector>
 #include "src/lite_kernel.h"
@@ -37,4 +37,4 @@ class OptMomentumCPUKernel : public LiteKernel {
 };
 }  // namespace mindspore::kernel
 
-#endif  // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPT_MOMENTUM_H_
+#endif  // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_OPT_MOMENTUM_H_
diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_depth.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_depth.cc
index 3ecb34a6a..fe253cda5 100644
--- a/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_depth.cc
+++ b/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_depth.cc
@@ -85,6 +85,7 @@ int SpaceToDepthCPUKernel::Run() {
       MS_LOG(ERROR) << "SpaceToDepth error error_code[" << ret << "]";
       return ret;
     }
+    return RET_OK;
   } else {
     MS_LOG(ERROR) << "Only support NHWC now!";
     return RET_ERROR;
diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/quantization/quantize.h b/mindspore/lite/src/runtime/kernel/arm/opclib/quantization/quantize.h
index a0d78631f..61a8a5380 100644
--- a/mindspore/lite/src/runtime/kernel/arm/opclib/quantization/quantize.h
+++ b/mindspore/lite/src/runtime/kernel/arm/opclib/quantization/quantize.h
@@ -143,7 +143,7 @@ inline void CalculateActivationRangeQuantized(bool is_relu, bool is_relu6, int32
 inline void Quantize(float *input_data, int length, float scale, int zero_point, int8_t *output_data) {
   for (int i = 0; i < length; ++i) {
     int r = (int)round(input_data[i] / scale + zero_point);
-    int8_t q = r > CHAR_MAX ? CHAR_MAX : r;
+    int8_t q = r > CHAR_MAX ? (int8_t)CHAR_MAX : (int8_t)r;
     q = q < CHAR_MIN ? CHAR_MIN : q;
     output_data[i] = q;
   }
diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/space_to_batch_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/space_to_batch_fp32_tests.cc
index 7445f0a75..3088ca9a6 100644
--- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/space_to_batch_fp32_tests.cc
+++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/space_to_batch_fp32_tests.cc
@@ -28,7 +28,7 @@ class SpaceToBatchTestFp32 : public mindspore::Common {
   SpaceToBatchTestFp32() {}
 };
 
-int InitSpaceToBatchParameter(SpaceToBatchParameter *param) {
+void InitSpaceToBatchParameter(SpaceToBatchParameter *param) {
   param->n_dims_ = 4;
   param->n_space_dims_ = 2;
 
@@ -56,7 +56,7 @@ int InitSpaceToBatchParameter(SpaceToBatchParameter *param) {
   param->need_paddings_ = true;
 }
 
-int InitSpaceToBatchParameter2(SpaceToBatchParameter *param) {
+void InitSpaceToBatchParameter2(SpaceToBatchParameter *param) {
   param->block_sizes_[0] = 2;
   param->block_sizes_[1] = 2;
 
-- 
GitLab