diff --git a/metadef b/metadef index f1af97e..ecdc591 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit f1af97e1c9ce9164901d4e719d3acaa1b8597d14 +Subproject commit ecdc591e4ffb87609be93e2f630c82098586ebc2 diff --git a/parser/common/CMakeLists.txt b/parser/common/CMakeLists.txt index e9c1884..087b83b 100644 --- a/parser/common/CMakeLists.txt +++ b/parser/common/CMakeLists.txt @@ -3,7 +3,7 @@ set(SRC_LIST "data_op_parser.cc" "op_parser_factory.cc" "pre_checker.cc" - "register_tbe.cc" + "op_registration_tbe.cc" "parser_api.cc" "parser_inner_ctx.cc" "proto_file_parser.cc" diff --git a/parser/common/acl_graph_parser_util.cc b/parser/common/acl_graph_parser_util.cc index c10ed57..d5f0d20 100644 --- a/parser/common/acl_graph_parser_util.cc +++ b/parser/common/acl_graph_parser_util.cc @@ -37,7 +37,7 @@ #include "graph/opsproto_manager.h" #include "graph/utils/type_utils.h" #include "omg/parser/parser_inner_ctx.h" -#include "parser/common/register_tbe.h" +#include "parser/common/op_registration_tbe.h" #include "tbe_plugin_loader.h" #include "mmpa/mmpa_api.h" diff --git a/parser/common/data_op_parser.h b/parser/common/data_op_parser.h index da2f15a..6329e87 100644 --- a/parser/common/data_op_parser.h +++ b/parser/common/data_op_parser.h @@ -1,5 +1,5 @@ /** - * Copyright 2020 Huawei Technologies Co., Ltd + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/parser/common/graph_pass.h b/parser/common/graph_pass.h index 68a6338..28e3279 100644 --- a/parser/common/graph_pass.h +++ b/parser/common/graph_pass.h @@ -22,21 +22,17 @@ #include "common/pass.h" namespace ge { -/// /// @ingroup domi_omg /// @brief graph pass /// @author -/// class GraphPass : public Pass { public: - /// /// run graph pass /// @param [in] graph graph to be optimized /// @return SUCCESS optimize successfully /// @return NOT_CHANGED not optimized /// @return others optimized failed /// @author - /// virtual Status Run(ge::ComputeGraphPtr graph) = 0; virtual Status ClearStatus() { return SUCCESS; }; }; diff --git a/parser/common/model_saver.cc b/parser/common/model_saver.cc index 21d9368..a3445a8 100644 --- a/parser/common/model_saver.cc +++ b/parser/common/model_saver.cc @@ -74,10 +74,9 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelSaver::SaveJsonToFi GELOGE(FAILED, "[Open][File] [%s] failed. %s", file_path, err_msg); return FAILED; } - const char *model_char = model_str.c_str(); uint32_t len = static_cast(model_str.length()); // Write data to file - mmSsize_t mmpa_ret = mmWrite(fd, const_cast(static_cast(model_char)), len); + mmSsize_t mmpa_ret = mmWrite(fd, const_cast(static_cast(model_str.c_str())), len); if (mmpa_ret == EN_ERROR || mmpa_ret == EN_INVALID_PARAM) { char_t err_buf[kMaxErrStrLen + 1U] = {}; const auto err_msg = mmGetErrorFormatMessage(mmGetErrorCode(), &err_buf[0], kMaxErrStrLen); diff --git a/parser/common/model_saver.h b/parser/common/model_saver.h index cee6c07..137e96a 100644 --- a/parser/common/model_saver.h +++ b/parser/common/model_saver.h @@ -1,5 +1,5 @@ /** - * Copyright 2020 Huawei Technologies Co., Ltd + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,11 +41,9 @@ public: static Status SaveJsonToFile(const char *file_path, const Json &model); private: - /// /// @ingroup domi_common /// @brief Check validity of the file path /// @return Status result - /// static Status CheckPath(const string &file_path); static int CreateDirectory(const std::string &directory_path); @@ -53,4 +51,4 @@ private: } // namespace parser } // namespace ge -#endif //PARSER_COMMON_FILE_SAVER_H_ +#endif // PARSER_COMMON_FILE_SAVER_H_ diff --git a/parser/common/module.mk b/parser/common/module.mk index ba73f40..6dcbb38 100644 --- a/parser/common/module.mk +++ b/parser/common/module.mk @@ -15,7 +15,7 @@ COMMON_LOCAL_SRC_FILES := \ data_op_parser.cc \ op_parser_factory.cc \ pre_checker.cc \ - register_tbe.cc \ + op_registration_tbe.cc \ parser_api.cc \ parser_inner_ctx.cc \ proto_file_parser.cc \ diff --git a/parser/common/op_map.h b/parser/common/op_map.h index cae651c..3ea80c2 100644 --- a/parser/common/op_map.h +++ b/parser/common/op_map.h @@ -1,5 +1,5 @@ /** - * Copyright 2020 Huawei Technologies Co., Ltd + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/parser/common/op_parser_factory.h b/parser/common/op_parser_factory.h index 92fdda5..682de50 100644 --- a/parser/common/op_parser_factory.h +++ b/parser/common/op_parser_factory.h @@ -1,5 +1,5 @@ /** - * Copyright 2020 Huawei Technologies Co., Ltd + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -77,7 +77,6 @@ class OpParserFactory { * @brief OpParser creation function * @return Created OpParser */ - // typedef shared_ptr (*CREATOR_FUN)(void); using CREATOR_FUN = std::function(void)>; /** diff --git a/parser/common/register_tbe.cc b/parser/common/op_registration_tbe.cc similarity index 99% rename from parser/common/register_tbe.cc rename to parser/common/op_registration_tbe.cc index c1287f2..6548034 100644 --- a/parser/common/register_tbe.cc +++ b/parser/common/op_registration_tbe.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parser/common/register_tbe.h" +#include "parser/common/op_registration_tbe.h" #include #include #include diff --git a/parser/common/register_tbe.h b/parser/common/op_registration_tbe.h similarity index 100% rename from parser/common/register_tbe.h rename to parser/common/op_registration_tbe.h diff --git a/parser/common/parser_api.cc b/parser/common/parser_api.cc index 2110116..a848ee2 100644 --- a/parser/common/parser_api.cc +++ b/parser/common/parser_api.cc @@ -1,5 +1,5 @@ /** - * Copyright 2020 Huawei Technologies Co., Ltd + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ #include "common/util.h" #include "tbe_plugin_loader.h" #include "framework/common/debug/ge_log.h" -#include "parser/common/register_tbe.h" +#include "parser/common/op_registration_tbe.h" #include "framework/omg/parser/parser_inner_ctx.h" #include "external/ge/ge_api_types.h" diff --git a/parser/common/parser_factory.cc b/parser/common/parser_factory.cc index 60efe29..3fac0f4 100644 --- a/parser/common/parser_factory.cc +++ b/parser/common/parser_factory.cc @@ -1,5 +1,5 @@ /** - * Copyright 2020 Huawei Technologies Co., Ltd + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #include "omg/parser/parser_factory.h" #include "framework/common/debug/ge_log.h" -#include "common/register_tbe.h" +#include "common/op_registration_tbe.h" namespace domi { FMK_FUNC_HOST_VISIBILITY WeightsParserFactory *WeightsParserFactory::Instance() { diff --git a/parser/common/parser_fp16_t.cc b/parser/common/parser_fp16_t.cc index 3ce5c6b..d02704b 100644 --- a/parser/common/parser_fp16_t.cc +++ b/parser/common/parser_fp16_t.cc @@ -100,7 +100,8 @@ static float Fp16ToFloat(const uint16_t &fp_val) { e_ret = 0; m_ret = 0; } else { - e_ret = (static_cast(hf_exp) - static_cast(kFp16ExpBias)) + static_cast(kFp32ExpBias); + e_ret = static_cast((static_cast(hf_exp) - static_cast(kFp16ExpBias)) + + static_cast(kFp32ExpBias)); m_ret = hf_man & kFp16ManMask; m_ret = m_ret << (kFp32ManLen - kFp16ManLen); } @@ -132,7 +133,8 @@ static double Fp16ToDouble(const uint16_t &fp_val) { e_ret = 0; m_ret = 0; } else { - e_ret = (static_cast(hf_exp) - static_cast(kFp16ExpBias)) + static_cast(kFp64ExpBias); + e_ret = static_cast((static_cast(hf_exp) - static_cast(kFp16ExpBias)) + + static_cast(kFp64ExpBias)); m_ret = hf_man & kFp16ManMask; m_ret = m_ret << (kFp64ManLen - kFp16ManLen); } @@ -150,7 +152,7 @@ static double Fp16ToDouble(const uint16_t &fp_val) { /// @return Return uint8 value of fp16_t object static uint8_t GetUint8ValByMan(uint8_t s_ret, const uint64_t &long_int_m, const uint16_t &shift_out) { bool need_round = IsRoundOne(long_int_m, shift_out + kFp16ManLen); - auto m_ret = static_cast((long_int_m >> (kFp16ManLen + shift_out)) & kBitLen8Max); + auto m_ret = static_cast((long_int_m >> static_cast(kFp16ManLen + shift_out)) & kBitLen8Max); need_round = need_round && ((s_ret == 0 && m_ret < kInt8Max) || (s_ret == 1 && m_ret <= kInt8Max)); if (need_round) { m_ret++; @@ -172,14 +174,14 @@ static int8_t Fp16ToInt8(const uint16_t &fp_val) { int8_t ret; uint8_t ret_v; // 1.get s_ret and shift it to bit0. - uint8_t s_ret = Fp16ExtracSign(fp_val); + uint8_t s_ret = static_cast(Fp16ExtracSign(fp_val)); // 2.get hf_e and hf_m uint16_t hf_e = Fp16ExtracExp(fp_val); uint16_t hf_m = Fp16ExtracMan(fp_val); if (Fp16IsDenorm(fp_val)) { // Denormalized number ret_v = 0; - ret = *(ge::PtrToPtr(&ret_v)); + ret = static_cast(*(ge::PtrToPtr(&ret_v))); return ret; } @@ -215,7 +217,7 @@ static int8_t Fp16ToInt8(const uint16_t &fp_val) { ret_v = GetUint8ValByMan(s_ret, long_int_m, shift_out); } - ret = *(ge::PtrToPtr(&ret_v)); + ret = static_cast(*(ge::PtrToPtr(&ret_v))); return ret; } @@ -226,7 +228,7 @@ static int8_t Fp16ToInt8(const uint16_t &fp_val) { static uint8_t Fp16ToUInt8(const uint16_t &fp_val) { uint8_t m_ret = 0; // 1.get s_ret and shift it to bit0. - uint8_t s_ret = Fp16ExtracSign(fp_val); + uint8_t s_ret = static_cast(Fp16ExtracSign(fp_val)); // 2.get hf_e and hf_m uint16_t hf_e = Fp16ExtracExp(fp_val); uint16_t hf_m = Fp16ExtracMan(fp_val); @@ -258,7 +260,7 @@ static uint8_t Fp16ToUInt8(const uint16_t &fp_val) { } if (overflow_flag == 0U) { bool need_round = IsRoundOne(long_int_m, shift_out + kFp16ManLen); - m_ret = static_cast((long_int_m >> (kFp16ManLen + shift_out)) & kBitLen8Max); + m_ret = static_cast((long_int_m >> static_cast(kFp16ManLen + shift_out)) & kBitLen8Max); if (need_round && m_ret != kBitLen8Max) { m_ret++; } @@ -280,7 +282,7 @@ static uint8_t Fp16ToUInt8(const uint16_t &fp_val) { /// @return Return uint16 value of fp16_t object static uint16_t GetUint16ValByMan(uint16_t s_ret, const uint64_t &long_int_m, const uint16_t &shift_out) { bool need_round = IsRoundOne(long_int_m, shift_out + kFp16ManLen); - auto m_ret = static_cast((long_int_m >> (kFp16ManLen + shift_out)) & kBitLen16Max); + auto m_ret = static_cast((long_int_m >> static_cast(kFp16ManLen + shift_out)) & kBitLen16Max); if (need_round && m_ret < kInt16Max) { m_ret++; } @@ -343,7 +345,7 @@ static int16_t Fp16ToInt16(const uint16_t &fp_val) { // Generate final result ret_v = GetUint16ValByMan(s_ret, long_int_m, shift_out); } - ret = *(ge::PtrToPtr(&ret_v)); + ret = static_cast(*(ge::PtrToPtr(&ret_v))); return ret; } @@ -378,7 +380,7 @@ static uint16_t Fp16ToUInt16(const uint16_t &fp_val) { } } bool need_round = IsRoundOne(long_int_m, shift_out + kFp16ManLen); - m_ret = static_cast((long_int_m >> (kFp16ManLen + shift_out)) & kBitLen16Max); + m_ret = static_cast((long_int_m >> static_cast(kFp16ManLen + shift_out)) & kBitLen16Max); if (need_round && m_ret != kBitLen16Max) { m_ret++; } @@ -419,7 +421,7 @@ static int32_t Fp16ToInt32(const uint16_t &fp_val) { } } bool need_round = IsRoundOne(long_int_m, shift_out + kFp16ManLen); - auto m_ret = static_cast((long_int_m >> (kFp16ManLen + shift_out)) & kBitLen32Max); + auto m_ret = static_cast((long_int_m >> static_cast(kFp16ManLen + shift_out)) & kBitLen32Max); if (need_round && m_ret < kInt32Max) { m_ret++; } @@ -434,7 +436,7 @@ static int32_t Fp16ToInt32(const uint16_t &fp_val) { ret_v = (s_ret << static_cast(kBitShift31)) | (m_ret); } - return *(ge::PtrToPtr(&ret_v)); + return static_cast(*(ge::PtrToPtr(&ret_v))); } /// @ingroup fp16_t math conversion static method @@ -468,7 +470,7 @@ static uint32_t Fp16ToUInt32(const uint16_t &fp_val) { } } bool need_round = IsRoundOne(long_int_m, shift_out + kFp16ManLen); - m_ret = static_cast(long_int_m >> (kFp16ManLen + shift_out)) & kBitLen32Max; + m_ret = static_cast(long_int_m >> static_cast(kFp16ManLen + shift_out)) & kBitLen32Max; if (need_round && m_ret != kBitLen32Max) { m_ret++; } @@ -483,10 +485,10 @@ static uint32_t Fp16ToUInt32(const uint16_t &fp_val) { static uint16_t Fp16AddCalVal(uint16_t s_ret, int16_t e_ret, uint16_t m_ret, uint32_t m_trunc, uint16_t shift_out) { uint16_t m_min = kFp16ManHideBit << shift_out; - uint16_t m_max = m_min << 1; + uint16_t m_max = static_cast(m_min << 1U); // Denormal while (m_ret < m_min && e_ret > 0) { // the value of m_ret should not be smaller than 2^23 - m_ret = m_ret << 1; + m_ret = static_cast(m_ret << 1U); m_ret += (kFp32SignMask & m_trunc) >> kFp32SignIndex; m_trunc = m_trunc << 1; e_ret = e_ret - 1; @@ -560,12 +562,12 @@ static uint16_t Fp16Add(uint16_t v_1, uint16_t v_2) { uint32_t m_trunc = 0; int16_t e_ret = std::max(e_a, e_b); - int16_t e_tmp = std::abs(e_a - e_b); + int16_t e_tmp = static_cast(std::abs(e_a - e_b)); if (e_a > e_b) { - m_trunc = (m_b << (static_cast(kBitShift32) - static_cast(e_tmp))); + m_trunc = (m_b << static_cast(static_cast(kBitShift32) - static_cast(e_tmp))); m_b = RightShift(m_b, e_tmp); } else if (e_a < e_b) { - m_trunc = (m_a << (static_cast(kBitShift32) - static_cast(e_tmp))); + m_trunc = (m_a << static_cast(static_cast(kBitShift32) - static_cast(e_tmp))); m_a = RightShift(m_a, e_tmp); } // calculate mantissav @@ -690,7 +692,7 @@ static uint16_t Fp16Div(uint16_t v_1, uint16_t v_2) { m_b = m_tmp; } m_div = static_cast(m_a * 1.0f / m_b); - fp16_t fp_div = m_div; + fp16_t fp_div = static_cast(m_div); ret = fp_div.val; if (s_a != s_b) { ret |= kFp16SignMask; @@ -917,7 +919,7 @@ fp16_t &fp16_t::operator=(const int8_t &i_val) { e_ret = kFp16ManLen; while ((m_ret & kFp16ManHideBit) == 0) { - m_ret = m_ret << 1; + m_ret = static_cast(m_ret << 1U); e_ret = e_ret - 1U; } e_ret = e_ret + kFp16ExpBias; @@ -935,7 +937,7 @@ fp16_t &fp16_t::operator=(const uint8_t &ui_val) { if (static_cast(m_ret)) { e_ret = kFp16ManLen; while ((m_ret & kFp16ManHideBit) == 0) { - m_ret = m_ret << 1; + m_ret = static_cast(m_ret << 1U); e_ret = e_ret - 1U; } e_ret = e_ret + kFp16ExpBias; @@ -948,18 +950,18 @@ fp16_t &fp16_t::operator=(const uint8_t &ui_val) { static void SetValByUint16Val(const uint16_t &input_val, const uint16_t &sign, uint16_t &ret_val) { uint32_t m_tmp = (input_val & kFp32AbsMax); uint16_t m_min = kFp16ManHideBit; - uint16_t m_max = m_min << 1; + uint16_t m_max = static_cast(m_min << 1U); uint16_t len = static_cast(GetManBitLength(m_tmp)); if (static_cast(m_tmp)) { int16_t e_ret; if (len > static_cast(kDim11)) { e_ret = kFp16ExpBias + kFp16ManLen; - uint16_t e_tmp = len - static_cast(kDim11); + uint16_t e_tmp = static_cast(len - static_cast(kDim11)); uint32_t trunc_mask = 1; for (int i = 1; i < e_tmp; i++) { trunc_mask = (trunc_mask << 1) + 1; } - uint32_t m_trunc = (m_tmp & trunc_mask) << (static_cast(kBitShift32) - e_tmp); + uint32_t m_trunc = (m_tmp & trunc_mask) << static_cast(static_cast(kBitShift32) - e_tmp); for (int i = 0; i < e_tmp; i++) { m_tmp = (m_tmp >> 1); e_ret = e_ret + 1; @@ -978,8 +980,8 @@ static void SetValByUint16Val(const uint16_t &input_val, const uint16_t &sign, u } } else { e_ret = static_cast(kFp16ExpBias); - m_tmp = m_tmp << (kManBitLength - len); - e_ret = e_ret + (len - 1); + m_tmp = m_tmp << static_cast(kManBitLength - len); + e_ret = e_ret + static_cast(len - 1); } auto m_ret = static_cast(m_tmp); ret_val = Fp16Constructor(sign, static_cast(e_ret), m_ret); @@ -990,7 +992,7 @@ fp16_t &fp16_t::operator=(const int16_t &i_val) { if (i_val == 0) { val = 0; } else { - uint16_t ui_val = *(ge::PtrToPtr(&i_val)); + uint16_t ui_val = static_cast(*(ge::PtrToPtr(&i_val))); auto s_ret = static_cast(ui_val >> static_cast(kBitShift15)); if (static_cast(s_ret)) { int16_t iValM = -i_val; @@ -1008,17 +1010,17 @@ fp16_t &fp16_t::operator=(const uint16_t &ui_val) { int16_t e_ret; uint16_t m_ret = ui_val; uint16_t m_min = kFp16ManHideBit; - uint16_t m_max = m_min << 1; + uint16_t m_max = static_cast(m_min << 1U); uint16_t len = static_cast(GetManBitLength(m_ret)); if (len > kManBitLength) { e_ret = kFp16ExpBias + kFp16ManLen; uint32_t m_trunc; uint32_t trunc_mask = 1; - uint16_t e_tmp = len - kManBitLength; + uint16_t e_tmp = static_cast(len - kManBitLength); for (int i = 1; i < e_tmp; i++) { trunc_mask = (trunc_mask << 1) + 1; } - m_trunc = (m_ret & trunc_mask) << (static_cast(kBitShift32) - e_tmp); + m_trunc = (m_ret & trunc_mask) << static_cast(static_cast(kBitShift32) - e_tmp); for (int i = 0; i < e_tmp; i++) { m_ret = (m_ret >> 1); e_ret = e_ret + 1; @@ -1040,8 +1042,8 @@ fp16_t &fp16_t::operator=(const uint16_t &ui_val) { } } else { e_ret = static_cast(kFp16ExpBias); - m_ret = m_ret << (static_cast(kDim11) - len); - e_ret = e_ret + (len - 1); + m_ret = m_ret << static_cast(static_cast(kDim11) - len); + e_ret = static_cast(e_ret + (len - 1)); } val = Fp16Constructor(0u, static_cast(e_ret), m_ret); } @@ -1054,15 +1056,15 @@ static void SetValByUint32Val(const uint32_t &input_val, const uint16_t &sign, u uint32_t m_min = kFp16ManHideBit; uint32_t m_max = m_min << 1; uint16_t len = static_cast(GetManBitLength(m_tmp)); - if (len > kDim11) { + if (len > static_cast(kDim11)) { e_ret = kFp16ExpBias + kFp16ManLen; uint32_t m_trunc = 0; uint32_t trunc_mask = 1; - uint16_t e_tmp = len - static_cast(kDim11); + uint16_t e_tmp = static_cast(len - static_cast(kDim11)); for (int i = 1; i < e_tmp; i++) { trunc_mask = (trunc_mask << 1) + 1; } - m_trunc = (m_tmp & trunc_mask) << (static_cast(kBitShift32) - e_tmp); + m_trunc = (m_tmp & trunc_mask) << static_cast(static_cast(kBitShift32) - e_tmp); for (int i = 0; i < e_tmp; i++) { m_tmp = (m_tmp >> 1); e_ret = e_ret + 1; @@ -1085,8 +1087,8 @@ static void SetValByUint32Val(const uint32_t &input_val, const uint16_t &sign, u } } else { e_ret = static_cast(kFp16ExpBias); - m_tmp = m_tmp << (static_cast(kDim11) - len); - e_ret = e_ret + (len - 1); + m_tmp = m_tmp << static_cast(static_cast(kDim11) - len); + e_ret = e_ret + static_cast(len - 1); } auto m_ret = static_cast(m_tmp); ret_val = Fp16Constructor(sign, static_cast(e_ret), m_ret); @@ -1116,11 +1118,11 @@ fp16_t &fp16_t::operator=(const uint32_t &ui_val) { uint32_t m_min = kFp16ManHideBit; uint32_t m_max = m_min << 1; uint16_t len = static_cast(GetManBitLength(m_tmp)); - if (len > kDim11) { + if (len > static_cast(kDim11)) { e_ret = kFp16ExpBias + kFp16ManLen; uint32_t m_trunc = 0; uint32_t trunc_mask = 1; - uint16_t e_tmp = len - static_cast(kDim11); + uint16_t e_tmp = static_cast(len - static_cast(kDim11)); for (int i = 1; i < e_tmp; i++) { trunc_mask = (trunc_mask << 1) + 1; } @@ -1147,8 +1149,8 @@ fp16_t &fp16_t::operator=(const uint32_t &ui_val) { } } else { e_ret = static_cast(kFp16ExpBias); - m_tmp = m_tmp << (static_cast(kDim11) - len); - e_ret = e_ret + (len - 1); + m_tmp = m_tmp << static_cast(static_cast(kDim11) - len); + e_ret = static_cast(e_ret + (len - 1)); } auto m_ret = static_cast(m_tmp); val = Fp16Constructor(0u, static_cast(e_ret), m_ret); @@ -1200,7 +1202,7 @@ fp16_t &fp16_t::operator=(const double &d_val) { } else { // Regular case with no overflow or underflow e_ret = static_cast(e_d - 0x3F0u); - need_round = IsRoundOne(m_d, m_len_delta); + need_round = IsRoundOne(m_d, static_cast(m_len_delta)); m_ret = static_cast(m_d >> m_len_delta); if (need_round) { m_ret++; diff --git a/parser/common/parser_fp16_t.h b/parser/common/parser_fp16_t.h index 2f970b9..6b2ab3d 100644 --- a/parser/common/parser_fp16_t.h +++ b/parser/common/parser_fp16_t.h @@ -169,7 +169,7 @@ inline bool Fp16IsInf(const uint16_t x) { /// @ingroup fp16 special value judgment /// @brief whether a fp16 is NaN inline bool Fp16IsNan(const uint16_t x) { - return ((((x) & kFp16ExpMask) == kFp16ExpMask) && ((x) & kFp16ManMask)); + return ((((x) & kFp16ExpMask) == kFp16ExpMask) && (((x) & kFp16ManMask) != 0U)); } /// @ingroup fp16 special value judgment /// @brief whether a fp16 is invalid @@ -211,38 +211,38 @@ constexpr uint32_t kFp32MaxExp = 0xFFU; constexpr uint32_t kFp32MaxMan = 0x7FFFFFU; /// @ingroup fp32 special value judgment /// @brief whether a fp32 is NaN -inline bool Fp32IsNan(const uint16_t x) { - return ((((x) & kFp32ExpMask) == kFp32ExpMask) && ((x) & kFp32ManMask)); +inline bool Fp32IsNan(const uint32_t x) { + return ((((x) & kFp32ExpMask) == kFp32ExpMask) && (((x) & kFp32ManMask) != 0U)); } /// @ingroup fp32 special value judgment /// @brief whether a fp32 is infinite -inline bool Fp32IsInf(const uint16_t x) { - return ((((x) & kFp32ExpMask) == kFp32ExpMask) && (!((x) & kFp32ManMask))); +inline bool Fp32IsInf(const uint32_t x) { + return ((((x) & kFp32ExpMask) == kFp32ExpMask) && (((x) & kFp32ManMask) == 0U)); } /// @ingroup fp32 special value judgment /// @brief whether a fp32 is a denormalized value -inline bool Fp32IsDenorm(const uint16_t x) { - return ((((x)&kFp32ExpMask) == 0)); +inline bool Fp32IsDenorm(const uint32_t x) { + return ((((x)&kFp32ExpMask) == 0)); } /// @ingroup fp32 basic operator /// @brief get sign of fp32 -inline bool Fp32ExtracSign(const uint16_t x) { - return (((x) >> kFp32SignIndex) & 1); +inline uint32_t Fp32ExtracSign(const uint16_t x) { + return (((x) >> kFp32SignIndex) & 1U); } /// @ingroup fp32 basic operator /// @brief get exponent of fp16 -inline bool Fp32ExtracExp(const uint16_t x) { - return (((x)&kFp32ExpMask) >> kFp32ManLen); +inline uint32_t Fp32ExtracExp(const uint32_t x) { + return (((x)&kFp32ExpMask) >> kFp32ManLen); } /// @ingroup fp32 basic operator /// @brief get mantissa of fp16 -inline uint16_t Fp32ExtracMan(const uint16_t x) { - return (((x)&kFp32ManMask) | (((((x) >> kFp32ManLen) & kFp32MaxExp) > 0 ? 1 : 0) * kFp32ManHideBit)); +inline uint32_t Fp32ExtracMan(const uint32_t x) { + return (((x)&kFp32ManMask) | (((((x) >> kFp32ManLen) & kFp32MaxExp) > 0 ? 1 : 0) * kFp32ManHideBit)); } /// @ingroup fp32 basic operator /// @brief constructor of fp32 from sign exponent and mantissa -inline uint16_t Fp32Constructor(const uint16_t s, const uint16_t e, const uint16_t m) { - return (((s) << kFp32SignIndex) | ((e) << kFp32ManLen) | ((m) & kFp32MaxMan)); +inline uint32_t Fp32Constructor(const uint32_t s, const uint32_t e, const uint32_t m) { + return (((s) << kFp32SignIndex) | ((e) << kFp32ManLen) | ((m) & kFp32MaxMan)); } /// @ingroup fp64 basic parameter /// @brief fp64 exponent bias @@ -279,13 +279,13 @@ constexpr uint64_t kFp64MaxExp = 0x07FF; constexpr uint64_t kFp64MaxMan = 0xFFFFFFFFFFFLLu; /// @ingroup fp64 special value judgment /// @brief whether a fp64 is NaN -inline bool Fp64IsNan(const uint16_t x) { - return ((((x) & kFp64ExpMask) == kFp64ExpMask) && ((x) & kFp64ManMask)); +inline bool Fp64IsNan(const uint64_t x) { + return ((((x) & kFp64ExpMask) == kFp64ExpMask) && (((x) & kFp64ManMask) != 0ULL)); } /// @ingroup fp64 special value judgment /// @brief whether a fp64 is infinite -inline bool Fp64IsInf(const uint16_t x) { - return ((((x) & kFp64ExpMask) == kFp64ExpMask) && (!((x) & kFp64ManMask))); +inline bool Fp64IsInf(const uint64_t x) { + return ((((x) & kFp64ExpMask) == kFp64ExpMask) && (((x) & kFp64ManMask) == 0ULL)); } /// @ingroup integer special value judgment /// @brief maximum positive value of int8_t (0111 1111) diff --git a/parser/common/parser_types.cc b/parser/common/parser_types.cc index a7bf216..73ef323 100644 --- a/parser/common/parser_types.cc +++ b/parser/common/parser_types.cc @@ -18,426 +18,426 @@ namespace ge { namespace parser { -const char *DATA = "Data"; -const char *AIPPDATA = "AippData"; -const char *CONVOLUTION = "Convolution"; -const char *CORRELATION = "Correlation"; -const char *CORRELATIONV2 = "Correlation_V2"; -const char *DECONVOLUTION = "Deconvolution"; -const char *POOLING = "Pooling"; -const char *ELTWISE = "Eltwise"; -const char *RELU = "ReLU"; -const char *RELU6 = "ReLU6"; -const char *SIGMOID = "Sigmoid"; -const char *ABSVAL = "AbsVal"; -const char *TANH = "TanH"; -const char *PRELU = "PReLU"; -const char *BATCHNORM = "BatchNorm"; -const char *FUSIONBATCHNORM = "FusionBatchNorm"; -const char *SCALE = "Scale"; -const char *FULL_CONNECTION = "FullConnection"; -const char *SOFTMAX = "Softmax"; -const char *PLUS = "Plus"; -const char *ACTIVATION = "Activation"; -const char *FLATTEN = "Flatten"; -const char *ADD = "Add"; -const char *SUB = "Sub"; -const char *MUL = "Mul"; -const char *MATMUL = "MatMul"; -const char *RSQRT = "Rsqrt"; -const char *BIASADD = "BiasAdd"; -const char *RESHAPE = "Reshape"; -const char *REFORMAT = "ReFormat"; -const char *DEPCONVOLUTION = "ConvolutionDepthwise"; -const char *DROPOUT = "Dropout"; -const char *DROPOUTGENMASK = "DropOutGenMask"; -const char *DROPOUTDOMASK = "DropOutDoMask"; -const char *CONCAT = "Concat"; -const char *ROIPOOLING = "ROIPooling"; -const char *PROPOSAL = "Proposal"; -const char *FSRDETECTIONOUTPUT = "FSRDetectionOutput"; -const char *DETECTIONPOSTPROCESS = "Detectpostprocess"; -const char *LRN = "LRN"; -const char *TRANSDATA = "TransData"; -const char *PERMUTE = "Permute"; -const char *SSDNORMALIZE = "SSDNormalize"; -const char *SSDPRIORBOX = "SSDPriorBox"; -const char *NETOUTPUT = "NetOutput"; -const char *SSDDETECTIONOUTPUT = "SSDDetectionOutput"; -const char *REFINEDETDETECTIONOUTPUT = "RefinedetDetectionOutput"; -const char *CHANNELAXPY = "ChannelAxpy"; -const char *PSROIPOOLING = "PSROIPooling"; -const char *POWER = "Power"; -const char *POW = "Pow"; -const char *ROIALIGN = "ROIAlign"; -const char *PYTHON = "Python"; -const char *FREESPACEEXTRACT = "FreespaceExtract"; -const char *SPATIALTF = "SpatialTransform"; -const char *SHAPE = "Shape"; -const char *SHAPEN = "ShapeN"; -const char *ARGMAX = "ArgMax"; -const char *GATHERND = "GatherNd"; -const char *GATHER = "Gather"; -const char *REALDIV = "RealDiv"; -const char *PACK = "Pack"; -const char *SLICE = "Slice"; -const char *SLICED = "SliceD"; -const char *FLOORDIV = "FloorDiv"; -const char *SQUEEZE = "Squeeze"; -const char *UNSQUEEZE = "Unsqueeze"; -const char *STRIDEDSLICE = "StridedSlice"; -const char *RANGE = "Range"; -const char *RPNPROPOSALS = "RpnProposals"; -const char *DECODEBBOX = "DecodeBbox"; -const char *PAD = "Pad"; -const char *PADV2 = "PadV2"; -const char *MIRRORPAD = "MirrorPad"; -const char *TILE = "Tile"; -const char *SIZE = "Size"; -const char *CLIPBOXES = "ClipBoxes"; -const char *FASTRCNNPREDICTIONS = "FastrcnnPredictions"; -const char *SPLIT = "Split"; -const char *SPLITV = "SplitV"; -const char *EXPANDDIMS = "ExpandDims"; -const char *EMPTY = "Empty"; -const char *MEAN = "Mean"; -const char *GREATER = "Greater"; -const char *SWITCH = "Switch"; -const char *SWITCHN = "SwitchN"; -const char *MERGE = "Merge"; -const char *SYMBOLICGRADIENT = "SymbolicGradient"; -const char *REMOTECALL = "RemoteCall"; -const char *_IF = "_If"; -const char *STATELESSIF = "StatelessIf"; -const char *IF = "If"; -const char *CASE = "Case"; -const char *_WHILE = "_While"; -const char *WHILE = "While"; -const char *STATELESSWHILE = "StatelessWhile"; -const char *FOR = "For"; -const char *PARTITIONEDCALL = "PartitionedCall"; -const char *STATEFULPARTITIONEDCALL = "StatefulPartitionedCall"; -const char *FAKEPARAM = "FakeParam"; -const char *TRANSPOSE = "Transpose"; -const char *TRANSPOSED = "TransposeD"; -const char *CAST = "Cast"; -const char *REGION = "Region"; -const char *YOLO = "Yolo"; -const char *YOLODETECTIONOUTPUT = "YoloDetectionOutput"; -const char *FILL = "Fill"; -const char *REVERSE = "Reverse"; -const char *UNPACK = "Unpack"; -const char *YOLO2REORG = "Yolo2Reorg"; -const char *REDUCESUM = "ReduceSum"; -const char *SUM = "Sum"; -const char *CONSTANT = "Const"; -const char *FILECONSTANT = "FileConstant"; -const char *RESIZEBILINEAR = "ResizeBilinear"; -const char *RESIZEBILINEARGRAD = "ResizeBilinearGrad"; -const char *MAXIMUM = "Maximum"; -const char *FRAMEWORKOP = "FrameworkOp"; -const char *ARG = "_Arg"; -const char *FUSEDBATCHNORMGRAD = "FusedBatchNormGrad"; -const char *LSTM = "LSTM"; -const char *HIGHWAY = "HighWay"; -const char *RNN = "RNN"; -const char *ATTENTIONDECODER = "AttentionDecoder"; -const char *LOGICAL_NOT = "LogicalNot"; -const char *LOGICAL_AND = "LogicalAnd"; -const char *LOGICAL_OR = "LogicalOr"; -const char *EQUAL = "Equal"; -const char *NOTEQUAL = "NotEqual"; -const char *INTERP = "Interp"; -const char *SHUFFLECHANNEL = "ShuffleChannel"; -const char *AIPP = "Aipp"; -const char *MULTISHAPE = "MultiShape"; -const char *RECIPROCAL = "Reciprocal"; -const char *SELU = "Selu"; -const char *ELU = "Elu"; -const char *ACOSH = "Acosh"; -const char *ASINH = "Asinh"; -const char *MINIMUM = "Minimum"; -const char *CLIP = "Clip"; -const char *L2NORMALIZE = "L2Normalize"; -const char *CROPANDRESIZE = "CropAndResize"; -const char *UNUSEDCONST = "UnusedConst"; -const char *SPARSETODENSE = "SparseToDense"; -const char *NONMAXSUPPRESSION = "NonMaxSuppression"; -const char *TOPKV2 = "TopKV2"; -const char *INVERTPERMUTATION = "InvertPermutation"; -const char *MULTINOMIAL = "Multinomial"; -const char *REVERSESEQUENCE = "ReverseSequence"; -const char *REDUCEPROD = "ReduceProd"; -const char *REDUCEMAX = "ReduceMax"; -const char *REDUCEMIN = "ReduceMin"; -const char *EXTRACTIMAGEPATCHES = "ExtractImagePatches"; -const char *SQRT = "Sqrt"; -const char *REDUCEALL = "ReduceAll"; -const char *RESIZENEARESTNEIGHBOR = "ResizeNearestNeighbor"; -const char *SPACETOBATCHND = "SpaceToBatchND"; -const char *BATCHTOSPACEND = "BatchToSpaceND"; -const char *ASSERT = "Assert"; -const char *GREATEREQUAL = "GreaterEqual"; -const char *FLOOR = "Floor"; -const char *RANDOMUNIFORM = "RandomUniform"; -const char *BATCHMATMUL = "BatchMatMul"; -const char *SPACETODEPTH = "SpaceToDepth"; -const char *DEPTHTOSPACE = "DepthToSpace"; -const char *RINT = "Rint"; -const char *ATAN = "Atan"; -const char *ATAN2 = "Atan2"; -const char *ATANH = "Atanh"; -const char *ACOS = "Acos"; -const char *ASIN = "Asin"; -const char *NEG = "Neg"; -const char *LOG = "Log"; -const char *TAN = "Tan"; -const char *ROUND = "Round"; -const char *UPSAMPLE = "Upsample"; -const char *FLOORMOD = "FloorMod"; -const char *LESS = "Less"; -const char *LESSEQUAL = "LessEqual"; -const char *ONEHOT = "OneHot"; -const char *REFSWITCH = "RefSwitch"; -const char *REFMERGE = "RefMerge"; -const char *ENTER = "Enter"; -const char *REFENTER = "RefEnter"; -const char *LOOPCOND = "LoopCond"; -const char *NEXTITERATION = "NextIteration"; -const char *REFNEXTITERATION = "RefNextIteration"; -const char *EXIT = "Exit"; -const char *REFEXIT = "RefExit"; -const char *CONTROLTRIGGER = "ControlTrigger"; -const char *ZEROSLIKE = "ZerosLike"; -const char *EXP = "Exp"; -const char *WHERE = "Where"; -const char *FAKEQUANTWITHMINMAXVARS = "FakeQuantWithMinMaxVars"; -const char *SOFTPLUS = "Softplus"; -const char *SOFTSIGN = "Softsign"; -const char *COSH = "Cosh"; -const char *SINH = "Sinh"; -const char *SQUAREDDIFFERENCE = "SquaredDifference"; -const char *REQUIREDSPACETOBATCHPADDINGS = "RequiredSpaceToBatchPaddings"; // for retinanet scope fusion -const char *SSDPOSTPROCESSOR = "SSDPostProcessor"; -const char *RETINANETBOXES = "RetinanetBoxes"; -const char *RETINAMULTIANCHORS = "RetinaMultiAnchor"; -const char *RETINANETCLIPPEDBOXES = "RetinanetClippedBoxes"; -const char *RETINANETFILTEREDDETECTIONS = "RetinanetFilteredDetections"; -const char *RETINANETPOSTPROCESSOR = "RetinanetPostProcessor"; -const char *RETINANETANCHORS = "RetinanetAnchors"; -const char *FASTERRCNNMAP = "FasterRCNNMap"; -const char *FASTERRCNNMAP1 = "FasterRCNNMap1"; -const char *FASTERRCNNSECONDSTAGEPOSTPROCESSOR = "FasterRCNNSecondStagePostprocessor"; -const char *FASTERRCNNROIINTERPOOLING = "FasterRCNNROIInterPooling"; -const char *FASTERRCNNFIRSTSTAGEPOSTPROCESSOR = "FasterRCNNFirstStagePostprocessor"; -const char *FASTERRCNNGRIDANCHORGENERATOR = "FasterRCNNGridAnchorGenerator"; -const char *ROIINTERPOOLING = "ROIInterPooling"; -const char *FASTERRCNNCLIPTOWINDOW = "FasterRCNNClipToWindow"; -const char *EMBEDLOOKUP = "EmbedLookup"; -const char *HASHLOOKUP = "HashLookup"; -const char *LSH_PROJ = "LshProject"; -const char *SVDF = "SVDF"; -const char *SSDANCHORGENERATOR = "SSDAnchorGenerator"; -const char *IDENTITY = "Identity"; -const char *IDENTITYN = "IdentityN"; -const char *PLACEHOLDERWITHDEFAULT = "PlaceholderWithDefault"; -const char *SELECT = "Select"; -const char *GETSPAN = "GetSpan"; -const char *STOPGRADIENT = "StopGradient"; -const char *PREVENTGRADIENT = "PreventGradient"; -const char *GUARANTEECONST = "GuaranteeConst"; -const char *BROADCASTGRADIENTARGS = "BroadcastGradientArgs"; -const char *BROADCASTARGS = "BroadcastArgs"; -const char *CONFUSIONMATRIX = "ConfusionMatrix"; -const char *RANK = "Rank"; -const char *PLACEHOLDER = "PlaceHolder"; -const char *END = "End"; -const char *BASICLSTMCELL = "BasicLSTMCell"; -const char *GETNEXT = "GetNext"; -const char *INITDATA = "InitData"; -const char *REFIDENTITY = "RefIdentity"; -const char *BITCAST = "Bitcast"; +const char_t * const DATA = "Data"; +const char_t * const AIPPDATA = "AippData"; +const char_t * const CONVOLUTION = "Convolution"; +const char_t * const CORRELATION = "Correlation"; +const char_t * const CORRELATIONV2 = "Correlation_V2"; +const char_t * const DECONVOLUTION = "Deconvolution"; +const char_t * const POOLING = "Pooling"; +const char_t * const ELTWISE = "Eltwise"; +const char_t * const RELU = "ReLU"; +const char_t * const RELU6 = "ReLU6"; +const char_t * const SIGMOID = "Sigmoid"; +const char_t * const ABSVAL = "AbsVal"; +const char_t * const TANH = "TanH"; +const char_t * const PRELU = "PReLU"; +const char_t * const BATCHNORM = "BatchNorm"; +const char_t * const FUSIONBATCHNORM = "FusionBatchNorm"; +const char_t * const SCALE = "Scale"; +const char_t * const FULL_CONNECTION = "FullConnection"; +const char_t * const SOFTMAX = "Softmax"; +const char_t * const PLUS = "Plus"; +const char_t * const ACTIVATION = "Activation"; +const char_t * const FLATTEN = "Flatten"; +const char_t * const ADD = "Add"; +const char_t * const SUB = "Sub"; +const char_t * const MUL = "Mul"; +const char_t * const MATMUL = "MatMul"; +const char_t * const RSQRT = "Rsqrt"; +const char_t * const BIASADD = "BiasAdd"; +const char_t * const RESHAPE = "Reshape"; +const char_t * const REFORMAT = "ReFormat"; +const char_t * const DEPCONVOLUTION = "ConvolutionDepthwise"; +const char_t * const DROPOUT = "Dropout"; +const char_t * const DROPOUTGENMASK = "DropOutGenMask"; +const char_t * const DROPOUTDOMASK = "DropOutDoMask"; +const char_t * const CONCAT = "Concat"; +const char_t * const ROIPOOLING = "ROIPooling"; +const char_t * const PROPOSAL = "Proposal"; +const char_t * const FSRDETECTIONOUTPUT = "FSRDetectionOutput"; +const char_t * const DETECTIONPOSTPROCESS = "Detectpostprocess"; +const char_t * const LRN = "LRN"; +const char_t * const TRANSDATA = "TransData"; +const char_t * const PERMUTE = "Permute"; +const char_t * const SSDNORMALIZE = "SSDNormalize"; +const char_t * const SSDPRIORBOX = "SSDPriorBox"; +const char_t * const NETOUTPUT = "NetOutput"; +const char_t * const SSDDETECTIONOUTPUT = "SSDDetectionOutput"; +const char_t * const REFINEDETDETECTIONOUTPUT = "RefinedetDetectionOutput"; +const char_t * const CHANNELAXPY = "ChannelAxpy"; +const char_t * const PSROIPOOLING = "PSROIPooling"; +const char_t * const POWER = "Power"; +const char_t * const POW = "Pow"; +const char_t * const ROIALIGN = "ROIAlign"; +const char_t * const PYTHON = "Python"; +const char_t * const FREESPACEEXTRACT = "FreespaceExtract"; +const char_t * const SPATIALTF = "SpatialTransform"; +const char_t * const SHAPE = "Shape"; +const char_t * const SHAPEN = "ShapeN"; +const char_t * const ARGMAX = "ArgMax"; +const char_t * const GATHERND = "GatherNd"; +const char_t * const GATHER = "Gather"; +const char_t * const REALDIV = "RealDiv"; +const char_t * const PACK = "Pack"; +const char_t * const SLICE = "Slice"; +const char_t * const SLICED = "SliceD"; +const char_t * const FLOORDIV = "FloorDiv"; +const char_t * const SQUEEZE = "Squeeze"; +const char_t * const UNSQUEEZE = "Unsqueeze"; +const char_t * const STRIDEDSLICE = "StridedSlice"; +const char_t * const RANGE = "Range"; +const char_t * const RPNPROPOSALS = "RpnProposals"; +const char_t * const DECODEBBOX = "DecodeBbox"; +const char_t * const PAD = "Pad"; +const char_t * const PADV2 = "PadV2"; +const char_t * const MIRRORPAD = "MirrorPad"; +const char_t * const TILE = "Tile"; +const char_t * const SIZE = "Size"; +const char_t * const CLIPBOXES = "ClipBoxes"; +const char_t * const FASTRCNNPREDICTIONS = "FastrcnnPredictions"; +const char_t * const SPLIT = "Split"; +const char_t * const SPLITV = "SplitV"; +const char_t * const EXPANDDIMS = "ExpandDims"; +const char_t * const EMPTY = "Empty"; +const char_t * const MEAN = "Mean"; +const char_t * const GREATER = "Greater"; +const char_t * const SWITCH = "Switch"; +const char_t * const SWITCHN = "SwitchN"; +const char_t * const MERGE = "Merge"; +const char_t * const SYMBOLICGRADIENT = "SymbolicGradient"; +const char_t * const REMOTECALL = "RemoteCall"; +const char_t * const _IF = "_If"; +const char_t * const STATELESSIF = "StatelessIf"; +const char_t * const IF = "If"; +const char_t * const CASE = "Case"; +const char_t * const _WHILE = "_While"; +const char_t * const WHILE = "While"; +const char_t * const STATELESSWHILE = "StatelessWhile"; +const char_t * const FOR = "For"; +const char_t * const PARTITIONEDCALL = "PartitionedCall"; +const char_t * const STATEFULPARTITIONEDCALL = "StatefulPartitionedCall"; +const char_t * const FAKEPARAM = "FakeParam"; +const char_t * const TRANSPOSE = "Transpose"; +const char_t * const TRANSPOSED = "TransposeD"; +const char_t * const CAST = "Cast"; +const char_t * const REGION = "Region"; +const char_t * const YOLO = "Yolo"; +const char_t * const YOLODETECTIONOUTPUT = "YoloDetectionOutput"; +const char_t * const FILL = "Fill"; +const char_t * const REVERSE = "Reverse"; +const char_t * const UNPACK = "Unpack"; +const char_t * const YOLO2REORG = "Yolo2Reorg"; +const char_t * const REDUCESUM = "ReduceSum"; +const char_t * const SUM = "Sum"; +const char_t * const CONSTANT = "Const"; +const char_t * const FILECONSTANT = "FileConstant"; +const char_t * const RESIZEBILINEAR = "ResizeBilinear"; +const char_t * const RESIZEBILINEARGRAD = "ResizeBilinearGrad"; +const char_t * const MAXIMUM = "Maximum"; +const char_t * const FRAMEWORKOP = "FrameworkOp"; +const char_t * const ARG = "_Arg"; +const char_t * const FUSEDBATCHNORMGRAD = "FusedBatchNormGrad"; +const char_t * const LSTM = "LSTM"; +const char_t * const HIGHWAY = "HighWay"; +const char_t * const RNN = "RNN"; +const char_t * const ATTENTIONDECODER = "AttentionDecoder"; +const char_t * const LOGICAL_NOT = "LogicalNot"; +const char_t * const LOGICAL_AND = "LogicalAnd"; +const char_t * const LOGICAL_OR = "LogicalOr"; +const char_t * const EQUAL = "Equal"; +const char_t * const NOTEQUAL = "NotEqual"; +const char_t * const INTERP = "Interp"; +const char_t * const SHUFFLECHANNEL = "ShuffleChannel"; +const char_t * const AIPP = "Aipp"; +const char_t * const MULTISHAPE = "MultiShape"; +const char_t * const RECIPROCAL = "Reciprocal"; +const char_t * const SELU = "Selu"; +const char_t * const ELU = "Elu"; +const char_t * const ACOSH = "Acosh"; +const char_t * const ASINH = "Asinh"; +const char_t * const MINIMUM = "Minimum"; +const char_t * const CLIP = "Clip"; +const char_t * const L2NORMALIZE = "L2Normalize"; +const char_t * const CROPANDRESIZE = "CropAndResize"; +const char_t * const UNUSEDCONST = "UnusedConst"; +const char_t * const SPARSETODENSE = "SparseToDense"; +const char_t * const NONMAXSUPPRESSION = "NonMaxSuppression"; +const char_t * const TOPKV2 = "TopKV2"; +const char_t * const INVERTPERMUTATION = "InvertPermutation"; +const char_t * const MULTINOMIAL = "Multinomial"; +const char_t * const REVERSESEQUENCE = "ReverseSequence"; +const char_t * const REDUCEPROD = "ReduceProd"; +const char_t * const REDUCEMAX = "ReduceMax"; +const char_t * const REDUCEMIN = "ReduceMin"; +const char_t * const EXTRACTIMAGEPATCHES = "ExtractImagePatches"; +const char_t * const SQRT = "Sqrt"; +const char_t * const REDUCEALL = "ReduceAll"; +const char_t * const RESIZENEARESTNEIGHBOR = "ResizeNearestNeighbor"; +const char_t * const SPACETOBATCHND = "SpaceToBatchND"; +const char_t * const BATCHTOSPACEND = "BatchToSpaceND"; +const char_t * const ASSERT = "Assert"; +const char_t * const GREATEREQUAL = "GreaterEqual"; +const char_t * const FLOOR = "Floor"; +const char_t * const RANDOMUNIFORM = "RandomUniform"; +const char_t * const BATCHMATMUL = "BatchMatMul"; +const char_t * const SPACETODEPTH = "SpaceToDepth"; +const char_t * const DEPTHTOSPACE = "DepthToSpace"; +const char_t * const RINT = "Rint"; +const char_t * const ATAN = "Atan"; +const char_t * const ATAN2 = "Atan2"; +const char_t * const ATANH = "Atanh"; +const char_t * const ACOS = "Acos"; +const char_t * const ASIN = "Asin"; +const char_t * const NEG = "Neg"; +const char_t * const LOG = "Log"; +const char_t * const TAN = "Tan"; +const char_t * const ROUND = "Round"; +const char_t * const UPSAMPLE = "Upsample"; +const char_t * const FLOORMOD = "FloorMod"; +const char_t * const LESS = "Less"; +const char_t * const LESSEQUAL = "LessEqual"; +const char_t * const ONEHOT = "OneHot"; +const char_t * const REFSWITCH = "RefSwitch"; +const char_t * const REFMERGE = "RefMerge"; +const char_t * const ENTER = "Enter"; +const char_t * const REFENTER = "RefEnter"; +const char_t * const LOOPCOND = "LoopCond"; +const char_t * const NEXTITERATION = "NextIteration"; +const char_t * const REFNEXTITERATION = "RefNextIteration"; +const char_t * const EXIT = "Exit"; +const char_t * const REFEXIT = "RefExit"; +const char_t * const CONTROLTRIGGER = "ControlTrigger"; +const char_t * const ZEROSLIKE = "ZerosLike"; +const char_t * const EXP = "Exp"; +const char_t * const WHERE = "Where"; +const char_t * const FAKEQUANTWITHMINMAXVARS = "FakeQuantWithMinMaxVars"; +const char_t * const SOFTPLUS = "Softplus"; +const char_t * const SOFTSIGN = "Softsign"; +const char_t * const COSH = "Cosh"; +const char_t * const SINH = "Sinh"; +const char_t * const SQUAREDDIFFERENCE = "SquaredDifference"; +const char_t * const REQUIREDSPACETOBATCHPADDINGS = "RequiredSpaceToBatchPaddings"; // for retinanet scope fusion +const char_t * const SSDPOSTPROCESSOR = "SSDPostProcessor"; +const char_t * const RETINANETBOXES = "RetinanetBoxes"; +const char_t * const RETINAMULTIANCHORS = "RetinaMultiAnchor"; +const char_t * const RETINANETCLIPPEDBOXES = "RetinanetClippedBoxes"; +const char_t * const RETINANETFILTEREDDETECTIONS = "RetinanetFilteredDetections"; +const char_t * const RETINANETPOSTPROCESSOR = "RetinanetPostProcessor"; +const char_t * const RETINANETANCHORS = "RetinanetAnchors"; +const char_t * const FASTERRCNNMAP = "FasterRCNNMap"; +const char_t * const FASTERRCNNMAP1 = "FasterRCNNMap1"; +const char_t * const FASTERRCNNSECONDSTAGEPOSTPROCESSOR = "FasterRCNNSecondStagePostprocessor"; +const char_t * const FASTERRCNNROIINTERPOOLING = "FasterRCNNROIInterPooling"; +const char_t * const FASTERRCNNFIRSTSTAGEPOSTPROCESSOR = "FasterRCNNFirstStagePostprocessor"; +const char_t * const FASTERRCNNGRIDANCHORGENERATOR = "FasterRCNNGridAnchorGenerator"; +const char_t * const ROIINTERPOOLING = "ROIInterPooling"; +const char_t * const FASTERRCNNCLIPTOWINDOW = "FasterRCNNClipToWindow"; +const char_t * const EMBEDLOOKUP = "EmbedLookup"; +const char_t * const HASHLOOKUP = "HashLookup"; +const char_t * const LSH_PROJ = "LshProject"; +const char_t * const SVDF = "SVDF"; +const char_t * const SSDANCHORGENERATOR = "SSDAnchorGenerator"; +const char_t * const IDENTITY = "Identity"; +const char_t * const IDENTITYN = "IdentityN"; +const char_t * const PLACEHOLDERWITHDEFAULT = "PlaceholderWithDefault"; +const char_t * const SELECT = "Select"; +const char_t * const GETSPAN = "GetSpan"; +const char_t * const STOPGRADIENT = "StopGradient"; +const char_t * const PREVENTGRADIENT = "PreventGradient"; +const char_t * const GUARANTEECONST = "GuaranteeConst"; +const char_t * const BROADCASTGRADIENTARGS = "BroadcastGradientArgs"; +const char_t * const BROADCASTARGS = "BroadcastArgs"; +const char_t * const CONFUSIONMATRIX = "ConfusionMatrix"; +const char_t * const RANK = "Rank"; +const char_t * const PLACEHOLDER = "PlaceHolder"; +const char_t * const END = "End"; +const char_t * const BASICLSTMCELL = "BasicLSTMCell"; +const char_t * const GETNEXT = "GetNext"; +const char_t * const INITDATA = "InitData"; +const char_t * const REFIDENTITY = "RefIdentity"; +const char_t * const BITCAST = "Bitcast"; /***************Ann special operator*************************/ -const char *ANN_MEAN = "AnnMean"; -const char *ANN_CONVOLUTION = "AnnConvolution"; -const char *ANN_DEPCONVOLUTION = "AnnDepthConv"; -const char *ANN_FULLCONNECTION = "AnnFullConnection"; -const char *ANN_NETOUTPUT = "AnnNetOutput"; -const char *ANN_DATA = "AnnData"; -const char *ANN_RESHAPE = "AnnReshape"; -const char *ANN_ADD = "AnnAdd"; -const char *ANN_MUL = "AnnMul"; -const char *ANN_SUB = "AnnSub"; -const char *ANN_DIV = "AnnDiv"; -const char *ANN_DEQUANTIZE = "AnnDequant"; -const char *ANN_QUANTIZE = "AnnQuant"; -const char *ANN_PAD = "AnnPad"; -const char *ANN_RESIZE_BILINEAR = "AnnResizeBilinear"; +const char_t * const ANN_MEAN = "AnnMean"; +const char_t * const ANN_CONVOLUTION = "AnnConvolution"; +const char_t * const ANN_DEPCONVOLUTION = "AnnDepthConv"; +const char_t * const ANN_FULLCONNECTION = "AnnFullConnection"; +const char_t * const ANN_NETOUTPUT = "AnnNetOutput"; +const char_t * const ANN_DATA = "AnnData"; +const char_t * const ANN_RESHAPE = "AnnReshape"; +const char_t * const ANN_ADD = "AnnAdd"; +const char_t * const ANN_MUL = "AnnMul"; +const char_t * const ANN_SUB = "AnnSub"; +const char_t * const ANN_DIV = "AnnDiv"; +const char_t * const ANN_DEQUANTIZE = "AnnDequant"; +const char_t * const ANN_QUANTIZE = "AnnQuant"; +const char_t * const ANN_PAD = "AnnPad"; +const char_t * const ANN_RESIZE_BILINEAR = "AnnResizeBilinear"; /***************************************************/ /******************Training operator*************************/ -const char *GATHERV2 = "GatherV2"; -const char *CONVGRADFILTER = "Conv2DBackpropFilter"; -const char *CONV2D = "Conv2D"; -const char *CONV2DBACKPROPINPUT = "Conv2DBackpropInput"; -const char *FUSEDBATCHNORM = "FusedBatchNorm"; -const char *BIASADDGRAD = "BiasAddGrad"; -const char *ACTIVATIONGRAD = "ReluGrad"; -const char *MAXPOOLWITHARGMAX = "MaxPoolWithArgmax"; -const char *MAXPOOLGRADWITHARGMAX = "MaxPoolGradWithArgmax"; -const char *SPARSESOFTMAXCROSSENTROPYWITHLOGITS = "SparseSoftmaxCrossEntropyWithLogits"; -const char *SNAPSHOT = "Snapshot"; -const char *VAR = "Var"; -const char *MEANGRAD = "MeanGrad"; -const char *TRANSLATE = "Translate"; -const char *ADDN = "AddN"; -const char *L2LOSS = "L2Loss"; -const char *MULTIPLY = "Multiply"; -const char *HUBERLOSSGRAD = "HuberLossGrad"; -const char *HUBERLOSS = "HuberLoss"; -const char *NEGATIVE = "Negative"; -const char *SSDCAST = "SSDCast"; -const char *SPARSESOFTMAXCROSSENTROPY = "SsdSparseSoftmaxCrossEntropy"; -const char *SPARSESOFTMAXCROSSENTROPYGRAD = "SsdSparseSoftmaxCrossEntropyGrad"; -const char *SSDSQUEEZEFUSION = "SsdSqueezeFusion"; -const char *CONCATFOUR2FIVE = "ConcatFour2Five"; -const char *CONCATFIVE2FOUR = "ConcatFive2Four"; -const char *SSDREALDIVTILEMUL = "SSDRealdivTileMul"; -const char *SSDSUMMULREALDIVMEAN = "SSDSumMulRealdivMean"; +const char_t * const GATHERV2 = "GatherV2"; +const char_t * const CONVGRADFILTER = "Conv2DBackpropFilter"; +const char_t * const CONV2D = "Conv2D"; +const char_t * const CONV2DBACKPROPINPUT = "Conv2DBackpropInput"; +const char_t * const FUSEDBATCHNORM = "FusedBatchNorm"; +const char_t * const BIASADDGRAD = "BiasAddGrad"; +const char_t * const ACTIVATIONGRAD = "ReluGrad"; +const char_t * const MAXPOOLWITHARGMAX = "MaxPoolWithArgmax"; +const char_t * const MAXPOOLGRADWITHARGMAX = "MaxPoolGradWithArgmax"; +const char_t * const SPARSESOFTMAXCROSSENTROPYWITHLOGITS = "SparseSoftmaxCrossEntropyWithLogits"; +const char_t * const SNAPSHOT = "Snapshot"; +const char_t * const VAR = "Var"; +const char_t * const MEANGRAD = "MeanGrad"; +const char_t * const TRANSLATE = "Translate"; +const char_t * const ADDN = "AddN"; +const char_t * const L2LOSS = "L2Loss"; +const char_t * const MULTIPLY = "Multiply"; +const char_t * const HUBERLOSSGRAD = "HuberLossGrad"; +const char_t * const HUBERLOSS = "HuberLoss"; +const char_t * const NEGATIVE = "Negative"; +const char_t * const SSDCAST = "SSDCast"; +const char_t * const SPARSESOFTMAXCROSSENTROPY = "SsdSparseSoftmaxCrossEntropy"; +const char_t * const SPARSESOFTMAXCROSSENTROPYGRAD = "SsdSparseSoftmaxCrossEntropyGrad"; +const char_t * const SSDSQUEEZEFUSION = "SsdSqueezeFusion"; +const char_t * const CONCATFOUR2FIVE = "ConcatFour2Five"; +const char_t * const CONCATFIVE2FOUR = "ConcatFive2Four"; +const char_t * const SSDREALDIVTILEMUL = "SSDRealdivTileMul"; +const char_t * const SSDSUMMULREALDIVMEAN = "SSDSumMulRealdivMean"; -const char *VARIABLEV2 = "VariableV2"; -const char *VARHANDLEOP = "VarHandleOp"; -const char *TEMPORARYVARIABLE = "TemporaryVariable"; -const char *DESTROYTEMPORARYVARIABLE = "DestroyTemporaryVariable"; -const char *VARIABLE = "Variable"; -const char *ASSIGN = "Assign"; -const char *ASSIGNVARIABLEOP = "AssignVariableOp"; -const char *ASSIGNADD = "AssignAdd"; -const char *ASSIGNADDVARIABLEOP = "AssignAddVariableOp"; -const char *ASSIGNSUB = "AssignSub"; -const char *ASSIGNSUBVARIABLEOP = "AssignSubVariableOp"; -const char *APPLYMOMENTUM = "ApplyMomentum"; -const char *RESOURCEAPPLYMOMENTUM = "ResourceApplyMomentum"; -const char *SGD = "SGD"; -const char *NOOP = "NoOp"; -const char *READVARIABLEOP = "ReadVariableOp"; -const char *PARALLELCONCATSTART = "_ParallelConcatStart"; -const char *CONSTANTOP = "Constant"; -const char *DEPTHWISECONV2DBACKPROPFILTER = "DepthwiseConv2dNativeBackpropFilter"; -const char *DEPTHWISECONV2DBACKPORPINPUT = "DepthwiseConv2dNativeBackpropInput"; -const char *DEPTHWISECONV2DFORWARDNATIVE = "DepthwiseConv2dNative"; -const char *DROPOUTGRAD = "DropOutGrad"; -const char *APPLYRMSPROPMIXEDPRECISION = "apply_rms_prop_mixed_precision"; -const char *APPLYRMSPROP = "ApplyRMSProp"; -const char *RELU6GRAD = "Relu6Grad"; -const char *AVGPOOLGRAD = "AvgPoolGrad"; -const char *CONCATV2 = "ConcatV2"; -const char *CONCATOFFSET = "ConcatOffset"; -const char *LAYERNORMGRAD = "LayerNormGrad"; -const char *LAYERNORM = "LayerNorm"; -const char *LARS = "Lars"; -const char *DYNAMICSTITCH = "DynamicStitch"; +const char_t * const VARIABLEV2 = "VariableV2"; +const char_t * const VARHANDLEOP = "VarHandleOp"; +const char_t * const TEMPORARYVARIABLE = "TemporaryVariable"; +const char_t * const DESTROYTEMPORARYVARIABLE = "DestroyTemporaryVariable"; +const char_t * const VARIABLE = "Variable"; +const char_t * const ASSIGN = "Assign"; +const char_t * const ASSIGNVARIABLEOP = "AssignVariableOp"; +const char_t * const ASSIGNADD = "AssignAdd"; +const char_t * const ASSIGNADDVARIABLEOP = "AssignAddVariableOp"; +const char_t * const ASSIGNSUB = "AssignSub"; +const char_t * const ASSIGNSUBVARIABLEOP = "AssignSubVariableOp"; +const char_t * const APPLYMOMENTUM = "ApplyMomentum"; +const char_t * const RESOURCEAPPLYMOMENTUM = "ResourceApplyMomentum"; +const char_t * const SGD = "SGD"; +const char_t * const NOOP = "NoOp"; +const char_t * const READVARIABLEOP = "ReadVariableOp"; +const char_t * const PARALLELCONCATSTART = "_ParallelConcatStart"; +const char_t * const CONSTANTOP = "Constant"; +const char_t * const DEPTHWISECONV2DBACKPROPFILTER = "DepthwiseConv2dNativeBackpropFilter"; +const char_t * const DEPTHWISECONV2DBACKPORPINPUT = "DepthwiseConv2dNativeBackpropInput"; +const char_t * const DEPTHWISECONV2DFORWARDNATIVE = "DepthwiseConv2dNative"; +const char_t * const DROPOUTGRAD = "DropOutGrad"; +const char_t * const APPLYRMSPROPMIXEDPRECISION = "apply_rms_prop_mixed_precision"; +const char_t * const APPLYRMSPROP = "ApplyRMSProp"; +const char_t * const RELU6GRAD = "Relu6Grad"; +const char_t * const AVGPOOLGRAD = "AvgPoolGrad"; +const char_t * const CONCATV2 = "ConcatV2"; +const char_t * const CONCATOFFSET = "ConcatOffset"; +const char_t * const LAYERNORMGRAD = "LayerNormGrad"; +const char_t * const LAYERNORM = "LayerNorm"; +const char_t * const LARS = "Lars"; +const char_t * const DYNAMICSTITCH = "DynamicStitch"; /***************************************************/ -const char *SQUARE = "Square"; -const char *HCOMBROADCAST = "HcomBroadcast"; -const char *HCOMALLGATHER = "HcomAllGather"; -const char *HCOMALLREDUCE = "HcomAllReduce"; -const char *HCOMREDUCESCATTER = "HcomReduceScatter"; -const char *HCOMSEND = "HcomSend"; -const char *HCOMRECEIVE = "HcomReceive"; -const char *HCOMREMOTEREAD = "HcomRemoteRead"; -const char *HCOMREMOTEREFREAD = "HcomRemoteRefRead"; -const char *HCOMREMOTEWRITE = "HcomRemoteWrite"; -const char *HCOMREMOTESCATTERWRITE = "HcomRemoteScatterWrite"; +const char_t * const SQUARE = "Square"; +const char_t * const HCOMBROADCAST = "HcomBroadcast"; +const char_t * const HCOMALLGATHER = "HcomAllGather"; +const char_t * const HCOMALLREDUCE = "HcomAllReduce"; +const char_t * const HCOMREDUCESCATTER = "HcomReduceScatter"; +const char_t * const HCOMSEND = "HcomSend"; +const char_t * const HCOMRECEIVE = "HcomReceive"; +const char_t * const HCOMREMOTEREAD = "HcomRemoteRead"; +const char_t * const HCOMREMOTEREFREAD = "HcomRemoteRefRead"; +const char_t * const HCOMREMOTEWRITE = "HcomRemoteWrite"; +const char_t * const HCOMREMOTESCATTERWRITE = "HcomRemoteScatterWrite"; -const char *VARASSIGN = "VarAssign"; -const char *VARISINITIALIZEDOP = "VarIsInitializedOp"; -const char *LogTimeStamp = "LogTimeStamp"; -const char *ISVARIABLEINITIALIZED = "IsVariableInitialized"; -const char *STREAMSWITCH = "StreamSwitch"; -const char *STREAMSWITCHN = "StreamSwitchN"; -const char *STREAMACTIVE = "StreamActive"; -const char *MEMCPYASYNC = "MemcpyAsync"; -const char *MEMCPYADDRASYNC = "MemcpyAddrAsync"; -const char *STREAMMERGE = "StreamMerge"; -const char *ENDGRAPH = "EndGraph"; -const char *SEND = "Send"; -const char *RECV = "Recv"; -const char *ENDOFSEQUENCE = "EndOfSequence"; +const char_t * const VARASSIGN = "VarAssign"; +const char_t * const VARISINITIALIZEDOP = "VarIsInitializedOp"; +const char_t * const LogTimeStamp = "LogTimeStamp"; +const char_t * const ISVARIABLEINITIALIZED = "IsVariableInitialized"; +const char_t * const STREAMSWITCH = "StreamSwitch"; +const char_t * const STREAMSWITCHN = "StreamSwitchN"; +const char_t * const STREAMACTIVE = "StreamActive"; +const char_t * const MEMCPYASYNC = "MemcpyAsync"; +const char_t * const MEMCPYADDRASYNC = "MemcpyAddrAsync"; +const char_t * const STREAMMERGE = "StreamMerge"; +const char_t * const ENDGRAPH = "EndGraph"; +const char_t * const SEND = "Send"; +const char_t * const RECV = "Recv"; +const char_t * const ENDOFSEQUENCE = "EndOfSequence"; -const char *LABELSET = "LabelSet"; -const char *LABELGOTO = "LabelGoto"; -const char *LABELGOTOEX = "LabelGotoEx"; -const char *LABELSWITCH = "LabelSwitch"; -const char *LABELSWITCHBYINDEX = "LabelSwitchByIndex"; +const char_t * const LABELSET = "LabelSet"; +const char_t * const LABELGOTO = "LabelGoto"; +const char_t * const LABELGOTOEX = "LabelGotoEx"; +const char_t * const LABELSWITCH = "LabelSwitch"; +const char_t * const LABELSWITCHBYINDEX = "LabelSwitchByIndex"; -const char *ATOMICADDRCLEAN = "AtomicAddrClean"; +const char_t * const ATOMICADDRCLEAN = "AtomicAddrClean"; -const char *ABS_GRAD = "AbsGrad"; -const char *ACCUMULATE_N_V2 = "AccumulateNV2"; -const char *ACOS_GRAD = "AcosGrad"; -const char *ACOSH_GRAD = "AcoshGrad"; -const char *ANY = "Any"; -const char *APPROXIMATE_EQUAL = "ApproximateEqual"; -const char *ASIN_GRAD = "AsinGrad"; -const char *ASINH_GRAD = "AsinhGrad"; -const char *ATAN_GRAD = "AtanGrad"; -const char *BROADCAST_TO = "BroadcastTo"; -const char *ELU_GRAD = "EluGrad"; -const char *ADD_V2 = "AddV2"; -const char *DATAFORMATDIMMAP = "DataFormatDimMap"; -const char *DATAFORMATVECPERMUTE = "DataFormatVecPermute"; -const char *BESSELI0E = "BesselI0e"; -const char *BESSELI1E = "BesselI1e"; -const char *APPLYADADELTA = "ApplyAdadelta"; -const char *APPLYADAGRAD = "ApplyAdagrad"; -const char *APPLYADAGRADDA = "ApplyAdagradDA"; -const char *APPLYADAM = "ApplyAdam"; -const char *APPLYADAMAX = "ApplyAdaMax"; -const char *APPLYADDSIGN = "ApplyAddSign"; -const char *APPLYCENTEREDRMSPROP = "ApplyCenteredRMSProp"; -const char *APPLYFTRL = "ApplyFtrl"; -const char *APPLYFTRLV2 = "ApplyFtrlV2"; -const char *APPLYGRADIENTDESCENT = "ApplyGradientDescent"; -const char *APPLYPOWERSIGN = "ApplyPowerSign"; -const char *APPLYPROXIMALADAGRAD = "ApplyProximalAdagrad"; -const char *APPLYPROXIMALGRADIENTDESCENT = "ApplyProximalGradientDescent"; -const char *DEQUANTIZE = "Dequantize"; +const char_t * const ABS_GRAD = "AbsGrad"; +const char_t * const ACCUMULATE_N_V2 = "AccumulateNV2"; +const char_t * const ACOS_GRAD = "AcosGrad"; +const char_t * const ACOSH_GRAD = "AcoshGrad"; +const char_t * const ANY = "Any"; +const char_t * const APPROXIMATE_EQUAL = "ApproximateEqual"; +const char_t * const ASIN_GRAD = "AsinGrad"; +const char_t * const ASINH_GRAD = "AsinhGrad"; +const char_t * const ATAN_GRAD = "AtanGrad"; +const char_t * const BROADCAST_TO = "BroadcastTo"; +const char_t * const ELU_GRAD = "EluGrad"; +const char_t * const ADD_V2 = "AddV2"; +const char_t * const DATAFORMATDIMMAP = "DataFormatDimMap"; +const char_t * const DATAFORMATVECPERMUTE = "DataFormatVecPermute"; +const char_t * const BESSELI0E = "BesselI0e"; +const char_t * const BESSELI1E = "BesselI1e"; +const char_t * const APPLYADADELTA = "ApplyAdadelta"; +const char_t * const APPLYADAGRAD = "ApplyAdagrad"; +const char_t * const APPLYADAGRADDA = "ApplyAdagradDA"; +const char_t * const APPLYADAM = "ApplyAdam"; +const char_t * const APPLYADAMAX = "ApplyAdaMax"; +const char_t * const APPLYADDSIGN = "ApplyAddSign"; +const char_t * const APPLYCENTEREDRMSPROP = "ApplyCenteredRMSProp"; +const char_t * const APPLYFTRL = "ApplyFtrl"; +const char_t * const APPLYFTRLV2 = "ApplyFtrlV2"; +const char_t * const APPLYGRADIENTDESCENT = "ApplyGradientDescent"; +const char_t * const APPLYPOWERSIGN = "ApplyPowerSign"; +const char_t * const APPLYPROXIMALADAGRAD = "ApplyProximalAdagrad"; +const char_t * const APPLYPROXIMALGRADIENTDESCENT = "ApplyProximalGradientDescent"; +const char_t * const DEQUANTIZE = "Dequantize"; -const char *FOCAL_LOSS = "FocalLoss"; -const char *FOCAL_LOSS_GRAD = "FocalLossGrad"; -const char *SMOOTHL1_LOSS = "SmoothL1Loss"; -const char *SMOOTHL1_LOSS_grad = "SmoothL1LossGrad"; -const char *REDUCEMEAN = "ReduceMean"; -const char *CONCAT_V2 = "ConcatV2"; -const char *ONEHOT_V2 = "OneHotV2"; -const char *SLICE_V2 = "SliceV2"; -const char *TILE_V2 = "TileV2"; -const char *SUM_V2 = "SumV2"; +const char_t * const FOCAL_LOSS = "FocalLoss"; +const char_t * const FOCAL_LOSS_GRAD = "FocalLossGrad"; +const char_t * const SMOOTHL1_LOSS = "SmoothL1Loss"; +const char_t * const SMOOTHL1_LOSS_grad = "SmoothL1LossGrad"; +const char_t * const REDUCEMEAN = "ReduceMean"; +const char_t * const CONCAT_V2 = "ConcatV2"; +const char_t * const ONEHOT_V2 = "OneHotV2"; +const char_t * const SLICE_V2 = "SliceV2"; +const char_t * const TILE_V2 = "TileV2"; +const char_t * const SUM_V2 = "SumV2"; // Common type when the operator has the same name -const char *DETECTIONOUTPUT = "DetectionOutput"; +const char_t * const DETECTIONOUTPUT = "DetectionOutput"; // Custom operator -const char *CUSTOMOP = "CustomOp"; -const char *CUSTOMOP_NCHW = "CustomOpNchw"; -const char *CUSTOMOP_NHWC = "CustomOpNhwc"; -const char *CUSTOMOP_NC1HWC0 = "CustomOpNc1hwc0"; +const char_t * const CUSTOMOP = "CustomOp"; +const char_t * const CUSTOMOP_NCHW = "CustomOpNchw"; +const char_t * const CUSTOMOP_NHWC = "CustomOpNhwc"; +const char_t * const CUSTOMOP_NC1HWC0 = "CustomOpNc1hwc0"; // Depthwise 4d_2_6d,6d_2_4d -const char *DEPTHWISEWEIGHT4D26D = "depthwise_weight_4d_2_6d"; -const char *DEPTHWISEWEIGHT6D24D = "depthwise_weight_6d_2_4d"; +const char_t * const DEPTHWISEWEIGHT4D26D = "depthwise_weight_4d_2_6d"; +const char_t * const DEPTHWISEWEIGHT6D24D = "depthwise_weight_6d_2_4d"; -const char *SQRTGRAD = "SqrtGrad"; -const char *SIGMOIDGRAD = "SigmoidGrad"; +const char_t * const SQRTGRAD = "SqrtGrad"; +const char_t * const SIGMOIDGRAD = "SigmoidGrad"; -const char *TRANSSHAPE = "TransShape"; +const char_t * const TRANSSHAPE = "TransShape"; // Horovod operator -const char *HVDCALLBACKALLREDUCE = "HorovodAllreduce"; -const char *HVDCALLBACKALLGATHER = "HorovodAllgather"; -const char *HVDCALLBACKBROADCAST = "HorovodBroadcast"; -const char *HVDWAIT = "HorovodWait"; +const char_t * const HVDCALLBACKALLREDUCE = "HorovodAllreduce"; +const char_t * const HVDCALLBACKALLGATHER = "HorovodAllgather"; +const char_t * const HVDCALLBACKBROADCAST = "HorovodBroadcast"; +const char_t * const HVDWAIT = "HorovodWait"; /// /// @brief Magic number of model file diff --git a/parser/common/thread_pool.h b/parser/common/thread_pool.h index 96a9cfd..8baf7d9 100644 --- a/parser/common/thread_pool.h +++ b/parser/common/thread_pool.h @@ -1,5 +1,5 @@ /** - * Copyright 2020 Huawei Technologies Co., Ltd + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/parser/onnx/onnx_constant_parser.cc b/parser/onnx/onnx_constant_parser.cc index 06ba0bf..06c6041 100644 --- a/parser/onnx/onnx_constant_parser.cc +++ b/parser/onnx/onnx_constant_parser.cc @@ -1,5 +1,5 @@ /** - * Copyright (c) Huawei Technologies Co., Ltd. 2020~2022. All rights reserved. + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/parser/onnx/onnx_constant_parser.h b/parser/onnx/onnx_constant_parser.h index 628e832..1345783 100644 --- a/parser/onnx/onnx_constant_parser.h +++ b/parser/onnx/onnx_constant_parser.h @@ -1,5 +1,5 @@ /** - * Copyright 2020 Huawei Technologies Co., Ltd + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/parser/onnx/onnx_custom_parser_adapter.cc b/parser/onnx/onnx_custom_parser_adapter.cc index d634daf..b6d000b 100644 --- a/parser/onnx/onnx_custom_parser_adapter.cc +++ b/parser/onnx/onnx_custom_parser_adapter.cc @@ -1,5 +1,5 @@ /** - * Copyright (c) Huawei Technologies Co., Ltd. 2020~2022. All rights reserved. + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/parser/onnx/onnx_custom_parser_adapter.h b/parser/onnx/onnx_custom_parser_adapter.h index e22dda7..0dfdf82 100644 --- a/parser/onnx/onnx_custom_parser_adapter.h +++ b/parser/onnx/onnx_custom_parser_adapter.h @@ -1,5 +1,5 @@ /** - * Copyright (c) Huawei Technologies Co., Ltd. 2020~2022. All rights reserved. + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/parser/onnx/onnx_data_parser.cc b/parser/onnx/onnx_data_parser.cc index 927e618..6483a4d 100644 --- a/parser/onnx/onnx_data_parser.cc +++ b/parser/onnx/onnx_data_parser.cc @@ -1,5 +1,5 @@ /** - * Copyright (c) Huawei Technologies Co., Ltd. 2020~2022. All rights reserved. + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/parser/onnx/onnx_data_parser.h b/parser/onnx/onnx_data_parser.h index 4d51e2f..8503779 100644 --- a/parser/onnx/onnx_data_parser.h +++ b/parser/onnx/onnx_data_parser.h @@ -1,5 +1,5 @@ /** - * Copyright (c) Huawei Technologies Co., Ltd. 2020~2022. All rights reserved. + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/parser/onnx/onnx_file_constant_parser.cc b/parser/onnx/onnx_file_constant_parser.cc index 1b6717d..36abbbe 100644 --- a/parser/onnx/onnx_file_constant_parser.cc +++ b/parser/onnx/onnx_file_constant_parser.cc @@ -1,5 +1,5 @@ /** - * Copyright (c) Huawei Technologies Co., Ltd. 2020~2022. All rights reserved. + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ const char *const kFileConstant = "FileConstant"; namespace ge { Status OnnxFileConstantParser::ParseParams(const Message *op_src, ge::Operator &op_def) { GE_CHECK_NOTNULL(op_src); - const ge::onnx::NodeProto *node = reinterpret_cast(op_src); + const ge::onnx::NodeProto *node = PtrToPtr(op_src); GELOGD("Onnx op node name = %s, op type= %s, parse params", node->name().c_str(), node->op_type().c_str()); ge::onnx::TensorProto tensor_proto; diff --git a/parser/onnx/onnx_file_constant_parser.h b/parser/onnx/onnx_file_constant_parser.h index 0c523c5..a0ff9b4 100644 --- a/parser/onnx/onnx_file_constant_parser.h +++ b/parser/onnx/onnx_file_constant_parser.h @@ -1,5 +1,5 @@ /** - * Copyright (c) Huawei Technologies Co., Ltd. 2020~2022. All rights reserved. + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/parser/onnx/onnx_op_parser.h b/parser/onnx/onnx_op_parser.h index 2ab3c38..fa54a4f 100644 --- a/parser/onnx/onnx_op_parser.h +++ b/parser/onnx/onnx_op_parser.h @@ -1,5 +1,5 @@ /** - * Copyright (c) Huawei Technologies Co., Ltd. 2020~2022. All rights reserved. + * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tests/st/CMakeLists.txt b/tests/st/CMakeLists.txt index 1acc4ed..0cf2fdd 100644 --- a/tests/st/CMakeLists.txt +++ b/tests/st/CMakeLists.txt @@ -274,7 +274,7 @@ set(PARSER_SRC_FILES "${PARSER_DIR}/parser/common/pre_checker.cc" "${PARSER_DIR}/parser/common/proto_file_parser.cc" "${PARSER_DIR}/parser/common/prototype_pass_manager.cc" - "${PARSER_DIR}/parser/common/register_tbe.cc" + "${PARSER_DIR}/parser/common/op_registration_tbe.cc" "${PARSER_DIR}/parser/common/tbe_plugin_loader.cc" "${PARSER_DIR}/parser/common/thread_pool.cc" "${PARSER_DIR}/parser/common/auto_mapping_subgraph_io_index_func.cc" diff --git a/tests/st/testcase/test_caffe_parser.cc b/tests/st/testcase/test_caffe_parser.cc index 45fc70c..fe5ecf9 100644 --- a/tests/st/testcase/test_caffe_parser.cc +++ b/tests/st/testcase/test_caffe_parser.cc @@ -21,7 +21,7 @@ #include "parser/common/op_parser_factory.h" #include "graph/operator_reg.h" #include "register/op_registry.h" -#include "parser/common/register_tbe.h" +#include "parser/common/op_registration_tbe.h" #include "framework/omg/parser/model_parser.h" #include "framework/omg/parser/parser_factory.h" #include "external/parser/caffe_parser.h" diff --git a/tests/st/testcase/test_onnx_parser.cc b/tests/st/testcase/test_onnx_parser.cc index 799f2d6..05b4207 100644 --- a/tests/st/testcase/test_onnx_parser.cc +++ b/tests/st/testcase/test_onnx_parser.cc @@ -19,7 +19,7 @@ #include "parser/common/op_parser_factory.h" #include "graph/operator_reg.h" #include "register/op_registry.h" -#include "parser/common/register_tbe.h" +#include "parser/common/op_registration_tbe.h" #include "external/parser/onnx_parser.h" #include "st/parser_st_utils.h" #include "external/ge/ge_api_types.h" diff --git a/tests/st/testcase/test_tensorflow_parser.cc b/tests/st/testcase/test_tensorflow_parser.cc index ac6c275..0db72f5 100644 --- a/tests/st/testcase/test_tensorflow_parser.cc +++ b/tests/st/testcase/test_tensorflow_parser.cc @@ -23,7 +23,6 @@ #include "graph/operator_reg.h" #include "register/op_registry.h" #include "external/register/register.h" -#include "parser/common/register_tbe.h" #include "st/parser_st_utils.h" #include "tests/depends/ops_stub/ops_stub.h" #include "parser/common/acl_graph_parser_util.h" @@ -68,7 +67,7 @@ #include "parser/common/parser_fp16_t.h" #include "parser/common/op_parser_factory.h" #include "parser/common/prototype_pass_manager.h" -#include "parser/common/register_tbe.h" +#include "parser/common/op_registration_tbe.h" #include "parser/common/pass_manager.h" #include "parser/tensorflow/parser_graph_optimizer.h" #include "metadef/inc/register/scope/scope_pass_registry_impl.h" diff --git a/tests/ut/parser/CMakeLists.txt b/tests/ut/parser/CMakeLists.txt index 8b44a0a..2826196 100644 --- a/tests/ut/parser/CMakeLists.txt +++ b/tests/ut/parser/CMakeLists.txt @@ -275,7 +275,7 @@ set(PARSER_SRC_FILES "${PARSER_DIR}/parser/common/pre_checker.cc" "${PARSER_DIR}/parser/common/proto_file_parser.cc" "${PARSER_DIR}/parser/common/prototype_pass_manager.cc" - "${PARSER_DIR}/parser/common/register_tbe.cc" + "${PARSER_DIR}/parser/common/op_registration_tbe.cc" "${PARSER_DIR}/parser/common/tbe_plugin_loader.cc" "${PARSER_DIR}/parser/common/thread_pool.cc" "${PARSER_DIR}/parser/common/auto_mapping_subgraph_io_index_func.cc" diff --git a/tests/ut/parser/testcase/caffe_parser_testcase/caffe_parser_unittest.cc b/tests/ut/parser/testcase/caffe_parser_testcase/caffe_parser_unittest.cc index 5d1a5bd..53e5cf9 100755 --- a/tests/ut/parser/testcase/caffe_parser_testcase/caffe_parser_unittest.cc +++ b/tests/ut/parser/testcase/caffe_parser_testcase/caffe_parser_unittest.cc @@ -23,7 +23,7 @@ #include "graph/operator_reg.h" #include "external/graph/types.h" #include "register/op_registry.h" -#include "parser/common/register_tbe.h" +#include "parser/common/op_registration_tbe.h" #include "framework/omg/parser/model_parser.h" #include "framework/omg/parser/parser_factory.h" #include "external/parser/caffe_parser.h" diff --git a/tests/ut/parser/testcase/common/acl_graph_parser_unittest.cc b/tests/ut/parser/testcase/common/acl_graph_parser_unittest.cc index e452661..50a787c 100755 --- a/tests/ut/parser/testcase/common/acl_graph_parser_unittest.cc +++ b/tests/ut/parser/testcase/common/acl_graph_parser_unittest.cc @@ -23,7 +23,7 @@ #include "graph/operator_reg.h" #include "external/graph/types.h" #include "register/op_registry.h" -#include "parser/common/register_tbe.h" +#include "parser/common/op_registration_tbe.h" #include "external/parser/onnx_parser.h" #include "ut/parser/parser_ut_utils.h" #include "external/ge/ge_api_types.h" diff --git a/tests/ut/parser/testcase/onnx_parser_testcase/onnx_parser_unittest.cc b/tests/ut/parser/testcase/onnx_parser_testcase/onnx_parser_unittest.cc index c945d69..b0338ce 100644 --- a/tests/ut/parser/testcase/onnx_parser_testcase/onnx_parser_unittest.cc +++ b/tests/ut/parser/testcase/onnx_parser_testcase/onnx_parser_unittest.cc @@ -20,7 +20,7 @@ #include "graph/operator_reg.h" #include "external/graph/types.h" #include "register/op_registry.h" -#include "parser/common/register_tbe.h" +#include "parser/common/op_registration_tbe.h" #include "external/parser/onnx_parser.h" #include "ut/parser/parser_ut_utils.h" #include "external/ge/ge_api_types.h" diff --git a/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_auto_mapping_parser_adapter_unittest.cc b/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_auto_mapping_parser_adapter_unittest.cc index ed6e274..b088603 100644 --- a/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_auto_mapping_parser_adapter_unittest.cc +++ b/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_auto_mapping_parser_adapter_unittest.cc @@ -22,7 +22,7 @@ #include "graph/operator_reg.h" #include "external/graph/types.h" #include "register/op_registry.h" -#include "parser/common/register_tbe.h" +#include "parser/common/op_registration_tbe.h" namespace ge { diff --git a/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc b/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc index 549ea61..8e4ccab 100644 --- a/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc +++ b/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc @@ -25,7 +25,6 @@ #include "external/graph/types.h" #include "register/op_registry.h" #include "external/register/register.h" -#include "parser/common/register_tbe.h" #include "tests/depends/ops_stub/ops_stub.h" #include "parser/common/acl_graph_parser_util.h" #include "metadef/third_party/graphengine/inc/external/ge/ge_api_types.h" @@ -71,7 +70,7 @@ #include "parser/common/parser_fp16_t.h" #include "parser/common/op_parser_factory.h" #include "parser/common/prototype_pass_manager.h" -#include "parser/common/register_tbe.h" +#include "parser/common/op_registration_tbe.h" #include "parser/common/pass_manager.h" #include "parser/tensorflow/parser_graph_optimizer.h" #include "metadef/inc/register/scope/scope_pass_registry_impl.h"