diff --git a/onnxruntime/core/optimizer/conv_activation_action_base.h b/onnxruntime/core/optimizer/conv_activation_action_base.h index aead7dd9775fd..888809cecb660 100644 --- a/onnxruntime/core/optimizer/conv_activation_action_base.h +++ b/onnxruntime/core/optimizer/conv_activation_action_base.h @@ -8,7 +8,7 @@ namespace onnxruntime { class FusedConvActivationActionBase : public ReplaceWithNew { -private: + private: std::string OpType(const RuntimeState& runtime_state) const override { const auto& domain = runtime_state.selected_nodes.Target().Domain(); const auto& op_type = runtime_state.selected_nodes.Target().OpType(); @@ -31,6 +31,7 @@ class FusedConvActivationActionBase : public ReplaceWithNew { std::string Domain(const RuntimeState& runtime_state) const override { auto domain = runtime_state.selected_nodes.Target().Domain(); return domain == kOnnxDomain ? kMSDomain : domain; - }}; + } +}; } // namespace onnxruntime diff --git a/onnxruntime/core/optimizer/conv_activation_fusion.cc b/onnxruntime/core/optimizer/conv_activation_fusion.cc index 8c60ef6e6e057..efe400d2b9d72 100644 --- a/onnxruntime/core/optimizer/conv_activation_fusion.cc +++ b/onnxruntime/core/optimizer/conv_activation_fusion.cc @@ -7,11 +7,11 @@ #include "core/common/inlined_containers.h" #include "core/framework/tensorprotoutils.h" -#include "core/mlas/inc/mlas.h" #include "core/graph/graph_utils.h" #include "core/graph/node_attr_utils.h" -#include "core/optimizer/utils.h" +#include "core/mlas/inc/mlas.h" #include "core/optimizer/conv_activation_action_base.h" +#include "core/optimizer/utils.h" namespace onnxruntime { diff --git a/onnxruntime/core/optimizer/conv_add_act_fusion.cc b/onnxruntime/core/optimizer/conv_add_act_fusion.cc index 672116ddc239c..8bbdfb848840b 100644 --- a/onnxruntime/core/optimizer/conv_add_act_fusion.cc +++ b/onnxruntime/core/optimizer/conv_add_act_fusion.cc @@ -2,13 +2,13 @@ // Licensed under the MIT License. #include "core/optimizer/conv_add_act_fusion.h" -#include "core/optimizer/conv_activation_action_base.h" #include #include "core/graph/graph_utils.h" #include "core/graph/node_attr_utils.h" #include "core/mlas/inc/mlas.h" +#include "core/optimizer/conv_activation_action_base.h" #include "core/optimizer/initializer.h" #include "core/optimizer/utils.h" @@ -210,8 +210,6 @@ using NTO = NodesToOptimize; class FuseConvAddActivationAction : public FusedConvActivationActionBase { private: - - NodeAttributes ExtraAttributes(const RuntimeState& state) const override { NodeAttributes extra_fused_conv_attributes;