You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by tq...@apache.org on 2025/03/10 22:56:22 UTC
(tvm) 30/37: Use specific import via using and not do global namespace
This is an automated email from the ASF dual-hosted git repository.
tqchen pushed a commit to branch refactor-s0
in repository https://gitbox.apache.org/repos/asf/tvm.git
commit 6c60fd30e103730afc8d6a74dd809ad49203277d
Author: tqchen <ti...@gmail.com>
AuthorDate: Sun Mar 9 14:24:14 2025 -0400
Use specific import via using and not do global namespace
---
include/tvm/runtime/memory.h | 3 ++-
include/tvm/runtime/ndarray.h | 2 +-
include/tvm/runtime/object.h | 13 +++++++++++--
include/tvm/runtime/packed_func.h | 18 +++++++++---------
src/runtime/object_internal.h | 6 ++++--
5 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/include/tvm/runtime/memory.h b/include/tvm/runtime/memory.h
index adf7fe9a3a..8429650421 100644
--- a/include/tvm/runtime/memory.h
+++ b/include/tvm/runtime/memory.h
@@ -28,7 +28,8 @@
namespace tvm {
namespace runtime {
-using namespace tvm::ffi;
+using tvm::ffi::make_object;
+using tvm::ffi::make_inplace_array_object;
} // namespace runtime
} // namespace tvm
diff --git a/include/tvm/runtime/ndarray.h b/include/tvm/runtime/ndarray.h
index bd209f2c4c..4ed86fee82 100644
--- a/include/tvm/runtime/ndarray.h
+++ b/include/tvm/runtime/ndarray.h
@@ -445,7 +445,7 @@ inline Object* TVMArrayHandleToObjectHandle(TVMArrayHandle handle) {
}
inline void NDArray::FFIDecRef(TVMArrayHandle handle) {
- details::ObjectUnsafe::DecRefObjectHandle(TVMArrayHandleToObjectHandle(handle));
+ ffi::details::ObjectUnsafe::DecRefObjectHandle(TVMArrayHandleToObjectHandle(handle));
}
/*! \brief Magic number for NDArray file */
diff --git a/include/tvm/runtime/object.h b/include/tvm/runtime/object.h
index 2f89d11965..ec39461b0c 100644
--- a/include/tvm/runtime/object.h
+++ b/include/tvm/runtime/object.h
@@ -33,7 +33,16 @@ namespace runtime {
template<typename T>
class Optional;
-using namespace tvm::ffi;
+
+using tvm::ffi::Object;
+using tvm::ffi::ObjectPtr;
+using tvm::ffi::ObjectPtrEqual;
+using tvm::ffi::ObjectPtrHash;
+
+using tvm::ffi::Downcast;
+using tvm::ffi::GetRef;
+using tvm::ffi::GetObjectPtr;
+
/*!
* \brief Namespace for the list of type index.
@@ -113,7 +122,7 @@ class ObjectRef : public tvm::ffi::ObjectRef {
* \param ref The reference data.
*/
static void FFIClearAfterMove(ObjectRef* ref) {
- details::ObjectUnsafe::LegacyClearObjectPtrAfterMove(ref);
+ ffi::details::ObjectUnsafe::LegacyClearObjectPtrAfterMove(ref);
}
/*!
* \brief Internal helper function get data_ as ObjectPtr of ObjectType.
diff --git a/include/tvm/runtime/packed_func.h b/include/tvm/runtime/packed_func.h
index 0a2461515e..168798149a 100644
--- a/include/tvm/runtime/packed_func.h
+++ b/include/tvm/runtime/packed_func.h
@@ -641,14 +641,14 @@ class TVMPODValue_ {
return Module(ObjectPtr<Object>(nullptr));
}
TVM_CHECK_TYPE_CODE(type_code_, kTVMModuleHandle);
- return Module(details::ObjectUnsafe::ObjectPtrFromUnowned<Object>(static_cast<Object*>(value_.v_handle)));
+ return Module(ffi::details::ObjectUnsafe::ObjectPtrFromUnowned<Object>(static_cast<Object*>(value_.v_handle)));
}
operator PackedFunc() const {
if (type_code_ == kTVMNullptr) {
return PackedFunc(ObjectPtr<Object>(nullptr));
}
TVM_CHECK_TYPE_CODE(type_code_, kTVMPackedFuncHandle);
- return PackedFunc(details::ObjectUnsafe::ObjectPtrFromUnowned<Object>(static_cast<Object*>(value_.v_handle)));
+ return PackedFunc(ffi::details::ObjectUnsafe::ObjectPtrFromUnowned<Object>(static_cast<Object*>(value_.v_handle)));
}
operator Device() const {
TVM_CHECK_TYPE_CODE(type_code_, kDLDevice);
@@ -1199,7 +1199,7 @@ class TVMRetValue : public TVMPODValue_CRTP_<TVMRetValue> {
if (other != nullptr) {
this->Clear();
type_code_ = type_code;
- value_.v_handle = details::ObjectUnsafe::MoveTVMFFIObjectPtrFromObjectPtr(&other);
+ value_.v_handle = ffi::details::ObjectUnsafe::MoveTVMFFIObjectPtrFromObjectPtr(&other);
} else {
SwitchToPOD(kTVMNullptr);
value_.v_handle = nullptr;
@@ -1213,18 +1213,18 @@ class TVMRetValue : public TVMPODValue_CRTP_<TVMRetValue> {
delete ptr<std::string>();
break;
case kTVMPackedFuncHandle:
- details::ObjectUnsafe::DecRefObjectHandle(static_cast<Object*>(value_.v_handle));
+ ffi::details::ObjectUnsafe::DecRefObjectHandle(static_cast<Object*>(value_.v_handle));
break;
case kTVMNDArrayHandle: {
NDArray::FFIDecRef(static_cast<TVMArrayHandle>(value_.v_handle));
break;
}
case kTVMModuleHandle: {
- details::ObjectUnsafe::DecRefObjectHandle(static_cast<Object*>(value_.v_handle));
+ ffi::details::ObjectUnsafe::DecRefObjectHandle(static_cast<Object*>(value_.v_handle));
break;
}
case kTVMObjectHandle: {
- details::ObjectUnsafe::DecRefObjectHandle(static_cast<Object*>(value_.v_handle));
+ ffi::details::ObjectUnsafe::DecRefObjectHandle(static_cast<Object*>(value_.v_handle));
break;
}
}
@@ -2096,7 +2096,7 @@ inline void TVMArgsSetter::SetObject(size_t i, T&& value) const {
return;
}
- Object* ptr = details::ObjectUnsafe::GetRawObjectPtrFromObjectRef(value);
+ Object* ptr = ffi::details::ObjectUnsafe::GetRawObjectPtrFromObjectRef(value);
if constexpr (std::is_base_of_v<NDArray::ContainerType, ContainerType> ||
std::is_base_of_v<ContainerType, NDArray::ContainerType>) {
if (std::is_base_of_v<NDArray::ContainerType, ContainerType> ||
@@ -2187,7 +2187,7 @@ inline void TVMArgsSetter::SetObject(size_t i, T&& value) const {
type_codes_[i] = kTVMObjectRValueRefArg;
} else {
// value.data_.data_;
- values_[i].v_handle = details::ObjectUnsafe::GetTVMFFIObjectPtrFromObjectRef(value);
+ values_[i].v_handle = ffi::details::ObjectUnsafe::GetTVMFFIObjectPtrFromObjectRef(value);
type_codes_[i] = kTVMObjectHandle;
}
}
@@ -2439,7 +2439,7 @@ inline TVMMovableArgValue_::operator T() const {
if (type_code_ == kTVMObjectRValueRefArg) {
auto** ref = static_cast<Object**>(value_.v_handle);
if (ObjectTypeChecker<T>::Check(*ref)) {
- return T(details::ObjectUnsafe::MoveObjectPtrFromRValueRef<Object>(ref));
+ return T(ffi::details::ObjectUnsafe::MoveObjectPtrFromRValueRef<Object>(ref));
}
}
// fallback
diff --git a/src/runtime/object_internal.h b/src/runtime/object_internal.h
index beae137e26..3cde330f59 100644
--- a/src/runtime/object_internal.h
+++ b/src/runtime/object_internal.h
@@ -44,7 +44,8 @@ class ObjectInternal {
*/
static void ObjectRetain(TVMObjectHandle obj) {
if (obj != nullptr) {
- static_cast<Object*>(obj)->IncRef();
+ // static_cast<Object*>(obj)->IncRef();
+ tvm::ffi::details::ObjectUnsafe::IncRefObjectHandle(obj);
}
}
@@ -53,7 +54,8 @@ class ObjectInternal {
*/
static void ObjectFree(TVMObjectHandle obj) {
if (obj != nullptr) {
- static_cast<Object*>(obj)->DecRef();
+ // static_cast<Object*>(obj)->DecRef();
+ tvm::ffi::details::ObjectUnsafe::DecRefObjectHandle(obj);
}
}
/*!