From ce50cbdf9618feb2fdebd72e820f187c3794d936 Mon Sep 17 00:00:00 2001 From: Tianqi Chen Date: Wed, 14 Oct 2020 19:04:23 -0400 Subject: [PATCH] [REFACTOR] util => utils for consistency in the project. (#6684) * [REFACTOR] util => utils for consistency in the project. * Update CMake --- CMakeLists.txt | 14 +++++----- .../app/src/main/jni/tvm_runtime.h | 2 +- .../app/src/main/jni/tvm_runtime.h | 2 +- .../app/src/main/jni/tvm_runtime.h | 2 +- apps/bundle_deploy/runtime.cc | 2 +- apps/cpp_rpc/main.cc | 2 +- apps/cpp_rpc/rpc_env.cc | 4 +-- apps/howto_deploy/tvm_runtime_pack.cc | 2 +- apps/ios_rpc/tvmrpc/TVMRuntime.mm | 2 +- cmake/{util => utils}/FindCUDA.cmake | 0 cmake/{util => utils}/FindEthosN.cmake | 0 cmake/{util => utils}/FindLLVM.cmake | 0 cmake/{util => utils}/FindOpenCL.cmake | 0 cmake/{util => utils}/FindROCM.cmake | 0 cmake/{util => utils}/FindVulkan.cmake | 0 cmake/{util/Util.cmake => utils/Utils.cmake} | 0 docs/dev/relay_add_op.rst | 2 +- golang/src/tvm_runtime_pack.cc | 2 +- include/tvm/topi/{util.h => utils.h} | 8 +++--- python/tvm/te/hybrid/__init__.py | 4 +-- python/tvm/te/hybrid/calls.py | 2 +- python/tvm/te/hybrid/module.py | 4 +-- python/tvm/te/hybrid/parser.py | 26 +++++++++---------- python/tvm/te/hybrid/preprocessor.py | 2 +- python/tvm/te/hybrid/{util.py => utils.py} | 0 src/arith/int_constraints.cc | 2 +- src/arith/iter_affine_map.cc | 2 +- src/node/structural_hash.cc | 2 +- src/relay/analysis/feature.cc | 2 +- src/relay/analysis/mac_count.cc | 2 +- src/relay/analysis/util.cc | 2 +- src/relay/backend/compile_engine.cc | 2 +- src/relay/backend/vm/compiler.cc | 2 +- src/relay/backend/vm/compiler.h | 2 +- src/relay/op/annotation/annotation.cc | 2 +- src/relay/op/device_copy.cc | 2 +- src/relay/op/dyn/tensor/transform.cc | 2 +- src/relay/op/memory/memory.cc | 2 +- src/relay/op/nn/bitserial.cc | 2 +- src/relay/op/nn/convolution.cc | 2 +- src/relay/op/nn/nn.cc | 2 +- src/relay/op/nn/pooling.cc | 2 +- src/relay/op/nn/sparse.cc | 2 +- src/relay/op/op_common.h | 2 +- src/relay/op/tensor/transform.cc | 6 ++--- src/relay/op/vision/rcnn_op.cc | 2 +- src/relay/op/vm/vm.cc | 2 +- src/relay/qnn/op/concatenate.cc | 6 ++--- src/relay/qnn/op/convolution.cc | 4 +-- src/relay/qnn/op/dense.cc | 4 +-- src/relay/qnn/op/dequantize.cc | 4 +-- src/relay/qnn/op/mul.cc | 4 +-- src/relay/qnn/op/op_common.h | 4 +-- src/relay/qnn/op/quantize.cc | 4 +-- src/relay/qnn/op/requantize.cc | 6 ++--- src/relay/qnn/{util.cc => utils.cc} | 6 ++--- src/relay/qnn/{util.h => utils.h} | 8 +++--- src/relay/quantize/partition.cc | 2 +- src/relay/quantize/quantize.h | 2 +- src/relay/quantize/realize.cc | 4 +-- src/relay/transforms/alter_op_layout.cc | 2 +- src/relay/transforms/annotate_target.cc | 2 +- src/relay/transforms/canonicalize_cast.cc | 4 +-- src/relay/transforms/canonicalize_ops.cc | 2 +- .../combine_parallel_batch_matmul.cc | 2 +- .../transforms/combine_parallel_conv2d.cc | 2 +- .../transforms/combine_parallel_dense.cc | 2 +- src/relay/transforms/combine_parallel_op.cc | 2 +- src/relay/transforms/combine_parallel_op.h | 2 +- .../transforms/combine_parallel_op_batch.cc | 2 +- .../transforms/combine_parallel_op_batch.h | 2 +- src/relay/transforms/convert_layout.cc | 2 +- src/relay/transforms/defunctionalization.cc | 2 +- src/relay/transforms/dynamic_to_static.cc | 2 +- .../transforms/eliminate_common_subexpr.cc | 2 +- src/relay/transforms/fast_math.cc | 2 +- src/relay/transforms/fold_constant.cc | 2 +- src/relay/transforms/fold_scale_axis.cc | 4 +-- src/relay/transforms/forward_rewrite.cc | 2 +- src/relay/transforms/fuse_ops.cc | 4 +-- src/relay/transforms/gradient.cc | 4 +-- ...fer_layout_util.h => infer_layout_utils.h} | 10 +++---- .../transforms/merge_compiler_regions.cc | 2 +- src/relay/transforms/partial_eval.cc | 2 +- src/relay/transforms/partition_graph.cc | 2 +- .../transforms/{pass_util.h => pass_utils.h} | 8 +++--- .../{pattern_util.h => pattern_utils.h} | 8 +++--- src/relay/transforms/simplify_inference.cc | 2 +- src/relay/transforms/to_a_normal_form.cc | 2 +- .../transforms/to_basic_block_normal_form.cc | 2 +- src/relay/transforms/to_cps.cc | 2 +- src/relay/transforms/transform_layout.h | 4 +-- src/relay/transforms/type_infer.cc | 2 +- src/runtime/contrib/ethosn/ethosn_runtime.cc | 2 +- src/runtime/cuda/cuda_module.cc | 2 +- src/runtime/{file_util.cc => file_utils.cc} | 4 +-- src/runtime/{file_util.h => file_utils.h} | 10 +++---- src/runtime/hexagon/hexagon_module.cc | 2 +- src/runtime/metal/metal_module.mm | 2 +- src/runtime/module.cc | 2 +- src/runtime/opencl/opencl_common.h | 2 +- src/runtime/rocm/rocm_module.cc | 2 +- src/runtime/rpc/rpc_server_env.cc | 2 +- src/runtime/stackvm/stackvm_module.cc | 2 +- src/runtime/vm/executable.cc | 2 +- .../{serialize_util.h => serialize_utils.h} | 8 +++--- src/runtime/vulkan/vulkan.cc | 2 +- src/support/socket.h | 2 +- src/support/{util.h => utils.h} | 8 +++--- src/target/llvm/codegen_llvm.h | 2 +- src/target/llvm/llvm_module.cc | 2 +- src/target/source/codegen_aocl.cc | 2 +- src/target/source/source_module.cc | 2 +- src/te/autodiff/ad_simplify.cc | 2 +- src/te/autodiff/{ad_util.cc => ad_utils.cc} | 4 +-- src/te/autodiff/{ad_util.h => ad_utils.h} | 8 +++--- src/te/autodiff/adjoint.cc | 2 +- src/te/autodiff/jacobian.cc | 2 +- src/te/operation/compute_op.cc | 2 +- src/te/operation/cross_thread_reduction.cc | 2 +- src/te/operation/extern_op.cc | 2 +- src/te/operation/hybrid_op.cc | 2 +- src/te/operation/hybrid_op.h | 2 +- src/te/operation/{op_util.cc => op_utils.cc} | 4 +-- src/te/operation/{op_util.h => op_utils.h} | 10 +++---- src/te/operation/scan_op.cc | 2 +- src/te/operation/tensor_compute_op.cc | 2 +- src/te/operation/tensorize.cc | 2 +- src/te/schedule/operation_inline.cc | 2 +- src/te/schedule/schedule_dataflow_rewrite.cc | 2 +- src/te/schedule/schedule_ops.cc | 4 +-- src/tir/transforms/arg_binder.cc | 2 +- src/tir/transforms/coproc_sync.cc | 2 +- src/tir/transforms/hoist_if_then_else.cc | 2 +- src/tir/transforms/inject_double_buffer.cc | 2 +- src/tir/transforms/inject_virtual_thread.cc | 2 +- .../transforms/{ir_util.cc => ir_utils.cc} | 4 +-- src/tir/transforms/{ir_util.h => ir_utils.h} | 8 +++--- src/tir/transforms/lift_attr_scope.cc | 2 +- src/tir/transforms/loop_partition.cc | 2 +- .../lower_device_storage_access_info.cc | 2 +- src/tir/transforms/lower_thread_allreduce.cc | 2 +- src/tir/transforms/lower_tvm_builtin.cc | 2 +- src/tir/transforms/make_packed_api.cc | 2 +- src/tir/transforms/storage_access.cc | 2 +- src/tir/transforms/storage_flatten.cc | 2 +- src/tir/transforms/storage_rewrite.cc | 2 +- .../transforms/tensorcore_infer_fragment.cc | 2 +- src/tir/transforms/thread_storage_sync.cc | 2 +- src/tir/transforms/unroll_loop.cc | 2 +- src/topi/broadcast.cc | 2 +- src/topi/reduction.cc | 2 +- src/topi/transform.cc | 2 +- web/emcc/wasm_runtime.cc | 2 +- 154 files changed, 228 insertions(+), 228 deletions(-) rename cmake/{util => utils}/FindCUDA.cmake (100%) rename cmake/{util => utils}/FindEthosN.cmake (100%) rename cmake/{util => utils}/FindLLVM.cmake (100%) rename cmake/{util => utils}/FindOpenCL.cmake (100%) rename cmake/{util => utils}/FindROCM.cmake (100%) rename cmake/{util => utils}/FindVulkan.cmake (100%) rename cmake/{util/Util.cmake => utils/Utils.cmake} (100%) rename include/tvm/topi/{util.h => utils.h} (92%) rename python/tvm/te/hybrid/{util.py => utils.py} (100%) rename src/relay/qnn/{util.cc => utils.cc} (98%) rename src/relay/qnn/{util.h => utils.h} (98%) rename src/relay/transforms/{infer_layout_util.h => infer_layout_utils.h} (97%) rename src/relay/transforms/{pass_util.h => pass_utils.h} (98%) rename src/relay/transforms/{pattern_util.h => pattern_utils.h} (99%) rename src/runtime/{file_util.cc => file_utils.cc} (99%) rename src/runtime/{file_util.h => file_utils.h} (93%) rename src/runtime/vm/{serialize_util.h => serialize_utils.h} (96%) rename src/support/{util.h => utils.h} (97%) rename src/te/autodiff/{ad_util.cc => ad_utils.cc} (99%) rename src/te/autodiff/{ad_util.h => ad_utils.h} (97%) rename src/te/operation/{op_util.cc => op_utils.cc} (99%) rename src/te/operation/{op_util.h => op_utils.h} (95%) rename src/tir/transforms/{ir_util.cc => ir_utils.cc} (99%) rename src/tir/transforms/{ir_util.h => ir_utils.h} (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e24bbeb5acd84..7aacfcd4d9ef8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.2) project(tvm C CXX) # Utility functions -include(cmake/util/Util.cmake) -include(cmake/util/FindCUDA.cmake) -include(cmake/util/FindOpenCL.cmake) -include(cmake/util/FindVulkan.cmake) -include(cmake/util/FindLLVM.cmake) -include(cmake/util/FindROCM.cmake) -include(cmake/util/FindEthosN.cmake) +include(cmake/utils/Utils.cmake) +include(cmake/utils/FindCUDA.cmake) +include(cmake/utils/FindOpenCL.cmake) +include(cmake/utils/FindVulkan.cmake) +include(cmake/utils/FindLLVM.cmake) +include(cmake/utils/FindROCM.cmake) +include(cmake/utils/FindEthosN.cmake) if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/config.cmake) include(${CMAKE_CURRENT_BINARY_DIR}/config.cmake) diff --git a/apps/android_camera/app/src/main/jni/tvm_runtime.h b/apps/android_camera/app/src/main/jni/tvm_runtime.h index bc10bdaa508c0..5f3db04274a1a 100644 --- a/apps/android_camera/app/src/main/jni/tvm_runtime.h +++ b/apps/android_camera/app/src/main/jni/tvm_runtime.h @@ -40,7 +40,7 @@ #include "../src/runtime/c_runtime_api.cc" #include "../src/runtime/cpu_device_api.cc" #include "../src/runtime/dso_library.cc" -#include "../src/runtime/file_util.cc" +#include "../src/runtime/file_utils.cc" #include "../src/runtime/graph/graph_runtime.cc" #include "../src/runtime/library_module.cc" #include "../src/runtime/module.cc" diff --git a/apps/android_deploy/app/src/main/jni/tvm_runtime.h b/apps/android_deploy/app/src/main/jni/tvm_runtime.h index f1a47a674281b..362d278c38c4d 100644 --- a/apps/android_deploy/app/src/main/jni/tvm_runtime.h +++ b/apps/android_deploy/app/src/main/jni/tvm_runtime.h @@ -28,7 +28,7 @@ #include "../src/runtime/c_runtime_api.cc" #include "../src/runtime/cpu_device_api.cc" #include "../src/runtime/dso_library.cc" -#include "../src/runtime/file_util.cc" +#include "../src/runtime/file_utils.cc" #include "../src/runtime/graph/graph_runtime.cc" #include "../src/runtime/library_module.cc" #include "../src/runtime/module.cc" diff --git a/apps/android_rpc/app/src/main/jni/tvm_runtime.h b/apps/android_rpc/app/src/main/jni/tvm_runtime.h index aea61e757aa7b..2005568c608c4 100644 --- a/apps/android_rpc/app/src/main/jni/tvm_runtime.h +++ b/apps/android_rpc/app/src/main/jni/tvm_runtime.h @@ -40,7 +40,7 @@ #include "../src/runtime/c_runtime_api.cc" #include "../src/runtime/cpu_device_api.cc" #include "../src/runtime/dso_library.cc" -#include "../src/runtime/file_util.cc" +#include "../src/runtime/file_utils.cc" #include "../src/runtime/graph/graph_runtime.cc" #include "../src/runtime/graph/graph_runtime_factory.cc" #include "../src/runtime/library_module.cc" diff --git a/apps/bundle_deploy/runtime.cc b/apps/bundle_deploy/runtime.cc index 8e294a05775de..3224028b60a13 100644 --- a/apps/bundle_deploy/runtime.cc +++ b/apps/bundle_deploy/runtime.cc @@ -24,7 +24,7 @@ #include "../../src/runtime/c_runtime_api.cc" #include "../../src/runtime/cpu_device_api.cc" -#include "../../src/runtime/file_util.cc" +#include "../../src/runtime/file_utils.cc" #include "../../src/runtime/graph/graph_runtime.cc" #include "../../src/runtime/library_module.cc" #include "../../src/runtime/module.cc" diff --git a/apps/cpp_rpc/main.cc b/apps/cpp_rpc/main.cc index 777fffa7d37c4..9bbbea92f41c2 100644 --- a/apps/cpp_rpc/main.cc +++ b/apps/cpp_rpc/main.cc @@ -35,7 +35,7 @@ #include #include "../../src/support/socket.h" -#include "../../src/support/util.h" +#include "../../src/support/utils.h" #include "rpc_server.h" #if defined(_WIN32) diff --git a/apps/cpp_rpc/rpc_env.cc b/apps/cpp_rpc/rpc_env.cc index c64cb2f09f94d..b76a1abbdadd2 100644 --- a/apps/cpp_rpc/rpc_env.cc +++ b/apps/cpp_rpc/rpc_env.cc @@ -40,8 +40,8 @@ int mkdir(const char* path, int /* ignored */) { return _mkdir(path); } #include #include -#include "../../src/runtime/file_util.h" -#include "../../src/support/util.h" +#include "../../src/runtime/file_utils.h" +#include "../../src/support/utils.h" #include "rpc_env.h" namespace { diff --git a/apps/howto_deploy/tvm_runtime_pack.cc b/apps/howto_deploy/tvm_runtime_pack.cc index b43f920b60566..d6dd5876a994a 100644 --- a/apps/howto_deploy/tvm_runtime_pack.cc +++ b/apps/howto_deploy/tvm_runtime_pack.cc @@ -39,7 +39,7 @@ */ #include "../../src/runtime/c_runtime_api.cc" #include "../../src/runtime/cpu_device_api.cc" -#include "../../src/runtime/file_util.cc" +#include "../../src/runtime/file_utils.cc" #include "../../src/runtime/library_module.cc" #include "../../src/runtime/module.cc" #include "../../src/runtime/ndarray.cc" diff --git a/apps/ios_rpc/tvmrpc/TVMRuntime.mm b/apps/ios_rpc/tvmrpc/TVMRuntime.mm index 9e2899bf6e5ec..61a4668cdd91f 100644 --- a/apps/ios_rpc/tvmrpc/TVMRuntime.mm +++ b/apps/ios_rpc/tvmrpc/TVMRuntime.mm @@ -25,7 +25,7 @@ #include "../../../src/runtime/c_runtime_api.cc" #include "../../../src/runtime/cpu_device_api.cc" #include "../../../src/runtime/dso_library.cc" -#include "../../../src/runtime/file_util.cc" +#include "../../../src/runtime/file_utils.cc" #include "../../../src/runtime/library_module.cc" #include "../../../src/runtime/metadata_module.cc" #include "../../../src/runtime/module.cc" diff --git a/cmake/util/FindCUDA.cmake b/cmake/utils/FindCUDA.cmake similarity index 100% rename from cmake/util/FindCUDA.cmake rename to cmake/utils/FindCUDA.cmake diff --git a/cmake/util/FindEthosN.cmake b/cmake/utils/FindEthosN.cmake similarity index 100% rename from cmake/util/FindEthosN.cmake rename to cmake/utils/FindEthosN.cmake diff --git a/cmake/util/FindLLVM.cmake b/cmake/utils/FindLLVM.cmake similarity index 100% rename from cmake/util/FindLLVM.cmake rename to cmake/utils/FindLLVM.cmake diff --git a/cmake/util/FindOpenCL.cmake b/cmake/utils/FindOpenCL.cmake similarity index 100% rename from cmake/util/FindOpenCL.cmake rename to cmake/utils/FindOpenCL.cmake diff --git a/cmake/util/FindROCM.cmake b/cmake/utils/FindROCM.cmake similarity index 100% rename from cmake/util/FindROCM.cmake rename to cmake/utils/FindROCM.cmake diff --git a/cmake/util/FindVulkan.cmake b/cmake/utils/FindVulkan.cmake similarity index 100% rename from cmake/util/FindVulkan.cmake rename to cmake/utils/FindVulkan.cmake diff --git a/cmake/util/Util.cmake b/cmake/utils/Utils.cmake similarity index 100% rename from cmake/util/Util.cmake rename to cmake/utils/Utils.cmake diff --git a/docs/dev/relay_add_op.rst b/docs/dev/relay_add_op.rst index 7dca251dd532e..0697939be1623 100644 --- a/docs/dev/relay_add_op.rst +++ b/docs/dev/relay_add_op.rst @@ -231,7 +231,7 @@ Adding a Gradient in C++ Adding a gradient in C++ is similar to adding one in Python, but the interface for registering is slightly different. -First, make sure ``src/relay/pass/pattern_util.h`` is included. It provides +First, make sure ``src/relay/pass/pattern_utils.h`` is included. It provides helper functions for creating nodes in the Relay AST. Then, define the gradient in a similar fashion as in the Python example: diff --git a/golang/src/tvm_runtime_pack.cc b/golang/src/tvm_runtime_pack.cc index 644249fa75c98..7dd6dd5e94c52 100644 --- a/golang/src/tvm_runtime_pack.cc +++ b/golang/src/tvm_runtime_pack.cc @@ -23,7 +23,7 @@ */ #include "src/runtime/c_runtime_api.cc" #include "src/runtime/cpu_device_api.cc" -#include "src/runtime/file_util.cc" +#include "src/runtime/file_utils.cc" #include "src/runtime/library_module.cc" #include "src/runtime/module.cc" #include "src/runtime/ndarray.cc" diff --git a/include/tvm/topi/util.h b/include/tvm/topi/utils.h similarity index 92% rename from include/tvm/topi/util.h rename to include/tvm/topi/utils.h index 4e0cdc6f2057c..60dc3a6a01dd4 100644 --- a/include/tvm/topi/util.h +++ b/include/tvm/topi/utils.h @@ -19,10 +19,10 @@ /*! * \brief Topi utility function - * \file topi/util.h + * \file topi/utils.h */ -#ifndef TVM_TOPI_UTIL_H_ -#define TVM_TOPI_UTIL_H_ +#ifndef TVM_TOPI_UTILS_H_ +#define TVM_TOPI_UTILS_H_ #include #include @@ -44,4 +44,4 @@ inline Array ArrayOrInt(TVMArgValue arg) { } } // namespace topi } // namespace tvm -#endif // TVM_TOPI_UTIL_H_ +#endif // TVM_TOPI_UTILS_H_ diff --git a/python/tvm/te/hybrid/__init__.py b/python/tvm/te/hybrid/__init__.py index 3cd1b01797ce0..3a10bda29a7da 100644 --- a/python/tvm/te/hybrid/__init__.py +++ b/python/tvm/te/hybrid/__init__.py @@ -35,7 +35,7 @@ from .module import HybridModule from .parser import source_to_op -from .util import _pruned_source +from .utils import _pruned_source def script(pyfunc): @@ -51,7 +51,7 @@ def script(pyfunc): """ # pylint: disable=import-outside-toplevel, missing-docstring def wrapped_func(func, *args, **kwargs): - from .util import _is_tvm_arg_types + from .utils import _is_tvm_arg_types if _is_tvm_arg_types(args): src = _pruned_source(func) diff --git a/python/tvm/te/hybrid/calls.py b/python/tvm/te/hybrid/calls.py index 2e7fc2b72311b..7611891150505 100644 --- a/python/tvm/te/hybrid/calls.py +++ b/python/tvm/te/hybrid/calls.py @@ -25,7 +25,7 @@ from tvm.tir import call_intrin from tvm.tir.stmt import For -from .util import _internal_assert +from .utils import _internal_assert # pylint: disable=redefined-builtin,invalid-name diff --git a/python/tvm/te/hybrid/module.py b/python/tvm/te/hybrid/module.py index 672089cef3847..2af67853ca5ba 100644 --- a/python/tvm/te/hybrid/module.py +++ b/python/tvm/te/hybrid/module.py @@ -24,8 +24,8 @@ import ast from tvm.contrib import util -from .util import _internal_assert -from .util import _is_tvm_arg_types +from .utils import _internal_assert +from .utils import _is_tvm_arg_types from .parser import source_to_op diff --git a/python/tvm/te/hybrid/parser.py b/python/tvm/te/hybrid/parser.py index 8704518723f0c..d47b2ee879fcb 100644 --- a/python/tvm/te/hybrid/parser.py +++ b/python/tvm/te/hybrid/parser.py @@ -37,16 +37,16 @@ from tvm.tir import all as _all from tvm.tir import any as _any -from .util import _internal_assert +from .utils import _internal_assert from . import calls -from . import util +from . import utils from .preprocessor import determine_variable_usage def concat_list_to_block(lst): """Concatenate a list of Python IR nodes to HalideIR Block""" if not lst: - return util.make_nop() + return utils.make_nop() n = len(lst) if n == 1: return lst[0] @@ -55,10 +55,10 @@ def concat_list_to_block(lst): def visit_list_to_block(visit, lst): """Visit and concatenate a list of Python IR nodes to HalideIR Block""" - lst = [visit(stmt) for stmt in lst if not util.is_docstring(stmt)] - lst = [stmt for stmt in lst if not tvm.ir.structural_equal(stmt, util.make_nop())] + lst = [visit(stmt) for stmt in lst if not utils.is_docstring(stmt)] + lst = [stmt for stmt in lst if not tvm.ir.structural_equal(stmt, utils.make_nop())] if not lst: - return util.make_nop() + return utils.make_nop() return concat_list_to_block(lst) @@ -314,7 +314,7 @@ def visit_Assign(self, node): ) self.add_symbol(node.targets[i].id, Symbol.GlobalBuffer, rhs.output(i)) rmap[rhs.outputs[i].op] = rhs.output(i) - return util.replace_io(rhs.body, rmap) + return utils.replace_io(rhs.body, rmap) _internal_assert(len(node.targets) == 1, "So far only one-valued assignment is supported!") lhs = node.targets[0] @@ -339,8 +339,8 @@ def visit_Assign(self, node): self.add_symbol(lhs, getattr(Symbol, scope.title() + "Buffer"), ph) if scope == "output": self.outputs.append(lhs) - return util.make_nop() - if isinstance(rhs, util.halide_imm_types) and ast.Store not in rw: + return utils.make_nop() + if isinstance(rhs, utils.halide_imm_types) and ast.Store not in rw: self.add_symbol(lhs, Symbol.ConstVar, rhs) else: _internal_assert( @@ -355,7 +355,7 @@ def visit_Assign(self, node): if lhs is not None: buf, args = lhs return tvm.tir.ProducerStore(buf, rhs, args) - return util.make_nop() + return utils.make_nop() lhs, args = self.visit(lhs) _internal_assert( @@ -412,7 +412,7 @@ def visit_If(self, node): return visit_list_to_block(self.visit, node.body) if node.orelse: return visit_list_to_block(self.visit, node.orelse) - return util.make_nop() + return utils.make_nop() if_body = visit_list_to_block(self.visit, node.body) @@ -559,7 +559,7 @@ def visit_Return(self, node): logging.log(logging.CRITICAL, "[Warning] Not all the output buffers returned!") self.outputs = [self.symbols[i][1] for i in ids] self.returned = True - return util.make_nop() + return utils.make_nop() def visit_Tuple(self, node): return tuple(self.visit(i) for i in node.elts) @@ -570,7 +570,7 @@ def visit_Str(self, node): def visit_Assert(self, node): test = self.visit(node.test) mesg = tvm.runtime.convert(self.visit(node.msg)) - return tvm.tir.AssertStmt(test, mesg, util.make_nop()) + return tvm.tir.AssertStmt(test, mesg, utils.make_nop()) def parse_python(src, args, symbols, closure_vars): diff --git a/python/tvm/te/hybrid/preprocessor.py b/python/tvm/te/hybrid/preprocessor.py index b046231fbf48b..295476f80812b 100644 --- a/python/tvm/te/hybrid/preprocessor.py +++ b/python/tvm/te/hybrid/preprocessor.py @@ -19,7 +19,7 @@ import ast import sys from .runtime import HYBRID_GLOBALS -from .util import _internal_assert +from .utils import _internal_assert class PyVariableUsage(ast.NodeVisitor): diff --git a/python/tvm/te/hybrid/util.py b/python/tvm/te/hybrid/utils.py similarity index 100% rename from python/tvm/te/hybrid/util.py rename to python/tvm/te/hybrid/utils.py diff --git a/src/arith/int_constraints.cc b/src/arith/int_constraints.cc index 189869bd64e76..56c95d0ab7133 100644 --- a/src/arith/int_constraints.cc +++ b/src/arith/int_constraints.cc @@ -33,7 +33,7 @@ #include #include -#include "../tir/transforms/ir_util.h" +#include "../tir/transforms/ir_utils.h" namespace tvm { namespace arith { diff --git a/src/arith/iter_affine_map.cc b/src/arith/iter_affine_map.cc index 7afa75a7efb0b..e56ef2a75ee1d 100644 --- a/src/arith/iter_affine_map.cc +++ b/src/arith/iter_affine_map.cc @@ -27,7 +27,7 @@ #include #include -#include "../support/util.h" +#include "../support/utils.h" #include "const_fold.h" namespace tvm { diff --git a/src/node/structural_hash.cc b/src/node/structural_hash.cc index 1122b8e1ee40e..cb576fa9c0677 100644 --- a/src/node/structural_hash.cc +++ b/src/node/structural_hash.cc @@ -28,7 +28,7 @@ #include #include -#include "../support/util.h" +#include "../support/utils.h" namespace tvm { diff --git a/src/relay/analysis/feature.cc b/src/relay/analysis/feature.cc index 63f5e711bfcd2..b3516e965b85b 100644 --- a/src/relay/analysis/feature.cc +++ b/src/relay/analysis/feature.cc @@ -27,7 +27,7 @@ #include #include -#include "../transforms/pass_util.h" +#include "../transforms/pass_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/analysis/mac_count.cc b/src/relay/analysis/mac_count.cc index d2e62b705d99a..5e35ab7ba62df 100644 --- a/src/relay/analysis/mac_count.cc +++ b/src/relay/analysis/mac_count.cc @@ -32,7 +32,7 @@ #include #include -#include "../transforms/pattern_util.h" +#include "../transforms/pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/analysis/util.cc b/src/relay/analysis/util.cc index b98106a091b31..59ce01ce4227a 100644 --- a/src/relay/analysis/util.cc +++ b/src/relay/analysis/util.cc @@ -31,7 +31,7 @@ #include #include -#include "../transforms/pass_util.h" +#include "../transforms/pass_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/backend/compile_engine.cc b/src/relay/backend/compile_engine.cc index b679fea500997..d720e94ddc759 100644 --- a/src/relay/backend/compile_engine.cc +++ b/src/relay/backend/compile_engine.cc @@ -45,7 +45,7 @@ #include #include -#include "../transforms/pass_util.h" +#include "../transforms/pass_utils.h" #include "utils.h" namespace tvm { diff --git a/src/relay/backend/vm/compiler.cc b/src/relay/backend/vm/compiler.cc index fb9ca08f05928..c7ceca3604c8c 100644 --- a/src/relay/backend/vm/compiler.cc +++ b/src/relay/backend/vm/compiler.cc @@ -46,7 +46,7 @@ #include "../../../target/source/codegen_source_base.h" #include "../../backend/compile_engine.h" #include "../../op/op_common.h" -#include "../../transforms/pass_util.h" +#include "../../transforms/pass_utils.h" #include "../utils.h" #include "compiler.h" diff --git a/src/relay/backend/vm/compiler.h b/src/relay/backend/vm/compiler.h index 19924ab383585..56965c544701e 100644 --- a/src/relay/backend/vm/compiler.h +++ b/src/relay/backend/vm/compiler.h @@ -44,7 +44,7 @@ #include "../../../runtime/vm/naive_allocator.h" #include "../../../runtime/vm/profiler/vm.h" #include "../../backend/compile_engine.h" -#include "../../transforms/pass_util.h" +#include "../../transforms/pass_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/op/annotation/annotation.cc b/src/relay/op/annotation/annotation.cc index d3eb4f96ed098..a2c54656d4646 100644 --- a/src/relay/op/annotation/annotation.cc +++ b/src/relay/op/annotation/annotation.cc @@ -30,7 +30,7 @@ #include #include -#include "../../transforms/infer_layout_util.h" +#include "../../transforms/infer_layout_utils.h" #include "../type_relations.h" namespace tvm { diff --git a/src/relay/op/device_copy.cc b/src/relay/op/device_copy.cc index 3a58607e6dd89..b26dc879be0a3 100644 --- a/src/relay/op/device_copy.cc +++ b/src/relay/op/device_copy.cc @@ -33,7 +33,7 @@ #include #include -#include "../transforms/infer_layout_util.h" +#include "../transforms/infer_layout_utils.h" #include "type_relations.h" namespace tvm { diff --git a/src/relay/op/dyn/tensor/transform.cc b/src/relay/op/dyn/tensor/transform.cc index 4b594ffccfa52..863ad643f0dac 100644 --- a/src/relay/op/dyn/tensor/transform.cc +++ b/src/relay/op/dyn/tensor/transform.cc @@ -36,7 +36,7 @@ #include #include -#include "../../../transforms/infer_layout_util.h" +#include "../../../transforms/infer_layout_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/op/memory/memory.cc b/src/relay/op/memory/memory.cc index 771024502b216..b853ef635b124 100644 --- a/src/relay/op/memory/memory.cc +++ b/src/relay/op/memory/memory.cc @@ -29,7 +29,7 @@ #include #include -#include "../../transforms/infer_layout_util.h" +#include "../../transforms/infer_layout_utils.h" #include "../op_common.h" #include "../type_relations.h" diff --git a/src/relay/op/nn/bitserial.cc b/src/relay/op/nn/bitserial.cc index 022ca5cc96d89..61a1b8fdf289e 100644 --- a/src/relay/op/nn/bitserial.cc +++ b/src/relay/op/nn/bitserial.cc @@ -26,7 +26,7 @@ #include #include -#include "../../transforms/infer_layout_util.h" +#include "../../transforms/infer_layout_utils.h" #include "../op_common.h" namespace tvm { diff --git a/src/relay/op/nn/convolution.cc b/src/relay/op/nn/convolution.cc index 2b9103b9709a0..cf3f0fa85d68e 100644 --- a/src/relay/op/nn/convolution.cc +++ b/src/relay/op/nn/convolution.cc @@ -29,7 +29,7 @@ #include -#include "../../transforms/infer_layout_util.h" +#include "../../transforms/infer_layout_utils.h" #include "../op_common.h" #include "convolution_make.h" diff --git a/src/relay/op/nn/nn.cc b/src/relay/op/nn/nn.cc index 1de7ca0037727..cbd7ae47acd78 100644 --- a/src/relay/op/nn/nn.cc +++ b/src/relay/op/nn/nn.cc @@ -37,7 +37,7 @@ #include #include -#include "../../transforms/infer_layout_util.h" +#include "../../transforms/infer_layout_utils.h" #include "../make_op.h" #include "../op_common.h" #include "../type_relations.h" diff --git a/src/relay/op/nn/pooling.cc b/src/relay/op/nn/pooling.cc index 1e5306035a6ce..cee7b6456ce67 100644 --- a/src/relay/op/nn/pooling.cc +++ b/src/relay/op/nn/pooling.cc @@ -31,7 +31,7 @@ #include -#include "../../transforms/infer_layout_util.h" +#include "../../transforms/infer_layout_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/op/nn/sparse.cc b/src/relay/op/nn/sparse.cc index f12afe2a7f1f9..3f51e1f8ab376 100644 --- a/src/relay/op/nn/sparse.cc +++ b/src/relay/op/nn/sparse.cc @@ -28,7 +28,7 @@ #include -#include "../../transforms/infer_layout_util.h" +#include "../../transforms/infer_layout_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/op/op_common.h b/src/relay/op/op_common.h index cbb8cec2d43b3..d530345fc9e89 100644 --- a/src/relay/op/op_common.h +++ b/src/relay/op/op_common.h @@ -33,7 +33,7 @@ #include #include -#include "../transforms/infer_layout_util.h" +#include "../transforms/infer_layout_utils.h" #include "type_relations.h" namespace tvm { diff --git a/src/relay/op/tensor/transform.cc b/src/relay/op/tensor/transform.cc index 8170234249001..20cd0a12ed98c 100644 --- a/src/relay/op/tensor/transform.cc +++ b/src/relay/op/tensor/transform.cc @@ -40,9 +40,9 @@ #include -#include "../../transforms/infer_layout_util.h" -#include "../../transforms/pass_util.h" -#include "../../transforms/pattern_util.h" +#include "../../transforms/infer_layout_utils.h" +#include "../../transforms/pass_utils.h" +#include "../../transforms/pattern_utils.h" #include "../make_op.h" #include "../op_common.h" diff --git a/src/relay/op/vision/rcnn_op.cc b/src/relay/op/vision/rcnn_op.cc index f14b29604f06e..6550815c64226 100644 --- a/src/relay/op/vision/rcnn_op.cc +++ b/src/relay/op/vision/rcnn_op.cc @@ -25,7 +25,7 @@ #include #include -#include "../../transforms/infer_layout_util.h" +#include "../../transforms/infer_layout_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/op/vm/vm.cc b/src/relay/op/vm/vm.cc index 59756ea6ffabe..424ed5f4bc988 100644 --- a/src/relay/op/vm/vm.cc +++ b/src/relay/op/vm/vm.cc @@ -30,7 +30,7 @@ #include #include -#include "../../transforms/infer_layout_util.h" +#include "../../transforms/infer_layout_utils.h" #include "../op_common.h" #include "../type_relations.h" diff --git a/src/relay/qnn/op/concatenate.cc b/src/relay/qnn/op/concatenate.cc index bda8cf8787934..29ecf451767eb 100644 --- a/src/relay/qnn/op/concatenate.cc +++ b/src/relay/qnn/op/concatenate.cc @@ -28,9 +28,9 @@ #include #include "../../op/tensor/transform.h" -#include "../../transforms/infer_layout_util.h" -#include "../../transforms/pattern_util.h" -#include "../util.h" +#include "../../transforms/infer_layout_utils.h" +#include "../../transforms/pattern_utils.h" +#include "../utils.h" namespace tvm { namespace relay { diff --git a/src/relay/qnn/op/convolution.cc b/src/relay/qnn/op/convolution.cc index f112a7259552e..b2b6b092fd624 100644 --- a/src/relay/qnn/op/convolution.cc +++ b/src/relay/qnn/op/convolution.cc @@ -31,8 +31,8 @@ #include #include -#include "../../transforms/pattern_util.h" -#include "../util.h" +#include "../../transforms/pattern_utils.h" +#include "../utils.h" namespace tvm { namespace relay { diff --git a/src/relay/qnn/op/dense.cc b/src/relay/qnn/op/dense.cc index 464b3f9aeff34..3cfc418868eaa 100644 --- a/src/relay/qnn/op/dense.cc +++ b/src/relay/qnn/op/dense.cc @@ -28,8 +28,8 @@ #include #include "../../op/nn/nn.h" -#include "../../transforms/pattern_util.h" -#include "../util.h" +#include "../../transforms/pattern_utils.h" +#include "../utils.h" namespace tvm { namespace relay { diff --git a/src/relay/qnn/op/dequantize.cc b/src/relay/qnn/op/dequantize.cc index 3a5f81e2627ad..f0c139c2a5e3a 100644 --- a/src/relay/qnn/op/dequantize.cc +++ b/src/relay/qnn/op/dequantize.cc @@ -27,8 +27,8 @@ #include #include -#include "../../transforms/pattern_util.h" -#include "../util.h" +#include "../../transforms/pattern_utils.h" +#include "../utils.h" namespace tvm { namespace relay { diff --git a/src/relay/qnn/op/mul.cc b/src/relay/qnn/op/mul.cc index ec74b799407b4..781114cc5f5af 100644 --- a/src/relay/qnn/op/mul.cc +++ b/src/relay/qnn/op/mul.cc @@ -25,8 +25,8 @@ #include #include -#include "../../transforms/pattern_util.h" -#include "../util.h" +#include "../../transforms/pattern_utils.h" +#include "../utils.h" #include "op_common.h" namespace tvm { diff --git a/src/relay/qnn/op/op_common.h b/src/relay/qnn/op/op_common.h index 50fc0cda30cf2..e99c11b6f02b8 100644 --- a/src/relay/qnn/op/op_common.h +++ b/src/relay/qnn/op/op_common.h @@ -32,8 +32,8 @@ #include #include "../../op/type_relations.h" -#include "../../transforms/infer_layout_util.h" -#include "../util.h" +#include "../../transforms/infer_layout_utils.h" +#include "../utils.h" namespace tvm { namespace relay { diff --git a/src/relay/qnn/op/quantize.cc b/src/relay/qnn/op/quantize.cc index fb7ef9720c878..1b5cb5e2b55b8 100644 --- a/src/relay/qnn/op/quantize.cc +++ b/src/relay/qnn/op/quantize.cc @@ -27,8 +27,8 @@ #include #include -#include "../../transforms/pattern_util.h" -#include "../util.h" +#include "../../transforms/pattern_utils.h" +#include "../utils.h" namespace tvm { namespace relay { diff --git a/src/relay/qnn/op/requantize.cc b/src/relay/qnn/op/requantize.cc index 817a734dc637a..ea878557d98ee 100644 --- a/src/relay/qnn/op/requantize.cc +++ b/src/relay/qnn/op/requantize.cc @@ -26,9 +26,9 @@ #include #include -#include "../../transforms/infer_layout_util.h" -#include "../../transforms/pattern_util.h" -#include "../util.h" +#include "../../transforms/infer_layout_utils.h" +#include "../../transforms/pattern_utils.h" +#include "../utils.h" namespace tvm { namespace relay { diff --git a/src/relay/qnn/util.cc b/src/relay/qnn/utils.cc similarity index 98% rename from src/relay/qnn/util.cc rename to src/relay/qnn/utils.cc index 113038e327d7a..fc59b61cc6a5f 100644 --- a/src/relay/qnn/util.cc +++ b/src/relay/qnn/utils.cc @@ -18,13 +18,13 @@ */ /*! - * \file src/relay/qnn/util.cc + * \file src/relay/qnn/utils.cc * \brief Utility functions for QNN. */ -#include "util.h" +#include "utils.h" -#include "../transforms/pattern_util.h" +#include "../transforms/pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/qnn/util.h b/src/relay/qnn/utils.h similarity index 98% rename from src/relay/qnn/util.h rename to src/relay/qnn/utils.h index 72eb2a46b2ae8..f8885c36d1627 100644 --- a/src/relay/qnn/util.h +++ b/src/relay/qnn/utils.h @@ -18,12 +18,12 @@ */ /*! - * \file src/relay/qnn/util.h + * \file src/relay/qnn/utils.h * \brief Utility methods needs for quantized ops that can be shared */ -#ifndef TVM_RELAY_QNN_UTIL_H_ -#define TVM_RELAY_QNN_UTIL_H_ +#ifndef TVM_RELAY_QNN_UTILS_H_ +#define TVM_RELAY_QNN_UTILS_H_ #include #include @@ -216,4 +216,4 @@ static inline std::vector GetFloatVectorFromConstant(const Expr& expr) { } // namespace qnn } // namespace relay } // namespace tvm -#endif // TVM_RELAY_QNN_UTIL_H_ +#endif // TVM_RELAY_QNN_UTILS_H_ diff --git a/src/relay/quantize/partition.cc b/src/relay/quantize/partition.cc index 14b420d6034c0..c65cc18799327 100644 --- a/src/relay/quantize/partition.cc +++ b/src/relay/quantize/partition.cc @@ -26,7 +26,7 @@ #include -#include "../transforms/pattern_util.h" +#include "../transforms/pattern_utils.h" #include "./quantize.h" namespace tvm { diff --git a/src/relay/quantize/quantize.h b/src/relay/quantize/quantize.h index d5396dea00d18..7c2acbcb06d45 100644 --- a/src/relay/quantize/quantize.h +++ b/src/relay/quantize/quantize.h @@ -29,7 +29,7 @@ #include -#include "../transforms/pattern_util.h" +#include "../transforms/pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/quantize/realize.cc b/src/relay/quantize/realize.cc index ace2c24731730..4b598907e76ed 100644 --- a/src/relay/quantize/realize.cc +++ b/src/relay/quantize/realize.cc @@ -29,8 +29,8 @@ #include #include -#include "../qnn/util.h" -#include "../transforms/pattern_util.h" +#include "../qnn/utils.h" +#include "../transforms/pattern_utils.h" #include "./quantize.h" namespace tvm { diff --git a/src/relay/transforms/alter_op_layout.cc b/src/relay/transforms/alter_op_layout.cc index 3d242cd09f7d5..7c5ee019a4374 100644 --- a/src/relay/transforms/alter_op_layout.cc +++ b/src/relay/transforms/alter_op_layout.cc @@ -36,7 +36,7 @@ #include #include -#include "pattern_util.h" +#include "pattern_utils.h" #include "transform_layout.h" namespace tvm { diff --git a/src/relay/transforms/annotate_target.cc b/src/relay/transforms/annotate_target.cc index 015489dd08576..b9d6cce762e5b 100644 --- a/src/relay/transforms/annotate_target.cc +++ b/src/relay/transforms/annotate_target.cc @@ -29,7 +29,7 @@ #include #include -#include "pass_util.h" +#include "pass_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/canonicalize_cast.cc b/src/relay/transforms/canonicalize_cast.cc index 055ab1480a6e8..510d098990e39 100644 --- a/src/relay/transforms/canonicalize_cast.cc +++ b/src/relay/transforms/canonicalize_cast.cc @@ -26,8 +26,8 @@ #include #include -#include "pass_util.h" -#include "pattern_util.h" +#include "pass_utils.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/canonicalize_ops.cc b/src/relay/transforms/canonicalize_ops.cc index fec757ee68d54..dfb30cae46938 100644 --- a/src/relay/transforms/canonicalize_ops.cc +++ b/src/relay/transforms/canonicalize_ops.cc @@ -28,7 +28,7 @@ #include #include -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/combine_parallel_batch_matmul.cc b/src/relay/transforms/combine_parallel_batch_matmul.cc index b2b9703c28bc5..5b56504602a97 100644 --- a/src/relay/transforms/combine_parallel_batch_matmul.cc +++ b/src/relay/transforms/combine_parallel_batch_matmul.cc @@ -42,7 +42,7 @@ #include "./combine_parallel_op.h" #include "./expr_subst.h" -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/combine_parallel_conv2d.cc b/src/relay/transforms/combine_parallel_conv2d.cc index 54aec99f46fb3..20fa3e404f6a4 100644 --- a/src/relay/transforms/combine_parallel_conv2d.cc +++ b/src/relay/transforms/combine_parallel_conv2d.cc @@ -44,7 +44,7 @@ #include "./combine_parallel_op.h" #include "./expr_subst.h" -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/combine_parallel_dense.cc b/src/relay/transforms/combine_parallel_dense.cc index 76b26d0e085b2..74a6921c94099 100644 --- a/src/relay/transforms/combine_parallel_dense.cc +++ b/src/relay/transforms/combine_parallel_dense.cc @@ -43,7 +43,7 @@ #include "./combine_parallel_op_batch.h" #include "./expr_subst.h" -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/combine_parallel_op.cc b/src/relay/transforms/combine_parallel_op.cc index 7ca2ce8b5dba6..b23d01ff469b9 100644 --- a/src/relay/transforms/combine_parallel_op.cc +++ b/src/relay/transforms/combine_parallel_op.cc @@ -40,7 +40,7 @@ #include #include "expr_subst.h" -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/combine_parallel_op.h b/src/relay/transforms/combine_parallel_op.h index 6f53e86d534b0..9785a366299bc 100644 --- a/src/relay/transforms/combine_parallel_op.h +++ b/src/relay/transforms/combine_parallel_op.h @@ -38,7 +38,7 @@ #include #include "./expr_subst.h" -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/combine_parallel_op_batch.cc b/src/relay/transforms/combine_parallel_op_batch.cc index 2e9ffdb9bb3c3..a41e1e0d6674e 100644 --- a/src/relay/transforms/combine_parallel_op_batch.cc +++ b/src/relay/transforms/combine_parallel_op_batch.cc @@ -58,7 +58,7 @@ #include "./combine_parallel_op.h" #include "./expr_subst.h" -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/combine_parallel_op_batch.h b/src/relay/transforms/combine_parallel_op_batch.h index 9f87d9d2184f2..7a518e9ac370a 100644 --- a/src/relay/transforms/combine_parallel_op_batch.h +++ b/src/relay/transforms/combine_parallel_op_batch.h @@ -37,7 +37,7 @@ #include "./combine_parallel_op.h" #include "./expr_subst.h" -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/convert_layout.cc b/src/relay/transforms/convert_layout.cc index 65fdeda5f6cd8..577fb068aab95 100644 --- a/src/relay/transforms/convert_layout.cc +++ b/src/relay/transforms/convert_layout.cc @@ -36,7 +36,7 @@ #include #include -#include "pattern_util.h" +#include "pattern_utils.h" #include "transform_layout.h" namespace tvm { diff --git a/src/relay/transforms/defunctionalization.cc b/src/relay/transforms/defunctionalization.cc index ec614d23a02e3..135d7fcee5486 100644 --- a/src/relay/transforms/defunctionalization.cc +++ b/src/relay/transforms/defunctionalization.cc @@ -68,7 +68,7 @@ #include #include "../analysis/type_solver.h" -#include "../transforms/pass_util.h" +#include "../transforms/pass_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/dynamic_to_static.cc b/src/relay/transforms/dynamic_to_static.cc index edcb83972cc7a..5caaea8c9eadd 100644 --- a/src/relay/transforms/dynamic_to_static.cc +++ b/src/relay/transforms/dynamic_to_static.cc @@ -27,7 +27,7 @@ #include #include -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/eliminate_common_subexpr.cc b/src/relay/transforms/eliminate_common_subexpr.cc index 92cc64dedba6e..720a97e9d19da 100644 --- a/src/relay/transforms/eliminate_common_subexpr.cc +++ b/src/relay/transforms/eliminate_common_subexpr.cc @@ -32,7 +32,7 @@ #include -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/fast_math.cc b/src/relay/transforms/fast_math.cc index 3c8d8db637c81..91fb4cfa89730 100644 --- a/src/relay/transforms/fast_math.cc +++ b/src/relay/transforms/fast_math.cc @@ -27,7 +27,7 @@ #include #include -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/fold_constant.cc b/src/relay/transforms/fold_constant.cc index a3f2f69f7a586..660aff2eed9a6 100644 --- a/src/relay/transforms/fold_constant.cc +++ b/src/relay/transforms/fold_constant.cc @@ -31,7 +31,7 @@ #include #include -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/fold_scale_axis.cc b/src/relay/transforms/fold_scale_axis.cc index 0c2abbfdd238e..e4c924dad1e8f 100644 --- a/src/relay/transforms/fold_scale_axis.cc +++ b/src/relay/transforms/fold_scale_axis.cc @@ -30,8 +30,8 @@ #include #include "../op/tensor/transform.h" -#include "pass_util.h" -#include "pattern_util.h" +#include "pass_utils.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/forward_rewrite.cc b/src/relay/transforms/forward_rewrite.cc index f093f5425d942..58396256105b3 100644 --- a/src/relay/transforms/forward_rewrite.cc +++ b/src/relay/transforms/forward_rewrite.cc @@ -27,7 +27,7 @@ #include #include -#include "pass_util.h" +#include "pass_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/fuse_ops.cc b/src/relay/transforms/fuse_ops.cc index 10fa05435288b..bc6335a539afa 100644 --- a/src/relay/transforms/fuse_ops.cc +++ b/src/relay/transforms/fuse_ops.cc @@ -31,8 +31,8 @@ #include #include "../../support/arena.h" -#include "pass_util.h" -#include "pattern_util.h" +#include "pass_utils.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/gradient.cc b/src/relay/transforms/gradient.cc index bf81050803178..1722c90069cbd 100644 --- a/src/relay/transforms/gradient.cc +++ b/src/relay/transforms/gradient.cc @@ -29,8 +29,8 @@ #include #include "let_list.h" -#include "pass_util.h" -#include "pattern_util.h" +#include "pass_utils.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/infer_layout_util.h b/src/relay/transforms/infer_layout_utils.h similarity index 97% rename from src/relay/transforms/infer_layout_util.h rename to src/relay/transforms/infer_layout_utils.h index 5cc180e8e2e39..3965b0a6a78bc 100644 --- a/src/relay/transforms/infer_layout_util.h +++ b/src/relay/transforms/infer_layout_utils.h @@ -18,14 +18,14 @@ */ /*! - * \file infer_layout_util.h + * \file infer_layout_utils.h * \brief Utility functions to alter the layouts of operators or replace primitive operators with other expressions. This pass can be used for computing convolution in custom layouts or other general weight pre-transformation. */ -#ifndef TVM_RELAY_TRANSFORMS_INFER_LAYOUT_UTIL_H_ -#define TVM_RELAY_TRANSFORMS_INFER_LAYOUT_UTIL_H_ +#ifndef TVM_RELAY_TRANSFORMS_INFER_LAYOUT_UTILS_H_ +#define TVM_RELAY_TRANSFORMS_INFER_LAYOUT_UTILS_H_ #include #include @@ -34,7 +34,7 @@ #include #include -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { @@ -235,4 +235,4 @@ static inline std::tuple, Array, bool> InferCorrectLayouts } // namespace relay } // namespace tvm -#endif // TVM_RELAY_TRANSFORMS_INFER_LAYOUT_UTIL_H_ +#endif // TVM_RELAY_TRANSFORMS_INFER_LAYOUT_UTILS_H_ diff --git a/src/relay/transforms/merge_compiler_regions.cc b/src/relay/transforms/merge_compiler_regions.cc index 5e615e4316bdc..17fd44707b023 100644 --- a/src/relay/transforms/merge_compiler_regions.cc +++ b/src/relay/transforms/merge_compiler_regions.cc @@ -43,7 +43,7 @@ #include #include "../analysis/annotated_region_set.h" -#include "pass_util.h" +#include "pass_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/partial_eval.cc b/src/relay/transforms/partial_eval.cc index afe2bd5d93029..276d093d6993d 100644 --- a/src/relay/transforms/partial_eval.cc +++ b/src/relay/transforms/partial_eval.cc @@ -98,7 +98,7 @@ #include #include "let_list.h" -#include "pass_util.h" +#include "pass_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/partition_graph.cc b/src/relay/transforms/partition_graph.cc index e4560c093115c..08d26d76ee2d2 100644 --- a/src/relay/transforms/partition_graph.cc +++ b/src/relay/transforms/partition_graph.cc @@ -44,7 +44,7 @@ #include "../analysis/annotated_region_set.h" #include "../backend/utils.h" -#include "pass_util.h" +#include "pass_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/pass_util.h b/src/relay/transforms/pass_utils.h similarity index 98% rename from src/relay/transforms/pass_util.h rename to src/relay/transforms/pass_utils.h index f3c99ccfa120c..a2f22cbbf106a 100644 --- a/src/relay/transforms/pass_util.h +++ b/src/relay/transforms/pass_utils.h @@ -19,11 +19,11 @@ /*! * - * \file tvm/relay/_transforms/pass_util.h + * \file tvm/relay/_transforms/pass_utils.h * \brief Utilities for writing passes */ -#ifndef TVM_RELAY_TRANSFORMS_PASS_UTIL_H_ -#define TVM_RELAY_TRANSFORMS_PASS_UTIL_H_ +#ifndef TVM_RELAY_TRANSFORMS_PASS_UTILS_H_ +#define TVM_RELAY_TRANSFORMS_PASS_UTILS_H_ #include #include @@ -276,4 +276,4 @@ class Fill : ExprFunctor { } // namespace relay } // namespace tvm -#endif // TVM_RELAY_TRANSFORMS_PASS_UTIL_H_ +#endif // TVM_RELAY_TRANSFORMS_PASS_UTILS_H_ diff --git a/src/relay/transforms/pattern_util.h b/src/relay/transforms/pattern_utils.h similarity index 99% rename from src/relay/transforms/pattern_util.h rename to src/relay/transforms/pattern_utils.h index 3c653af01e2e3..82ffd8a17c1b6 100644 --- a/src/relay/transforms/pattern_util.h +++ b/src/relay/transforms/pattern_utils.h @@ -19,12 +19,12 @@ /*! * - * \file tvm/relay/_pattern_util.h + * \file tvm/relay/transforms/pattern_utils.h * \brief Header of internal operator functions * These can be used for writing passes. */ -#ifndef TVM_RELAY_TRANSFORMS_PATTERN_UTIL_H_ -#define TVM_RELAY_TRANSFORMS_PATTERN_UTIL_H_ +#ifndef TVM_RELAY_TRANSFORMS_PATTERN_UTILS_H_ +#define TVM_RELAY_TRANSFORMS_PATTERN_UTILS_H_ #include #include @@ -676,4 +676,4 @@ Expr CastHint(Expr data, DataType dtype); } // namespace relay } // namespace tvm -#endif // TVM_RELAY_TRANSFORMS_PATTERN_UTIL_H_ +#endif // TVM_RELAY_TRANSFORMS_PATTERN_UTILS_H_ diff --git a/src/relay/transforms/simplify_inference.cc b/src/relay/transforms/simplify_inference.cc index 8728e90f55a31..7df71967d834f 100644 --- a/src/relay/transforms/simplify_inference.cc +++ b/src/relay/transforms/simplify_inference.cc @@ -26,7 +26,7 @@ #include #include -#include "pattern_util.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/to_a_normal_form.cc b/src/relay/transforms/to_a_normal_form.cc index adb757b9de0cd..e5d7b133c0c02 100644 --- a/src/relay/transforms/to_a_normal_form.cc +++ b/src/relay/transforms/to_a_normal_form.cc @@ -31,7 +31,7 @@ #include "../../support/arena.h" #include "../analysis/dependency_graph.h" #include "let_list.h" -#include "pass_util.h" +#include "pass_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/to_basic_block_normal_form.cc b/src/relay/transforms/to_basic_block_normal_form.cc index 5fc01e1517608..fcec4e80ce5bf 100644 --- a/src/relay/transforms/to_basic_block_normal_form.cc +++ b/src/relay/transforms/to_basic_block_normal_form.cc @@ -31,7 +31,7 @@ #include "../../support/arena.h" #include "../analysis/dependency_graph.h" #include "let_list.h" -#include "pass_util.h" +#include "pass_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/to_cps.cc b/src/relay/transforms/to_cps.cc index 7c11ce5d4cd93..5ece501331727 100644 --- a/src/relay/transforms/to_cps.cc +++ b/src/relay/transforms/to_cps.cc @@ -57,7 +57,7 @@ #include #include "let_list.h" -#include "pass_util.h" +#include "pass_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/transform_layout.h b/src/relay/transforms/transform_layout.h index 61a74404afd1b..c250d3801b68e 100644 --- a/src/relay/transforms/transform_layout.h +++ b/src/relay/transforms/transform_layout.h @@ -34,8 +34,8 @@ #include #include -#include "infer_layout_util.h" -#include "pattern_util.h" +#include "infer_layout_utils.h" +#include "pattern_utils.h" namespace tvm { namespace relay { diff --git a/src/relay/transforms/type_infer.cc b/src/relay/transforms/type_infer.cc index d34a662778a4a..105aed3614cd0 100644 --- a/src/relay/transforms/type_infer.cc +++ b/src/relay/transforms/type_infer.cc @@ -46,7 +46,7 @@ #include #include "../analysis/type_solver.h" -#include "pass_util.h" +#include "pass_utils.h" namespace tvm { namespace relay { diff --git a/src/runtime/contrib/ethosn/ethosn_runtime.cc b/src/runtime/contrib/ethosn/ethosn_runtime.cc index f5164e55c46c5..7fc44368af6dd 100644 --- a/src/runtime/contrib/ethosn/ethosn_runtime.cc +++ b/src/runtime/contrib/ethosn/ethosn_runtime.cc @@ -36,7 +36,7 @@ #include #include -#include "../../file_util.h" +#include "../../file_utils.h" #include "ethosn_device.h" #include "ethosn_driver_library/Inference.hpp" #include "ethosn_driver_library/Network.hpp" diff --git a/src/runtime/cuda/cuda_module.cc b/src/runtime/cuda/cuda_module.cc index bf844c1ad798c..c356897c8e90f 100644 --- a/src/runtime/cuda/cuda_module.cc +++ b/src/runtime/cuda/cuda_module.cc @@ -32,7 +32,7 @@ #include #include -#include "../file_util.h" +#include "../file_utils.h" #include "../meta_data.h" #include "../pack_args.h" #include "../thread_storage_scope.h" diff --git a/src/runtime/file_util.cc b/src/runtime/file_utils.cc similarity index 99% rename from src/runtime/file_util.cc rename to src/runtime/file_utils.cc index 68d174e470a24..c3298d266cdd1 100644 --- a/src/runtime/file_util.cc +++ b/src/runtime/file_utils.cc @@ -18,9 +18,9 @@ */ /*! - * \file file_util.cc + * \file file_utils.cc */ -#include "file_util.h" +#include "file_utils.h" #include #include diff --git a/src/runtime/file_util.h b/src/runtime/file_utils.h similarity index 93% rename from src/runtime/file_util.h rename to src/runtime/file_utils.h index 1c350357ec9af..696a9760c2e1d 100644 --- a/src/runtime/file_util.h +++ b/src/runtime/file_utils.h @@ -18,11 +18,11 @@ */ /*! - * \file file_util.h - * \brief Minimum file manipulation util for runtime. + * \file file_utils.h + * \brief Minimum file manipulation utils for runtime. */ -#ifndef TVM_RUNTIME_FILE_UTIL_H_ -#define TVM_RUNTIME_FILE_UTIL_H_ +#ifndef TVM_RUNTIME_FILE_UTILS_H_ +#define TVM_RUNTIME_FILE_UTILS_H_ #include #include @@ -94,4 +94,4 @@ void LoadMetaDataFromFile(const std::string& file_name, void RemoveFile(const std::string& file_name); } // namespace runtime } // namespace tvm -#endif // TVM_RUNTIME_FILE_UTIL_H_ +#endif // TVM_RUNTIME_FILE_UTILS_H_ diff --git a/src/runtime/hexagon/hexagon_module.cc b/src/runtime/hexagon/hexagon_module.cc index 66e2a5698fb23..305fd50cbdd50 100644 --- a/src/runtime/hexagon/hexagon_module.cc +++ b/src/runtime/hexagon/hexagon_module.cc @@ -31,7 +31,7 @@ #include #include -#include "../file_util.h" +#include "../file_utils.h" #include "../meta_data.h" namespace tvm { diff --git a/src/runtime/metal/metal_module.mm b/src/runtime/metal/metal_module.mm index 8d10ff210d8dc..2d3a901c85244 100644 --- a/src/runtime/metal/metal_module.mm +++ b/src/runtime/metal/metal_module.mm @@ -27,7 +27,7 @@ #include #include #include -#include "../file_util.h" +#include "../file_utils.h" #include "../meta_data.h" #include "../pack_args.h" #include "../thread_storage_scope.h" diff --git a/src/runtime/module.cc b/src/runtime/module.cc index 98b0b3a834666..8c3fb49ea7e03 100644 --- a/src/runtime/module.cc +++ b/src/runtime/module.cc @@ -28,7 +28,7 @@ #include #include -#include "file_util.h" +#include "file_utils.h" namespace tvm { namespace runtime { diff --git a/src/runtime/opencl/opencl_common.h b/src/runtime/opencl/opencl_common.h index aab0c27cb39be..290f8c2565081 100644 --- a/src/runtime/opencl/opencl_common.h +++ b/src/runtime/opencl/opencl_common.h @@ -51,7 +51,7 @@ #include #include -#include "../file_util.h" +#include "../file_utils.h" #include "../meta_data.h" #include "../pack_args.h" #include "../thread_storage_scope.h" diff --git a/src/runtime/rocm/rocm_module.cc b/src/runtime/rocm/rocm_module.cc index 79958d20aa1f9..8a83599c644b0 100644 --- a/src/runtime/rocm/rocm_module.cc +++ b/src/runtime/rocm/rocm_module.cc @@ -31,7 +31,7 @@ #include #include -#include "../file_util.h" +#include "../file_utils.h" #include "../meta_data.h" #include "../pack_args.h" #include "../thread_storage_scope.h" diff --git a/src/runtime/rpc/rpc_server_env.cc b/src/runtime/rpc/rpc_server_env.cc index b999a48a376a4..cb25150449a10 100644 --- a/src/runtime/rpc/rpc_server_env.cc +++ b/src/runtime/rpc/rpc_server_env.cc @@ -23,7 +23,7 @@ */ #include -#include "../file_util.h" +#include "../file_utils.h" namespace tvm { namespace runtime { diff --git a/src/runtime/stackvm/stackvm_module.cc b/src/runtime/stackvm/stackvm_module.cc index 6c9af1cbeb429..88c19362a1f84 100644 --- a/src/runtime/stackvm/stackvm_module.cc +++ b/src/runtime/stackvm/stackvm_module.cc @@ -30,7 +30,7 @@ #include #include -#include "../file_util.h" +#include "../file_utils.h" namespace tvm { namespace runtime { diff --git a/src/runtime/vm/executable.cc b/src/runtime/vm/executable.cc index cc1dc8dd19e53..08e9af61fdc35 100644 --- a/src/runtime/vm/executable.cc +++ b/src/runtime/vm/executable.cc @@ -37,7 +37,7 @@ #include #include -#include "serialize_util.h" +#include "serialize_utils.h" namespace tvm { namespace runtime { diff --git a/src/runtime/vm/serialize_util.h b/src/runtime/vm/serialize_utils.h similarity index 96% rename from src/runtime/vm/serialize_util.h rename to src/runtime/vm/serialize_utils.h index d17256d6a0795..726a46ee2fa17 100644 --- a/src/runtime/vm/serialize_util.h +++ b/src/runtime/vm/serialize_utils.h @@ -18,11 +18,11 @@ */ /*! - * \file src/runtime/vm/serialize_util.h + * \file src/runtime/vm/serialize_utils.h * \brief Definitions of helpers for serializing and deserializing a Relay VM. */ -#ifndef TVM_RUNTIME_VM_SERIALIZE_UTIL_H_ -#define TVM_RUNTIME_VM_SERIALIZE_UTIL_H_ +#ifndef TVM_RUNTIME_VM_SERIALIZE_UTILS_H_ +#define TVM_RUNTIME_VM_SERIALIZE_UTILS_H_ #include #include @@ -164,4 +164,4 @@ struct VMInstructionSerializer { } // namespace runtime } // namespace tvm -#endif // TVM_RUNTIME_VM_SERIALIZE_UTIL_H_ +#endif // TVM_RUNTIME_VM_SERIALIZE_UTILS_H_ diff --git a/src/runtime/vulkan/vulkan.cc b/src/runtime/vulkan/vulkan.cc index 5b630337acbb1..3cbe245ed095c 100644 --- a/src/runtime/vulkan/vulkan.cc +++ b/src/runtime/vulkan/vulkan.cc @@ -26,7 +26,7 @@ #include #include -#include "../file_util.h" +#include "../file_utils.h" #include "../pack_args.h" #include "../thread_storage_scope.h" #include "../workspace_pool.h" diff --git a/src/support/socket.h b/src/support/socket.h index d70f956a51fb5..f38918feb8cba 100644 --- a/src/support/socket.h +++ b/src/support/socket.h @@ -52,7 +52,7 @@ using ssize_t = int; #include #include -#include "../support/util.h" +#include "../support/utils.h" #if defined(_WIN32) static inline int poll(struct pollfd* pfd, int nfds, int timeout) { diff --git a/src/support/util.h b/src/support/utils.h similarity index 97% rename from src/support/util.h rename to src/support/utils.h index 5020df2e2ea78..ce1f2bed43f95 100644 --- a/src/support/util.h +++ b/src/support/utils.h @@ -18,11 +18,11 @@ */ /*! - * \file util.h + * \file utils.h * \brief Defines some common utility function.. */ -#ifndef TVM_SUPPORT_UTIL_H_ -#define TVM_SUPPORT_UTIL_H_ +#ifndef TVM_SUPPORT_UTILS_H_ +#define TVM_SUPPORT_UTILS_H_ #include #ifndef _WIN32 @@ -164,4 +164,4 @@ inline size_t HashCombine(size_t key, size_t value) { } // namespace support } // namespace tvm -#endif // TVM_SUPPORT_UTIL_H_ +#endif // TVM_SUPPORT_UTILS_H_ diff --git a/src/target/llvm/codegen_llvm.h b/src/target/llvm/codegen_llvm.h index 351d7d90b4fe8..3b0ce10534fd7 100644 --- a/src/target/llvm/codegen_llvm.h +++ b/src/target/llvm/codegen_llvm.h @@ -45,7 +45,7 @@ #include #include "../../runtime/thread_storage_scope.h" -#include "../../tir/transforms/ir_util.h" +#include "../../tir/transforms/ir_utils.h" #include "llvm_common.h" namespace tvm { diff --git a/src/target/llvm/llvm_module.cc b/src/target/llvm/llvm_module.cc index 712980cdbe411..a37710d5622b2 100644 --- a/src/target/llvm/llvm_module.cc +++ b/src/target/llvm/llvm_module.cc @@ -30,7 +30,7 @@ #include -#include "../../runtime/file_util.h" +#include "../../runtime/file_utils.h" #include "../../runtime/library_module.h" #include "codegen_blob.h" #include "codegen_llvm.h" diff --git a/src/target/source/codegen_aocl.cc b/src/target/source/codegen_aocl.cc index e90b7d4f8b2cb..00533d27c5a66 100644 --- a/src/target/source/codegen_aocl.cc +++ b/src/target/source/codegen_aocl.cc @@ -25,7 +25,7 @@ #include #include -#include "../../runtime/file_util.h" +#include "../../runtime/file_utils.h" #include "../../runtime/opencl/aocl/aocl_module.h" #include "../build_common.h" #include "codegen_opencl.h" diff --git a/src/target/source/source_module.cc b/src/target/source/source_module.cc index 68a34c8304f86..e1ee1539d9861 100644 --- a/src/target/source/source_module.cc +++ b/src/target/source/source_module.cc @@ -25,7 +25,7 @@ #include #include -#include "../../runtime/file_util.h" +#include "../../runtime/file_utils.h" #include "../../runtime/meta_data.h" #include "codegen_source_base.h" diff --git a/src/te/autodiff/ad_simplify.cc b/src/te/autodiff/ad_simplify.cc index eefd243281c3e..81df5c9d6b429 100644 --- a/src/te/autodiff/ad_simplify.cc +++ b/src/te/autodiff/ad_simplify.cc @@ -56,7 +56,7 @@ #include #include -#include "ad_util.h" +#include "ad_utils.h" namespace tvm { namespace te { diff --git a/src/te/autodiff/ad_util.cc b/src/te/autodiff/ad_utils.cc similarity index 99% rename from src/te/autodiff/ad_util.cc rename to src/te/autodiff/ad_utils.cc index 024015a601aad..268abab9cacb8 100644 --- a/src/te/autodiff/ad_util.cc +++ b/src/te/autodiff/ad_utils.cc @@ -18,10 +18,10 @@ */ /*! - * \file ad_util.cc + * \file ad_utils.cc * \brief Utility for tensor-level auto-differentiation. */ -#include "ad_util.h" +#include "ad_utils.h" #include #include diff --git a/src/te/autodiff/ad_util.h b/src/te/autodiff/ad_utils.h similarity index 97% rename from src/te/autodiff/ad_util.h rename to src/te/autodiff/ad_utils.h index 21de61cc46c26..56070ef272677 100644 --- a/src/te/autodiff/ad_util.h +++ b/src/te/autodiff/ad_utils.h @@ -18,11 +18,11 @@ */ /*! - * \file ad_util.h + * \file ad_utils.h * \brief Helper utilities to implement auto-differentiation. */ -#ifndef TVM_TE_AUTODIFF_AD_UTIL_H_ -#define TVM_TE_AUTODIFF_AD_UTIL_H_ +#ifndef TVM_TE_AUTODIFF_AD_UTILS_H_ +#define TVM_TE_AUTODIFF_AD_UTILS_H_ #include #include @@ -132,4 +132,4 @@ TVM_DLL Tensor RemoveJacobianAndLiftNonzeroCond(const Tensor& tensor, } // namespace te } // namespace tvm -#endif // TVM_TE_AUTODIFF_AD_UTIL_H_ +#endif // TVM_TE_AUTODIFF_AD_UTILS_H_ diff --git a/src/te/autodiff/adjoint.cc b/src/te/autodiff/adjoint.cc index 9f3adfb01a2ca..34d38aa758820 100644 --- a/src/te/autodiff/adjoint.cc +++ b/src/te/autodiff/adjoint.cc @@ -39,7 +39,7 @@ #include #include -#include "ad_util.h" +#include "ad_utils.h" namespace tvm { namespace te { diff --git a/src/te/autodiff/jacobian.cc b/src/te/autodiff/jacobian.cc index 3724af51c63a5..ba03ba08febdb 100644 --- a/src/te/autodiff/jacobian.cc +++ b/src/te/autodiff/jacobian.cc @@ -30,7 +30,7 @@ #include -#include "ad_util.h" +#include "ad_utils.h" namespace tvm { namespace te { diff --git a/src/te/operation/compute_op.cc b/src/te/operation/compute_op.cc index 527b251867adb..64995761524b0 100644 --- a/src/te/operation/compute_op.cc +++ b/src/te/operation/compute_op.cc @@ -37,7 +37,7 @@ #include "../../arith/interval_set.h" #include "../schedule/message_passing.h" -#include "op_util.h" +#include "op_utils.h" namespace tvm { namespace te { diff --git a/src/te/operation/cross_thread_reduction.cc b/src/te/operation/cross_thread_reduction.cc index 6369ecbabad8f..6aba9ab500b6d 100644 --- a/src/te/operation/cross_thread_reduction.cc +++ b/src/te/operation/cross_thread_reduction.cc @@ -24,7 +24,7 @@ #include #include "compute_op.h" -#include "op_util.h" +#include "op_utils.h" namespace tvm { namespace te { diff --git a/src/te/operation/extern_op.cc b/src/te/operation/extern_op.cc index e61fe51470fea..2afdd4a93c7e2 100644 --- a/src/te/operation/extern_op.cc +++ b/src/te/operation/extern_op.cc @@ -28,7 +28,7 @@ #include -#include "op_util.h" +#include "op_utils.h" namespace tvm { namespace te { diff --git a/src/te/operation/hybrid_op.cc b/src/te/operation/hybrid_op.cc index 01162cb14e18d..98270e9a2952d 100644 --- a/src/te/operation/hybrid_op.cc +++ b/src/te/operation/hybrid_op.cc @@ -35,7 +35,7 @@ #include #include -#include "op_util.h" +#include "op_utils.h" namespace tvm { namespace te { diff --git a/src/te/operation/hybrid_op.h b/src/te/operation/hybrid_op.h index a11ae89e23f71..705456850ce6d 100644 --- a/src/te/operation/hybrid_op.h +++ b/src/te/operation/hybrid_op.h @@ -32,7 +32,7 @@ #include #include "../../tir/transforms/arg_binder.h" -#include "../../tir/transforms/ir_util.h" +#include "../../tir/transforms/ir_utils.h" #include "../schedule/message_passing.h" namespace tvm { diff --git a/src/te/operation/op_util.cc b/src/te/operation/op_utils.cc similarity index 99% rename from src/te/operation/op_util.cc rename to src/te/operation/op_utils.cc index 2abf68a71d544..80f7fe2b4e41e 100644 --- a/src/te/operation/op_util.cc +++ b/src/te/operation/op_utils.cc @@ -19,9 +19,9 @@ /*! * \brief Utility to make loop nest. - * \file op_util.cc + * \file op_utils.cc */ -#include "op_util.h" +#include "op_utils.h" #include #include diff --git a/src/te/operation/op_util.h b/src/te/operation/op_utils.h similarity index 95% rename from src/te/operation/op_util.h rename to src/te/operation/op_utils.h index 6c864fca67d50..16f7d96cfa77a 100644 --- a/src/te/operation/op_util.h +++ b/src/te/operation/op_utils.h @@ -18,11 +18,11 @@ */ /*! - * \file op_util.h + * \file op_utils.h * \brief Common utility used in operator construction. */ -#ifndef TVM_TE_OPERATION_OP_UTIL_H_ -#define TVM_TE_OPERATION_OP_UTIL_H_ +#ifndef TVM_TE_OPERATION_OP_UTILS_H_ +#define TVM_TE_OPERATION_OP_UTILS_H_ #include #include @@ -32,7 +32,7 @@ #include #include "../../tir/transforms/arg_binder.h" -#include "../../tir/transforms/ir_util.h" +#include "../../tir/transforms/ir_utils.h" #include "../schedule/message_passing.h" namespace tvm { @@ -101,4 +101,4 @@ tir::ForType IterVarTypeToForType(IterVarType iter_type); } // namespace te } // namespace tvm -#endif // TVM_TE_OPERATION_OP_UTIL_H_ +#endif // TVM_TE_OPERATION_OP_UTILS_H_ diff --git a/src/te/operation/scan_op.cc b/src/te/operation/scan_op.cc index 99b0edf60a7c9..726714580b786 100644 --- a/src/te/operation/scan_op.cc +++ b/src/te/operation/scan_op.cc @@ -26,7 +26,7 @@ #include #include "../schedule/graph.h" -#include "op_util.h" +#include "op_utils.h" namespace tvm { namespace te { diff --git a/src/te/operation/tensor_compute_op.cc b/src/te/operation/tensor_compute_op.cc index f6f00584aa76a..ecb2e860c3e64 100644 --- a/src/te/operation/tensor_compute_op.cc +++ b/src/te/operation/tensor_compute_op.cc @@ -31,7 +31,7 @@ #include #include "./compute_op.h" -#include "./op_util.h" +#include "./op_utils.h" namespace tvm { namespace te { diff --git a/src/te/operation/tensorize.cc b/src/te/operation/tensorize.cc index ab96ae8180f51..9733cd940a9f9 100644 --- a/src/te/operation/tensorize.cc +++ b/src/te/operation/tensorize.cc @@ -28,7 +28,7 @@ #include "../schedule/message_passing.h" #include "compute_op.h" -#include "op_util.h" +#include "op_utils.h" namespace tvm { namespace te { diff --git a/src/te/schedule/operation_inline.cc b/src/te/schedule/operation_inline.cc index 7399af90f5709..01d93c5ec8bd0 100644 --- a/src/te/schedule/operation_inline.cc +++ b/src/te/schedule/operation_inline.cc @@ -29,7 +29,7 @@ #include -#include "../../tir/transforms/ir_util.h" +#include "../../tir/transforms/ir_utils.h" namespace tvm { namespace te { diff --git a/src/te/schedule/schedule_dataflow_rewrite.cc b/src/te/schedule/schedule_dataflow_rewrite.cc index 78f0608a0d148..f335f953b7b20 100644 --- a/src/te/schedule/schedule_dataflow_rewrite.cc +++ b/src/te/schedule/schedule_dataflow_rewrite.cc @@ -27,7 +27,7 @@ #include -#include "../../tir/transforms/ir_util.h" +#include "../../tir/transforms/ir_utils.h" #include "message_passing.h" #include "operation_inline.h" diff --git a/src/te/schedule/schedule_ops.cc b/src/te/schedule/schedule_ops.cc index e5124dfdc9658..a16d9bb73000d 100644 --- a/src/te/schedule/schedule_ops.cc +++ b/src/te/schedule/schedule_ops.cc @@ -31,8 +31,8 @@ #include #include -#include "../../tir/transforms/ir_util.h" -#include "../operation/op_util.h" +#include "../../tir/transforms/ir_utils.h" +#include "../operation/op_utils.h" #include "graph.h" namespace tvm { diff --git a/src/tir/transforms/arg_binder.cc b/src/tir/transforms/arg_binder.cc index b88d2980b770b..1faa6267b4fee 100644 --- a/src/tir/transforms/arg_binder.cc +++ b/src/tir/transforms/arg_binder.cc @@ -28,7 +28,7 @@ #include #include -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/coproc_sync.cc b/src/tir/transforms/coproc_sync.cc index 716ec625d5a8a..9de9eaa8a639d 100644 --- a/src/tir/transforms/coproc_sync.cc +++ b/src/tir/transforms/coproc_sync.cc @@ -29,7 +29,7 @@ #include #include -#include "ir_util.h" +#include "ir_utils.h" #include "storage_access.h" namespace tvm { diff --git a/src/tir/transforms/hoist_if_then_else.cc b/src/tir/transforms/hoist_if_then_else.cc index 4e7589c3a7953..9db800c2a6d2e 100644 --- a/src/tir/transforms/hoist_if_then_else.cc +++ b/src/tir/transforms/hoist_if_then_else.cc @@ -32,7 +32,7 @@ #include "../../arith/interval_set.h" #include "../../runtime/thread_storage_scope.h" -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/inject_double_buffer.cc b/src/tir/transforms/inject_double_buffer.cc index 9d5ee950cdfa3..1eea43d27d460 100644 --- a/src/tir/transforms/inject_double_buffer.cc +++ b/src/tir/transforms/inject_double_buffer.cc @@ -26,7 +26,7 @@ #include #include -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/inject_virtual_thread.cc b/src/tir/transforms/inject_virtual_thread.cc index d5405790a15aa..c0a0b08f22a0b 100644 --- a/src/tir/transforms/inject_virtual_thread.cc +++ b/src/tir/transforms/inject_virtual_thread.cc @@ -28,7 +28,7 @@ #include -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/ir_util.cc b/src/tir/transforms/ir_utils.cc similarity index 99% rename from src/tir/transforms/ir_util.cc rename to src/tir/transforms/ir_utils.cc index 4f21f0bb74117..744e9a4f8ed3b 100644 --- a/src/tir/transforms/ir_util.cc +++ b/src/tir/transforms/ir_utils.cc @@ -18,10 +18,10 @@ */ /*! - * \file ir_util.cc + * \file ir_utils.cc * \brief Helper functions to construct and compose IR nodes. */ -#include "ir_util.h" +#include "ir_utils.h" #include diff --git a/src/tir/transforms/ir_util.h b/src/tir/transforms/ir_utils.h similarity index 97% rename from src/tir/transforms/ir_util.h rename to src/tir/transforms/ir_utils.h index 2f9d70659f4da..eb7a246957d20 100644 --- a/src/tir/transforms/ir_util.h +++ b/src/tir/transforms/ir_utils.h @@ -18,11 +18,11 @@ */ /*! - * \file ir_util.h + * \file ir_utils.h * \brief Helper functions to construct and compose IR nodes. */ -#ifndef TVM_TIR_TRANSFORMS_IR_UTIL_H_ -#define TVM_TIR_TRANSFORMS_IR_UTIL_H_ +#ifndef TVM_TIR_TRANSFORMS_IR_UTILS_H_ +#define TVM_TIR_TRANSFORMS_IR_UTILS_H_ #include #include @@ -170,4 +170,4 @@ Stmt ConvertSSA(Stmt stmt); } // namespace tir } // namespace tvm -#endif // TVM_TIR_TRANSFORMS_IR_UTIL_H_ +#endif // TVM_TIR_TRANSFORMS_IR_UTILS_H_ diff --git a/src/tir/transforms/lift_attr_scope.cc b/src/tir/transforms/lift_attr_scope.cc index 1a1279f0640ad..44b121a7b5592 100644 --- a/src/tir/transforms/lift_attr_scope.cc +++ b/src/tir/transforms/lift_attr_scope.cc @@ -27,7 +27,7 @@ #include #include -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/loop_partition.cc b/src/tir/transforms/loop_partition.cc index 23f41e1676a63..68c43fac11707 100644 --- a/src/tir/transforms/loop_partition.cc +++ b/src/tir/transforms/loop_partition.cc @@ -33,7 +33,7 @@ #include "../../arith/interval_set.h" #include "../../runtime/thread_storage_scope.h" -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/lower_device_storage_access_info.cc b/src/tir/transforms/lower_device_storage_access_info.cc index fac50a08a9b72..3b317e3f99687 100644 --- a/src/tir/transforms/lower_device_storage_access_info.cc +++ b/src/tir/transforms/lower_device_storage_access_info.cc @@ -30,7 +30,7 @@ #include #include "../../runtime/thread_storage_scope.h" -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/lower_thread_allreduce.cc b/src/tir/transforms/lower_thread_allreduce.cc index bd216bb1c6cb0..720c9d0a67e0c 100644 --- a/src/tir/transforms/lower_thread_allreduce.cc +++ b/src/tir/transforms/lower_thread_allreduce.cc @@ -32,7 +32,7 @@ #include #include "../../runtime/thread_storage_scope.h" -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/lower_tvm_builtin.cc b/src/tir/transforms/lower_tvm_builtin.cc index c8df122d40b5c..39e6640eece6a 100644 --- a/src/tir/transforms/lower_tvm_builtin.cc +++ b/src/tir/transforms/lower_tvm_builtin.cc @@ -29,7 +29,7 @@ #include -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/make_packed_api.cc b/src/tir/transforms/make_packed_api.cc index 3fae2bbf40c89..3cacf52d90d24 100644 --- a/src/tir/transforms/make_packed_api.cc +++ b/src/tir/transforms/make_packed_api.cc @@ -36,7 +36,7 @@ #include #include "arg_binder.h" -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/storage_access.cc b/src/tir/transforms/storage_access.cc index f9adfb82a33f9..6514a834b397f 100644 --- a/src/tir/transforms/storage_access.cc +++ b/src/tir/transforms/storage_access.cc @@ -28,7 +28,7 @@ #include #include -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/storage_flatten.cc b/src/tir/transforms/storage_flatten.cc index 7475bf6d2f8ee..c062cf73aeef4 100644 --- a/src/tir/transforms/storage_flatten.cc +++ b/src/tir/transforms/storage_flatten.cc @@ -41,7 +41,7 @@ #include "../../arith/ir_visitor_with_analyzer.h" #include "../../runtime/thread_storage_scope.h" #include "arg_binder.h" -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/storage_rewrite.cc b/src/tir/transforms/storage_rewrite.cc index 09d96510f7f01..3abff415d1f1a 100644 --- a/src/tir/transforms/storage_rewrite.cc +++ b/src/tir/transforms/storage_rewrite.cc @@ -36,7 +36,7 @@ #include #include "../../runtime/thread_storage_scope.h" -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/tir/transforms/tensorcore_infer_fragment.cc b/src/tir/transforms/tensorcore_infer_fragment.cc index 1b3b3c44ff9ca..81c8645f3dda5 100644 --- a/src/tir/transforms/tensorcore_infer_fragment.cc +++ b/src/tir/transforms/tensorcore_infer_fragment.cc @@ -30,7 +30,7 @@ #include #include "../../runtime/thread_storage_scope.h" -#include "ir_util.h" +#include "ir_utils.h" #include "storage_access.h" namespace tvm { diff --git a/src/tir/transforms/thread_storage_sync.cc b/src/tir/transforms/thread_storage_sync.cc index 4893748bf5221..05ee8146cbd8b 100644 --- a/src/tir/transforms/thread_storage_sync.cc +++ b/src/tir/transforms/thread_storage_sync.cc @@ -31,7 +31,7 @@ #include #include "../../runtime/thread_storage_scope.h" -#include "ir_util.h" +#include "ir_utils.h" #include "storage_access.h" namespace tvm { diff --git a/src/tir/transforms/unroll_loop.cc b/src/tir/transforms/unroll_loop.cc index a15190665949e..122654149f24a 100644 --- a/src/tir/transforms/unroll_loop.cc +++ b/src/tir/transforms/unroll_loop.cc @@ -33,7 +33,7 @@ #include #include -#include "ir_util.h" +#include "ir_utils.h" namespace tvm { namespace tir { diff --git a/src/topi/broadcast.cc b/src/topi/broadcast.cc index a06d914015800..f6a28c7722af4 100644 --- a/src/topi/broadcast.cc +++ b/src/topi/broadcast.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include namespace tvm { namespace topi { diff --git a/src/topi/reduction.cc b/src/topi/reduction.cc index b5c6690e16763..55c59162e68cc 100644 --- a/src/topi/reduction.cc +++ b/src/topi/reduction.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include namespace tvm { namespace topi { diff --git a/src/topi/transform.cc b/src/topi/transform.cc index d79952e2494f4..19243803cdc9f 100644 --- a/src/topi/transform.cc +++ b/src/topi/transform.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include namespace tvm { namespace topi { diff --git a/web/emcc/wasm_runtime.cc b/web/emcc/wasm_runtime.cc index a67b4c3dcd146..a5f8c8252571c 100644 --- a/web/emcc/wasm_runtime.cc +++ b/web/emcc/wasm_runtime.cc @@ -34,7 +34,7 @@ #include "src/runtime/c_runtime_api.cc" #include "src/runtime/cpu_device_api.cc" -#include "src/runtime/file_util.cc" +#include "src/runtime/file_utils.cc" #include "src/runtime/graph/graph_runtime.cc" #include "src/runtime/library_module.cc" #include "src/runtime/module.cc"