This is an automated email from the ASF dual-hosted git repository. tqchen pushed a commit to branch refactor in repository https://gitbox.apache.org/repos/asf/tvm.git
commit 78337e089c988c18cbe913a4621ddf146ea92149 Author: Siyuan Feng <[email protected]> AuthorDate: Mon Feb 17 14:43:38 2025 +0800 remove microdev and antlr --- cmake/config.cmake | 7 ------- docker/Dockerfile.ci_cpu | 4 ---- docker/Dockerfile.ci_hexagon | 4 ---- include/tvm/runtime/c_runtime_api.h | 4 +--- include/tvm/runtime/device_api.h | 4 +--- include/tvm/runtime/packed_func.h | 2 -- jvm/core/src/main/java/org/apache/tvm/Device.java | 3 +-- python/tvm/_ffi/runtime_ctypes.py | 2 -- src/driver/driver_api.cc | 4 +--- src/runtime/profiling.cc | 6 ------ tests/scripts/task_config_build_cpu.sh | 1 - tests/scripts/task_config_build_gpu.sh | 1 - tests/scripts/task_config_build_wasm.sh | 1 - 13 files changed, 4 insertions(+), 39 deletions(-) diff --git a/cmake/config.cmake b/cmake/config.cmake index 6345c0c061..17f587efd4 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -278,13 +278,6 @@ set(USE_CLML OFF) # USE_CLML_GRAPH_EXECUTOR - CLML SDK PATH or ON or OFF set(USE_CLML_GRAPH_EXECUTOR OFF) -# Build ANTLR parser for Relay text format -# Possible values: -# - ON: enable ANTLR by searching default locations (cmake find_program for antlr4 and /usr/local for jar) -# - OFF: disable ANTLR -# - /path/to/antlr-*-complete.jar: path to specific ANTLR jar file -set(USE_ANTLR OFF) - # Whether to enable debug code that may cause ABI changes set(TVM_DEBUG_WITH_ABI_CHANGE OFF) diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu index 5ba1dd7214..18b4d7baab 100644 --- a/docker/Dockerfile.ci_cpu +++ b/docker/Dockerfile.ci_cpu @@ -77,10 +77,6 @@ COPY install/ubuntu_install_golang.sh /install/ubuntu_install_golang.sh RUN bash /install/ubuntu_install_golang.sh ENV PATH $PATH:/usr/lib/go-1.18/bin -# ANTLR deps -COPY install/ubuntu_install_java.sh /install/ubuntu_install_java.sh -RUN bash /install/ubuntu_install_java.sh - # BYODT deps COPY install/ubuntu_install_universal.sh /install/ubuntu_install_universal.sh RUN bash /install/ubuntu_install_universal.sh diff --git a/docker/Dockerfile.ci_hexagon b/docker/Dockerfile.ci_hexagon index 489894d252..4410bfacb3 100644 --- a/docker/Dockerfile.ci_hexagon +++ b/docker/Dockerfile.ci_hexagon @@ -54,10 +54,6 @@ ENV PATH $PATH:$CARGO_HOME/bin COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh RUN bash /install/ubuntu_install_python_package.sh -# ANTLR deps -COPY install/ubuntu_install_java.sh /install/ubuntu_install_java.sh -RUN bash /install/ubuntu_install_java.sh - # Hexagon COPY install/ubuntu_install_hexagon.sh /install/ubuntu_install_hexagon.sh RUN bash /install/ubuntu_install_hexagon.sh diff --git a/include/tvm/runtime/c_runtime_api.h b/include/tvm/runtime/c_runtime_api.h index 277ac048ac..ef25cbe9f7 100644 --- a/include/tvm/runtime/c_runtime_api.h +++ b/include/tvm/runtime/c_runtime_api.h @@ -119,8 +119,7 @@ typedef enum { // To help avoid accidental conflicts between `DLDeviceType` // and this enumeration, start numbering the new enumerators // a little higher than (currently) seems necessary. - kDLMicroDev=35, - TVMDeviceExtType_End, // sentinel value + TVMDeviceExtType_End = 36, // sentinel value } TVMDeviceExtType; #ifdef __cplusplus @@ -146,7 +145,6 @@ static_assert(kDLOneAPI == 14, TVM_HARCODED_INTEGER_CHANGED_MSG); static_assert(kDLWebGPU == 15, TVM_HARCODED_INTEGER_CHANGED_MSG); static_assert(kDLHexagon == 16, TVM_HARCODED_INTEGER_CHANGED_MSG); -static_assert(kDLMicroDev == 35, TVM_HARCODED_INTEGER_CHANGED_MSG); #undef TVM_HARCODED_INTEGER_CHANGED_MSG #endif diff --git a/include/tvm/runtime/device_api.h b/include/tvm/runtime/device_api.h index f27bfdacb5..2564b73d1e 100644 --- a/include/tvm/runtime/device_api.h +++ b/include/tvm/runtime/device_api.h @@ -237,9 +237,7 @@ class TVM_DLL DeviceAPI { * before launching the kernel function. * \param device_type The device type. */ - static bool NeedSetDevice(int device_type) { - return device_type != kDLCPU && device_type != kDLMicroDev; - } + static bool NeedSetDevice(int device_type) { return device_type != kDLCPU; } /*! * \brief Whether pointer arithmetics on a device owned pointer may be performed on the host. diff --git a/include/tvm/runtime/packed_func.h b/include/tvm/runtime/packed_func.h index 9b31481b9d..07a6848bfe 100644 --- a/include/tvm/runtime/packed_func.h +++ b/include/tvm/runtime/packed_func.h @@ -1478,8 +1478,6 @@ inline const char* DLDeviceType2Str(int type) { return "webgpu"; case kDLHexagon: return "hexagon"; - case kDLMicroDev: - return "microdev"; default: LOG(FATAL) << "unknown type = " << type; } diff --git a/jvm/core/src/main/java/org/apache/tvm/Device.java b/jvm/core/src/main/java/org/apache/tvm/Device.java index 8390d88cb9..337f62b74c 100644 --- a/jvm/core/src/main/java/org/apache/tvm/Device.java +++ b/jvm/core/src/main/java/org/apache/tvm/Device.java @@ -28,8 +28,7 @@ public class Device { */ static final int kDLCPU = 1, kDLCUDA = 2, kDLCUDAHost = 3, kDLOpenCL = 4, kDLVulkan = 7, kDLMetal = 8, kDLVPI = 9, kDLROCM = 10, kDLROCMHost = 11, kDLExtDev = 12, - kDLCUDAManaged = 13, kDLOneAPI = 14, kDLWebGPU = 15, kDLHexagon = 16, - kDLMicroDev = 35; + kDLCUDAManaged = 13, kDLOneAPI = 14, kDLWebGPU = 15, kDLHexagon = 16; private static final Map<Integer, String> MASK2STR = new HashMap<Integer, String>(); private static final Map<String, Integer> STR2MASK = new HashMap<String, Integer>(); diff --git a/python/tvm/_ffi/runtime_ctypes.py b/python/tvm/_ffi/runtime_ctypes.py index 3b7e82430b..f79df1644e 100644 --- a/python/tvm/_ffi/runtime_ctypes.py +++ b/python/tvm/_ffi/runtime_ctypes.py @@ -264,7 +264,6 @@ class Device(ctypes.Structure): kDLOneAPI = 14 kDLWebGPU = 15 kDLHexagon = 16 - kDLMicroDev = 35 _fields_ = [("device_type", ctypes.c_int), ("device_id", ctypes.c_int)] MASK2STR = { @@ -282,7 +281,6 @@ class Device(ctypes.Structure): kDLOneAPI: "oneapi", kDLWebGPU: "webgpu", kDLHexagon: "hexagon", - kDLMicroDev: "microdev", } STR2MASK = { diff --git a/src/driver/driver_api.cc b/src/driver/driver_api.cc index 83ed8d261d..5b12f13d96 100644 --- a/src/driver/driver_api.cc +++ b/src/driver/driver_api.cc @@ -288,7 +288,6 @@ IRModule ApplyPasses(IRModule mod, transform::Sequential seq) { return mod; } - IRModule LowerModule(IRModule mod, bool simple_mode) { Array<transform::Pass> pass_list = CreatePassList(simple_mode); return LowerWithPassList(std::move(mod), pass_list); @@ -379,8 +378,7 @@ runtime::Module TIRToRuntime(const Map<Target, IRModule>& inputs_arg, if (!target_host.defined()) { for (const auto& it : inputs) { - if (it.first->GetTargetDeviceType() == kDLCPU || - it.first->GetTargetDeviceType() == kDLMicroDev) { + if (it.first->GetTargetDeviceType() == kDLCPU) { target_host = it.first; break; } diff --git a/src/runtime/profiling.cc b/src/runtime/profiling.cc index 83be98556a..44790d7e74 100644 --- a/src/runtime/profiling.cc +++ b/src/runtime/profiling.cc @@ -863,12 +863,6 @@ PackedFunc WrapTimeEvaluator(PackedFunc pf, Device dev, int number, int repeat, int repeats_to_cooldown, int cache_flush_bytes, PackedFunc f_preproc) { ICHECK(pf != nullptr); - if (static_cast<int>(dev.device_type) == static_cast<int>(kDLMicroDev)) { - auto get_micro_time_evaluator = runtime::Registry::Get("micro._GetMicroTimeEvaluator"); - ICHECK(get_micro_time_evaluator != nullptr) << "micro backend not enabled"; - return (*get_micro_time_evaluator)(pf, dev, number, repeat); - } - auto ftimer = [pf, dev, number, repeat, min_repeat_ms, limit_zero_time_iterations, cooldown_interval_ms, repeats_to_cooldown, cache_flush_bytes, f_preproc](TVMArgs args, TVMRetValue* rv) mutable { diff --git a/tests/scripts/task_config_build_cpu.sh b/tests/scripts/task_config_build_cpu.sh index 42d6c06f7a..20bf6100f4 100755 --- a/tests/scripts/task_config_build_cpu.sh +++ b/tests/scripts/task_config_build_cpu.sh @@ -27,7 +27,6 @@ echo set\(USE_SORT ON\) >> config.cmake echo set\(USE_DNNL ON\) >> config.cmake echo set\(USE_ARM_COMPUTE_LIB ON\) >> config.cmake echo set\(USE_LLVM \"/usr/bin/llvm-config-17 --link-static\"\) >> config.cmake -echo set\(USE_ANTLR ON\) >> config.cmake echo set\(CMAKE_CXX_FLAGS \"-Wno-error=range-loop-construct -Wno-error=comment\"\) >> config.cmake echo set\(HIDE_PRIVATE_SYMBOLS ON\) >> config.cmake diff --git a/tests/scripts/task_config_build_gpu.sh b/tests/scripts/task_config_build_gpu.sh index 41a42676f1..244ce4b8a5 100755 --- a/tests/scripts/task_config_build_gpu.sh +++ b/tests/scripts/task_config_build_gpu.sh @@ -33,7 +33,6 @@ echo set\(USE_LLVM \"/usr/bin/llvm-config-15 --link-static\"\) >> config.cmake echo set\(USE_RPC ON\) >> config.cmake echo set\(USE_SORT ON\) >> config.cmake echo set\(USE_STACKVM_RUNTIME ON\) >> config.cmake -echo set\(USE_ANTLR ON\) >> config.cmake echo set\(USE_BLAS openblas\) >> config.cmake echo set\(CMAKE_CXX_FLAGS -Werror\) >> config.cmake echo set\(USE_TENSORRT_CODEGEN ON\) >> config.cmake diff --git a/tests/scripts/task_config_build_wasm.sh b/tests/scripts/task_config_build_wasm.sh index daac6c0a0c..11526082e4 100755 --- a/tests/scripts/task_config_build_wasm.sh +++ b/tests/scripts/task_config_build_wasm.sh @@ -25,7 +25,6 @@ cp ../cmake/config.cmake . echo set\(USE_SORT ON\) >> config.cmake echo set\(USE_LLVM llvm-config-15\) >> config.cmake -echo set\(USE_ANTLR ON\) >> config.cmake echo set\(CMAKE_CXX_FLAGS -Werror\) >> config.cmake echo set\(HIDE_PRIVATE_SYMBOLS ON\) >> config.cmake echo set\(USE_CCACHE OFF\) >> config.cmake
