From c4421f575528e8af46557d46ddbccd4e13cdcd93 Mon Sep 17 00:00:00 2001 From: Tianqi Chen Date: Tue, 18 Sep 2018 23:28:12 -0700 Subject: [PATCH] [SUBMODULE] update submodule to latest (#1728) --- HalideIR | 2 +- dlpack | 2 +- include/tvm/runtime/c_runtime_api.h | 4 ---- src/codegen/build_module.cc | 2 +- src/runtime/c_runtime_api.cc | 2 +- vta/src/device_api.cc | 3 +-- 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/HalideIR b/HalideIR index 6f64f7866747..f519848d972c 160000 --- a/HalideIR +++ b/HalideIR @@ -1 +1 @@ -Subproject commit 6f64f7866747a2a81bec84aea9bde0479c5b72c1 +Subproject commit f519848d972c67971b4cbf8c34070d5a5e3ede0d diff --git a/dlpack b/dlpack index 10892ac964f1..bee4d1dd8dc1 160000 --- a/dlpack +++ b/dlpack @@ -1 +1 @@ -Subproject commit 10892ac964f1af7c81aae145cd3fab78bbccd297 +Subproject commit bee4d1dd8dc1ee4a1fd8fa6a96476c2f8b7492a3 diff --git a/include/tvm/runtime/c_runtime_api.h b/include/tvm/runtime/c_runtime_api.h index 52499fb9186f..75e936d8f502 100644 --- a/include/tvm/runtime/c_runtime_api.h +++ b/include/tvm/runtime/c_runtime_api.h @@ -62,11 +62,7 @@ typedef int64_t tvm_index_t; typedef enum { kDLAOCL = 5, kDLSDAccel = 6, - kDLVulkan = 7, kOpenGL = 11, - // Extension DRAM type, used for quickly test extension device - // The device api can differ depending on the xpu driver registered. - kExtDev = 12, // AddExtraTVMType which is not in DLPack here } TVMDeviceExtType; diff --git a/src/codegen/build_module.cc b/src/codegen/build_module.cc index fef5a28b1d21..f35b09d1dfe6 100644 --- a/src/codegen/build_module.cc +++ b/src/codegen/build_module.cc @@ -102,7 +102,7 @@ Target CreateTarget(const std::string& target_name, } else if (target_name == "stackvm") { t->device_type = kDLCPU; } else if (target_name == "ext_dev") { - t->device_type = kExtDev; + t->device_type = kDLExtDev; } else { LOG(ERROR) << "Unknown target name " << target_name; return target::stackvm(); diff --git a/src/runtime/c_runtime_api.cc b/src/runtime/c_runtime_api.cc index a081a4c1df11..b566b9a3f608 100644 --- a/src/runtime/c_runtime_api.cc +++ b/src/runtime/c_runtime_api.cc @@ -38,7 +38,7 @@ inline std::string DeviceName(int type) { case kDLVPI: return "vpi"; case kDLROCM: return "rocm"; case kOpenGL: return "opengl"; - case kExtDev: return "ext_dev"; + case kDLExtDev: return "ext_dev"; default: LOG(FATAL) << "unknown type =" << type; return "Unknown"; } } diff --git a/vta/src/device_api.cc b/vta/src/device_api.cc index 88990e1b1331..a2729baa2591 100644 --- a/vta/src/device_api.cc +++ b/vta/src/device_api.cc @@ -72,8 +72,7 @@ class VTADeviceAPI final : public DeviceAPI { struct VTAWorkspacePool : public WorkspacePool { VTAWorkspacePool() : - WorkspacePool(static_cast(kExtDev), - VTADeviceAPI::Global()) {} + WorkspacePool(kDLExtDev, VTADeviceAPI::Global()) {} }; void* VTADeviceAPI::AllocWorkspace(TVMContext ctx, size_t size, TVMType type_hint) {