fix lint issues + one bug in IsCompatible

xadupre · Nov 17, 2023 · 2364589 · 2364589
1 parent 9ba122f
commit 2364589
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/onnxruntime/core/session/custom_ops.cc b/onnxruntime/core/session/custom_ops.cc
@@ -6,6 +6,7 @@
 #endif
 
 #include <type_traits>
+#include <unordered_set>
 
 #include "core/common/gsl.h"
 #include "core/framework/data_types.h"
@@ -804,7 +805,8 @@ ONNX_NAMESPACE::OpSchema CreateSchema(const std::string& domain, const std::vect
     if (!all_types.empty()) {
       std::vector<std::string> input_types;
       for (auto type : all_types) {
-        const ONNX_NAMESPACE::TypeProto* type_proto = DataTypeImpl::TensorTypeFromONNXEnum(static_cast<int>(type))->GetTypeProto();
+        const ONNX_NAMESPACE::TypeProto* type_proto =
+            DataTypeImpl::TensorTypeFromONNXEnum(static_cast<int>(type))->GetTypeProto();
         input_types.push_back(*ONNX_NAMESPACE::Utils::DataTypeUtils::ToType(*type_proto));
       }
       schema.TypeConstraint(input_name, input_types, "defined list of types");
@@ -864,7 +866,8 @@ ONNX_NAMESPACE::OpSchema CreateSchema(const std::string& domain, const std::vect
     if (!all_types.empty()) {
       std::vector<std::string> output_types;
       for (auto otype : all_types) {
-        const ONNX_NAMESPACE::TypeProto* type_proto = DataTypeImpl::TensorTypeFromONNXEnum(static_cast<int>(otype))->GetTypeProto();
+        const ONNX_NAMESPACE::TypeProto* type_proto =
+            DataTypeImpl::TensorTypeFromONNXEnum(static_cast<int>(otype))->GetTypeProto();
         output_types.push_back(*ONNX_NAMESPACE::Utils::DataTypeUtils::ToType(*type_proto));
       }
       schema.TypeConstraint(output_name, output_types, "defined list of types");
@@ -891,7 +894,6 @@ ONNX_NAMESPACE::OpSchema CreateSchema(const std::string& domain, const std::vect
   return schema;
 }
 
-
 Status IsCompatible(const ONNX_NAMESPACE::OpSchema& schema, const OrtCustomOp* op) {
   const size_t input_count = op->GetInputTypeCount(op);
   const size_t output_count = op->GetOutputTypeCount(op);
@@ -949,7 +951,7 @@ Status IsCompatible(const ONNX_NAMESPACE::OpSchema& schema, const OrtCustomOp* o
                         "custom op schemas mismatch, expecting ", i + 1,
                         i == 0 ? "st" : (i == 1 ? "nd" : "th"),
                         " output to keep same homogeneity");
-      ORT_RETURN_IF_NOT(formal_parameter.GetMinArity() == op->GetVariadicInputMinArity(op),
+      ORT_RETURN_IF_NOT(formal_parameter.GetMinArity() == op->GetVariadicOutputMinArity(op),
                         "custom op schemas mismatch, expecting ", i + 1,
                         i == 0 ? "st" : (i == 1 ? "nd" : "th"),
                         " output to keep same arity");

diff --git a/onnxruntime/test/testdata/custom_op_local_function/custom_gemm.cc b/onnxruntime/test/testdata/custom_op_local_function/custom_gemm.cc
@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+#include <string>
+#include <utility>
+
 #include "custom_gemm.h"
 
 #ifndef ORT_ENFORCE
@@ -328,7 +331,7 @@ const char* CustomGemmOp::GetExecutionProviderType() const {
   return "CPUExecutionProvider";
 }
 
-size_t CustomGemmOp::GetInputTypeCount() const { return 6; };
+size_t CustomGemmOp::GetInputTypeCount() const { return 6; }
 
 ONNXTensorElementDataType CustomGemmOp::GetInputType(size_t index) const {
   switch (index) {

diff --git a/onnxruntime/test/testdata/custom_op_local_function/custom_op_local_function.cc b/onnxruntime/test/testdata/custom_op_local_function/custom_op_local_function.cc
@@ -3,9 +3,10 @@
 
 #include "custom_op_local_function.h"
 
-#include <vector>
 #include <cmath>
 #include <mutex>
+#include <utility>
+#include <vector>
 
 #include "core/common/common.h"
 #include "core/framework/ortdevice.h"