junrushao1994 commented on a change in pull request #7330:
URL: https://github.com/apache/tvm/pull/7330#discussion_r563334447
##########
File path: include/tvm/node/container.h
##########
@@ -1449,31 +1449,41 @@ namespace runtime {
// Additional overloads for PackedFunc checking.
template <typename T>
struct ObjectTypeChecker<Array<T>> {
- static bool Check(const Object* ptr) {
- if (ptr == nullptr) return true;
- if (!ptr->IsInstance<ArrayNode>()) return false;
+ static Optional<String> Mismatch(const Object* ptr) {
+ if (ptr == nullptr) return Optional<String>();
Review comment:
```suggestion
if (ptr == nullptr) return NullOpt;
```
##########
File path: include/tvm/node/container.h
##########
@@ -1449,31 +1449,41 @@ namespace runtime {
// Additional overloads for PackedFunc checking.
template <typename T>
struct ObjectTypeChecker<Array<T>> {
- static bool Check(const Object* ptr) {
- if (ptr == nullptr) return true;
- if (!ptr->IsInstance<ArrayNode>()) return false;
+ static Optional<String> Mismatch(const Object* ptr) {
+ if (ptr == nullptr) return Optional<String>();
+ if (!ptr->IsInstance<ArrayNode>()) return
Optional<String>(ptr->GetTypeKey());
Review comment:
```suggestion
if (!ptr->IsInstance<ArrayNode>()) return String(ptr->GetTypeKey());
```
##########
File path: include/tvm/node/container.h
##########
@@ -1449,31 +1449,41 @@ namespace runtime {
// Additional overloads for PackedFunc checking.
template <typename T>
struct ObjectTypeChecker<Array<T>> {
- static bool Check(const Object* ptr) {
- if (ptr == nullptr) return true;
- if (!ptr->IsInstance<ArrayNode>()) return false;
+ static Optional<String> Mismatch(const Object* ptr) {
+ if (ptr == nullptr) return Optional<String>();
+ if (!ptr->IsInstance<ArrayNode>()) return
Optional<String>(ptr->GetTypeKey());
const ArrayNode* n = static_cast<const ArrayNode*>(ptr);
- for (const ObjectRef& p : *n) {
- if (!ObjectTypeChecker<T>::Check(p.get())) {
- return false;
+ for (size_t i = 0; i < n->size(); i++) {
+ const ObjectRef& p = (*n)[i];
+ auto check_subtype = ObjectTypeChecker<T>::Mismatch(p.get());
+ if (static_cast<bool>(check_subtype)) {
+ return Optional<String>("Array[index " + std::to_string(i) + ": " +
check_subtype.value() +
+ "]");
}
}
- return true;
+ return Optional<String>();
}
static std::string TypeName() { return "Array[" +
ObjectTypeChecker<T>::TypeName() + "]"; }
};
template <typename K, typename V>
struct ObjectTypeChecker<Map<K, V>> {
- static bool Check(const Object* ptr) {
- if (ptr == nullptr) return true;
- if (!ptr->IsInstance<MapNode>()) return false;
+ static Optional<String> Mismatch(const Object* ptr) {
+ if (ptr == nullptr) return Optional<String>();
+ if (!ptr->IsInstance<MapNode>()) return
Optional<String>(ptr->GetTypeKey());
const MapNode* n = static_cast<const MapNode*>(ptr);
for (const auto& kv : *n) {
- if (!ObjectTypeChecker<K>::Check(kv.first.get())) return false;
- if (!ObjectTypeChecker<V>::Check(kv.second.get())) return false;
+ Optional<String> key_type =
ObjectTypeChecker<K>::Mismatch(kv.first.get());
+ Optional<String> value_type =
ObjectTypeChecker<K>::Mismatch(kv.first.get());
+ if (static_cast<bool>(key_type) || static_cast<bool>(value_type)) {
Review comment:
yeah I think we should use `.defined()` more, which is more
straightforward because it is a word :-)
##########
File path: include/tvm/node/container.h
##########
@@ -1449,31 +1449,41 @@ namespace runtime {
// Additional overloads for PackedFunc checking.
template <typename T>
struct ObjectTypeChecker<Array<T>> {
- static bool Check(const Object* ptr) {
- if (ptr == nullptr) return true;
- if (!ptr->IsInstance<ArrayNode>()) return false;
+ static Optional<String> Mismatch(const Object* ptr) {
+ if (ptr == nullptr) return Optional<String>();
+ if (!ptr->IsInstance<ArrayNode>()) return
Optional<String>(ptr->GetTypeKey());
const ArrayNode* n = static_cast<const ArrayNode*>(ptr);
- for (const ObjectRef& p : *n) {
- if (!ObjectTypeChecker<T>::Check(p.get())) {
- return false;
+ for (size_t i = 0; i < n->size(); i++) {
+ const ObjectRef& p = (*n)[i];
+ auto check_subtype = ObjectTypeChecker<T>::Mismatch(p.get());
+ if (static_cast<bool>(check_subtype)) {
Review comment:
```suggestion
if (check_subtype.defined()) {
```
##########
File path: include/tvm/node/container.h
##########
@@ -1449,31 +1449,41 @@ namespace runtime {
// Additional overloads for PackedFunc checking.
template <typename T>
struct ObjectTypeChecker<Array<T>> {
- static bool Check(const Object* ptr) {
- if (ptr == nullptr) return true;
- if (!ptr->IsInstance<ArrayNode>()) return false;
+ static Optional<String> Mismatch(const Object* ptr) {
+ if (ptr == nullptr) return Optional<String>();
+ if (!ptr->IsInstance<ArrayNode>()) return
Optional<String>(ptr->GetTypeKey());
const ArrayNode* n = static_cast<const ArrayNode*>(ptr);
- for (const ObjectRef& p : *n) {
- if (!ObjectTypeChecker<T>::Check(p.get())) {
- return false;
+ for (size_t i = 0; i < n->size(); i++) {
+ const ObjectRef& p = (*n)[i];
+ auto check_subtype = ObjectTypeChecker<T>::Mismatch(p.get());
Review comment:
Be more explicit about the return type. My (personal) rule of thumb is
that if it is not c++ iterator, and the type does not appear on the same line,
then I would force myself to write it out
```suggestion
Optional<String> check_subtype =
ObjectTypeChecker<T>::Mismatch(p.get());
```
##########
File path: src/ir/expr.cc
##########
@@ -49,7 +49,7 @@ PrimExpr PrimExpr::FromObject_(ObjectRef ref) {
if (auto* ptr = ref.as<runtime::StringObj>()) {
return tir::StringImm(GetRef<runtime::String>(ptr));
}
- ICHECK(ObjectTypeChecker<PrimExpr>::Check(ref.get()))
+ ICHECK(!static_cast<bool>(ObjectTypeChecker<PrimExpr>::Mismatch(ref.get())))
<< "Expect type " << ObjectTypeChecker<PrimExpr>::TypeName() << " but
get "
<< ref->GetTypeKey();
Review comment:
ICHECK/CHECK will print out this line, but I don't think it is
informative though. We can do this instead. (I wonder if we have an equivalent
of `ICHECK` in `LOG(FATAL)`)
```C++
if (Optional<String> err =
ObjectTypeChecker<PrimExpr>::Mismatch(ref.get())) {
LOG(FATAL) << "Expect type " << ObjectTypeChecker<PrimExpr>::TypeName()
<< " but get " << ref->GetTypeKey() << ". Full error message:
" << err.value();
}
```
##########
File path: include/tvm/node/container.h
##########
@@ -1449,6 +1449,19 @@ namespace runtime {
// Additional overloads for PackedFunc checking.
template <typename T>
struct ObjectTypeChecker<Array<T>> {
+ static Optional<String> CheckAndGetMismatch(const Object* ptr) {
+ if (ptr == nullptr) return NullOpt;
+ if (!ptr->IsInstance<ArrayNode>()) return String(ptr->GetTypeKey());
+ const ArrayNode* n = static_cast<const ArrayNode*>(ptr);
+ for (size_t i = 0; i < n->size(); i++) {
+ const ObjectRef& p = (*n)[i];
+ Optional<String> check_subtype =
ObjectTypeChecker<T>::CheckAndGetMismatch(p.get());
+ if (check_subtype.defined()) {
+ return String("Array[index " + std::to_string(i) + ": " +
check_subtype.value() + "]");
Review comment:
Hey, I just wonder, if there is a variable `x` typed as nested
`Array<Array<SomeType>>`, and some checking fails on like `x[0][1]`, in this
case, what the error message could be?
##########
File path: include/tvm/node/container.h
##########
@@ -1449,6 +1449,19 @@ namespace runtime {
// Additional overloads for PackedFunc checking.
template <typename T>
struct ObjectTypeChecker<Array<T>> {
+ static Optional<String> CheckAndGetMismatch(const Object* ptr) {
+ if (ptr == nullptr) return NullOpt;
+ if (!ptr->IsInstance<ArrayNode>()) return String(ptr->GetTypeKey());
+ const ArrayNode* n = static_cast<const ArrayNode*>(ptr);
+ for (size_t i = 0; i < n->size(); i++) {
+ const ObjectRef& p = (*n)[i];
+ Optional<String> check_subtype =
ObjectTypeChecker<T>::CheckAndGetMismatch(p.get());
+ if (check_subtype.defined()) {
+ return String("Array[index " + std::to_string(i) + ": " +
check_subtype.value() + "]");
Review comment:
Nice!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
