Fix various lint warnings under runtime/executor/... (#1589)

dbort · facebook-github-bot · commit a06b4504cad5 · 2024-01-12T16:25:01.000-08:00
Summary: Pull Request resolved: #1589 Fix a bunch of clang-tidy warnings hit when building .cpp/.h files under runtime/executor/..., which can also include .h files included by those .cpp files. Reviewed By: larryliu0820 Differential Revision: D52717684 fbshipit-source-id: c882a9ac72981d364a9e58c24b1fc0ec19740c03
diff --git a/runtime/backend/backend_init_context.h b/runtime/backend/backend_init_context.h
@@ -18,7 +18,7 @@ namespace executor {
  */
 class BackendInitContext final {
  public:
-  BackendInitContext(MemoryAllocator* runtime_allocator)
+  explicit BackendInitContext(MemoryAllocator* runtime_allocator)
       : runtime_allocator_(runtime_allocator) {}
 
   /** Get the runtime allocator passed from Method. It's the same runtime
diff --git a/runtime/core/exec_aten/exec_aten.h b/runtime/core/exec_aten/exec_aten.h
@@ -93,6 +93,7 @@ using ArrayRef = torch::executor::ArrayRef<T>;
 template <typename T>
 using optional = torch::executor::optional<T>;
 using nullopt_t = torch::executor::nullopt_t;
+// NOLINTNEXTLINE(facebook-hte-NamespaceScopedStaticDeclaration)
 static constexpr nullopt_t nullopt{0};
 using ScalarType = torch::executor::ScalarType;
 using TensorList = ArrayRef<Tensor>;
diff --git a/runtime/core/exec_aten/util/tensor_util.h b/runtime/core/exec_aten/util/tensor_util.h
@@ -714,16 +714,6 @@ inline bool tensors_have_same_shape_and_dtype(
   return tensors_have_same_shape(a, b, c) && tensors_have_same_dtype(a, b, c);
 }
 
-#define ET_CHECK_DEFAULT_OR_CHANNELSLAST_DIMORDER(t__)           \
-  ({                                                             \
-    ET_CHECK_MSG(                                                \
-        is_default_dim_order(                                    \
-            t__.dim_order().data(), t__.dim_order().size()) ||   \
-            is_channels_last_dim_order(                          \
-                t__.dim_order().data(), t__.dim_order().size()), \
-        "Tensor must have default or channels last dim order");  \
-  })
-
 inline bool tensor_has_expected_size(
     exec_aten::Tensor a,
     exec_aten::ArrayRef<exec_aten::SizesType> expected_sizes) {
diff --git a/runtime/executor/method.cpp b/runtime/executor/method.cpp
@@ -8,14 +8,12 @@
 
 #include <executorch/runtime/executor/method.h>
 
-#include <cinttypes>
+#include <cinttypes> // @donotremove
 #include <cstdint>
 #include <cstdio>
 
 #include <executorch/runtime/backend/interface.h>
 #include <executorch/runtime/core/event_tracer_hooks.h>
-#include <executorch/runtime/core/exec_aten/util/dim_order_util.h>
-#include <executorch/runtime/core/exec_aten/util/scalar_type_util.h>
 #include <executorch/runtime/core/exec_aten/util/tensor_util.h>
 #include <executorch/runtime/core/span.h>
 #include <executorch/runtime/executor/memory_manager.h>
diff --git a/runtime/executor/targets.bzl b/runtime/executor/targets.bzl
@@ -65,8 +65,6 @@ def define_common_targets():
             deps = [
                 "//executorch/kernels/prim_ops:prim_ops_registry" + aten_suffix,
                 "//executorch/runtime/backend:interface",
-                "//executorch/runtime/core/exec_aten/util:dim_order_util",
-                "//executorch/runtime/core/exec_aten/util:scalar_type_util",
                 "//executorch/runtime/core/exec_aten/util:tensor_util" + aten_suffix,
                 "//executorch/runtime/core:core",
                 "//executorch/runtime/kernel:kernel_runtime_context" + aten_suffix,
diff --git a/runtime/executor/tensor_parser_aten.cpp b/runtime/executor/tensor_parser_aten.cpp
@@ -15,7 +15,7 @@
 #include <executorch/runtime/platform/profiler.h>
 #include <executorch/schema/program_generated.h>
 
-#include <ATen/ATen.h> // @manual=//caffe2/aten:ATen-core
+#include <ATen/ATen.h> // @donotremove @manual=//caffe2/aten:ATen-core
 
 namespace torch {
 namespace executor {
diff --git a/runtime/executor/tensor_parser_exec_aten.cpp b/runtime/executor/tensor_parser_exec_aten.cpp
@@ -10,7 +10,6 @@
 
 #include <executorch/runtime/core/evalue.h>
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
-#include <executorch/runtime/core/exec_aten/util/dim_order_util.h>
 #include <executorch/runtime/executor/memory_manager.h>
 #include <executorch/runtime/executor/program.h>
 #include <executorch/runtime/platform/profiler.h>
diff --git a/runtime/executor/tensor_parser_portable.cpp b/runtime/executor/tensor_parser_portable.cpp
@@ -8,7 +8,6 @@
 
 #include <executorch/runtime/executor/tensor_parser.h>
 
-#include <executorch/runtime/core/evalue.h>
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
 #include <executorch/runtime/core/exec_aten/util/dim_order_util.h>
 #include <executorch/runtime/core/exec_aten/util/scalar_type_util.h>
diff --git a/runtime/executor/test/allocation_failure_stress_test.cpp b/runtime/executor/test/allocation_failure_stress_test.cpp
@@ -39,6 +39,8 @@ constexpr size_t kDefaultRuntimeMemBytes = 32 * 1024U;
 class AllocationFailureStressTest : public ::testing::Test {
  protected:
   void SetUp() override {
+    torch::executor::runtime_init();
+
     // Create a loader for the serialized ModuleAdd program.
     const char* path = std::getenv("ET_MODULE_ADD_PATH");
     Result<FileDataLoader> loader = FileDataLoader::from(path);
diff --git a/runtime/executor/test/kernel_integration_test.cpp b/runtime/executor/test/kernel_integration_test.cpp
@@ -129,6 +129,8 @@ KernelControl KernelControl::singleton_;
 class KernelIntegrationTest : public ::testing::Test {
  protected:
   void SetUp() override {
+    torch::executor::runtime_init();
+
     // Register the controllable kernel hook.
     KernelControl::register_singleton();
     // Ensure that its state is clear.
diff --git a/runtime/executor/test/memory_manager_test.cpp b/runtime/executor/test/memory_manager_test.cpp
@@ -57,6 +57,7 @@ TEST(MemoryManagerTest, DEPRECATEDCtor) {
   MemoryAllocator temp_allocator(0, nullptr);
   MemoryAllocator const_allocator(0, nullptr);
 
+  // NOLINTNEXTLINE(facebook-hte-Deprecated)
   MemoryManager mm(
       /*constant_allocator=*/&const_allocator,
       /*non_constant_allocator=*/&planned_memory,
diff --git a/runtime/executor/test/method_meta_test.cpp b/runtime/executor/test/method_meta_test.cpp
@@ -13,7 +13,6 @@
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
 #include <executorch/runtime/executor/method_meta.h>
 #include <executorch/runtime/executor/program.h>
-#include <executorch/util/util.h>
 #include <gtest/gtest.h>
 
 using namespace ::testing;
diff --git a/runtime/executor/test/method_test.cpp b/runtime/executor/test/method_test.cpp
@@ -52,6 +52,8 @@ class MethodTest : public ::testing::Test {
   }
 
   void SetUp() override {
+    torch::executor::runtime_init();
+
     load_program(std::getenv("ET_MODULE_ADD_PATH"), "add");
     load_program(std::getenv("ET_MODULE_INDEX_PATH"), "index");
     load_program(
diff --git a/runtime/executor/test/program_test.cpp b/runtime/executor/test/program_test.cpp
@@ -326,6 +326,7 @@ TEST_F(ProgramTest, getMethods) {
 // Test that the deprecated Load method (capital 'L') still works.
 TEST_F(ProgramTest, DEPRECATEDLoad) {
   // Parse the Program from the data.
+  // NOLINTNEXTLINE(facebook-hte-Deprecated)
   Result<Program> program_res = Program::Load(multi_loader_.get());
   EXPECT_EQ(program_res.error(), Error::Ok);
 }
diff --git a/runtime/executor/test/targets.bzl b/runtime/executor/test/targets.bzl
@@ -145,7 +145,6 @@ def define_common_targets(is_fbcode = False):
             ],
             deps = [
                 "//executorch/runtime/executor:program",
-                "//executorch/util:util",
                 "//executorch/extension/data_loader:file_data_loader",
             ],
             env = modules_env,
diff --git a/runtime/executor/test/test_backend_compiler_lib.cpp b/runtime/executor/test/test_backend_compiler_lib.cpp
@@ -12,7 +12,6 @@
 #include <executorch/runtime/platform/profiler.h>
 #include <cstdio>
 #include <cstdlib> /* strtol */
-#include <memory>
 
 namespace torch {
 namespace executor {
@@ -33,7 +32,7 @@ class BackendWithCompiler final : public PyTorchBackendInterface {
   int max_shape = 4;
 
  public:
-  ~BackendWithCompiler() = default;
+  ~BackendWithCompiler() override = default;
 
   bool is_available() const override {
     return true;
diff --git a/runtime/executor/test/test_backend_with_delegate_mapping.cpp b/runtime/executor/test/test_backend_with_delegate_mapping.cpp
@@ -29,7 +29,7 @@ struct DemoOpList {
 
 class BackendWithDelegateMapping final : public PyTorchBackendInterface {
  public:
-  ~BackendWithDelegateMapping() = default;
+  ~BackendWithDelegateMapping() override = default;
 
   bool is_available() const override {
     return true;
@@ -51,8 +51,9 @@ class BackendWithDelegateMapping final : public PyTorchBackendInterface {
     char* copy = strdup(str);
 
     while (true) {
-      op_name = strtok(copy, ",");
-      delegate_debug_identifier = strtok(nullptr, ",");
+      char* saveptr = nullptr;
+      op_name = strtok_r(copy, ",", &saveptr);
+      delegate_debug_identifier = strtok_r(nullptr, ",", &saveptr);
 
       if (op_name == nullptr || delegate_debug_identifier == nullptr) {
         break;
diff --git a/runtime/platform/profiler.h b/runtime/platform/profiler.h
@@ -143,7 +143,7 @@ void profiling_create_block(const char* name);
 // object goes out of scope.
 class ExecutorchProfiler {
  public:
-  ExecutorchProfiler(const char* name);
+  explicit ExecutorchProfiler(const char* name);
 
   ~ExecutorchProfiler();
 
