saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-26 19:52:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move ORT_ENFORCE()'s within MLTypeCallDispatcher to helper class functions to reduce the size used by function names in ORT_ENFORCE(). (#6624)

Browse source 
Move ORT_ENFORCE()'s within MLTypeCallDispatcher to helper class functions to reduce the size of function names in ORT_ENFORCE().
ORT_ENFORCE() captures the containing function's name in the error message. For some usages of MLTypeCallDispatcher (i.e., with numerous types or long type names), the function name is quite long and can contribute significantly to the binary size. Usage in the Cast CPU kernel is a notable example.
This change moves the ORT_ENFORCE() checks from a class template member function template with variable length name to a helper function with a fixed length name.
This commit is contained in:
Edward Chen 2021-02-10 11:34:38 -08:00 committed by GitHub
parent eef9a7a8a9
commit 352e8cb8a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/onnxruntime/core/framework/data_types_internal.h
View file

@ -224,10 +224,11 @@ inline bool IsPrimitiveDataType(const PrimitiveDataTypeBase* prim_type) {
// GCC until very recently does not support template parameter pack expansion within lambda context.
namespace mltype_dispatcher_internal {
// T - type handled by this helper
struct CallableDispatchableHelper {
class CallableDispatchableHelper {
int32_t dt_type_; // Type currently dispatched
size_t called_;
public:
explicit CallableDispatchableHelper(int32_t dt_type) noexcept : dt_type_(dt_type), called_(0) {}
// Must return integer to be in a expandable context
@ -239,6 +240,11 @@ struct CallableDispatchableHelper {
}
return 0;
}
void CheckCalledOnce() {
ORT_ENFORCE(called_ < 2, "Check for duplicate types in MLTypeCallDispatcher");
ORT_ENFORCE(called_ == 1, "Unsupported data type: ", dt_type_);
}
};
// Default policy is to throw with no return type.
@ -251,11 +257,12 @@ struct UnsupportedTypeDefaultPolicy {
// Helper with the result type
template <class Ret, class UnsupportedPolicy = UnsupportedTypeDefaultPolicy<Ret>>
struct CallableDispatchableRetHelper {
class CallableDispatchableRetHelper {
int32_t dt_type_; // Type currently dispatched
size_t called_;
Ret result_;
public:
explicit CallableDispatchableRetHelper(int32_t dt_type) noexcept : dt_type_(dt_type), called_(0), result_() {}
Ret Get() {
@ -312,8 +319,7 @@ class MLTypeCallDispatcher {
mltype_dispatcher_internal::CallableDispatchableHelper helper(dt_type_);
int results[] = {0, helper.template Invoke<Types>(Fn<Types>(), std::forward<Args>(args)...)...};
ORT_UNUSED_PARAMETER(results);
ORT_ENFORCE(helper.called_ < 2, "Check for duplicate types in MLTypeCallDispatcher");
ORT_ENFORCE(helper.called_ == 1, "Unsupported data type: ", dt_type_);
helper.CheckCalledOnce();
}
};
@ -370,7 +376,7 @@ class MLTypeCallDispatcher2 {
// avoid "unused parameter" warning for the case where Types is empty
static_cast<void>(std::array<int, sizeof...(Args)>{(ORT_UNUSED_PARAMETER(args), 0)...});
ORT_ENFORCE(helper.called_ == 1, "Unsupported data type: ", dt_type_);
helper.CheckCalledOnce();
}
template <template <typename...> class Fn, typename LeadingTemplateArgTypeList, typename... Args>
@ -385,7 +391,7 @@ class MLTypeCallDispatcher2 {
// avoid "unused parameter" warning for the case where Types is empty
static_cast<void>(std::array<int, sizeof...(Args)>{(ORT_UNUSED_PARAMETER(args), 0)...});
ORT_ENFORCE(helper.called_ == 1, "Unsupported data type: ", dt_type_);
helper.CheckCalledOnce();
}
};