timekiller
/
mindspore2022
forked from huawei/mindspore2022
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!230 fix clang complier bug 

Merge pull request !230 from SanjayChan/master
This commit is contained in:
mindspore-ci-bot 2020-04-11 14:55:25 +08:00 committed by Gitee
parent 0d23520016 e09f220f17
commit 5ec3c8a215
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mindspore/ccsrc/onnx/onnx_exporter.cc
View File

@ -174,14 +174,14 @@ OPERATOR_ONNX_CONVERT_DEFINE(Sigmoid, Sigmoid, OpNameInfo())
OPERATOR_ONNX_CONVERT_DEFINE(Flatten, Flatten, OpNameInfo()) OPERATOR_ONNX_CONVERT_DEFINE(Flatten, Flatten, OpNameInfo())
OPERATOR_ONNX_CONVERT_DEFINE(Squeeze, Squeeze, OPERATOR_ONNX_CONVERT_DEFINE(Squeeze, Squeeze,
OpNameInfo().Attr("axis", "axes", onnx::AttributeProto_AttributeType_INTS, OpNameInfo().Attr("axis", "axes", onnx::AttributeProto_AttributeType_INTS,
SetAttrTupleValueToProto)) SetAttrTupleValueToProto<0>))
OPERATOR_ONNX_CONVERT_DEFINE( OPERATOR_ONNX_CONVERT_DEFINE(
Conv2D, Conv, Conv2D, Conv,
OpNameInfo() OpNameInfo()
.Attr("dilation", "dilations", onnx::AttributeProto_AttributeType_INTS, SetAttrValueToProto<Int32Imm, 2>) .Attr("dilation", "dilations", onnx::AttributeProto_AttributeType_INTS, SetAttrValueToProto<Int32Imm, 2>)
.Attr("group", "group", onnx::AttributeProto_AttributeType_INT, SetAttrValueToProto<Int32Imm>) .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, .Attr("pad_mode", "auto_pad", onnx::AttributeProto_AttributeType_STRING,
[](ValuePtr value, onnx::AttributeProto_AttributeType, onnx::AttributeProto* const attr_proto, [](ValuePtr value, onnx::AttributeProto_AttributeType, onnx::AttributeProto* const attr_proto,
const PrimitivePtr& prim) { const PrimitivePtr& prim) {

2
mindspore/ccsrc/optimizer/irpass/incorporate_getitem.h
View File

@ -15,7 +15,7 @@
*/ */
#ifndef MINDSPORE_CCSRC_OPTIMIZER_IRPASS_INCORPORATE_GETITEM_H_ #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 <vector>
#include <algorithm> #include <algorithm>

2
mindspore/ccsrc/parallel/ops_info/operator_info.cc
View File

@ -236,7 +236,7 @@ OperatorVector CreateMirrorOps(const std::string& group_name, size_t dev_num) {
OperatorName operator_name = MIRROR_OPERATOR; OperatorName operator_name = MIRROR_OPERATOR;
ValuePtr attr0_value = MakeValue(group_name); 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); ValuePtr attr2_value = MakeValue(mean_flag);
Attr attr0 = std::make_pair(GROUP, attr0_value); Attr attr0 = std::make_pair(GROUP, attr0_value);

1
mindspore/ccsrc/utils/log_adapter.h
View File

@ -22,6 +22,7 @@
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <memory> #include <memory>
#include "./overload.h"
#include "./securec.h" #include "./securec.h"
#ifdef USE_GLOG #ifdef USE_GLOG
#include "glog/logging.h" #include "glog/logging.h"