Star548
371
代码
代码
Issues24
Pull Requests50
Actions
项目讨论
Wiki
分析
Star548
371
已合并
修复Yolo算子原型宏隔离 #1251
wkkk0528创建于 17 天前
修复Yolo算子原型宏隔离 #1251
已合并
wkkk0528创建于 17 天前
从wkkk0528/ops-cvfix/proto_macro_isolation合入到cann/ops-cvmaster
共 4 个文件变更+119-118
Mobjdetect/yolo/op_graph/yolo_proto.h+3-0
@@ -48,6 +48,8 @@ namespace ge {
48 *@par Third-party framework compatibility48 *@par Third-party framework compatibility
49 *Compatible with the Yolo operator in darknet.49 *Compatible with the Yolo operator in darknet.
50 */50 */
51+#ifndef OPS_PROTO_DEF_YOLO
52+#define OPS_PROTO_DEF_YOLO
51REG_OP(Yolo)53REG_OP(Yolo)
52 .INPUT(x, TensorType({DT_FLOAT16, DT_FLOAT}))54 .INPUT(x, TensorType({DT_FLOAT16, DT_FLOAT}))
53 .OUTPUT(coord_data, TensorType({DT_FLOAT16, DT_FLOAT}))55 .OUTPUT(coord_data, TensorType({DT_FLOAT16, DT_FLOAT}))
@@ -61,6 +63,7 @@ REG_OP(Yolo)
61 .ATTR(background, Bool, false)63 .ATTR(background, Bool, false)
62 .ATTR(softmaxtree, Bool, false)64 .ATTR(softmaxtree, Bool, false)
63 .OP_END_FACTORY_REG(Yolo)65 .OP_END_FACTORY_REG(Yolo)
66+#endif
64 67 
65} // namespace ge68} // namespace ge
66 69 
Mobjdetect/yolo/tests/ut/op_host/CMakeLists.txt+4-7
@@ -1,9 +1,6 @@
1-file(GLOB CURRENT_DIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
2if(UT_TEST_ALL OR OP_HOST_UT)1if(UT_TEST_ALL OR OP_HOST_UT)
3- add_modules_ut_sources(UT_NAME ${OP_TILING_MODULE_NAME} MODE PRIVATE DIR ${CMAKE_CURRENT_SOURCE_DIR})2+ if("${ASCEND_COMPUTE_UNIT}" STREQUAL "ascend950")
4-endif()3+ add_modules_ut_sources(UT_NAME ${OP_TILING_MODULE_NAME} MODE PRIVATE DIR ${CMAKE_CURRENT_SOURCE_DIR}/arch35)
5-foreach(SUB_DIR ${CURRENT_DIRS})
6- if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUB_DIR}/CMakeLists.txt")
7- add_subdirectory(${SUB_DIR})
8 endif()4 endif()
9-endforeach()5+ add_modules_ut_sources(UT_NAME ${OP_INFERSHAPE_MODULE_NAME} MODE PRIVATE DIR ${CMAKE_CURRENT_SOURCE_DIR})
6+endif()
Mobjdetect/yolo/tests/ut/op_host/arch35/test_yolo_tiling.cpp+55-54
@@ -26,7 +26,7 @@ protected:
26 static void TearDownTestCase() { std::cout << "YoloTiling TearDown" << std::endl; }26 static void TearDownTestCase() { std::cout << "YoloTiling TearDown" << std::endl; }
27};27};
28 28 
29-std::map<std::string, std::string> soc_version_infos = {{"Short_SoC_version", "Ascend950"}};29+std::map<std::string, std::string> soc_versions_infos = {{"Short_SoC_version", "Ascend950"}};
30 30 
31constexpr size_t YOLO_SYS_WORKSPACE_SIZE = 16777216;31constexpr size_t YOLO_SYS_WORKSPACE_SIZE = 16777216;
32 32 
@@ -45,19 +45,20 @@ TEST_F(YoloTiling, yolo_v3_mode1_fp32)
45 {{{1, 80, 507}, {1, 80, 507}}, ge::DT_FLOAT, ge::FORMAT_ND}, // output classes_prob45 {{{1, 80, 507}, {1, 80, 507}}, ge::DT_FLOAT, ge::FORMAT_ND}, // output classes_prob
46 },46 },
47 {47 {
48- gert::TilingContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(3)),48+ gert::TilingContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(3)),
49- gert::TilingContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),49+ gert::TilingContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
50- gert::TilingContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(80)),50+ gert::TilingContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(80)),
51- gert::TilingContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V3")),51+ gert::TilingContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V3")),
52- gert::TilingContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),52+ gert::TilingContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
53- gert::TilingContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),53+ gert::TilingContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
54 },54 },
55 &compileInfo,55 &compileInfo,
56+ "Ascend950", // soc version
56 64, // number of cores57 64, // number of cores
57 262144, // ubsize58 262144, // ubsize
58 4096); // max tiling data size59 4096); // max tiling data size
59 uint64_t expectTilingKey = 0; // YOLO_MODE_160 uint64_t expectTilingKey = 0; // YOLO_MODE_1
60- string expectTilingData = "12884901889 80 169 ";61+ string expectTilingData = "12884901889 80 169 192 528 ";
61 std::vector<size_t> expectWorkspaces = {YOLO_SYS_WORKSPACE_SIZE};62 std::vector<size_t> expectWorkspaces = {YOLO_SYS_WORKSPACE_SIZE};
62 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);63 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
63}64}
@@ -77,16 +78,16 @@ TEST_F(YoloTiling, yolo_v2_mode1_fp16)
77 {{{1, 20, 845}, {1, 20, 845}}, ge::DT_FLOAT16, ge::FORMAT_ND}, // output classes_prob78 {{{1, 20, 845}, {1, 20, 845}}, ge::DT_FLOAT16, ge::FORMAT_ND}, // output classes_prob
78 },79 },
79 {80 {
80- gert::TilingContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(5)),81+ gert::TilingContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(5)),
81- gert::TilingContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),82+ gert::TilingContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
82- gert::TilingContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(20)),83+ gert::TilingContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(20)),
83- gert::TilingContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V2")),84+ gert::TilingContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V2")),
84- gert::TilingContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),85+ gert::TilingContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
85- gert::TilingContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),86+ gert::TilingContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
86 },87 },
87- &compileInfo, 64, 262144, 4096);88+ &compileInfo, "Ascend950", 64, 262144, 4096);
88 uint64_t expectTilingKey = 0; // YOLO_MODE_189 uint64_t expectTilingKey = 0; // YOLO_MODE_1
89- string expectTilingData = "21474836481 20 169 ";90+ string expectTilingData = "21474836481 20 169 192 864 ";
90 std::vector<size_t> expectWorkspaces = {YOLO_SYS_WORKSPACE_SIZE};91 std::vector<size_t> expectWorkspaces = {YOLO_SYS_WORKSPACE_SIZE};
91 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);92 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
92}93}
@@ -106,16 +107,16 @@ TEST_F(YoloTiling, yolo_v2_mode2_fp32)
106 {{{1, 20, 845}, {1, 20, 845}}, ge::DT_FLOAT, ge::FORMAT_ND},107 {{{1, 20, 845}, {1, 20, 845}}, ge::DT_FLOAT, ge::FORMAT_ND},
107 },108 },
108 {109 {
109- gert::TilingContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(5)),110+ gert::TilingContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(5)),
110- gert::TilingContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),111+ gert::TilingContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
111- gert::TilingContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(20)),112+ gert::TilingContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(20)),
112- gert::TilingContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V2")),113+ gert::TilingContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V2")),
113- gert::TilingContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(true)),114+ gert::TilingContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(true)),
114- gert::TilingContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),115+ gert::TilingContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
115 },116 },
116- &compileInfo, 64, 262144, 4096);117+ &compileInfo, "Ascend950", 64, 262144, 4096);
117 uint64_t expectTilingKey = 1; // YOLO_MODE_2118 uint64_t expectTilingKey = 1; // YOLO_MODE_2
118- string expectTilingData = "21474836481 20 169 ";119+ string expectTilingData = "21474836481 20 169 192 864 ";
119 std::vector<size_t> expectWorkspaces = {YOLO_SYS_WORKSPACE_SIZE};120 std::vector<size_t> expectWorkspaces = {YOLO_SYS_WORKSPACE_SIZE};
120 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);121 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
121}122}
@@ -135,16 +136,16 @@ TEST_F(YoloTiling, yolo_v2_mode3_fp16)
135 {{{1, 20, 845}, {1, 20, 845}}, ge::DT_FLOAT16, ge::FORMAT_ND},136 {{{1, 20, 845}, {1, 20, 845}}, ge::DT_FLOAT16, ge::FORMAT_ND},
136 },137 },
137 {138 {
138- gert::TilingContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(5)),139+ gert::TilingContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(5)),
139- gert::TilingContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),140+ gert::TilingContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
140- gert::TilingContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(20)),141+ gert::TilingContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(20)),
141- gert::TilingContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V2")),142+ gert::TilingContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V2")),
142- gert::TilingContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),143+ gert::TilingContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
143- gert::TilingContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(true)),144+ gert::TilingContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(true)),
144 },145 },
145- &compileInfo, 64, 262144, 4096);146+ &compileInfo, "Ascend950", 64, 262144, 4096);
146 uint64_t expectTilingKey = 2; // YOLO_MODE_3147 uint64_t expectTilingKey = 2; // YOLO_MODE_3
147- string expectTilingData = "21474836481 20 169 ";148+ string expectTilingData = "21474836481 20 169 192 864 ";
148 std::vector<size_t> expectWorkspaces = {YOLO_SYS_WORKSPACE_SIZE};149 std::vector<size_t> expectWorkspaces = {YOLO_SYS_WORKSPACE_SIZE};
149 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);150 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
150}151}
@@ -164,16 +165,16 @@ TEST_F(YoloTiling, yolo_v2_mode4_fp32)
164 {{{1, 20, 845}, {1, 20, 845}}, ge::DT_FLOAT, ge::FORMAT_ND},165 {{{1, 20, 845}, {1, 20, 845}}, ge::DT_FLOAT, ge::FORMAT_ND},
165 },166 },
166 {167 {
167- gert::TilingContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(5)),168+ gert::TilingContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(5)),
168- gert::TilingContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),169+ gert::TilingContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
169- gert::TilingContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(20)),170+ gert::TilingContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(20)),
170- gert::TilingContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V2")),171+ gert::TilingContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V2")),
171- gert::TilingContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(true)),172+ gert::TilingContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(true)),
172- gert::TilingContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(true)),173+ gert::TilingContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(true)),
173 },174 },
174- &compileInfo, 64, 262144, 4096);175+ &compileInfo, "Ascend950", 64, 262144, 4096);
175 uint64_t expectTilingKey = 3; // YOLO_MODE_4176 uint64_t expectTilingKey = 3; // YOLO_MODE_4
176- string expectTilingData = "21474836481 20 169 ";177+ string expectTilingData = "21474836481 20 169 192 864 ";
177 std::vector<size_t> expectWorkspaces = {YOLO_SYS_WORKSPACE_SIZE};178 std::vector<size_t> expectWorkspaces = {YOLO_SYS_WORKSPACE_SIZE};
178 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);179 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
179}180}
@@ -193,14 +194,14 @@ TEST_F(YoloTiling, yolo_invalid_dim_num)
193 {{{1, 80, 507}, {1, 80, 507}}, ge::DT_FLOAT, ge::FORMAT_ND},194 {{{1, 80, 507}, {1, 80, 507}}, ge::DT_FLOAT, ge::FORMAT_ND},
194 },195 },
195 {196 {
196- gert::TilingContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(3)),197+ gert::TilingContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(3)),
197- gert::TilingContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),198+ gert::TilingContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
198- gert::TilingContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(80)),199+ gert::TilingContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(80)),
199- gert::TilingContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V3")),200+ gert::TilingContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V3")),
200- gert::TilingContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),201+ gert::TilingContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
201- gert::TilingContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),202+ gert::TilingContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
202 },203 },
203- &compileInfo, 64, 262144, 4096);204+ &compileInfo, "Ascend950", 64, 262144, 4096);
204 ExecuteTestCase(tilingContextPara, ge::GRAPH_FAILED);205 ExecuteTestCase(tilingContextPara, ge::GRAPH_FAILED);
205}206}
206 207 
@@ -219,13 +220,13 @@ TEST_F(YoloTiling, yolo_invalid_channel_mismatch)
219 {{{1, 80, 507}, {1, 80, 507}}, ge::DT_FLOAT, ge::FORMAT_ND},220 {{{1, 80, 507}, {1, 80, 507}}, ge::DT_FLOAT, ge::FORMAT_ND},
220 },221 },
221 {222 {
222- gert::TilingContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(3)),223+ gert::TilingContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(3)),
223- gert::TilingContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),224+ gert::TilingContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
224- gert::TilingContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(80)),225+ gert::TilingContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(80)),
225- gert::TilingContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V3")),226+ gert::TilingContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V3")),
226- gert::TilingContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),227+ gert::TilingContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
227- gert::TilingContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),228+ gert::TilingContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
228 },229 },
229- &compileInfo, 64, 262144, 4096);230+ &compileInfo, "Ascend950", 64, 262144, 4096);
230 ExecuteTestCase(tilingContextPara, ge::GRAPH_FAILED);231 ExecuteTestCase(tilingContextPara, ge::GRAPH_FAILED);
231}232}
Mobjdetect/yolo/tests/ut/op_host/test_yolo_infershape.cpp+57-57
@@ -35,17 +35,17 @@ TEST_F(YoloInfershape, yolo_v3_fp32)
35 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},35 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},
36 },36 },
37 {37 {
38- gert::InfershapeContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(3)),38+ gert::InfershapeContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(3)),
39- gert::InfershapeContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),39+ gert::InfershapeContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
40- gert::InfershapeContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(80)),40+ gert::InfershapeContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(80)),
41- gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V3")),41+ gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V3")),
42- gert::InfershapeContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),42+ gert::InfershapeContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
43- gert::InfershapeContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),43+ gert::InfershapeContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
44 });44 });
45 std::vector<std::vector<int64_t>> expectOutputShape = {45 std::vector<std::vector<int64_t>> expectOutputShape = {
46- {1, 12, 169},46+ {1, 12, 192},
47- {1, 507},47+ {1, 528},
48- {1, 80, 507},48+ {1, 80, 528},
49 };49 };
50 ExecuteTestCase(infershapeContextPara, ge::GRAPH_SUCCESS, expectOutputShape);50 ExecuteTestCase(infershapeContextPara, ge::GRAPH_SUCCESS, expectOutputShape);
51}51}
@@ -63,17 +63,17 @@ TEST_F(YoloInfershape, yolo_v2_fp16)
63 {{{}, {}}, ge::DT_FLOAT16, ge::FORMAT_ND},63 {{{}, {}}, ge::DT_FLOAT16, ge::FORMAT_ND},
64 },64 },
65 {65 {
66- gert::InfershapeContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(5)),66+ gert::InfershapeContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(5)),
67- gert::InfershapeContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),67+ gert::InfershapeContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
68- gert::InfershapeContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(20)),68+ gert::InfershapeContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(20)),
69- gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V2")),69+ gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V2")),
70- gert::InfershapeContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),70+ gert::InfershapeContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
71- gert::InfershapeContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),71+ gert::InfershapeContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
72 });72 });
73 std::vector<std::vector<int64_t>> expectOutputShape = {73 std::vector<std::vector<int64_t>> expectOutputShape = {
74- {1, 20, 169},74+ {1, 20, 192},
75- {1, 845},75+ {1, 864},
76- {1, 20, 845},76+ {1, 20, 864},
77 };77 };
78 ExecuteTestCase(infershapeContextPara, ge::GRAPH_SUCCESS, expectOutputShape);78 ExecuteTestCase(infershapeContextPara, ge::GRAPH_SUCCESS, expectOutputShape);
79}79}
@@ -91,17 +91,17 @@ TEST_F(YoloInfershape, yolo_batch2_fp32)
91 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},91 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},
92 },92 },
93 {93 {
94- gert::InfershapeContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(3)),94+ gert::InfershapeContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(3)),
95- gert::InfershapeContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),95+ gert::InfershapeContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
96- gert::InfershapeContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(80)),96+ gert::InfershapeContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(80)),
97- gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V3")),97+ gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V3")),
98- gert::InfershapeContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),98+ gert::InfershapeContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
99- gert::InfershapeContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),99+ gert::InfershapeContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
100 });100 });
101 std::vector<std::vector<int64_t>> expectOutputShape = {101 std::vector<std::vector<int64_t>> expectOutputShape = {
102- {2, 12, 676},102+ {2, 12, 704},
103- {2, 2028},103+ {2, 2048},
104- {2, 80, 2028},104+ {2, 80, 2048},
105 };105 };
106 ExecuteTestCase(infershapeContextPara, ge::GRAPH_SUCCESS, expectOutputShape);106 ExecuteTestCase(infershapeContextPara, ge::GRAPH_SUCCESS, expectOutputShape);
107}107}
@@ -119,12 +119,12 @@ TEST_F(YoloInfershape, yolo_invalid_dim_num)
119 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},119 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},
120 },120 },
121 {121 {
122- gert::InfershapeContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(3)),122+ gert::InfershapeContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(3)),
123- gert::InfershapeContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),123+ gert::InfershapeContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
124- gert::InfershapeContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(80)),124+ gert::InfershapeContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(80)),
125- gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V3")),125+ gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V3")),
126- gert::InfershapeContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),126+ gert::InfershapeContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
127- gert::InfershapeContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),127+ gert::InfershapeContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
128 });128 });
129 ExecuteTestCase(infershapeContextPara, ge::GRAPH_FAILED);129 ExecuteTestCase(infershapeContextPara, ge::GRAPH_FAILED);
130}130}
@@ -142,13 +142,13 @@ TEST_F(YoloInfershape, yolo_invalid_coords)
142 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},142 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},
143 },143 },
144 {144 {
145- gert::InfershapeContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(3)),145+ gert::InfershapeContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(3)),
146 gert::InfershapeContextPara::OpAttr("coords",146 gert::InfershapeContextPara::OpAttr("coords",
147- Ops::Math::AnyValue::CreateFrom<int64_t>(5)), // invalid coords147+ Ops::Cv::AnyValue::CreateFrom<int64_t>(5)), // invalid coords
148- gert::InfershapeContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(80)),148+ gert::InfershapeContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(80)),
149- gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V3")),149+ gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V3")),
150- gert::InfershapeContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),150+ gert::InfershapeContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
151- gert::InfershapeContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),151+ gert::InfershapeContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
152 });152 });
153 ExecuteTestCase(infershapeContextPara, ge::GRAPH_FAILED);153 ExecuteTestCase(infershapeContextPara, ge::GRAPH_FAILED);
154}154}
@@ -166,12 +166,12 @@ TEST_F(YoloInfershape, yolo_invalid_boxes_zero)
166 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},166 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},
167 },167 },
168 {168 {
169- gert::InfershapeContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(0)), // invalid boxes169+ gert::InfershapeContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(0)), // invalid boxes
170- gert::InfershapeContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),170+ gert::InfershapeContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
171- gert::InfershapeContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(80)),171+ gert::InfershapeContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(80)),
172- gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V3")),172+ gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V3")),
173- gert::InfershapeContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),173+ gert::InfershapeContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
174- gert::InfershapeContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),174+ gert::InfershapeContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
175 });175 });
176 ExecuteTestCase(infershapeContextPara, ge::GRAPH_FAILED);176 ExecuteTestCase(infershapeContextPara, ge::GRAPH_FAILED);
177}177}
@@ -189,12 +189,12 @@ TEST_F(YoloInfershape, yolo_invalid_classes_exceed)
189 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},189 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},
190 },190 },
191 {191 {
192- gert::InfershapeContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(3)),192+ gert::InfershapeContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(3)),
193- gert::InfershapeContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),193+ gert::InfershapeContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
194- gert::InfershapeContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(1025)), // > 1024194+ gert::InfershapeContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(1025)), // > 1024
195- gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V3")),195+ gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V3")),
196- gert::InfershapeContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),196+ gert::InfershapeContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
197- gert::InfershapeContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),197+ gert::InfershapeContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
198 });198 });
199 ExecuteTestCase(infershapeContextPara, ge::GRAPH_FAILED);199 ExecuteTestCase(infershapeContextPara, ge::GRAPH_FAILED);
200}200}
@@ -212,12 +212,12 @@ TEST_F(YoloInfershape, yolo_invalid_channel_mismatch)
212 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},212 {{{}, {}}, ge::DT_FLOAT, ge::FORMAT_ND},
213 },213 },
214 {214 {
215- gert::InfershapeContextPara::OpAttr("boxes", Ops::Math::AnyValue::CreateFrom<int64_t>(3)),215+ gert::InfershapeContextPara::OpAttr("boxes", Ops::Cv::AnyValue::CreateFrom<int64_t>(3)),
216- gert::InfershapeContextPara::OpAttr("coords", Ops::Math::AnyValue::CreateFrom<int64_t>(4)),216+ gert::InfershapeContextPara::OpAttr("coords", Ops::Cv::AnyValue::CreateFrom<int64_t>(4)),
217- gert::InfershapeContextPara::OpAttr("classes", Ops::Math::AnyValue::CreateFrom<int64_t>(80)),217+ gert::InfershapeContextPara::OpAttr("classes", Ops::Cv::AnyValue::CreateFrom<int64_t>(80)),
218- gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Math::AnyValue::CreateFrom<std::string>("V3")),218+ gert::InfershapeContextPara::OpAttr("yolo_version", Ops::Cv::AnyValue::CreateFrom<std::string>("V3")),
219- gert::InfershapeContextPara::OpAttr("softmax", Ops::Math::AnyValue::CreateFrom<bool>(false)),219+ gert::InfershapeContextPara::OpAttr("softmax", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
220- gert::InfershapeContextPara::OpAttr("background", Ops::Math::AnyValue::CreateFrom<bool>(false)),220+ gert::InfershapeContextPara::OpAttr("background", Ops::Cv::AnyValue::CreateFrom<bool>(false)),
221 });221 });
222 ExecuteTestCase(infershapeContextPara, ge::GRAPH_FAILED);222 ExecuteTestCase(infershapeContextPara, ge::GRAPH_FAILED);
223}223}