Fix cpp lint

mengshyu · mengshyu · commit 8aaad2bc440e · 2024-09-21T22:34:22.000-04:00
diff --git a/src/relax/backend/contrib/nnapi/codegen.cc b/src/relax/backend/contrib/nnapi/codegen.cc
@@ -48,7 +48,7 @@ class CollectFromCompositeFunctionBody : public ExprVisitor {
   explicit CollectFromCompositeFunctionBody(NNAPIJSONSerializer* serializer)
       : serializer_(serializer), node_(std::make_shared<JSONGraphNode>()) {}
 
-  void VisitExpr_(const CallNode* call_node) override final;
+  void VisitExpr_(const CallNode* call_node) override;
 
   void SetPermuteDimsAttribute(const CallNode* call_node) {
     const auto* permute_dims_attr = call_node->attrs.as<PermuteDimsAttrs>();
@@ -237,12 +237,11 @@ void CollectFromCompositeFunctionBody::VisitExpr_(const CallNode* call_node) {
     SetAstypeAttribute(call_node);
   } else if (name == "relax.mean") {
     SetMeanAttribute(call_node);
-  }
-  else if(name == "relax.nn.conv2d"){
+  } else if (name == "relax.nn.conv2d") {
     SetConv2dAttribute(call_node);
-  }
-  else if(name == "relax.nn.max_pool2d"){
+  } else if (name == "relax.nn.max_pool2d") {
     SetMaxPool2dAttribute(call_node);
+  } else {
   }
   ExprVisitor::VisitExpr_(call_node);
 }
diff --git a/src/runtime/contrib/nnapi/nnapi_builder.cc b/src/runtime/contrib/nnapi/nnapi_builder.cc
@@ -26,6 +26,7 @@
 
 #include <algorithm>
 #include <iterator>
+#include <utility>
 
 #include "../json/json_runtime.h"
 #include "nnapi_ops.h"
diff --git a/src/runtime/contrib/nnapi/nnapi_builder.h b/src/runtime/contrib/nnapi/nnapi_builder.h
@@ -84,14 +84,14 @@ class NNAPIModelBuilder {
     other.model_ = nullptr;
     next_operand_index_ = other.next_operand_index_;
     other.next_operand_index_ = 0;
-  };
+  }
   inline NNAPIModelBuilder& operator=(NNAPIModelBuilder&& other) {
     model_ = other.model_;
     other.model_ = nullptr;
     next_operand_index_ = other.next_operand_index_;
     other.next_operand_index_ = 0;
     return *this;
-  };
+  }
 
   NNAPIOperand CreateOperandWithValue(const DLTensor& tensor);
   NNAPIOperand CreateOperandWithValue(int32_t tensor_type, std::vector<int64_t> dimensions,
diff --git a/src/runtime/contrib/nnapi/nnapi_ops.cc b/src/runtime/contrib/nnapi/nnapi_ops.cc
@@ -23,7 +23,12 @@
 #include <algorithm>
 #include <cstdint>
 #include <functional>
+#include <memory>
+#include <string>
+#include <tuple>
+#include <unordered_map>
 #include <utility>
+#include <vector>
 
 #include "nnapi_builder.h"
 
@@ -115,7 +120,7 @@ void SoftmaxOpConverter::Convert(NNAPIModelBuilder& builder, const JSONGraphNode
 
   // Add the scalar input for beta value at index 1.
   const auto& input = inputs[0];
-  // TODO: Conditionally use float16 beta for float16 input.
+  // TODO(PLLab): Conditionally use float16 beta for float16 input.
   ICHECK_EQ(input.GetTensorType(), ANEURALNETWORKS_TENSOR_FLOAT32)
       << "NNAPI runtime does not support non-float32 inputs for softmax yet";
   const float beta = 1.0f;
@@ -128,7 +133,7 @@ void SoftmaxOpConverter::Convert(NNAPIModelBuilder& builder, const JSONGraphNode
 
 // Insert a reshape operation that reshapes `operand` to `dimensions` and return the reshaped
 // operand.
-NNAPIOperand ReshapeOperand(NNAPIModelBuilder& builder, const NNAPIOperand& operand,
+NNAPIOperand ReshapeOperand(NNAPIModelBuilder& builder, const NNAPIOperand& operand,  // NOLINT(*)
                             std::vector<int64_t> dimensions) {
   // ANEURALNETWORKS_RESHAPE requires the dimensions to be specified in a int32 tensor.
   const std::vector<int32_t> dimensions_int32(dimensions.begin(), dimensions.end());
@@ -148,7 +153,7 @@ NNAPIOperand ReshapeOperand(NNAPIModelBuilder& builder, const NNAPIOperand& oper
   return reshaped_operand;
 }
 
-NNAPIOperand TransposeOperand(NNAPIModelBuilder& builder, const NNAPIOperand& operand,
+NNAPIOperand TransposeOperand(NNAPIModelBuilder& builder, const NNAPIOperand& operand,  // NOLINT(*)
                               std::vector<int64_t> dimensions) {
   const std::vector<int32_t> dimensions_int32(dimensions.begin(), dimensions.end());
   const std::vector<int64_t> dim_of_axes{static_cast<int64_t>(dimensions_int32.size())};
@@ -281,7 +286,8 @@ void CastOpConverter::Convert(NNAPIModelBuilder& builder, const JSONGraphNode& n
 }
 
 template <int TensorType, typename DataType>
-NNAPIOperand CreateConv2DBiasOperand(NNAPIModelBuilder& builder, int64_t output_depth) {
+NNAPIOperand CreateConv2DBiasOperand(NNAPIModelBuilder& builder,  // NOLINT(*)
+                                     int64_t output_depth) {
   std::vector<DataType> bias(output_depth, 0.0f);
 
   const std::vector<int64_t> dim_of_bias{static_cast<int64_t>(bias.size())};
@@ -324,17 +330,16 @@ void Conv2dOpConverter::Convert(NNAPIModelBuilder& builder, const JSONGraphNode&
           CreateConv2DBiasOperand<ANEURALNETWORKS_TENSOR_FLOAT16, uint16_t>(builder, output_depth);
       input_indices.push_back(bias_operand.GetOperandIndex());
     }
-  }
-  else{
+  } else {
     int64_t bias_dim;
-    for(int i=0; i<inputs[2].GetDimensions().size();i++){
-      if(inputs[2].GetDimensions()[i]!=1) {
+    for (int i = 0; i < inputs[2].GetDimensions().size(); i++) {
+      if (inputs[2].GetDimensions()[i] != 1) {
         bias_dim = inputs[2].GetDimensions()[i];
       }
     }
     std::vector<int64_t> bias_dimension = {bias_dim};
     NNAPIOperand bias_operand = ReshapeOperand(builder, inputs[2], bias_dimension);
-    input_indices[2] =  bias_operand.GetOperandIndex();
+    input_indices[2] = bias_operand.GetOperandIndex();
   }
   // padding operand
   std::vector<int32_t> padding;
@@ -588,7 +593,7 @@ const std::unordered_map<std::string, std::unique_ptr<NNAPIOpConverter>>& GetOpC
     return map;
   }();
   return map;
-};
+}
 
 }  // namespace contrib
 }  // namespace runtime
diff --git a/src/runtime/contrib/nnapi/nnapi_ops.h b/src/runtime/contrib/nnapi/nnapi_ops.h
@@ -23,6 +23,11 @@
 
 #include <android/NeuralNetworks.h>
 
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 #include "../json/json_node.h"
 #include "nnapi_builder.h"
 
@@ -36,7 +41,7 @@ struct NNAPIOpConverterParams {
   const JSONGraphNode& node;
   std::vector<NNAPIOperand> inputs;
   std::vector<NNAPIOperand> outputs;
-  NNAPIOpConverterParams(const JSONGraphNode& node);
+  explicit NNAPIOpConverterParams(const JSONGraphNode& node);
 };
 
 class NNAPIOpConverter {
@@ -46,9 +51,9 @@ class NNAPIOpConverter {
   explicit NNAPIOpConverter(std::string op_name);
   virtual ~NNAPIOpConverter() = default;
 
-  virtual void Convert(NNAPIModelBuilder& builder, const JSONGraphNode& node,
+  virtual void Convert(NNAPIModelBuilder& builder, const JSONGraphNode& node,  // NOLINT(*)
                        const std::vector<NNAPIOperand>& inputs,
-                       std::vector<NNAPIOperand>& outputs) const = 0;
+                       std::vector<NNAPIOperand>& outputs) const = 0;  // NOLINT(*)
 };
 
 class ElwBinaryOpConverter : public NNAPIOpConverter {
@@ -73,7 +78,7 @@ class UnaryOpConverter : public NNAPIOpConverter {
 
 class SoftmaxOpConverter : public NNAPIOpConverter {
  public:
-  inline explicit SoftmaxOpConverter() : NNAPIOpConverter("softmax") {}
+  inline SoftmaxOpConverter() : NNAPIOpConverter("softmax") {}
   ~SoftmaxOpConverter() = default;
 
   void Convert(NNAPIModelBuilder& builder, const JSONGraphNode& node,
@@ -83,7 +88,7 @@ class SoftmaxOpConverter : public NNAPIOpConverter {
 
 class MatmulOpConverter : public NNAPIOpConverter {
  public:
-  inline explicit MatmulOpConverter() : NNAPIOpConverter("") {}
+  inline MatmulOpConverter() : NNAPIOpConverter("") {}
   ~MatmulOpConverter() = default;
 
   void Convert(NNAPIModelBuilder& builder, const JSONGraphNode& node,
@@ -93,7 +98,7 @@ class MatmulOpConverter : public NNAPIOpConverter {
 
 class TransposeOpConverter : public NNAPIOpConverter {
  public:
-  inline explicit TransposeOpConverter() : NNAPIOpConverter("") {}
+  inline TransposeOpConverter() : NNAPIOpConverter("") {}
   ~TransposeOpConverter() = default;
 
   void Convert(NNAPIModelBuilder& builder, const JSONGraphNode& node,
@@ -112,7 +117,7 @@ class CastOpConverter : public NNAPIOpConverter {
 };
 class Conv2dOpConverter : public NNAPIOpConverter {
  public:
-  inline explicit Conv2dOpConverter() : NNAPIOpConverter("") {}
+  inline Conv2dOpConverter() : NNAPIOpConverter("") {}
   ~Conv2dOpConverter() = default;
 
   void Convert(NNAPIModelBuilder& builder, const JSONGraphNode& node,
@@ -122,7 +127,7 @@ class Conv2dOpConverter : public NNAPIOpConverter {
 
 class DenseOpConverter : public NNAPIOpConverter {
  public:
-  inline explicit DenseOpConverter() : NNAPIOpConverter("") {}
+  inline DenseOpConverter() : NNAPIOpConverter("") {}
   ~DenseOpConverter() = default;
 
   void Convert(NNAPIModelBuilder& builder, const JSONGraphNode& node,
@@ -132,7 +137,7 @@ class DenseOpConverter : public NNAPIOpConverter {
 
 class MaxPool2dOpConverter : public NNAPIOpConverter {
  public:
-  inline explicit MaxPool2dOpConverter() : NNAPIOpConverter("") {}
+  inline MaxPool2dOpConverter() : NNAPIOpConverter("") {}
   ~MaxPool2dOpConverter() = default;
 
   void Convert(NNAPIModelBuilder& builder, const JSONGraphNode& node,
diff --git a/src/runtime/contrib/nnapi/nnapi_runtime.cc b/src/runtime/contrib/nnapi/nnapi_runtime.cc
@@ -178,7 +178,8 @@ class NNAPIRuntime : public JSONRuntimeBase {
     ExecuteModel(compiled_model.compilation, compiled_model.model_output_operands);
   }
 
-  void AddOperation(NNAPIModelBuilder& builder, uint32_t nid, const JSONGraphNode& node) {
+  void AddOperation(NNAPIModelBuilder& builder, uint32_t nid,  // NOLINT(*)
+                    const JSONGraphNode& node) {
     std::vector<NNAPIOperand> inputs;
     std::vector<NNAPIOperand> outputs;
 

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,8 @@ class NNAPIRuntime : public JSONRuntimeBase {`
`178`	`178`	`ExecuteModel(compiled_model.compilation, compiled_model.model_output_operands);`
`179`	`179`	`}`
`180`	`180`
`181`		`- void AddOperation(NNAPIModelBuilder& builder, uint32_t nid, const JSONGraphNode& node) {`
	`181`	`+ void AddOperation(NNAPIModelBuilder& builder, uint32_t nid, // NOLINT(*)`
	`182`	`+ const JSONGraphNode& node) {`
`182`	`183`	`std::vector<NNAPIOperand> inputs;`
`183`	`184`	`std::vector<NNAPIOperand> outputs;`
`184`	`185`