wangwei
/
parser
Not watched
1
0
Fork 0
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Pre Merge pull request !553 from 邓涛/ge_dev

pull/553/MERGE
邓涛 Gitee 3 years ago
parent
1de1fd261b dbccda7454
commit
0b2e19e35c
No known key found for this signature in database GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 89 additions and 74 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      metadef
  2. +50
    -50
      parser/common/parser_fp16_t.cc
  3. +16
    -16
      parser/common/parser_fp16_t.h
  4. +7
    -7
      parser/tensorflow/tensorflow_parser.cc
  5. +11
    -0
      tests/depends/mmpa/src/mmpa_stub.cc
  6. +2
    -0
      tests/st/CMakeLists.txt
  7. +2
    -0
      tests/ut/parser/CMakeLists.txt

+ 1
- 1
metadef

@@ -1 +1 @@
Subproject commit 19b157b42550825b95170c9ad25f5ba16fb4ec79
Subproject commit 8fb59a00c6291207f3491fee0c4064efff94d79f

+ 50
- 50
parser/common/parser_fp16_t.cc View File

@@ -20,13 +20,13 @@
#include "graph/def_types.h"

namespace {
constexpr uint16_t kManBitLength = 11;
constexpr uint16_t kManBitLength = 11U;
}
namespace ge {
namespace parser {
/// @ingroup fp16_t global filed
/// @brief round mode of last valid digital
enum TagFp16RoundMode g_round_mode = TagFp16RoundMode::kRoundToNearest;
const TagFp16RoundMode g_round_mode = TagFp16RoundMode::kRoundToNearest;

void ExtractFp16(const uint16_t &val, uint16_t &s, int16_t &e, uint16_t &m) {
// 1.Extract
@@ -100,7 +100,7 @@ static float Fp16ToFloat(const uint16_t &fp_val) {
e_ret = 0;
m_ret = 0;
} else {
e_ret = hf_exp - kFp16ExpBias + kFp32ExpBias;
e_ret = (static_cast<uint32_t>(hf_exp) - static_cast<uint32_t>(kFp16ExpBias)) + static_cast<uint32_t>(kFp32ExpBias);
m_ret = hf_man & kFp16ManMask;
m_ret = m_ret << (kFp32ManLen - kFp16ManLen);
}
@@ -132,7 +132,7 @@ static double Fp16ToDouble(const uint16_t &fp_val) {
e_ret = 0;
m_ret = 0;
} else {
e_ret = hf_exp - kFp16ExpBias + kFp64ExpBias;
e_ret = (static_cast<uint64_t>(hf_exp) - static_cast<uint64_t>(kFp16ExpBias)) + static_cast<uint64_t>(kFp64ExpBias);
m_ret = hf_man & kFp16ManMask;
m_ret = m_ret << (kFp64ManLen - kFp16ManLen);
}
@@ -155,13 +155,13 @@ static uint8_t GetUint8ValByMan(uint8_t s_ret, const uint64_t &long_int_m, const
if (need_round) {
m_ret++;
}
if (s_ret) {
m_ret = (~m_ret) + 1;
if (static_cast<bool>(s_ret)) {
m_ret = (~m_ret) + 1U;
}
if (m_ret == 0) {
s_ret = 0;
}
return static_cast<uint8_t>((s_ret << kBitShift7) | (m_ret));
return static_cast<uint8_t>((s_ret << static_cast<uint8_t>(kBitShift7)) | (m_ret));
}

/// @ingroup fp16_t math conversion static method
@@ -208,14 +208,14 @@ static int8_t Fp16ToInt8(const uint16_t &fp_val) {
}
}
}
if (overflow_flag) {
if (static_cast<bool>(overflow_flag)) {
ret_v = kInt8Max + s_ret;
} else {
// Generate final result
ret_v = GetUint8ValByMan(s_ret, long_int_m, shift_out);
}

ret = *(reinterpret_cast<uint8_t *>(&ret_v));
ret = *(ge::PtrToPtr<uint8_t, uint8_t>(&ret_v));
return ret;
}

@@ -284,8 +284,8 @@ static uint16_t GetUint16ValByMan(uint16_t s_ret, const uint64_t &long_int_m, co
if (need_round && m_ret < kInt16Max) {
m_ret++;
}
if (s_ret) {
m_ret = (~m_ret) + 1;
if (static_cast<bool>(s_ret)) {
m_ret = (~m_ret) + 1U;
}
if (m_ret == 0) {
s_ret = 0;
@@ -308,7 +308,7 @@ static int16_t Fp16ToInt16(const uint16_t &fp_val) {

if (FP16_IS_DENORM(fp_val)) { // Denormalized number
ret_v = 0;
ret = *(reinterpret_cast<uint8_t *>(&ret_v));
ret = *(ge::PtrToPtr<uint16_t, uint8_t>(&ret_v));
return ret;
}

@@ -337,13 +337,13 @@ static int16_t Fp16ToInt16(const uint16_t &fp_val) {
}
}
}
if (overflow_flag) {
if (static_cast<bool>(overflow_flag)) {
ret_v = kInt16Max + s_ret;
} else {
// Generate final result
ret_v = GetUint16ValByMan(s_ret, long_int_m, shift_out);
}
ret = *(reinterpret_cast<int16_t *>(&ret_v));
ret = *(ge::PtrToPtr<uint16_t, uint16_t>(&ret_v));
return ret;
}

@@ -434,7 +434,7 @@ static int32_t Fp16ToInt32(const uint16_t &fp_val) {
ret_v = (s_ret << kBitShift31) | (m_ret);
}

return *(reinterpret_cast<int32_t *>(&ret_v));
return *(ge::PtrToPtr<uint32_t, uint32_t>(&ret_v));
}

/// @ingroup fp16_t math conversion static method
@@ -499,8 +499,8 @@ static uint16_t Fp16AddCalVal(uint16_t s_ret, int16_t e_ret, uint16_t m_ret, uin
}

bool b_last_bit = ((m_ret & 1) > 0);
bool b_trunc_high = 0;
bool b_trunc_left = 0;
bool b_trunc_high = false;
bool b_trunc_left = false;
b_trunc_high = (g_round_mode == TagFp16RoundMode::kRoundToNearest) && ((m_trunc & kFp32SignMask) > 0);
b_trunc_left = (g_round_mode == TagFp16RoundMode::kRoundToNearest) && ((m_trunc & kFp32AbsMax) > 0);
m_ret = ManRoundToNearest(b_last_bit, b_trunc_high, b_trunc_left, m_ret, shift_out);
@@ -562,7 +562,7 @@ static uint16_t Fp16Add(uint16_t v_1, uint16_t v_2) {
int16_t e_ret = std::max(e_a, e_b);
int16_t e_tmp = std::abs(e_a - e_b);
if (e_a > e_b) {
m_trunc = (m_b << (kBitShift32 - static_cast<uint16_t>(e_tmp)));
m_trunc = (m_b << (static_cast<uint16_t>(kBitShift32) - static_cast<uint16_t>(e_tmp)));
m_b = RightShift(m_b, e_tmp);
} else if (e_a < e_b) {
m_trunc = (m_a << (kBitShift32 - static_cast<uint16_t>(e_tmp)));
@@ -603,7 +603,7 @@ static uint16_t Fp16Mul(uint16_t v_1, uint16_t v_2) {
m_a = m_a_tmp;
m_b = m_b_tmp;

e_ret = e_a + e_b - kFp16ExpBias - kDim10;
e_ret = ((e_a + e_b) - kFp16ExpBias) - kDim10;
mul_m = m_a * m_b;
s_ret = s_a ^ s_b;

@@ -622,8 +622,8 @@ static uint16_t Fp16Mul(uint16_t v_1, uint16_t v_2) {
e_ret = e_ret + 1;
}
bool b_last_bit = ((mul_m & 1) > 0);
bool b_trunc_high = 0;
bool b_trunc_left = 0;
bool b_trunc_high = false;
bool b_trunc_left = false;
b_trunc_high = (g_round_mode == TagFp16RoundMode::kRoundToNearest) && ((m_trunc & kFp32SignMask) > 0);
b_trunc_left = (g_round_mode == TagFp16RoundMode::kRoundToNearest) && ((m_trunc & kFp32AbsMax) > 0);
mul_m = ManRoundToNearest(b_last_bit, b_trunc_high, b_trunc_left, mul_m);
@@ -676,14 +676,14 @@ static uint16_t Fp16Div(uint16_t v_1, uint16_t v_2) {
uint64_t m_tmp;
if (e_a > e_b) {
m_tmp = m_a;
uint16_t tmp = e_a - e_b;
uint16_t tmp = static_cast<uint16_t>(e_a - e_b);
for (int i = 0; i < tmp; i++) {
m_tmp = m_tmp << 1;
}
m_a = m_tmp;
} else if (e_a < e_b) {
m_tmp = m_b;
uint16_t tmp = e_b - e_a;
uint16_t tmp = static_cast<uint16_t>(e_b - e_a);
for (int i = 0; i < tmp; i++) {
m_tmp = m_tmp << 1;
}
@@ -892,7 +892,7 @@ fp16_t &fp16_t::operator=(const float &f_val) {
if (need_round) {
m_ret++;
}
if (m_ret & kFp16ManHideBit) {
if (static_cast<bool>(m_ret & kFp16ManHideBit)) {
e_ret++;
}
}
@@ -911,14 +911,14 @@ fp16_t &fp16_t::operator=(const int8_t &i_val) {
if (m_ret == 0) {
e_ret = 0;
} else {
if (s_ret) { // negative number(<0)
if (static_cast<bool>(s_ret)) { // negative number(<0)
m_ret = static_cast<uint16_t>(std::abs(i_val)); // complement
}

e_ret = kFp16ManLen;
while ((m_ret & kFp16ManHideBit) == 0) {
m_ret = m_ret << 1;
e_ret = e_ret - 1;
e_ret = e_ret - 1U;
}
e_ret = e_ret + kFp16ExpBias;
}
@@ -932,11 +932,11 @@ fp16_t &fp16_t::operator=(const uint8_t &ui_val) {
s_ret = 0;
e_ret = 0;
m_ret = ui_val;
if (m_ret) {
if (static_cast<bool>(m_ret)) {
e_ret = kFp16ManLen;
while ((m_ret & kFp16ManHideBit) == 0) {
m_ret = m_ret << 1;
e_ret = e_ret - 1;
e_ret = e_ret - 1U;
}
e_ret = e_ret + kFp16ExpBias;
}
@@ -950,11 +950,11 @@ static void SetValByUint16Val(const uint16_t &input_val, const uint16_t &sign, u
uint16_t m_min = kFp16ManHideBit;
uint16_t m_max = m_min << 1;
uint16_t len = static_cast<uint16_t>(GetManBitLength(m_tmp));
if (m_tmp) {
if (static_cast<bool>(m_tmp)) {
int16_t e_ret;
if (len > kDim11) {
e_ret = kFp16ExpBias + kFp16ManLen;
uint16_t e_tmp = len - kDim11;
uint16_t e_tmp = len - static_cast<uint16_t>(kDim11);
uint32_t trunc_mask = 1;
for (int i = 1; i < e_tmp; i++) {
trunc_mask = (trunc_mask << 1) + 1;
@@ -965,8 +965,8 @@ static void SetValByUint16Val(const uint16_t &input_val, const uint16_t &sign, u
e_ret = e_ret + 1;
}
bool b_last_bit = ((m_tmp & 1) > 0);
bool b_trunc_high = 0;
bool b_trunc_left = 0;
bool b_trunc_high = false;
bool b_trunc_left = false;
if (g_round_mode == TagFp16RoundMode::kRoundToNearest) { // trunc
b_trunc_high = ((m_trunc & kFp32SignMask) > 0);
b_trunc_left = ((m_trunc & kFp32AbsMax) > 0);
@@ -977,7 +977,7 @@ static void SetValByUint16Val(const uint16_t &input_val, const uint16_t &sign, u
e_ret = e_ret + 1;
}
} else {
e_ret = kFp16ExpBias;
e_ret = static_cast<int16_t>(kFp16ExpBias);
m_tmp = m_tmp << (kManBitLength - len);
e_ret = e_ret + (len - 1);
}
@@ -990,11 +990,11 @@ fp16_t &fp16_t::operator=(const int16_t &i_val) {
if (i_val == 0) {
val = 0;
} else {
uint16_t ui_val = *(reinterpret_cast<const uint16_t *>(&i_val));
uint16_t ui_val = *(ge::PtrToPtr<const int16_t, const int16_t>(&i_val));
auto s_ret = static_cast<uint16_t>(ui_val >> kBitShift15);
if (s_ret) {
if (static_cast<bool>(s_ret)) {
int16_t iValM = -i_val;
ui_val = *(reinterpret_cast<uint16_t *>(&iValM));
ui_val = *(ge::PtrToPtr<int16_t, uint16_t>(&iValM));
}
SetValByUint16Val(ui_val, s_ret, val);
}
@@ -1024,8 +1024,8 @@ fp16_t &fp16_t::operator=(const uint16_t &ui_val) {
e_ret = e_ret + 1;
}
bool b_last_bit = ((m_ret & 1) > 0);
bool b_trunc_high = 0;
bool b_trunc_left = 0;
bool b_trunc_high = false;
bool b_trunc_left = false;
if (g_round_mode == TagFp16RoundMode::kRoundToNearest) { // trunc
b_trunc_high = ((m_trunc & kFp32SignMask) > 0);
b_trunc_left = ((m_trunc & kFp32AbsMax) > 0);
@@ -1039,7 +1039,7 @@ fp16_t &fp16_t::operator=(const uint16_t &ui_val) {
val = kFp16Max;
}
} else {
e_ret = kFp16ExpBias;
e_ret = static_cast<int16_t>(kFp16ExpBias);
m_ret = m_ret << (kDim11 - len);
e_ret = e_ret + (len - 1);
}
@@ -1058,7 +1058,7 @@ static void SetValByUint32Val(const uint32_t &input_val, const uint16_t &sign, u
e_ret = kFp16ExpBias + kFp16ManLen;
uint32_t m_trunc = 0;
uint32_t trunc_mask = 1;
uint16_t e_tmp = len - kDim11;
uint16_t e_tmp = len - static_cast<uint16_t>(kDim11);
for (int i = 1; i < e_tmp; i++) {
trunc_mask = (trunc_mask << 1) + 1;
}
@@ -1068,8 +1068,8 @@ static void SetValByUint32Val(const uint32_t &input_val, const uint16_t &sign, u
e_ret = e_ret + 1;
}
bool b_last_bit = ((m_tmp & 1) > 0);
bool b_trunc_high = 0;
bool b_trunc_left = 0;
bool b_trunc_high = false;
bool b_trunc_left = false;
if (g_round_mode == TagFp16RoundMode::kRoundToNearest) { // trunc
b_trunc_high = ((m_trunc & kFp32SignMask) > 0);
b_trunc_left = ((m_trunc & kFp32AbsMax) > 0);
@@ -1084,7 +1084,7 @@ static void SetValByUint32Val(const uint32_t &input_val, const uint16_t &sign, u
m_tmp = kFp16MaxMan;
}
} else {
e_ret = kFp16ExpBias;
e_ret = static_cast<int16_t>(kFp16ExpBias);
m_tmp = m_tmp << (kDim11 - len);
e_ret = e_ret + (len - 1);
}
@@ -1096,11 +1096,11 @@ fp16_t &fp16_t::operator=(const int32_t &i_val) {
if (i_val == 0) {
val = 0;
} else {
uint32_t ui_val = *(reinterpret_cast<const uint32_t *>(&i_val));
uint32_t ui_val = *(ge::PtrToPtr<const int32_t, const uint32_t>(&i_val));
auto s_ret = static_cast<uint16_t>(ui_val >> kBitShift31);
if (s_ret) {
if (static_cast<bool>(s_ret)) {
int32_t iValM = -i_val;
ui_val = *(reinterpret_cast<uint32_t *>(&iValM));
ui_val = *(ge::PtrToPtr<int32_t, uint32_t>(&iValM));
}
SetValByUint32Val(ui_val, s_ret, val);
}
@@ -1120,7 +1120,7 @@ fp16_t &fp16_t::operator=(const uint32_t &ui_val) {
e_ret = kFp16ExpBias + kFp16ManLen;
uint32_t m_trunc = 0;
uint32_t trunc_mask = 1;
uint16_t e_tmp = len - kDim11;
uint16_t e_tmp = len - static_cast<uint16_t>(kDim11);
for (int i = 1; i < e_tmp; i++) {
trunc_mask = (trunc_mask << 1) + 1;
}
@@ -1146,7 +1146,7 @@ fp16_t &fp16_t::operator=(const uint32_t &ui_val) {
m_tmp = kFp16MaxMan;
}
} else {
e_ret = kFp16ExpBias;
e_ret = static_cast<int16_t>(kFp16ExpBias);
m_tmp = m_tmp << (kDim11 - len);
e_ret = e_ret + (len - 1);
}
@@ -1205,7 +1205,7 @@ fp16_t &fp16_t::operator=(const double &d_val) {
if (need_round) {
m_ret++;
}
if (m_ret & kFp16ManHideBit) {
if (static_cast<bool>(m_ret & kFp16ManHideBit)) {
e_ret++;
}
}
@@ -1240,7 +1240,7 @@ fp16_t::operator uint64_t() const { return 0; }

FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY int fp16_t::IsInf() const {
if ((val & kFp16AbsMax) == kFp16ExpMask) {
if (val & kFp16SignMask) {
if (static_cast<bool>(val & kFp16SignMask)) {
return -1;
} else {
return 1;


+ 16
- 16
parser/common/parser_fp16_t.h View File

@@ -91,16 +91,16 @@ using BitShift = enum {
};
/// @ingroup fp16 basic parameter
/// @brief fp16 exponent bias
constexpr uint16_t kFp16ExpBias = 15;
constexpr uint16_t kFp16ExpBias = 15U;
/// @ingroup fp16 basic parameter
/// @brief the exponent bit length of fp16 is 5
constexpr uint16_t kFp16ExpLen = 5;
constexpr uint16_t kFp16ExpLen = 5U;
/// @ingroup fp16 basic parameter
/// @brief the mantissa bit length of fp16 is 10
constexpr uint16_t kFp16ManLen = 10;
constexpr uint16_t kFp16ManLen = 10U;
/// @ingroup fp16 basic parameter
/// @brief bit index of sign in fp16
constexpr uint16_t kFp16SignIndex = 15;
constexpr uint16_t kFp16SignIndex = 15U;
/// @ingroup fp16 basic parameter
/// @brief sign mask of fp16 (1 00000 00000 00000)
constexpr uint16_t kFp16SignMask = 0x8000;
@@ -164,16 +164,16 @@ constexpr uint16_t kFp16MinNormal = 1.0f / (2 << 14);
#define FP16_IS_INVALID(x) (((x) & kFp16ExpMask) == kFp16ExpMask)
/// @ingroup fp32 basic parameter
/// @brief fp32 exponent bias
constexpr uint16_t kFp32ExpBias = 127;
constexpr uint16_t kFp32ExpBias = 127U;
/// @ingroup fp32 basic parameter
/// @brief the exponent bit length of float/fp32 is 8
constexpr uint16_t kFp32ExpLen = 8;
constexpr uint16_t kFp32ExpLen = 8U;
/// @ingroup fp32 basic parameter
/// @brief the mantissa bit length of float/fp32 is 23
constexpr uint16_t kFp32ManLen = 23;
constexpr uint16_t kFp32ManLen = 23U;
/// @ingroup fp32 basic parameter
/// @brief bit index of sign in float/fp32
constexpr uint16_t kFp32SignIndex = 31;
constexpr uint16_t kFp32SignIndex = 31U;
/// @ingroup fp32 basic parameter
/// @brief sign mask of fp32 (1 0000 0000 0000 0000 0000 0000 000)
constexpr uint32_t kFp32SignMask = 0x80000000u;
@@ -191,10 +191,10 @@ constexpr uint32_t kFp32ManHideBit = 0x00800000u;
constexpr uint32_t kFp32AbsMax = 0x7FFFFFFFu;
/// @ingroup fp32 basic parameter
/// @brief maximum exponent value of fp32 is 255(1111 1111)
constexpr uint32_t kFp32MaxExp = 0xFF;
constexpr uint32_t kFp32MaxExp = 0xFFU;
/// @ingroup fp32 basic parameter
/// @brief maximum mantissa value of fp32 (1111 1111 1111 1111 1111 111)
constexpr uint32_t kFp32MaxMan = 0x7FFFFF;
constexpr uint32_t kFp32MaxMan = 0x7FFFFFU;
/// @ingroup fp32 special value judgment
/// @brief whether a fp32 is NaN
#define FP32_IS_NAN(x) ((((x) & kFp32ExpMask) == kFp32ExpMask) && ((x) & kFp32ManMask))
@@ -218,16 +218,16 @@ constexpr uint32_t kFp32MaxMan = 0x7FFFFF;
#define FP32_CONSTRUCTOR(s, e, m) (((s) << kFp32SignIndex) | ((e) << kFp32ManLen) | ((m) & kFp32MaxMan))
/// @ingroup fp64 basic parameter
/// @brief fp64 exponent bias
constexpr uint16_t kFp64ExpBias = 1023;
constexpr uint16_t kFp64ExpBias = 1023U;
/// @ingroup fp64 basic parameter
/// @brief the exponent bit length of double/fp64 is 11
constexpr uint16_t kFp64ExpLen = 11;
constexpr uint16_t kFp64ExpLen = 11U;
/// @ingroup fp64 basic parameter
/// @brief the mantissa bit length of double/fp64 is 52
constexpr uint16_t kFp64ManLen = 52;
constexpr uint16_t kFp64ManLen = 52U;
/// @ingroup fp64 basic parameter
/// @brief bit index of sign in double/fp64 is 63
constexpr uint16_t kFp64SignIndex = 63;
constexpr uint16_t kFp64SignIndex = 63U;
/// @ingroup fp64 basic parameter
/// @brief sign mask of fp64 (1 000 (total 63bits 0))
constexpr uint64_t kFp64SignMask = 0x8000000000000000LLu;
@@ -269,14 +269,14 @@ constexpr int16_t kInt16Max = 0x7FFF;
constexpr uint16_t kBitLen16Max = 0xFFFF;
/// @ingroup integer special value judgment
/// @brief maximum positive value of int32_t (0111 1111 1111 1111 1111 1111 1111 1111)
constexpr int32_t kInt32Max = 0x7FFFFFFFu;
constexpr int32_t kInt32Max = 0x7FFFFFFF;
/// @ingroup integer special value judgment
/// @brief maximum value of a data with 32 bits length (1111 1111 1111 1111 1111 1111 1111 1111)
constexpr uint32_t kBitLen32Max = 0xFFFFFFFFu;
/// @ingroup integer special value judgment
/// @brief maximum positive value of int64_t
/// (0111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111)
constexpr int64_t kInt64Max = 0x7FFFFFFFFFFFFFFFu;
constexpr int64_t kInt64Max = 0x7FFFFFFFFFFFFFFF;
/// @ingroup integer special value judgment
/// @brief maximum value of a data with 64 bits length
/// (1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111)


+ 7
- 7
parser/tensorflow/tensorflow_parser.cc View File

@@ -1203,7 +1203,7 @@ Status TensorFlowModelParser::ParseFromMemory(const char *data, uint32_t size, g
graph_def = OriDef;
} else {
GELOGI("Before Trim, the Graph Node size is:%d", OriDef.node_size());
if (TrimGraph(OriDef, &graph_def)) {
if (static_cast<bool>(TrimGraph(OriDef, &graph_def))) {
GELOGE(FAILED, "Trim Graph fail.");
return INTERNAL_ERROR;
}
@@ -1370,7 +1370,7 @@ Status TensorFlowModelParser::Parse(const char *model_path, ge::ComputeGraphPtr
graph_def = ori_def;
} else {
GELOGI("Before Trim, the Graph Node size is:%d", ori_def.node_size());
if (TrimGraph(ori_def, &graph_def)) {
if (static_cast<bool>(TrimGraph(ori_def, &graph_def))) {
GELOGE(FAILED, "Trim Graph fail.");
return INTERNAL_ERROR;
}
@@ -3042,7 +3042,7 @@ Status TensorFlowModelParser::TrimGraphByInput(const domi::tensorflow::GraphDef
domi::tensorflow::GraphDef filtered_graph_def;
filtered_graph_def.mutable_node()->Clear();
for (const NodeDef &node : input_graph_def.node()) {
if (input_nodes.count(node.name())) {
if (static_cast<bool>(input_nodes.count(node.name()))) {
*(filtered_graph_def.mutable_node()->Add()) = node;
}
if (!delete_nodes.count(node.name())) {
@@ -3051,7 +3051,7 @@ Status TensorFlowModelParser::TrimGraphByInput(const domi::tensorflow::GraphDef
}
output_graph_def->Clear();
for (const NodeDef &node : filtered_graph_def.node()) {
if (input_nodes.count(node.name())) {
if (static_cast<bool>(input_nodes.count(node.name()))) {
NodeDef placeholder_node = node;
placeholder_node.clear_input();
GE_IF_BOOL_EXEC(node.op() != "Placeholder", placeholder_node.set_op("Placeholder"));
@@ -3099,7 +3099,7 @@ Status TensorFlowModelParser::TrimGraphByOutput(const domi::tensorflow::GraphDef
std::set<string> next_inputs;
for (const string &current_input : current_inputs) {
required_nodes.insert(current_input);
GE_IF_BOOL_EXEC(input_nodes.count(current_input), continue);
GE_IF_BOOL_EXEC(static_cast<bool>(input_nodes.count(current_input)), continue);
GE_CHK_BOOL_EXEC(node_lookup.count(current_input) > 0U,
ErrorManager::GetInstance().ATCReportErrMessage("E10016", {"parameter", "opname"},
{"out_nodes", current_input});
@@ -3118,13 +3118,13 @@ Status TensorFlowModelParser::TrimGraphByOutput(const domi::tensorflow::GraphDef
domi::tensorflow::GraphDef filtered_graph_def;
filtered_graph_def.mutable_node()->Clear();
for (const NodeDef &node : input_graph_def.node()) {
if (required_nodes.count(node.name())) {
if (static_cast<bool>(required_nodes.count(node.name()))) {
*(filtered_graph_def.mutable_node()->Add()) = node;
}
}
output_graph_def->Clear();
for (const NodeDef &node : filtered_graph_def.node()) {
if (input_nodes.count(node.name())) {
if (static_cast<bool>(input_nodes.count(node.name()))) {
NodeDef placeholder_node = node;
placeholder_node.clear_input();
GE_IF_BOOL_EXEC(node.op() != "Placeholder", placeholder_node.set_op("Placeholder"));


+ 11
- 0
tests/depends/mmpa/src/mmpa_stub.cc View File

@@ -158,6 +158,17 @@ mmTimespec mmGetTickCount() {
return rts;
}

INT32 mmGetSystemTime(mmSystemTime_t *sysTime) {
// Beijing olympics
sysTime->wYear = 2008;
sysTime->wMonth = 8;
sysTime->wDay = 8;
sysTime->wHour = 20;
sysTime->wMinute = 8;
sysTime->wSecond = 0;
return 0;
}

INT32 mmGetTid() {
INT32 ret = (INT32)syscall(SYS_gettid);



+ 2
- 0
tests/st/CMakeLists.txt View File

@@ -118,6 +118,7 @@ set(MATEDEF_SRC_FILES
"${PARSER_DIR}/metadef/graph/resource_context_mgr.cc"
"${PARSER_DIR}/metadef/graph/utils/constant_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/anchor_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/file_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/ge_ir_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/connection_matrix.cc"
"${PARSER_DIR}/metadef/graph/utils/cycle_detector.cc"
@@ -128,6 +129,7 @@ set(MATEDEF_SRC_FILES
"${PARSER_DIR}/metadef/graph/utils/transformer_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/tuning_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/type_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/trace/trace_manager.cc"
"${PARSER_DIR}/metadef/graph/common/large_bm.cc"
"${PARSER_DIR}/metadef/ops/op_imp.cpp"
"${PARSER_DIR}/metadef/third_party/transformer/src/axis_util.cc"


+ 2
- 0
tests/ut/parser/CMakeLists.txt View File

@@ -119,6 +119,7 @@ set(MATEDEF_SRC_FILES
"${PARSER_DIR}/metadef/graph/tensor.cc"
"${PARSER_DIR}/metadef/graph/types.cc"
"${PARSER_DIR}/metadef/graph/utils/anchor_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/file_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/ge_ir_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/graph_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/connection_matrix.cc"
@@ -129,6 +130,7 @@ set(MATEDEF_SRC_FILES
"${PARSER_DIR}/metadef/graph/utils/transformer_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/tuning_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/type_utils.cc"
"${PARSER_DIR}/metadef/graph/utils/trace/trace_manager.cc"
"${PARSER_DIR}/metadef/graph/common/large_bm.cc"
"${PARSER_DIR}/metadef/ops/op_imp.cpp"
"${PARSER_DIR}/metadef/third_party/transformer/src/axis_util.cc"


Write Preview
Loading…
Cancel
Save