Skip to content

Make ScalarType helpers constexpr #21001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cyyever wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Make ScalarType helpers constexpr #21001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions kernels/portable/cpu/op_gelu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,15 @@ Tensor& gelu_out(

ET_SWITCH_FLOATHBF16_TYPES(in.scalar_type(), ctx, "gelu.out", CTYPE, [&]() {
if (approximate == "tanh") {
const CTYPE kBeta = M_SQRT2 * M_2_SQRTPI * 0.5;
const CTYPE kKappa = static_cast<float>(0.044715);
apply_unary_map_fn(
[](const CTYPE x) {
[kBeta, kKappa](const CTYPE x) {
if (x == -std::numeric_limits<CTYPE>::infinity()) {
return static_cast<CTYPE>(0.0);
} else if (x == std::numeric_limits<CTYPE>::infinity()) {
return std::numeric_limits<CTYPE>::infinity();
}
const CTYPE kBeta = M_SQRT2 * M_2_SQRTPI * 0.5;
const CTYPE kKappa = static_cast<float>(0.044715);

const CTYPE x_cubed = x * x * x;
const CTYPE inner = kBeta * (x + kKappa * x_cubed);
const CTYPE ret = 0.5 * x * (1.0 + std::tanh(inner));
Expand Down
20 changes: 10 additions & 10 deletions runtime/core/exec_aten/util/scalar_type_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ ET_FORALL_SCALAR_TYPES(SPECIALIZE_CppTypeToScalarType)
* Returns true if the parameter is one of the values covered by
* ET_FORALL_SCALAR_TYPES.
*/
inline bool isValid(::executorch::aten::ScalarType type) {
inline constexpr bool isValid(::executorch::aten::ScalarType type) {
return static_cast<int8_t>(type) >= 0 &&
type < ::executorch::aten::ScalarType::NumOptions &&
type != ::executorch::aten::ScalarType::Undefined;
Expand Down Expand Up @@ -408,7 +408,7 @@ inline const char* toString(::executorch::aten::ScalarType t) {
* @param[in] t The type to get the underlying C type size of.
* @return The size of the associated C type in bytes.
*/
inline size_t elementSize(::executorch::aten::ScalarType t) {
inline constexpr size_t elementSize(::executorch::aten::ScalarType t) {
#define CASE_ELEMENTSIZE_CASE(ctype, name) \
case ::executorch::aten::ScalarType::name: \
return sizeof(ctype);
Expand Down Expand Up @@ -446,7 +446,7 @@ inline constexpr bool isFloatingType(::executorch::aten::ScalarType t) {
t == ::executorch::aten::ScalarType::BFloat16);
}

inline bool isRealType(::executorch::aten::ScalarType t) {
inline constexpr bool isRealType(::executorch::aten::ScalarType t) {
return (
t == ::executorch::aten::ScalarType::Byte ||
t == ::executorch::aten::ScalarType::Char ||
Expand All @@ -457,7 +457,7 @@ inline bool isRealType(::executorch::aten::ScalarType t) {
t == ::executorch::aten::ScalarType::Double);
}

inline bool isRealHType(::executorch::aten::ScalarType t) {
inline constexpr bool isRealHType(::executorch::aten::ScalarType t) {
return (
t == ::executorch::aten::ScalarType::Byte ||
t == ::executorch::aten::ScalarType::Char ||
Expand All @@ -469,15 +469,15 @@ inline bool isRealHType(::executorch::aten::ScalarType t) {
t == ::executorch::aten::ScalarType::Half);
}

inline bool isRealHBType(::executorch::aten::ScalarType t) {
inline constexpr bool isRealHBType(::executorch::aten::ScalarType t) {
return (isRealHType(t) || t == ::executorch::aten::ScalarType::Bool);
}

inline bool isRealHBF16Type(::executorch::aten::ScalarType t) {
inline constexpr bool isRealHBF16Type(::executorch::aten::ScalarType t) {
return (isRealHType(t) || t == ::executorch::aten::ScalarType::BFloat16);
}

inline bool isRealHBBF16Type(::executorch::aten::ScalarType t) {
inline constexpr bool isRealHBBF16Type(::executorch::aten::ScalarType t) {
return (isRealHBType(t) || t == ::executorch::aten::ScalarType::BFloat16);
}

Expand Down Expand Up @@ -547,7 +547,7 @@ struct is_barebones_unsigned_type
bool,
isBarebonesUnsignedType(CppTypeToScalarType<T>::value)> {};

inline ::executorch::aten::ScalarType toQIntType(
inline constexpr ::executorch::aten::ScalarType toQIntType(
::executorch::aten::ScalarType t) {
switch (t) {
case ::executorch::aten::ScalarType::Byte:
Expand All @@ -561,7 +561,7 @@ inline ::executorch::aten::ScalarType toQIntType(
}
}

inline ::executorch::aten::ScalarType toUnderlying(
inline constexpr ::executorch::aten::ScalarType toUnderlying(
::executorch::aten::ScalarType t) {
switch (t) {
case ::executorch::aten::ScalarType::QUInt8:
Expand Down Expand Up @@ -600,7 +600,7 @@ inline bool isSignedType(::executorch::aten::ScalarType t) {
#undef CASE_SIGNED
}

inline bool isUnderlying(
inline constexpr bool isUnderlying(
::executorch::aten::ScalarType type,
::executorch::aten::ScalarType qtype) {
return type == ::executorch::runtime::toUnderlying(qtype);
Expand Down
Loading