[micro_dev] Removed references to non-existent micro_dev

device_api.micro_dev was removed in 745e542, but several references still remained.
apache · Jun 1, 2021 · a3482df · a3482df
1 parent 194503f
commit a3482df
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 407 deletions.
diff --git a/include/tvm/runtime/device_api.h b/include/tvm/runtime/device_api.h
@@ -257,8 +257,6 @@ inline const char* DeviceName(int type) {
       return "ext_dev";
     case kDLWebGPU:
       return "webgpu";
-    case kDLMicroDev:
-      return "micro_dev";
     case kDLHexagon:
       return "hexagon";
     default:

diff --git a/python/tvm/__init__.py b/python/tvm/__init__.py
@@ -31,7 +31,7 @@
 # tvm.runtime
 from .runtime.object import Object
 from .runtime.ndarray import device, cpu, cuda, gpu, opencl, cl, vulkan, metal, mtl
-from .runtime.ndarray import vpi, rocm, ext_dev, micro_dev, hexagon
+from .runtime.ndarray import vpi, rocm, ext_dev, hexagon
 from .runtime import ndarray as nd
 
 # tvm.error

diff --git a/python/tvm/_ffi/runtime_ctypes.py b/python/tvm/_ffi/runtime_ctypes.py
@@ -173,7 +173,6 @@ class Device(ctypes.Structure):
         9: "vpi",
         10: "rocm",
         12: "ext_dev",
-        13: "micro_dev",
         14: "hexagon",
         15: "webgpu",
     }
@@ -194,7 +193,6 @@ class Device(ctypes.Structure):
         "vpi": 9,
         "rocm": 10,
         "ext_dev": 12,
-        "micro_dev": 13,
         "hexagon": 14,
         "webgpu": 15,
     }

diff --git a/python/tvm/autotvm/measure/measure_methods.py b/python/tvm/autotvm/measure/measure_methods.py
@@ -276,8 +276,6 @@ def get_build_kwargs(self):
 
             if "cuda" in self.task.target.keys:
                 kwargs["cuda_arch"] = "sm_" + "".join(dev.compute_version.split("."))
-        if self.task.target.device_name == "micro_dev":
-            kwargs.setdefault("build_option", {})["tir.disable_vectorize"] = True
 
         return kwargs
 

diff --git a/python/tvm/runtime/__init__.py b/python/tvm/runtime/__init__.py
@@ -27,7 +27,7 @@
 # function exposures
 from .object_generic import convert_to_object, convert, const
 from .ndarray import device, cpu, cuda, gpu, opencl, cl, vulkan, metal, mtl
-from .ndarray import vpi, rocm, ext_dev, micro_dev
+from .ndarray import vpi, rocm, ext_dev
 from .module import load_module, enabled, system_lib
 from .container import String
 from .params import save_param_dict, load_param_dict
diff --git a/python/tvm/runtime/module.py b/python/tvm/runtime/module.py
@@ -470,9 +470,6 @@ def load_module(path, fmt=""):
         files = [tar_temp.relpath(x) for x in tar_temp.listdir()]
         _cc.create_shared(path + ".so", files, cc=cc)
         path += ".so"
-    # TODO(weberlo): we should probably use a more distinctive suffix for microTVM object files
-    elif path.endswith(".obj"):
-        fmt = "micro_dev"
     # Redirect to the load API
     return _ffi_api.ModuleLoadFromFile(path, fmt)
 

diff --git a/python/tvm/runtime/ndarray.py b/python/tvm/runtime/ndarray.py
@@ -268,13 +268,10 @@ def device(dev_type, dev_id=0):
       assert tvm.device("cuda", 0) == tvm.cuda(0)
     """
     if isinstance(dev_type, string_types):
-        if "-device=micro_dev" in dev_type:
-            dev_type = Device.STR2MASK["micro_dev"]
-        else:
-            dev_type = dev_type.split()[0]
-            if dev_type not in Device.STR2MASK:
-                raise ValueError("Unknown device type %s" % dev_type)
-            dev_type = Device.STR2MASK[dev_type]
+        dev_type = dev_type.split()[0]
+        if dev_type not in Device.STR2MASK:
+            raise ValueError("Unknown device type %s" % dev_type)
+        dev_type = Device.STR2MASK[dev_type]
     return Device(dev_type, dev_id)
 
 
@@ -510,22 +507,6 @@ def ext_dev(dev_id=0):
     return Device(12, dev_id)
 
 
-def micro_dev(dev_id=0):
-    """Construct a micro device
-
-    Parameters
-    ----------
-    dev_id : int, optional
-        The integer device id
-
-    Returns
-    -------
-    dev : Device
-        The created device
-    """
-    return Device(13, dev_id)
-
-
 def hexagon(dev_id=0):
     """Construct a Hexagon device
 

diff --git a/src/runtime/module.cc b/src/runtime/module.cc
@@ -139,8 +139,6 @@ bool RuntimeEnabled(const std::string& target) {
     f_name = "target.build.stackvm";
   } else if (target == "rpc") {
     f_name = "device_api.rpc";
-  } else if (target == "micro_dev") {
-    f_name = "device_api.micro_dev";
   } else if (target == "hexagon") {
     f_name = "device_api.hexagon";
   } else if (target.length() >= 5 && target.substr(0, 5) == "nvptx") {

diff --git a/src/target/source/codegen_c_host.cc b/src/target/source/codegen_c_host.cc
@@ -424,6 +424,5 @@ runtime::Module BuildCHost(IRModule mod, Target target) {
 }
 
 TVM_REGISTER_GLOBAL("target.build.c").set_body_typed(BuildCHost);
-TVM_REGISTER_GLOBAL("target.build.micro_dev").set_body_typed(BuildCHost);
 }  // namespace codegen
 }  // namespace tvm