Remove util/util.h

Differential Revision: D61823549

Pull Request resolved: #4919

Author: dbort

backends/cadence/cadence_runner/targets.bzl

@@ -25,6 +25,5 @@ def define_common_targets():
             "fbsource//xplat/executorch/extension/data_loader:buffer_data_loader",
             "fbsource//xplat/executorch/kernels/portable:generated_lib",
             "fbsource//xplat/executorch/runtime/executor:program",
-            "fbsource//xplat/executorch/util:util",
         ],
     )

docs/source/Doxyfile

@@ -964,8 +964,7 @@ INPUT                  = ../runtime/executor/memory_manager.h \
                          ../runtime/core/tensor_shape_dynamism.h \
                          ../runtime/platform/compiler.h \
                          ../runtime/executor/ \
-                         ../runtime/platform/ \
-                         ../util/
+                         ../runtime/platform/
 
 
 

examples/apple/coreml/executor_runner/main.mm

@@ -14,7 +14,6 @@
 #import <executorch/runtime/platform/log.h>
 #import <executorch/runtime/platform/runtime.h>
 #import <executorch/devtools/etdump/etdump_flatcc.h>
-#import <executorch/util/util.h>
 #import <memory>
 #import <numeric>
 #import <string>

examples/mediatek/executor_runner/llama_runner/LlamaModelChunk.cpp

@@ -18,7 +18,6 @@
 #include <executorch/runtime/platform/log.h>
 #include <executorch/runtime/platform/profiler.h>
 #include <executorch/runtime/platform/runtime.h>
-#include <executorch/util/util.h>
 
 #include "LlamaConfig.h"
 #include "LlamaModelChunk.h"
@@ -344,4 +343,4 @@ void LlamaModelChunk::InitCache() {
   }
 }
 
-} // namespace torch::executor
+} // namespace torch::executor

examples/mediatek/executor_runner/llama_runner/LlamaModelChunk.h

@@ -19,7 +19,6 @@
 #include <executorch/runtime/platform/log.h>
 #include <executorch/runtime/platform/profiler.h>
 #include <executorch/runtime/platform/runtime.h>
-#include <executorch/util/util.h>
 
 #include "LlamaConfig.h"
 #include "ModelChunk.h"
@@ -136,4 +135,4 @@ class LlamaModelChunk : public ModelChunk {
   size_t mCurrentTokenIndex = 0;
 };
 
-} // namespace torch::executor
+} // namespace torch::executor

examples/mediatek/executor_runner/llama_runner/ModelChunk.cpp

@@ -19,7 +19,6 @@
 #include <executorch/runtime/platform/log.h>
 #include <executorch/runtime/platform/profiler.h>
 #include <executorch/runtime/platform/runtime.h>
-#include <executorch/util/util.h>
 
 #define ENSURE_INIT \
   ET_CHECK_MSG(Initialized(), "Error: Model chunk not initialized.");
@@ -573,4 +572,4 @@ void ModelChunk::ReleaseModelInstance(void* modelInstance) {
   }
 }
 
-} // namespace torch::executor
+} // namespace torch::executor

examples/mediatek/executor_runner/mtk_llama_executor_runner.cpp

@@ -60,7 +60,6 @@
 #include <executorch/runtime/platform/log.h>
 #include <executorch/runtime/platform/profiler.h>
 #include <executorch/runtime/platform/runtime.h>
-#include <executorch/util/util.h>
 
 #include "llama_runner/LlamaConfig.h"
 #include "llama_runner/LlamaRuntime.h"

examples/qualcomm/executor_runner/qnn_executor_runner.cpp

@@ -27,7 +27,6 @@
 #include <executorch/runtime/platform/log.h>
 #include <executorch/runtime/platform/profiler.h>
 #include <executorch/runtime/platform/runtime.h>
-#include <executorch/util/util.h>
 
 #include <gflags/gflags.h>
 

examples/sdk/sdk_example_runner/sdk_example_runner.cpp

@@ -29,7 +29,6 @@
 #include <executorch/runtime/executor/program.h>
 #include <executorch/runtime/platform/log.h>
 #include <executorch/runtime/platform/runtime.h>
-#include <executorch/util/util.h>
 
 static uint8_t method_allocator_pool[4 * 1024U * 1024U]; // 4MB
 static constexpr size_t kBundledAllocatorPoolSize = 16 * 1024U;

examples/sdk/sdk_example_runner/targets.bzl

@@ -19,7 +19,6 @@ def define_common_targets():
             "//executorch/runtime/executor:program",
             "//executorch/extension/data_loader:file_data_loader",
             "//executorch/extension/data_loader:buffer_data_loader",
-            "//executorch/util:util",
             "//executorch/devtools/etdump:etdump_flatcc",
             "//executorch/devtools/bundled_program:runtime",
         ],

exir/backend/test/demos/rpc/ExecutorBackend.cpp

@@ -20,7 +20,6 @@
 #include <executorch/runtime/core/exec_aten/util/tensor_util.h>
 #include <executorch/runtime/executor/method.h>
 #include <executorch/runtime/executor/program.h>
-#include <executorch/util/util.h>
 
 namespace torch {
 namespace executor {

exir/backend/test/demos/rpc/targets.bzl

@@ -27,7 +27,6 @@ def define_common_targets():
             "//executorch/kernels/portable:generated_lib",
             "//executorch/runtime/backend:interface",
             "//executorch/extension/data_loader:buffer_data_loader",
-            "//executorch/util:util",
         ] + MODELS_ATEN_OPS_LEAN_MODE_GENERATED_LIB,
         exported_deps = [
             "//executorch/runtime/core:core",

extension/training/test/targets.bzl

@@ -25,7 +25,6 @@ def define_common_targets(is_fbcode = False):
             ],
             deps = [
                 "//executorch/runtime/executor:program",
-                "//executorch/util:util",
                 "//executorch/extension/data_loader:file_data_loader",
                 "//executorch/runtime/core/exec_aten/testing_util:tensor_util",
                 "//executorch/extension/evalue_util:print_evalue",

runtime/core/exec_aten/testing_util/targets.bzl

@@ -32,7 +32,6 @@ def define_common_targets():
                 "//executorch/kernels/test/...",
                 "//executorch/runtime/core/test/...",
                 "//executorch/test/...",
-                "//executorch/util/...",
                 "//executorch/backends/fb/qnnpack/test/...",
                 "//executorch/extension/kernel_util/test/...",
                 "@EXECUTORCH_CLIENTS",

runtime/executor/test/targets.bzl

@@ -175,7 +175,6 @@ def define_common_targets(is_fbcode = False):
                 ":managed_memory_manager",
                 "//executorch/runtime/executor:program",
                 "//executorch/runtime/kernel:operator_registry",
-                "//executorch/util:util",
                 "//executorch/extension/data_loader:file_data_loader",
             ],
             env = modules_env,

shim/xplat/executorch/extension/pybindings/pybindings.bzl

@@ -16,7 +16,6 @@ PORTABLE_MODULE_DEPS = [
     "//executorch/extension/data_loader:buffer_data_loader",
     "//executorch/extension/data_loader:mmap_data_loader",
     "//executorch/extension/memory_allocator:malloc_memory_allocator",
-    "//executorch/util:util",
     "//executorch/runtime/executor/test:test_backend_compiler_lib",
     "//executorch/devtools/etdump:etdump_flatcc",
 ] + get_all_cpu_backend_targets()

util/targets.bzl

@@ -7,26 +7,6 @@ def define_common_targets():
     TARGETS and BUCK files that call this function.
     """
 
-    for aten_mode in (True, False):
-        aten_suffix = ("_aten" if aten_mode else "")
-
-        # DEPRECATED: Remove this once all users have migrated to
-        # extension/runner_util:inputs.
-        runtime.cxx_library(
-            name = "util" + aten_suffix,
-            srcs = [],
-            exported_headers = ["util.h"],
-            visibility = [
-                "//executorch/...",
-                "@EXECUTORCH_CLIENTS",
-            ],
-            exported_deps = [
-                "//executorch/extension/runner_util:inputs" + aten_suffix,
-                "//executorch/runtime/core:core",
-                "//executorch/runtime/executor:program" + aten_suffix,
-            ],
-        )
-
     if not runtime.is_oss:
         runtime.python_library(
             name = "python_profiler",