[REFACTOR] util => utils for consistency in the project. (apache#6684)

* [REFACTOR] util => utils for consistency in the project.

* Update CMake

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)

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"

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"

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"

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"

apps/cpp_rpc/main.cc

@@ -35,7 +35,7 @@
 #include <vector>
 
 #include "../../src/support/socket.h"
-#include "../../src/support/util.h"
+#include "../../src/support/utils.h"
 #include "rpc_server.h"
 
 #if defined(_WIN32)

apps/cpp_rpc/rpc_env.cc

@@ -40,8 +40,8 @@ int mkdir(const char* path, int /* ignored */) { return _mkdir(path); }
 #include <string>
 #include <vector>
 
-#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 {

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"

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"

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:
 

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"

include/tvm/topi/util.h → 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 <tvm/ir/expr.h>
 #include <tvm/runtime/packed_func.h>
@@ -44,4 +44,4 @@ inline Array<Integer> ArrayOrInt(TVMArgValue arg) {
 }
 }  // namespace topi
 }  // namespace tvm
-#endif  // TVM_TOPI_UTIL_H_
+#endif  // TVM_TOPI_UTILS_H_

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)

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
 

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
 
 

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):

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):

src/arith/int_constraints.cc

@@ -33,7 +33,7 @@
 #include <unordered_map>
 #include <utility>
 
-#include "../tir/transforms/ir_util.h"
+#include "../tir/transforms/ir_utils.h"
 
 namespace tvm {
 namespace arith {

src/arith/iter_affine_map.cc

@@ -27,7 +27,7 @@
 #include <tvm/tir/expr_functor.h>
 #include <tvm/tir/op.h>
 
-#include "../support/util.h"
+#include "../support/utils.h"
 #include "const_fold.h"
 
 namespace tvm {

src/node/structural_hash.cc

@@ -28,7 +28,7 @@
 #include <algorithm>
 #include <unordered_map>
 
-#include "../support/util.h"
+#include "../support/utils.h"
 
 namespace tvm {
 

src/relay/analysis/feature.cc

@@ -27,7 +27,7 @@
 #include <tvm/relay/expr_functor.h>
 #include <tvm/relay/feature.h>
 
-#include "../transforms/pass_util.h"
+#include "../transforms/pass_utils.h"
 
 namespace tvm {
 namespace relay {

src/relay/analysis/mac_count.cc

@@ -32,7 +32,7 @@
 #include <tvm/relay/op.h>
 #include <tvm/relay/op_attr_types.h>
 
-#include "../transforms/pattern_util.h"
+#include "../transforms/pattern_utils.h"
 
 namespace tvm {
 namespace relay {

src/relay/analysis/util.cc

@@ -31,7 +31,7 @@
 #include <tvm/relay/op_attr_types.h>
 #include <tvm/relay/pattern_functor.h>
 
-#include "../transforms/pass_util.h"
+#include "../transforms/pass_utils.h"
 
 namespace tvm {
 namespace relay {

src/relay/backend/compile_engine.cc

@@ -45,7 +45,7 @@
 #include <utility>
 #include <vector>
 
-#include "../transforms/pass_util.h"
+#include "../transforms/pass_utils.h"
 #include "utils.h"
 
 namespace tvm {

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"
 

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 {

src/relay/op/annotation/annotation.cc

@@ -30,7 +30,7 @@
 #include <tvm/tir/expr.h>
 #include <tvm/topi/elemwise.h>
 
-#include "../../transforms/infer_layout_util.h"
+#include "../../transforms/infer_layout_utils.h"
 #include "../type_relations.h"
 
 namespace tvm {

src/relay/op/device_copy.cc

@@ -33,7 +33,7 @@
 #include <tvm/tir/expr.h>
 #include <tvm/topi/elemwise.h>
 
-#include "../transforms/infer_layout_util.h"
+#include "../transforms/infer_layout_utils.h"
 #include "type_relations.h"
 
 namespace tvm {

src/relay/op/dyn/tensor/transform.cc

@@ -36,7 +36,7 @@
 #include <utility>
 #include <vector>
 
-#include "../../../transforms/infer_layout_util.h"
+#include "../../../transforms/infer_layout_utils.h"
 
 namespace tvm {
 namespace relay {

src/relay/op/memory/memory.cc

@@ -29,7 +29,7 @@
 #include <tvm/runtime/data_type.h>
 #include <tvm/topi/elemwise.h>
 
-#include "../../transforms/infer_layout_util.h"
+#include "../../transforms/infer_layout_utils.h"
 #include "../op_common.h"
 #include "../type_relations.h"
 

src/relay/op/nn/bitserial.cc

@@ -26,7 +26,7 @@
 #include <tvm/relay/op.h>
 #include <tvm/tir/data_layout.h>
 
-#include "../../transforms/infer_layout_util.h"
+#include "../../transforms/infer_layout_utils.h"
 #include "../op_common.h"
 
 namespace tvm {