diff --git a/ge/client/proto/ge_ir.proto b/ge/client/proto/ge_ir.proto index 12989a54..c0ef3071 100644 --- a/ge/client/proto/ge_ir.proto +++ b/ge/client/proto/ge_ir.proto @@ -31,6 +31,8 @@ enum DataType DT_STRING_REF = 24; // string_ref type DT_DUAL = 25; /**< dual output type */ DT_VARIANT = 26; // variant type + DT_BF16 = 27; // bf16 type + DT_INT4 = 28; // int4 type } message AttrDef diff --git a/ge/common/proto/ge_ir.proto b/ge/common/proto/ge_ir.proto index 12989a54..c0ef3071 100644 --- a/ge/common/proto/ge_ir.proto +++ b/ge/common/proto/ge_ir.proto @@ -31,6 +31,8 @@ enum DataType DT_STRING_REF = 24; // string_ref type DT_DUAL = 25; /**< dual output type */ DT_VARIANT = 26; // variant type + DT_BF16 = 27; // bf16 type + DT_INT4 = 28; // int4 type } message AttrDef diff --git a/ge/executor/proto/ge_ir.proto b/ge/executor/proto/ge_ir.proto index 12989a54..c0ef3071 100644 --- a/ge/executor/proto/ge_ir.proto +++ b/ge/executor/proto/ge_ir.proto @@ -31,6 +31,8 @@ enum DataType DT_STRING_REF = 24; // string_ref type DT_DUAL = 25; /**< dual output type */ DT_VARIANT = 26; // variant type + DT_BF16 = 27; // bf16 type + DT_INT4 = 28; // int4 type } message AttrDef diff --git a/ge/offline/proto/ge_ir.proto b/ge/offline/proto/ge_ir.proto index 12989a54..c0ef3071 100644 --- a/ge/offline/proto/ge_ir.proto +++ b/ge/offline/proto/ge_ir.proto @@ -31,6 +31,8 @@ enum DataType DT_STRING_REF = 24; // string_ref type DT_DUAL = 25; /**< dual output type */ DT_VARIANT = 26; // variant type + DT_BF16 = 27; // bf16 type + DT_INT4 = 28; // int4 type } message AttrDef diff --git a/ge/proto/ge_ir.proto b/ge/proto/ge_ir.proto index 12989a54..c0ef3071 100644 --- a/ge/proto/ge_ir.proto +++ b/ge/proto/ge_ir.proto @@ -31,6 +31,8 @@ enum DataType DT_STRING_REF = 24; // string_ref type DT_DUAL = 25; /**< dual output type */ DT_VARIANT = 26; // variant type + DT_BF16 = 27; // bf16 type + DT_INT4 = 28; // int4 type } message AttrDef diff --git a/metadef b/metadef index fcebf37d..72bcde72 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit fcebf37d7428caf4e0bd6e6c3a4f8143f6eac8b7 +Subproject commit 72bcde72074856e6cb1e8ba19df43b358bdb0160 diff --git a/parser b/parser index 424ac060..88c66a63 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit 424ac0609fe17f455865436462a2c62f85aea2b1 +Subproject commit 88c66a63b382bb54b338859e44b6321da979b22e diff --git a/tests/ut/ge/common/format_transfer_unittest.cc b/tests/ut/ge/common/format_transfer_unittest.cc index 73b7703d..04817d29 100644 --- a/tests/ut/ge/common/format_transfer_unittest.cc +++ b/tests/ut/ge/common/format_transfer_unittest.cc @@ -51,35 +51,5 @@ TEST_F(UtestFormatTransfer, build_unsupported_transfer) { auto transfer2 = BuildFormatTransfer(args2); EXPECT_EQ(transfer2, nullptr); } - -TEST_F(UtestFormatTransfer, get_size_by_data_type) { - EXPECT_EQ(GetSizeByDataType(DT_FLOAT), 4); - EXPECT_EQ(GetSizeByDataType(DT_FLOAT16), 2); - EXPECT_EQ(GetSizeByDataType(DT_INT8), 1); - EXPECT_EQ(GetSizeByDataType(DT_INT16), 2); - EXPECT_EQ(GetSizeByDataType(DT_UINT16), 2); - EXPECT_EQ(GetSizeByDataType(DT_UINT8), 1); - EXPECT_EQ(GetSizeByDataType(DT_INT32), 4); - EXPECT_EQ(GetSizeByDataType(DT_INT64), 8); - EXPECT_EQ(GetSizeByDataType(DT_UINT32), 4); - EXPECT_EQ(GetSizeByDataType(DT_UINT64), 8); - EXPECT_EQ(GetSizeByDataType(DT_BOOL), 1); - EXPECT_EQ(GetSizeByDataType(DT_DOUBLE), 8); - EXPECT_EQ(GetSizeByDataType(DT_STRING), -1); - EXPECT_EQ(GetSizeByDataType(DT_DUAL_SUB_INT8), 1); - EXPECT_EQ(GetSizeByDataType(DT_DUAL_SUB_UINT8), 1); - EXPECT_EQ(GetSizeByDataType(DT_COMPLEX64), 8); - EXPECT_EQ(GetSizeByDataType(DT_COMPLEX128), 16); - EXPECT_EQ(GetSizeByDataType(DT_QINT8), 1); - EXPECT_EQ(GetSizeByDataType(DT_QINT16), 2); - EXPECT_EQ(GetSizeByDataType(DT_QINT32), 4); - EXPECT_EQ(GetSizeByDataType(DT_QUINT8), 1); - EXPECT_EQ(GetSizeByDataType(DT_QUINT16), 2); - EXPECT_EQ(GetSizeByDataType(DT_RESOURCE), 8); - EXPECT_EQ(GetSizeByDataType(DT_STRING_REF), -1); - EXPECT_EQ(GetSizeByDataType(DT_DUAL), 5); - EXPECT_EQ(GetSizeByDataType(DT_UNDEFINED), -1); - EXPECT_EQ(DT_UNDEFINED, 28); -} } // namespace formats } // namespace ge