Nigel
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change FracZ to FRACTAL_Z

This commit is contained in:
lby 2022-06-27 18:08:55 +08:00
parent 1f9e564da6
commit 55e8b59451
14 changed files with 148 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
config/op_info.config
View File

File diff suppressed because one or more lines are too long

24
docs/api/api_python/ops/mindspore.ops.DataType.rst
View File

@ -14,7 +14,7 @@ mindspore.ops.DataType
BOOL_None = ("bool", "")
BOOL_Default = ("bool", "DefaultFormat")
BOOL_5HD = ("bool", "NC1HWC0")
BOOL_FracZ = ("bool", "FracZ")
BOOL_FracZ = ("bool", "FRACTAL_Z")
BOOL_FracNZ = ("bool", "FRACTAL_NZ")
BOOL_C1HWNCoC0 = ("bool", "C1HWNCoC0")
BOOL_NCHW = ("bool", "NCHW")
@ -26,7 +26,7 @@ mindspore.ops.DataType
I8_None = ("int8", "")
I8_Default = ("int8", "DefaultFormat")
I8_5HD = ("int8", "NC1HWC0")
I8_FracZ = ("int8", "FracZ")
I8_FracZ = ("int8", "FRACTAL_Z")
I8_FracNZ = ("int8", "FRACTAL_NZ")
I8_C1HWNCoC0 = ("int8", "C1HWNCoC0")
I8_NCHW = ("int8", "NCHW")
@ -38,7 +38,7 @@ mindspore.ops.DataType
U8_None = ("uint8", "")
U8_Default = ("uint8", "DefaultFormat")
U8_5HD = ("uint8", "NC1HWC0")
U8_FracZ = ("uint8", "FracZ")
U8_FracZ = ("uint8", "FRACTAL_Z")
U8_FracNZ = ("uint8", "FRACTAL_NZ")
U8_C1HWNCoC0 = ("uint8", "C1HWNCoC0")
U8_NCHW = ("uint8", "NCHW")
@ -50,7 +50,7 @@ mindspore.ops.DataType
I16_None = ("int16", "")
I16_Default = ("int16", "DefaultFormat")
I16_5HD = ("int16", "NC1HWC0")
I16_FracZ = ("int16", "FracZ")
I16_FracZ = ("int16", "FRACTAL_Z")
I16_FracNZ = ("int16", "FRACTAL_NZ")
I16_C1HWNCoC0 = ("int16", "C1HWNCoC0")
I16_NCHW = ("int16", "NCHW")
@ -62,7 +62,7 @@ mindspore.ops.DataType
U16_None = ("uint16", "")
U16_Default = ("uint16", "DefaultFormat")
U16_5HD = ("uint16", "NC1HWC0")
U16_FracZ = ("uint16", "FracZ")
U16_FracZ = ("uint16", "FRACTAL_Z")
U16_FracNZ = ("uint16", "FRACTAL_NZ")
U16_C1HWNCoC0 = ("uint16", "C1HWNCoC0")
U16_NCHW = ("uint16", "NCHW")
@ -74,7 +74,7 @@ mindspore.ops.DataType
I32_None = ("int32", "")
I32_Default = ("int32", "DefaultFormat")
I32_5HD = ("int32", "NC1HWC0")
I32_FracZ = ("int32", "FracZ")
I32_FracZ = ("int32", "FRACTAL_Z")
I32_FracNZ = ("int32", "FRACTAL_NZ")
I32_C1HWNCoC0 = ("int32", "C1HWNCoC0")
I32_NCHW = ("int32", "NCHW")
@ -86,7 +86,7 @@ mindspore.ops.DataType
U32_None = ("uint32", "")
U32_Default = ("uint32", "DefaultFormat")
U32_5HD = ("uint32", "NC1HWC0")
U32_FracZ = ("uint32", "FracZ")
U32_FracZ = ("uint32", "FRACTAL_Z")
U32_FracNZ = ("uint32", "FRACTAL_NZ")
U32_C1HWNCoC0 = ("uint32", "C1HWNCoC0")
U32_NCHW = ("uint32", "NCHW")
@ -98,7 +98,7 @@ mindspore.ops.DataType
I64_None = ("int64", "")
I64_Default = ("int64", "DefaultFormat")
I64_5HD = ("int64", "NC1HWC0")
I64_FracZ = ("int64", "FracZ")
I64_FracZ = ("int64", "FRACTAL_Z")
I64_FracNZ = ("int64", "FRACTAL_NZ")
I64_C1HWNCoC0 = ("int64", "C1HWNCoC0")
I64_NCHW = ("int64", "NCHW")
@ -110,7 +110,7 @@ mindspore.ops.DataType
U64_None = ("uint64", "")
U64_Default = ("uint64", "DefaultFormat")
U64_5HD = ("uint64", "NC1HWC0")
U64_FracZ = ("uint64", "FracZ")
U64_FracZ = ("uint64", "FRACTAL_Z")
U64_FracNZ = ("uint64", "FRACTAL_NZ")
U64_C1HWNCoC0 = ("uint64", "C1HWNCoC0")
U64_NCHW = ("uint64", "NCHW")
@ -122,7 +122,7 @@ mindspore.ops.DataType
F16_None = ("float16", "")
F16_Default = ("float16", "DefaultFormat")
F16_5HD = ("float16", "NC1HWC0")
F16_FracZ = ("float16", "FracZ")
F16_FracZ = ("float16", "FRACTAL_Z")
F16_FracNZ = ("float16", "FRACTAL_NZ")
F16_C1HWNCoC0 = ("float16", "C1HWNCoC0")
F16_NCHW = ("float16", "NCHW")
@ -141,7 +141,7 @@ mindspore.ops.DataType
F32_None = ("float32", "")
F32_Default = ("float32", "DefaultFormat")
F32_5HD = ("float32", "NC1HWC0")
F32_FracZ = ("float32", "FracZ")
F32_FracZ = ("float32", "FRACTAL_Z")
F32_FracNZ = ("float32", "FRACTAL_NZ")
F32_C1HWNCoC0 = ("float32", "C1HWNCoC0")
F32_NCHW = ("float32", "NCHW")
@ -160,7 +160,7 @@ mindspore.ops.DataType
F64_None = ("float64", "")
F64_Default = ("float64", "DefaultFormat")
F64_5HD = ("float64", "NC1HWC0")
F64_FracZ = ("float64", "FracZ")
F64_FracZ = ("float64", "FRACTAL_Z")
F64_FracNZ = ("float64", "FRACTAL_NZ")
F64_C1HWNCoC0 = ("float64", "C1HWNCoC0")
F64_NCHW = ("float64", "NCHW")

2
mindspore/ccsrc/include/common/utils/utils.h
View File

@ -728,7 +728,7 @@ constexpr auto kOpFormat_NCHW = "NCHW";
constexpr auto kOpFormat_NHWC = "NHWC";
constexpr auto kOpFormat_HWCN = "HWCN";
constexpr auto kOpFormat_NC1HWC0 = "NC1HWC0";
constexpr auto kOpFormat_FRAC_Z = "FracZ";
constexpr auto kOpFormat_FRAC_Z = "FRACTAL_Z";
constexpr auto kOpFormat_FRACTAL_Z = "FRACTAL_Z";
constexpr auto kOpFormat_FRAC_NZ = "FRACTAL_NZ";
constexpr auto kOpFormat_C1HWNCoC0 = "C1HWNCoC0";

5
mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_adapter.cc
View File

@ -144,11 +144,8 @@ std::string TbeAdapter::FormatPass(const std::string &format, const size_t &orig
return kOpFormat_NCHW;
}
return origin_shape_size == kNCHWShapeSize ? kOpFormat_NCHW : kOpFormat_ND;
} else if (format == kOpFormat_FRAC_Z) {
return kOpFormat_FRACTAL_Z;
} else {
return format;
}
return format;
}
bool TbeAdapter::GetSpecDataInput(const FusionScopeInfo &fusion_scope_info,

2
mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_compile.cc
View File

@ -590,7 +590,7 @@ std::string TbeKernelCompileManager::ParseSelectAndCheckResult(const nlohmann::j
return kFailed;
}
if (res != kFullySupported) {
PrintProcessLog(json, static_cast<int>(WARNING));
PrintProcessLog(json, static_cast<int>(DEBUG));
}
} else if (json.at(kStatus) == kFailed) {
auto all_logs = GetJsonValue<std::vector<nlohmann::json>>(json, kProcessInfo);

2
mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_select.cc
View File

@ -501,7 +501,7 @@ void TbeKernelSelect::CreateNewOpIOInfo(const mindspore::kernel::OpIOInfo &op_io
std::vector<std::string> TbeKernelSelect::SplitStrToVec(const std::string &op_select_json_item) {
const std::map<std::string, std::string> kDynamicFormatMap = {
{"NCHW", "DefaultFormat"}, {"ND", "DefaultFormat"}, {"FRACTAL_Z", "FracZ"}, {"NCDHW", "DefaultFormat"}};
{"NCHW", "DefaultFormat"}, {"ND", "DefaultFormat"}, {"NCDHW", "DefaultFormat"}};
if (op_select_json_item.empty()) {
MS_LOG(EXCEPTION) << "Op select ret item is null.";
}

12
mindspore/core/ir/anf.h
View File

@ -820,14 +820,14 @@ class MS_CORE_API Parameter final : public ANode {
/// \return True if this Parameter has a dynamic shape, otherwise false.
bool has_dynamic_shape() const { return has_dynamic_shape_; }
/// \brief Set groups attr in FracZ format.
/// \brief Set groups attr in FRACTAL_Z format.
///
/// \param[in] fracz_group Groups attr in FracZ format.
/// \param[in] fracz_group Groups attr in FRACTAL_Z format.
void set_fracz_group(int64_t fracz_group) { format_attrs_.fracz_group = fracz_group; }
/// \brief Get groups attr in FracZ format.
/// \brief Get groups attr in FRACTAL_Z format.
///
/// \return Groups attr in FracZ format.
/// \return Groups attr in FRACTAL_Z format.
int64_t fracz_group() const { return format_attrs_.fracz_group; }
/// \brief Set input_size attr in FracNZ_RNN or ND_RNN_Bias format.
@ -979,9 +979,9 @@ class MS_CORE_API ValueNode final : public ANode {
/// \param[in] group The count of groups using this ValueNode.
void set_fracz_group(int64_t group) { format_attr_.fracz_group = group; }
/// \brief Get groups attr in FracZ format.
/// \brief Get groups attr in FRACTAL_Z format.
///
/// \return Groups attr in FracZ format.
/// \return Groups attr in FRACTAL_Z format.
int64_t fracz_group() const { return format_attr_.fracz_group; }
/// \brief Set the count of graphs using this ValueNode.

2
mindspore/python/mindspore/_extends/graph_kernel/model/model.py
View File

@ -52,7 +52,7 @@ class DataFormat:
NHWC = "NHWC"
HWCN = "HWCN"
NC1HWC0 = "NC1HWC0"
FRAC_Z = "FracZ"
FRAC_Z = "FRACTAL_Z"
FRAC_NZ = "FRACTAL_NZ"
C1HWNCOC0 = "C1HWNCoC0"
NC1HWC0_C04 = "NC1HWC0_C04"

6
mindspore/python/mindspore/ops/_op_impl/tbe/trans_data.py
View File

@ -23,8 +23,10 @@ trans_data_op_info = TBERegOp("TransData") \
.compute_cost(10) \
.kernel_name("trans_data") \
.partial_flag(True) \
.attr("src_format", "required", "str", "DefaultFormat, NC1HWC0, FracZ, FRACTAL_NZ, HWCN, C1HWNCoC0, NDHWC, NHWC") \
.attr("dst_format", "required", "str", "DefaultFormat, NC1HWC0, FracZ, FRACTAL_NZ, HWCN, C1HWNCoC0, NDHWC, NHWC") \
.attr("src_format", "required", "str",
"DefaultFormat, NC1HWC0, FRACTAL_Z, FRACTAL_NZ, HWCN, C1HWNCoC0, NDHWC, NHWC") \
.attr("dst_format", "required", "str",
"DefaultFormat, NC1HWC0, FRACTAL_Z, FRACTAL_NZ, HWCN, C1HWNCoC0, NDHWC, NHWC") \
.attr("groups", "optional", "int", "all", "1") \
.input(0, "src", False, "required", "all") \
.output(0, "dst", False, "required", "all") \

6
mindspore/python/mindspore/ops/_op_impl/tbe/trans_data_ds.py
View File

@ -24,8 +24,10 @@ trans_data_op_info = TBERegOp("TransData") \
.kernel_name("trans_data") \
.partial_flag(True) \
.dynamic_shape(True) \
.attr("src_format", "required", "str", "DefaultFormat, NC1HWC0, FracZ, FRACTAL_NZ, HWCN, C1HWNCoC0, NDHWC, NHWC") \
.attr("dst_format", "required", "str", "DefaultFormat, NC1HWC0, FracZ, FRACTAL_NZ, HWCN, C1HWNCoC0, NDHWC, NHWC") \
.attr("src_format", "required", "str",
"DefaultFormat, NC1HWC0, FRACTAL_Z, FRACTAL_NZ, HWCN, C1HWNCoC0, NDHWC, NHWC") \
.attr("dst_format", "required", "str",
"DefaultFormat, NC1HWC0, FRACTAL_Z, FRACTAL_NZ, HWCN, C1HWNCoC0, NDHWC, NHWC") \
.attr("groups", "optional", "int", "all", "1") \
.input(0, "src", False, "required", "all") \
.output(0, "dst", False, "required", "all") \

48
mindspore/python/mindspore/ops/op_info_register.py
View File

@ -780,7 +780,7 @@ class DataType:
BOOL_None = ("bool", "")
BOOL_Default = ("bool", "DefaultFormat")
BOOL_5HD = ("bool", "NC1HWC0")
BOOL_FracZ = ("bool", "FracZ")
BOOL_FracZ = ("bool", "FRACTAL_Z")
BOOL_FracNZ = ("bool", "FRACTAL_NZ")
BOOL_C1HWNCoC0 = ("bool", "C1HWNCoC0")
BOOL_NCHW = ("bool", "NCHW")
@ -792,7 +792,7 @@ class DataType:
I8_None = ("int8", "")
I8_Default = ("int8", "DefaultFormat")
I8_5HD = ("int8", "NC1HWC0")
I8_FracZ = ("int8", "FracZ")
I8_FracZ = ("int8", "FRACTAL_Z")
I8_FracNZ = ("int8", "FRACTAL_NZ")
I8_C1HWNCoC0 = ("int8", "C1HWNCoC0")
I8_NCHW = ("int8", "NCHW")
@ -805,7 +805,7 @@ class DataType:
U8_None = ("uint8", "")
U8_Default = ("uint8", "DefaultFormat")
U8_5HD = ("uint8", "NC1HWC0")
U8_FracZ = ("uint8", "FracZ")
U8_FracZ = ("uint8", "FRACTAL_Z")
U8_FracNZ = ("uint8", "FRACTAL_NZ")
U8_C1HWNCoC0 = ("uint8", "C1HWNCoC0")
U8_NCHW = ("uint8", "NCHW")
@ -818,7 +818,7 @@ class DataType:
I16_None = ("int16", "")
I16_Default = ("int16", "DefaultFormat")
I16_5HD = ("int16", "NC1HWC0")
I16_FracZ = ("int16", "FracZ")
I16_FracZ = ("int16", "FRACTAL_Z")
I16_FracNZ = ("int16", "FRACTAL_NZ")
I16_C1HWNCoC0 = ("int16", "C1HWNCoC0")
I16_NCHW = ("int16", "NCHW")
@ -830,7 +830,7 @@ class DataType:
U16_None = ("uint16", "")
U16_Default = ("uint16", "DefaultFormat")
U16_5HD = ("uint16", "NC1HWC0")
U16_FracZ = ("uint16", "FracZ")
U16_FracZ = ("uint16", "FRACTAL_Z")
U16_FracNZ = ("uint16", "FRACTAL_NZ")
U16_C1HWNCoC0 = ("uint16", "C1HWNCoC0")
U16_NCHW = ("uint16", "NCHW")
@ -842,7 +842,7 @@ class DataType:
I32_None = ("int32", "")
I32_Default = ("int32", "DefaultFormat")
I32_5HD = ("int32", "NC1HWC0")
I32_FracZ = ("int32", "FracZ")
I32_FracZ = ("int32", "FRACTAL_Z")
I32_FracNZ = ("int32", "FRACTAL_NZ")
I32_C1HWNCoC0 = ("int32", "C1HWNCoC0")
I32_NCHW = ("int32", "NCHW")
@ -854,7 +854,7 @@ class DataType:
U32_None = ("uint32", "")
U32_Default = ("uint32", "DefaultFormat")
U32_5HD = ("uint32", "NC1HWC0")
U32_FracZ = ("uint32", "FracZ")
U32_FracZ = ("uint32", "FRACTAL_Z")
U32_FracNZ = ("uint32", "FRACTAL_NZ")
U32_C1HWNCoC0 = ("uint32", "C1HWNCoC0")
U32_NCHW = ("uint32", "NCHW")
@ -866,7 +866,7 @@ class DataType:
I64_None = ("int64", "")
I64_Default = ("int64", "DefaultFormat")
I64_5HD = ("int64", "NC1HWC0")
I64_FracZ = ("int64", "FracZ")
I64_FracZ = ("int64", "FRACTAL_Z")
I64_FracNZ = ("int64", "FRACTAL_NZ")
I64_C1HWNCoC0 = ("int64", "C1HWNCoC0")
I64_NCHW = ("int64", "NCHW")
@ -878,7 +878,7 @@ class DataType:
U64_None = ("uint64", "")
U64_Default = ("uint64", "DefaultFormat")
U64_5HD = ("uint64", "NC1HWC0")
U64_FracZ = ("uint64", "FracZ")
U64_FracZ = ("uint64", "FRACTAL_Z")
U64_FracNZ = ("uint64", "FRACTAL_NZ")
U64_C1HWNCoC0 = ("uint64", "C1HWNCoC0")
U64_NCHW = ("uint64", "NCHW")
@ -890,7 +890,7 @@ class DataType:
F16_None = ("float16", "")
F16_Default = ("float16", "DefaultFormat")
F16_5HD = ("float16", "NC1HWC0")
F16_FracZ = ("float16", "FracZ")
F16_FracZ = ("float16", "FRACTAL_Z")
F16_FracNZ = ("float16", "FRACTAL_NZ")
F16_C1HWNCoC0 = ("float16", "C1HWNCoC0")
F16_NCHW = ("float16", "NCHW")
@ -909,7 +909,7 @@ class DataType:
F32_None = ("float32", "")
F32_Default = ("float32", "DefaultFormat")
F32_5HD = ("float32", "NC1HWC0")
F32_FracZ = ("float32", "FracZ")
F32_FracZ = ("float32", "FRACTAL_Z")
F32_FracNZ = ("float32", "FRACTAL_NZ")
F32_C1HWNCoC0 = ("float32", "C1HWNCoC0")
F32_NCHW = ("float32", "NCHW")
@ -928,7 +928,7 @@ class DataType:
F64_None = ("float64", "")
F64_Default = ("float64", "DefaultFormat")
F64_5HD = ("float64", "NC1HWC0")
F64_FracZ = ("float64", "FracZ")
F64_FracZ = ("float64", "FRACTAL_Z")
F64_FracNZ = ("float64", "FRACTAL_NZ")
F64_C1HWNCoC0 = ("float64", "C1HWNCoC0")
F64_NCHW = ("float64", "NCHW")
@ -946,7 +946,7 @@ class DataType:
BOOL_None = ("bool", "")
BOOL_Default = ("bool", "DefaultFormat")
BOOL_5HD = ("bool", "NC1HWC0")
BOOL_FracZ = ("bool", "FracZ")
BOOL_FracZ = ("bool", "FRACTAL_Z")
BOOL_FracNZ = ("bool", "FRACTAL_NZ")
BOOL_C1HWNCoC0 = ("bool", "C1HWNCoC0")
BOOL_NCHW = ("bool", "NCHW")
@ -958,7 +958,7 @@ class DataType:
I8_None = ("int8", "")
I8_Default = ("int8", "DefaultFormat")
I8_5HD = ("int8", "NC1HWC0")
I8_FracZ = ("int8", "FracZ")
I8_FracZ = ("int8", "FRACTAL_Z")
I8_FracNZ = ("int8", "FRACTAL_NZ")
I8_C1HWNCoC0 = ("int8", "C1HWNCoC0")
I8_NCHW = ("int8", "NCHW")
@ -971,7 +971,7 @@ class DataType:
U8_None = ("uint8", "")
U8_Default = ("uint8", "DefaultFormat")
U8_5HD = ("uint8", "NC1HWC0")
U8_FracZ = ("uint8", "FracZ")
U8_FracZ = ("uint8", "FRACTAL_Z")
U8_FracNZ = ("uint8", "FRACTAL_NZ")
U8_C1HWNCoC0 = ("uint8", "C1HWNCoC0")
U8_NCHW = ("uint8", "NCHW")
@ -984,7 +984,7 @@ class DataType:
I16_None = ("int16", "")
I16_Default = ("int16", "DefaultFormat")
I16_5HD = ("int16", "NC1HWC0")
I16_FracZ = ("int16", "FracZ")
I16_FracZ = ("int16", "FRACTAL_Z")
I16_FracNZ = ("int16", "FRACTAL_NZ")
I16_C1HWNCoC0 = ("int16", "C1HWNCoC0")
I16_NCHW = ("int16", "NCHW")
@ -996,7 +996,7 @@ class DataType:
U16_None = ("uint16", "")
U16_Default = ("uint16", "DefaultFormat")
U16_5HD = ("uint16", "NC1HWC0")
U16_FracZ = ("uint16", "FracZ")
U16_FracZ = ("uint16", "FRACTAL_Z")
U16_FracNZ = ("uint16", "FRACTAL_NZ")
U16_C1HWNCoC0 = ("uint16", "C1HWNCoC0")
U16_NCHW = ("uint16", "NCHW")
@ -1008,7 +1008,7 @@ class DataType:
I32_None = ("int32", "")
I32_Default = ("int32", "DefaultFormat")
I32_5HD = ("int32", "NC1HWC0")
I32_FracZ = ("int32", "FracZ")
I32_FracZ = ("int32", "FRACTAL_Z")
I32_FracNZ = ("int32", "FRACTAL_NZ")
I32_C1HWNCoC0 = ("int32", "C1HWNCoC0")
I32_NCHW = ("int32", "NCHW")
@ -1020,7 +1020,7 @@ class DataType:
U32_None = ("uint32", "")
U32_Default = ("uint32", "DefaultFormat")
U32_5HD = ("uint32", "NC1HWC0")
U32_FracZ = ("uint32", "FracZ")
U32_FracZ = ("uint32", "FRACTAL_Z")
U32_FracNZ = ("uint32", "FRACTAL_NZ")
U32_C1HWNCoC0 = ("uint32", "C1HWNCoC0")
U32_NCHW = ("uint32", "NCHW")
@ -1032,7 +1032,7 @@ class DataType:
I64_None = ("int64", "")
I64_Default = ("int64", "DefaultFormat")
I64_5HD = ("int64", "NC1HWC0")
I64_FracZ = ("int64", "FracZ")
I64_FracZ = ("int64", "FRACTAL_Z")
I64_FracNZ = ("int64", "FRACTAL_NZ")
I64_C1HWNCoC0 = ("int64", "C1HWNCoC0")
I64_NCHW = ("int64", "NCHW")
@ -1044,7 +1044,7 @@ class DataType:
U64_None = ("uint64", "")
U64_Default = ("uint64", "DefaultFormat")
U64_5HD = ("uint64", "NC1HWC0")
U64_FracZ = ("uint64", "FracZ")
U64_FracZ = ("uint64", "FRACTAL_Z")
U64_FracNZ = ("uint64", "FRACTAL_NZ")
U64_C1HWNCoC0 = ("uint64", "C1HWNCoC0")
U64_NCHW = ("uint64", "NCHW")
@ -1056,7 +1056,7 @@ class DataType:
F16_None = ("float16", "")
F16_Default = ("float16", "DefaultFormat")
F16_5HD = ("float16", "NC1HWC0")
F16_FracZ = ("float16", "FracZ")
F16_FracZ = ("float16", "FRACTAL_Z")
F16_FracNZ = ("float16", "FRACTAL_NZ")
F16_C1HWNCoC0 = ("float16", "C1HWNCoC0")
F16_NCHW = ("float16", "NCHW")
@ -1075,7 +1075,7 @@ class DataType:
F32_None = ("float32", "")
F32_Default = ("float32", "DefaultFormat")
F32_5HD = ("float32", "NC1HWC0")
F32_FracZ = ("float32", "FracZ")
F32_FracZ = ("float32", "FRACTAL_Z")
F32_FracNZ = ("float32", "FRACTAL_NZ")
F32_C1HWNCoC0 = ("float32", "C1HWNCoC0")
F32_NCHW = ("float32", "NCHW")
@ -1094,7 +1094,7 @@ class DataType:
F64_None = ("float64", "")
F64_Default = ("float64", "DefaultFormat")
F64_5HD = ("float64", "NC1HWC0")
F64_FracZ = ("float64", "FracZ")
F64_FracZ = ("float64", "FRACTAL_Z")
F64_FracNZ = ("float64", "FRACTAL_NZ")
F64_C1HWNCoC0 = ("float64", "C1HWNCoC0")
F64_NCHW = ("float64", "NCHW")

4
tests/ut/data/profiler_data/container/0/data/Framework.host.vm_graph_desc_info.0.JOB2.slice_0
View File

@ -1,4 +1,4 @@
op_name:Default/Cast-op6 op_type:Cast input_id:0 input_format:DefaultFormat input_data_type:40 input_shape:"32,3,224,224" output_id:0 output_format:DefaultFormat output_data_type:39 output_shape:"32,3,224,224"
op_name:Default/TransData-op7 op_type:TransData input_id:0 input_format:DefaultFormat input_data_type:39 input_shape:"32,3,224,224" output_id:0 output_format:NC1HWC0 output_data_type:39 output_shape:"32,1,224,224,16"
op_name:Default/network-WithLossCell/_backbone-ResNet/conv1-Conv2d/Cast-op5 op_type:Cast input_id:0 input_format:FracZ input_data_type:40 input_shape:"49,4,16,16" output_id:0 output_format:FracZ output_data_type:39 output_shape:"49,4,16,16"
op_name:Default/network-WithLossCell/_backbone-ResNet/layer1-SequentialCell/0-ResidualBlock/conv1-Conv2d/Cast-op28 op_type:Cast input_id:0 input_format:FracZ input_data_type:40 input_shape:"4,4,16,16" output_id:0 output_format:FracZ output_data_type:39 output_shape:"4,4,16,16"
op_name:Default/network-WithLossCell/_backbone-ResNet/conv1-Conv2d/Cast-op5 op_type:Cast input_id:0 input_format:FRACTAL_Z input_data_type:40 input_shape:"49,4,16,16" output_id:0 output_format:FRACTAL_Z output_data_type:39 output_shape:"49,4,16,16"
op_name:Default/network-WithLossCell/_backbone-ResNet/layer1-SequentialCell/0-ResidualBlock/conv1-Conv2d/Cast-op28 op_type:Cast input_id:0 input_format:FRACTAL_Z input_data_type:40 input_shape:"4,4,16,16" output_id:0 output_format:FRACTAL_Z output_data_type:39 output_shape:"4,4,16,16"

4
tests/ut/data/profiler_data/profiler/framework_raw_0.csv
View File

@ -1,5 +1,5 @@
task_id,stream_id,block_dim,full_op_name,op_name,op_type,subgraph,op_info
51517,0,32,Default/Cast-op6,Cast-op6,Cast,Default,"{""input_0"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_UINT32"", ""shape"": ""32,3,224,224""}, ""output_0"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_UINT16"", ""shape"": ""32,3,224,224""}}"
51518,0,32,Default/TransData-op7,TransData-op7,TransData,Default,"{""input_0"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_UINT16"", ""shape"": ""32,3,224,224""}, ""output_0"": {""format"": ""NC1HWC0"", ""data_type"": ""NUMBER_TYPE_UINT16"", ""shape"": ""32,1,224,224,16""}}"
51519,0,32,Default/network-WithLossCell/_backbone-ResNet/conv1-Conv2d/Cast-op5,Cast-op5,Cast,Default,"{""input_0"": {""format"": ""FracZ"", ""data_type"": ""NUMBER_TYPE_UINT32"", ""shape"": ""49,4,16,16""}, ""output_0"": {""format"": ""FracZ"", ""data_type"": ""NUMBER_TYPE_UINT16"", ""shape"": ""49,4,16,16""}}"
51522,0,4,Default/network-WithLossCell/_backbone-ResNet/layer1-SequentialCell/0-ResidualBlock/conv1-Conv2d/Cast-op28,Cast-op28,Cast,Default,"{""input_0"": {""format"": ""FracZ"", ""data_type"": ""NUMBER_TYPE_UINT32"", ""shape"": ""4,4,16,16""}, ""output_0"": {""format"": ""FracZ"", ""data_type"": ""NUMBER_TYPE_UINT16"", ""shape"": ""4,4,16,16""}}"
51519,0,32,Default/network-WithLossCell/_backbone-ResNet/conv1-Conv2d/Cast-op5,Cast-op5,Cast,Default,"{""input_0"": {""format"": ""FRACTAL_Z"", ""data_type"": ""NUMBER_TYPE_UINT32"", ""shape"": ""49,4,16,16""}, ""output_0"": {""format"": ""FRACTAL_Z"", ""data_type"": ""NUMBER_TYPE_UINT16"", ""shape"": ""49,4,16,16""}}"
51522,0,4,Default/network-WithLossCell/_backbone-ResNet/layer1-SequentialCell/0-ResidualBlock/conv1-Conv2d/Cast-op28,Cast-op28,Cast,Default,"{""input_0"": {""format"": ""FRACTAL_Z"", ""data_type"": ""NUMBER_TYPE_UINT32"", ""shape"": ""4,4,16,16""}, ""output_0"": {""format"": ""FRACTAL_Z"", ""data_type"": ""NUMBER_TYPE_UINT16"", ""shape"": ""4,4,16,16""}}"

1 task_id stream_id block_dim full_op_name op_name op_type subgraph op_info
2 51517 0 32 Default/Cast-op6 Cast-op6 Cast Default {"input_0": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_UINT32", "shape": "32,3,224,224"}, "output_0": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_UINT16", "shape": "32,3,224,224"}}
3 51518 0 32 Default/TransData-op7 TransData-op7 TransData Default {"input_0": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_UINT16", "shape": "32,3,224,224"}, "output_0": {"format": "NC1HWC0", "data_type": "NUMBER_TYPE_UINT16", "shape": "32,1,224,224,16"}}
4 51519 0 32 Default/network-WithLossCell/_backbone-ResNet/conv1-Conv2d/Cast-op5 Cast-op5 Cast Default {"input_0": {"format": "FracZ", "data_type": "NUMBER_TYPE_UINT32", "shape": "49,4,16,16"}, "output_0": {"format": "FracZ", "data_type": "NUMBER_TYPE_UINT16", "shape": "49,4,16,16"}} {"input_0": {"format": "FRACTAL_Z", "data_type": "NUMBER_TYPE_UINT32", "shape": "49,4,16,16"}, "output_0": {"format": "FRACTAL_Z", "data_type": "NUMBER_TYPE_UINT16", "shape": "49,4,16,16"}}
5 51522 0 4 Default/network-WithLossCell/_backbone-ResNet/layer1-SequentialCell/0-ResidualBlock/conv1-Conv2d/Cast-op28 Cast-op28 Cast Default {"input_0": {"format": "FracZ", "data_type": "NUMBER_TYPE_UINT32", "shape": "4,4,16,16"}, "output_0": {"format": "FracZ", "data_type": "NUMBER_TYPE_UINT16", "shape": "4,4,16,16"}} {"input_0": {"format": "FRACTAL_Z", "data_type": "NUMBER_TYPE_UINT32", "shape": "4,4,16,16"}, "output_0": {"format": "FRACTAL_Z", "data_type": "NUMBER_TYPE_UINT16", "shape": "4,4,16,16"}}

4
tests/ut/data/profiler_data/profiler/framework_raw_1.csv
View File

@ -3,9 +3,9 @@ task_id,stream_id,block_dim,full_op_name,op_name,op_type,subgraph,op_info
30295,0,1,Default/AtomicAddrClean-op105,AtomicAddrClean-op105,AtomicAddrClean,Default,"{""input_0"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_FLOAT32"", ""shape"": ""10""}}"
30300,0,1,Default/AtomicAddrClean-op106,AtomicAddrClean-op106,AtomicAddrClean,Default,"{""input_0"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_FLOAT32"", ""shape"": ""84""}}"
30268,0,32,Default/Cast-op10,Cast-op10,Cast,Default,"{""input_0"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_FLOAT32"", ""shape"": ""32,1,32,32""}, ""output_0"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""32,1,32,32""}}"
30271,0,9,Default/network-WithLossCell/_backbone-LeNet5/conv1-Conv2d/Cast-op12,Cast-op12,Cast,Default,"{""input_0"": {""format"": ""FracZ"", ""data_type"": ""NUMBER_TYPE_FLOAT32"", ""shape"": ""25,1,16,16""}, ""output_0"": {""format"": ""FracZ"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""25,1,16,16""}}"
30271,0,9,Default/network-WithLossCell/_backbone-LeNet5/conv1-Conv2d/Cast-op12,Cast-op12,Cast,Default,"{""input_0"": {""format"": ""FRACTAL_Z"", ""data_type"": ""NUMBER_TYPE_FLOAT32"", ""shape"": ""25,1,16,16""}, ""output_0"": {""format"": ""FRACTAL_Z"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""25,1,16,16""}}"
30320,0,32,Gradients/Default/network-WithLossCell/_backbone-LeNet5/conv1-Conv2d/gradConv2D/Cast-op53,Cast-op53,Cast,Gradients,"{""input_0"": {""format"": ""NC1HWC0"", ""data_type"": ""NUMBER_TYPE_FLOAT32"", ""shape"": ""32,1,28,28,16""}, ""output_0"": {""format"": ""NC1HWC0"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""32,1,28,28,16""}}"
30269,0,32,Default/TransData-op11,TransData-op11,TransData,Default,"{""input_0"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""32,1,32,32""}, ""output_0"": {""format"": ""NC1HWC0"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""32,1,32,32""}}"
30308,0,32,Gradients/Default/network-WithLossCell/_backbone-LeNet5/gradReshape/TransData-op44,TransData-op44,TransData,Gradients,"{""input_0"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""32,16,5,5""}, ""output_0"": {""format"": ""NC1HWC0"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""32,1,5,5,16""}}"
30272,0,32,Default/network-WithLossCell/_backbone-LeNet5/conv1-Conv2d/Conv2D-op13,Conv2D-op13,Conv2D,Default,"{""input_0"": {""format"": ""NC1HWC0"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""32,1,32,32,16""}, ""input_1"": {""format"": ""FracZ"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""25,1,16,16""}, ""output_0"": {""format"": ""NC1HWC0"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""32,1,28,28,16""}}"
30272,0,32,Default/network-WithLossCell/_backbone-LeNet5/conv1-Conv2d/Conv2D-op13,Conv2D-op13,Conv2D,Default,"{""input_0"": {""format"": ""NC1HWC0"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""32,1,32,32,16""}, ""input_1"": {""format"": ""FRACTAL_Z"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""25,1,16,16""}, ""output_0"": {""format"": ""NC1HWC0"", ""data_type"": ""NUMBER_TYPE_FLOAT16"", ""shape"": ""32,1,28,28,16""}}"
30286,0,1,Default/network-WithLossCell/_backbone-LeNet5/fc3-Dense/MatMul-op9,MatMul-op9,MatMul,Default,"{""input_0"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_FLOAT32"", ""shape"": ""32,120""}, ""input_1"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_FLOAT32"", ""shape"": ""84,120""}, ""input_2"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_FLOAT32"", ""shape"": ""84""}, ""output_0"": {""format"": ""DefaultFormat"", ""data_type"": ""NUMBER_TYPE_FLOAT32"", ""shape"": ""32,84""}}"

1 task_id stream_id block_dim full_op_name op_name op_type subgraph op_info
3 30295 0 1 Default/AtomicAddrClean-op105 AtomicAddrClean-op105 AtomicAddrClean Default {"input_0": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_FLOAT32", "shape": "10"}}
4 30300 0 1 Default/AtomicAddrClean-op106 AtomicAddrClean-op106 AtomicAddrClean Default {"input_0": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_FLOAT32", "shape": "84"}}
5 30268 0 32 Default/Cast-op10 Cast-op10 Cast Default {"input_0": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_FLOAT32", "shape": "32,1,32,32"}, "output_0": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "32,1,32,32"}}
6 30271 0 9 Default/network-WithLossCell/_backbone-LeNet5/conv1-Conv2d/Cast-op12 Cast-op12 Cast Default {"input_0": {"format": "FracZ", "data_type": "NUMBER_TYPE_FLOAT32", "shape": "25,1,16,16"}, "output_0": {"format": "FracZ", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "25,1,16,16"}} {"input_0": {"format": "FRACTAL_Z", "data_type": "NUMBER_TYPE_FLOAT32", "shape": "25,1,16,16"}, "output_0": {"format": "FRACTAL_Z", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "25,1,16,16"}}
7 30320 0 32 Gradients/Default/network-WithLossCell/_backbone-LeNet5/conv1-Conv2d/gradConv2D/Cast-op53 Cast-op53 Cast Gradients {"input_0": {"format": "NC1HWC0", "data_type": "NUMBER_TYPE_FLOAT32", "shape": "32,1,28,28,16"}, "output_0": {"format": "NC1HWC0", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "32,1,28,28,16"}}
8 30269 0 32 Default/TransData-op11 TransData-op11 TransData Default {"input_0": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "32,1,32,32"}, "output_0": {"format": "NC1HWC0", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "32,1,32,32"}}
9 30308 0 32 Gradients/Default/network-WithLossCell/_backbone-LeNet5/gradReshape/TransData-op44 TransData-op44 TransData Gradients {"input_0": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "32,16,5,5"}, "output_0": {"format": "NC1HWC0", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "32,1,5,5,16"}}
10 30272 0 32 Default/network-WithLossCell/_backbone-LeNet5/conv1-Conv2d/Conv2D-op13 Conv2D-op13 Conv2D Default {"input_0": {"format": "NC1HWC0", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "32,1,32,32,16"}, "input_1": {"format": "FracZ", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "25,1,16,16"}, "output_0": {"format": "NC1HWC0", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "32,1,28,28,16"}} {"input_0": {"format": "NC1HWC0", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "32,1,32,32,16"}, "input_1": {"format": "FRACTAL_Z", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "25,1,16,16"}, "output_0": {"format": "NC1HWC0", "data_type": "NUMBER_TYPE_FLOAT16", "shape": "32,1,28,28,16"}}
11 30286 0 1 Default/network-WithLossCell/_backbone-LeNet5/fc3-Dense/MatMul-op9 MatMul-op9 MatMul Default {"input_0": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_FLOAT32", "shape": "32,120"}, "input_1": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_FLOAT32", "shape": "84,120"}, "input_2": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_FLOAT32", "shape": "84"}, "output_0": {"format": "DefaultFormat", "data_type": "NUMBER_TYPE_FLOAT32", "shape": "32,84"}}