Skip to content

[Cpp API Compatibility] Align ScalarType related APIs #78806

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

Merged
SigureMo merged 3 commits into from
Apr 29, 2026
Merged

[Cpp API Compatibility] Align ScalarType related APIs #78806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10c3748
align ScalarType related APIs
youge325 Apr 17, 2026
586c99e
Add ABI symbol compatibility check
youge325 Apr 25, 2026
aa1d65e
Revert "Add ABI symbol compatibility check"
youge325 Apr 28, 2026
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
78 changes: 78 additions & 0 deletions paddle/phi/api/include/compat/c10/core/ScalarType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,33 @@ inline bool isComplexType(ScalarType t) {
t == ScalarType::ComplexDouble);
}

inline bool isBitsType(ScalarType t) {
return t == ScalarType::Bits1x8 || t == ScalarType::Bits2x4 ||
t == ScalarType::Bits4x2 || t == ScalarType::Bits8 ||
t == ScalarType::Bits16;
}

inline bool isBarebonesUnsignedType(ScalarType t) {
return t == ScalarType::UInt1 || t == ScalarType::UInt2 ||
t == ScalarType::UInt3 || t == ScalarType::UInt4 ||
t == ScalarType::UInt5 || t == ScalarType::UInt6 ||
t == ScalarType::UInt7 || t == ScalarType::UInt16 ||
t == ScalarType::UInt32 || t == ScalarType::UInt64;
}

inline ScalarType toQIntType(ScalarType t) {
switch (t) {
case ScalarType::Byte:
return ScalarType::QUInt8;
case ScalarType::Char:
return ScalarType::QInt8;
case ScalarType::Int:
return ScalarType::QInt32;
default:
return t;
}
}

inline bool isSignedType(ScalarType t) {
#define CASE_ISSIGNED(name) \
case ScalarType::name: \
Expand Down Expand Up @@ -177,6 +204,57 @@ inline bool isSignedType(ScalarType t) {
return false; // Unreachable, but satisfies compiler
}

inline bool isUnderlying(ScalarType type, ScalarType qtype) {
return type == toUnderlying(qtype);
}

inline ScalarType toRealValueType(ScalarType t) {
switch (t) {
case ScalarType::ComplexHalf:
return ScalarType::Half;
case ScalarType::ComplexFloat:
return ScalarType::Float;
case ScalarType::ComplexDouble:
return ScalarType::Double;
default:
return t;
}
}

inline ScalarType toComplexType(ScalarType t) {
switch (t) {
case ScalarType::BFloat16:
return ScalarType::ComplexFloat;
case ScalarType::Half:
return ScalarType::ComplexHalf;
case ScalarType::Float:
return ScalarType::ComplexFloat;
case ScalarType::Double:
return ScalarType::ComplexDouble;
case ScalarType::ComplexHalf:
return ScalarType::ComplexHalf;
case ScalarType::ComplexFloat:
return ScalarType::ComplexFloat;
case ScalarType::ComplexDouble:
return ScalarType::ComplexDouble;
default:
TORCH_CHECK(false, "Unknown Complex ScalarType for ", t);
}
}

inline bool canCast(const ScalarType from, const ScalarType to) {
if (isComplexType(from) && !isComplexType(to)) {
return false;
}
if (isFloatingType(from) && isIntegralType(to, false)) {
return false;
}
if (from != ScalarType::Bool && to == ScalarType::Bool) {
return false;
}
return true;
}

} // namespace c10

namespace at {
Expand Down
21 changes: 21 additions & 0 deletions paddle/phi/api/include/compat/torch/headeronly/core/ScalarType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,4 +313,25 @@ inline std::ostream& operator<<(std::ostream& stream, ScalarType scalar_type) {
return stream << toString(scalar_type);
}

inline bool isQIntType(ScalarType t) {
return t == ScalarType::QInt8 || t == ScalarType::QUInt8 ||
t == ScalarType::QInt32 || t == ScalarType::QUInt4x2 ||
t == ScalarType::QUInt2x4;
}

inline ScalarType toUnderlying(ScalarType t) {
switch (t) {
case ScalarType::QUInt8:
case ScalarType::QUInt4x2:
case ScalarType::QUInt2x4:
return ScalarType::Byte;
case ScalarType::QInt8:
return ScalarType::Char;
case ScalarType::QInt32:
return ScalarType::Int;
default:
return t;
}
}

} // namespace c10
75 changes: 75 additions & 0 deletions test/cpp/compat/c10_ScalarType_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,78 @@ TEST(ScalarTypeTest, RestoredCompatScalarTypesKeepSourceLevelSemantics) {
EXPECT_TRUE(c10::isFloat8Type(c10::ScalarType::Float8_e8m0fnu));
EXPECT_TRUE(c10::isReducedFloatingType(c10::ScalarType::Float4_e2m1fn_x2));
}

TEST(ScalarTypeTest, HelperPredicatesAndConversionsMatchPyTorchBehavior) {
EXPECT_TRUE(c10::isQIntType(c10::ScalarType::QInt8));
EXPECT_TRUE(c10::isQIntType(c10::ScalarType::QUInt8));
EXPECT_TRUE(c10::isQIntType(c10::ScalarType::QInt32));
EXPECT_TRUE(c10::isQIntType(c10::ScalarType::QUInt4x2));
EXPECT_TRUE(c10::isQIntType(c10::ScalarType::QUInt2x4));
EXPECT_FALSE(c10::isQIntType(c10::ScalarType::Float));

EXPECT_TRUE(c10::isBitsType(c10::ScalarType::Bits1x8));
EXPECT_TRUE(c10::isBitsType(c10::ScalarType::Bits2x4));
EXPECT_TRUE(c10::isBitsType(c10::ScalarType::Bits4x2));
EXPECT_TRUE(c10::isBitsType(c10::ScalarType::Bits8));
EXPECT_TRUE(c10::isBitsType(c10::ScalarType::Bits16));
EXPECT_FALSE(c10::isBitsType(c10::ScalarType::Int));

EXPECT_TRUE(c10::isBarebonesUnsignedType(c10::ScalarType::UInt1));
EXPECT_TRUE(c10::isBarebonesUnsignedType(c10::ScalarType::UInt7));
EXPECT_TRUE(c10::isBarebonesUnsignedType(c10::ScalarType::UInt16));
EXPECT_TRUE(c10::isBarebonesUnsignedType(c10::ScalarType::UInt64));
EXPECT_FALSE(c10::isBarebonesUnsignedType(c10::ScalarType::Byte));
EXPECT_FALSE(c10::isBarebonesUnsignedType(c10::ScalarType::Int));

EXPECT_EQ(c10::toQIntType(c10::ScalarType::Byte), c10::ScalarType::QUInt8);
EXPECT_EQ(c10::toQIntType(c10::ScalarType::Char), c10::ScalarType::QInt8);
EXPECT_EQ(c10::toQIntType(c10::ScalarType::Int), c10::ScalarType::QInt32);
EXPECT_EQ(c10::toQIntType(c10::ScalarType::Float), c10::ScalarType::Float);

EXPECT_EQ(c10::toUnderlying(c10::ScalarType::QUInt8), c10::ScalarType::Byte);
EXPECT_EQ(c10::toUnderlying(c10::ScalarType::QUInt4x2),
c10::ScalarType::Byte);
EXPECT_EQ(c10::toUnderlying(c10::ScalarType::QUInt2x4),
c10::ScalarType::Byte);
EXPECT_EQ(c10::toUnderlying(c10::ScalarType::QInt8), c10::ScalarType::Char);
EXPECT_EQ(c10::toUnderlying(c10::ScalarType::QInt32), c10::ScalarType::Int);
EXPECT_EQ(c10::toUnderlying(c10::ScalarType::Float), c10::ScalarType::Float);

EXPECT_TRUE(
c10::isUnderlying(c10::ScalarType::Byte, c10::ScalarType::QUInt8));
EXPECT_TRUE(c10::isUnderlying(c10::ScalarType::Char, c10::ScalarType::QInt8));
EXPECT_TRUE(c10::isUnderlying(c10::ScalarType::Int, c10::ScalarType::QInt32));
EXPECT_FALSE(
c10::isUnderlying(c10::ScalarType::Byte, c10::ScalarType::QInt8));

EXPECT_EQ(c10::toRealValueType(c10::ScalarType::ComplexHalf),
c10::ScalarType::Half);
EXPECT_EQ(c10::toRealValueType(c10::ScalarType::ComplexFloat),
c10::ScalarType::Float);
EXPECT_EQ(c10::toRealValueType(c10::ScalarType::ComplexDouble),
c10::ScalarType::Double);
EXPECT_EQ(c10::toRealValueType(c10::ScalarType::Int), c10::ScalarType::Int);

EXPECT_EQ(c10::toComplexType(c10::ScalarType::Half),
c10::ScalarType::ComplexHalf);
EXPECT_EQ(c10::toComplexType(c10::ScalarType::Float),
c10::ScalarType::ComplexFloat);
EXPECT_EQ(c10::toComplexType(c10::ScalarType::Double),
c10::ScalarType::ComplexDouble);
EXPECT_EQ(c10::toComplexType(c10::ScalarType::BFloat16),
c10::ScalarType::ComplexFloat);
EXPECT_EQ(c10::toComplexType(c10::ScalarType::ComplexFloat),
c10::ScalarType::ComplexFloat);

EXPECT_TRUE(c10::canCast(c10::ScalarType::Int, c10::ScalarType::Long));
EXPECT_TRUE(c10::canCast(c10::ScalarType::Float, c10::ScalarType::Double));
EXPECT_TRUE(c10::canCast(c10::ScalarType::ComplexFloat,
c10::ScalarType::ComplexDouble));
EXPECT_TRUE(c10::canCast(c10::ScalarType::Bool, c10::ScalarType::Int));

EXPECT_FALSE(
c10::canCast(c10::ScalarType::ComplexFloat, c10::ScalarType::Float));
EXPECT_FALSE(c10::canCast(c10::ScalarType::Float, c10::ScalarType::Int));
EXPECT_FALSE(c10::canCast(c10::ScalarType::Double, c10::ScalarType::Long));
EXPECT_FALSE(c10::canCast(c10::ScalarType::Int, c10::ScalarType::Bool));
}