You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by GitBox <gi...@apache.org> on 2021/01/21 23:36:52 UTC
[GitHub] [tvm] areusch commented on a change in pull request #7152: [RUNTIME] Improve error messages for TypedPackedFunc
areusch commented on a change in pull request #7152:
URL: https://github.com/apache/tvm/pull/7152#discussion_r562266666
##########
File path: include/tvm/runtime/packed_func.h
##########
@@ -1377,7 +1449,7 @@ inline TObjectRef TVMPODValue_::AsObjectRef() const {
using ContainerType = typename TObjectRef::ContainerType;
if (type_code_ == kTVMNullptr) {
- ICHECK(TObjectRef::_type_is_nullable)
+ CHECK(TObjectRef::_type_is_nullable)
Review comment:
shouldn't this be static_assert?
##########
File path: include/tvm/runtime/packed_func.h
##########
@@ -1297,14 +1353,30 @@ TypedPackedFunc<R(Args...)>::TypedPackedFunc(const TVMArgValue& value)
: packed_(value.operator PackedFunc()) {}
template <typename R, typename... Args>
-TypedPackedFunc<R(Args...)>::TypedPackedFunc(TVMMovableArgValue_&& value)
+TypedPackedFunc<R(Args...)>::TypedPackedFunc(TVMMovableArgValueWithContext_&& value)
: packed_(value.operator PackedFunc()) {}
+template <typename R, typename... Args>
+template <typename FType>
+inline void TypedPackedFunc<R(Args...)>::AssignTypedLambda(FType flambda, std::string name) {
+ packed_ = PackedFunc([flambda, name](const TVMArgs& args, TVMRetValue* rv) {
+ if (args.size() != sizeof...(Args)) {
+ LOG(FATAL) << "Function " << name << " expects " << sizeof...(Args) << " arguments, but "
Review comment:
maybe standardize the previous error message formatting with this one too
##########
File path: include/tvm/runtime/packed_func.h
##########
@@ -1297,14 +1353,30 @@ TypedPackedFunc<R(Args...)>::TypedPackedFunc(const TVMArgValue& value)
: packed_(value.operator PackedFunc()) {}
template <typename R, typename... Args>
-TypedPackedFunc<R(Args...)>::TypedPackedFunc(TVMMovableArgValue_&& value)
+TypedPackedFunc<R(Args...)>::TypedPackedFunc(TVMMovableArgValueWithContext_&& value)
: packed_(value.operator PackedFunc()) {}
+template <typename R, typename... Args>
+template <typename FType>
+inline void TypedPackedFunc<R(Args...)>::AssignTypedLambda(FType flambda, std::string name) {
+ packed_ = PackedFunc([flambda, name](const TVMArgs& args, TVMRetValue* rv) {
+ if (args.size() != sizeof...(Args)) {
+ LOG(FATAL) << "Function " << name << " expects " << sizeof...(Args) << " arguments, but "
+ << args.size() << " were provided.";
+ }
+ detail::unpack_call<R, sizeof...(Args)>(&name, flambda, args, rv);
+ });
+}
+
template <typename R, typename... Args>
template <typename FType>
inline void TypedPackedFunc<R(Args...)>::AssignTypedLambda(FType flambda) {
packed_ = PackedFunc([flambda](const TVMArgs& args, TVMRetValue* rv) {
- detail::unpack_call<R, sizeof...(Args)>(flambda, args, rv);
+ if (args.size() != sizeof...(Args)) {
+ LOG(FATAL) << "Function <anonymous> expects " << sizeof...(Args) << " arguments, but "
Review comment:
and here as well
##########
File path: include/tvm/runtime/packed_func.h
##########
@@ -1240,16 +1293,19 @@ struct unpack_call_dispatcher<R, 0, index, F> {
template <int index, typename F>
struct unpack_call_dispatcher<void, 0, index, F> {
template <typename... Args>
- TVM_ALWAYS_INLINE static void run(const F& f, const TVMArgs& args_pack, TVMRetValue* rv,
+ TVM_ALWAYS_INLINE static void run(const std::string* optional_name, const F& f,
+ const TVMArgs& args_pack, TVMRetValue* rv,
Args&&... unpacked_args) {
f(std::forward<Args>(unpacked_args)...);
}
};
template <typename R, int nargs, typename F>
-TVM_ALWAYS_INLINE void unpack_call(const F& f, const TVMArgs& args, TVMRetValue* rv) {
- ICHECK_EQ(nargs, args.size()) << "Expect " << nargs << " arguments but get " << args.size();
- unpack_call_dispatcher<R, nargs, 0, F>::run(f, args, rv);
+TVM_ALWAYS_INLINE void unpack_call(const std::string* optional_name, const F& f,
+ const TVMArgs& args, TVMRetValue* rv) {
+ CHECK_EQ(nargs, args.size()) << (optional_name == nullptr ? "<anonymous>" : *optional_name)
Review comment:
maybe clarify what is the anonymous thing? i.e. `<anonymous function>` or like:
`CHECK_EQ(...) << "function " << (optional_name ...) << ": expected " << nargs << " arguments` ...
----------------------------------------------------------------
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:
users@infra.apache.org