From e09f220f17205ff13395e5991bd0c7d333949b60 Mon Sep 17 00:00:00 2001
From: chenzomi <chenzomi12@gmail.com>
Date: Sat, 11 Apr 2020 11:06:39 +0800
Subject: [PATCH] fix complite bug in clang

---
 mindspore/ccsrc/onnx/onnx_exporter.cc                  | 4 ++--
 mindspore/ccsrc/optimizer/irpass/incorporate_getitem.h | 2 +-
 mindspore/ccsrc/parallel/ops_info/operator_info.cc     | 2 +-
 mindspore/ccsrc/utils/log_adapter.h                    | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mindspore/ccsrc/onnx/onnx_exporter.cc b/mindspore/ccsrc/onnx/onnx_exporter.cc
index 3bd4a3888..e6ba60ff9 100644
--- a/mindspore/ccsrc/onnx/onnx_exporter.cc
+++ b/mindspore/ccsrc/onnx/onnx_exporter.cc
@@ -174,14 +174,14 @@ OPERATOR_ONNX_CONVERT_DEFINE(Sigmoid, Sigmoid, OpNameInfo())
 OPERATOR_ONNX_CONVERT_DEFINE(Flatten, Flatten, OpNameInfo())
 OPERATOR_ONNX_CONVERT_DEFINE(Squeeze, Squeeze,
                              OpNameInfo().Attr("axis", "axes", onnx::AttributeProto_AttributeType_INTS,
-                                               SetAttrTupleValueToProto))
+                                               SetAttrTupleValueToProto<0>))
 
 OPERATOR_ONNX_CONVERT_DEFINE(
   Conv2D, Conv,
   OpNameInfo()
     .Attr("dilation", "dilations", onnx::AttributeProto_AttributeType_INTS, SetAttrValueToProto<Int32Imm, 2>)
     .Attr("group", "group", onnx::AttributeProto_AttributeType_INT, SetAttrValueToProto<Int32Imm>)
-    .Attr("kernel_size", "kernel_shape", onnx::AttributeProto_AttributeType_INTS, SetAttrTupleValueToProto)
+    .Attr("kernel_size", "kernel_shape", onnx::AttributeProto_AttributeType_INTS, SetAttrTupleValueToProto<0>)
     .Attr("pad_mode", "auto_pad", onnx::AttributeProto_AttributeType_STRING,
           [](ValuePtr value, onnx::AttributeProto_AttributeType, onnx::AttributeProto* const attr_proto,
              const PrimitivePtr& prim) {
diff --git a/mindspore/ccsrc/optimizer/irpass/incorporate_getitem.h b/mindspore/ccsrc/optimizer/irpass/incorporate_getitem.h
index 9dc8e7255..77f3fa7b3 100644
--- a/mindspore/ccsrc/optimizer/irpass/incorporate_getitem.h
+++ b/mindspore/ccsrc/optimizer/irpass/incorporate_getitem.h
@@ -15,7 +15,7 @@
  */
 
 #ifndef MINDSPORE_CCSRC_OPTIMIZER_IRPASS_INCORPORATE_GETITEM_H_
-#define MINDSPORE_CCSRC_OPTIMIZER_IRPASS_INCORPORATE_GETITEM_H__
+#define MINDSPORE_CCSRC_OPTIMIZER_IRPASS_INCORPORATE_GETITEM_H_
 
 #include <vector>
 #include <algorithm>
diff --git a/mindspore/ccsrc/parallel/ops_info/operator_info.cc b/mindspore/ccsrc/parallel/ops_info/operator_info.cc
index a24f3e616..68c73bc54 100644
--- a/mindspore/ccsrc/parallel/ops_info/operator_info.cc
+++ b/mindspore/ccsrc/parallel/ops_info/operator_info.cc
@@ -236,7 +236,7 @@ OperatorVector CreateMirrorOps(const std::string& group_name, size_t dev_num) {
 
   OperatorName operator_name = MIRROR_OPERATOR;
   ValuePtr attr0_value = MakeValue(group_name);
-  ValuePtr attr1_value = MakeValue(dev_num);
+  ValuePtr attr1_value = MakeValue(SizeToInt(dev_num));
   ValuePtr attr2_value = MakeValue(mean_flag);
 
   Attr attr0 = std::make_pair(GROUP, attr0_value);
diff --git a/mindspore/ccsrc/utils/log_adapter.h b/mindspore/ccsrc/utils/log_adapter.h
index 61c253782..2122870c3 100644
--- a/mindspore/ccsrc/utils/log_adapter.h
+++ b/mindspore/ccsrc/utils/log_adapter.h
@@ -22,6 +22,7 @@
 #include <string>
 #include <sstream>
 #include <memory>
+#include "./overload.h"
 #include "./securec.h"
 #ifdef USE_GLOG
 #include "glog/logging.h"
-- 
GitLab