共 11 个文件变更+184-82
| @@ -35,14 +35,14 @@ TEST_F(BiasAddGradTiling, BiasAddGrad_tiling1) | |||
| 35 | gert::TilingContextPara tilingContextPara( | 35 | gert::TilingContextPara tilingContextPara( |
| 36 | "BiasAddGrad", | 36 | "BiasAddGrad", |
| 37 | { | 37 | { |
| 38 | - {{{1, 1, 4}, {1, 1, 4}}, ge::DT_FLOAT16, ge::FORMAT_ND}, | 38 | + {{{1, 1, 4, 2}, {1, 1, 4, 2}}, ge::DT_FLOAT16, ge::FORMAT_ND}, |
| 39 | }, | 39 | }, |
| 40 | { | 40 | { |
| 41 | - {{{1, 1, 4}, {1, 1, 4}}, ge::DT_FLOAT16, ge::FORMAT_ND}, | 41 | + {{{1, 1, 4, 2}, {1, 1, 4, 2}}, ge::DT_FLOAT16, ge::FORMAT_ND}, |
| 42 | }, | 42 | }, |
| 43 | {gert::TilingContextPara::OpAttr("data_format", Ops::Math::AnyValue::CreateFrom<std::string>("NHWC"))}, | 43 | {gert::TilingContextPara::OpAttr("data_format", Ops::Math::AnyValue::CreateFrom<std::string>("NHWC"))}, |
| 44 | &compileInfo); | 44 | &compileInfo); |
| 45 | - uint64_t expectTilingKey = 2660; | 45 | + uint64_t expectTilingKey = 5161; |
| 46 | std::vector<size_t> expectWorkspaces = {16777216}; | 46 | std::vector<size_t> expectWorkspaces = {16777216}; |
| 47 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); | 47 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); |
| 48 | } | 48 | } |
| @@ -53,15 +53,15 @@ TEST_F(BiasAddGradTiling, BiasAddGrad_tiling2) | |||
| 53 | gert::TilingContextPara tilingContextPara( | 53 | gert::TilingContextPara tilingContextPara( |
| 54 | "BiasAddGrad", | 54 | "BiasAddGrad", |
| 55 | { | 55 | { |
| 56 | - {{{1999, 1999, 4}, {1999, 1999, 4}}, ge::DT_FLOAT16, ge::FORMAT_ND}, | 56 | + {{{1999, 1999, 4, 2}, {1999, 1999, 4, 2}}, ge::DT_FLOAT16, ge::FORMAT_ND}, |
| 57 | }, | 57 | }, |
| 58 | { | 58 | { |
| 59 | - {{{1999, 1999, 4}, {1999, 1999, 4}}, ge::DT_FLOAT16, ge::FORMAT_ND}, | 59 | + {{{1999, 1999, 4, 2}, {1999, 1999, 4, 2}}, ge::DT_FLOAT16, ge::FORMAT_ND}, |
| 60 | }, | 60 | }, |
| 61 | - {gert::TilingContextPara::OpAttr("data_format", Ops::Math::AnyValue::CreateFrom<std::string>("NHWC"))}, | 61 | + {gert::TilingContextPara::OpAttr("data_format", Ops::Math::AnyValue::CreateFrom<std::string>("NCHW"))}, |
| 62 | &compileInfo); | 62 | &compileInfo); |
| 63 | - uint64_t expectTilingKey = 3092; | 63 | + uint64_t expectTilingKey = 141375; |
| 64 | - std::vector<size_t> expectWorkspaces = {16793600}; | 64 | + std::vector<size_t> expectWorkspaces = {16777216}; |
| 65 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); | 65 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| @@ -71,14 +71,14 @@ TEST_F(BiasAddGradTiling, BiasAddGrad_tiling3) | |||
| 71 | gert::TilingContextPara tilingContextPara( | 71 | gert::TilingContextPara tilingContextPara( |
| 72 | "BiasAddGrad", | 72 | "BiasAddGrad", |
| 73 | { | 73 | { |
| 74 | - {{{1999, 1999, 4}, {1999, 1999, 4}}, ge::DT_FLOAT16, ge::FORMAT_FRACTAL_Z}, | 74 | + {{{1999, 1999, 4, 1}, {1999, 1999, 4, 1}}, ge::DT_FLOAT16, ge::FORMAT_ND}, |
| 75 | }, | 75 | }, |
| 76 | { | 76 | { |
| 77 | - {{{1999, 1999, 4}, {1999, 1999, 4}}, ge::DT_FLOAT16, ge::FORMAT_FRACTAL_Z}, | 77 | + {{{1999, 1999, 4, 1}, {1999, 1999, 4, 1}}, ge::DT_FLOAT16, ge::FORMAT_ND}, |
| 78 | }, | 78 | }, |
| 79 | {gert::TilingContextPara::OpAttr("data_format", Ops::Math::AnyValue::CreateFrom<std::string>("NHWC"))}, | 79 | {gert::TilingContextPara::OpAttr("data_format", Ops::Math::AnyValue::CreateFrom<std::string>("NHWC"))}, |
| 80 | &compileInfo); | 80 | &compileInfo); |
| 81 | - uint64_t expectTilingKey = 3092; | 81 | + uint64_t expectTilingKey = 6167; |
| 82 | std::vector<size_t> expectWorkspaces = {16793600}; | 82 | std::vector<size_t> expectWorkspaces = {16793600}; |
| 83 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); | 83 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); |
| 84 | } | 84 | } |
| @@ -89,14 +89,14 @@ TEST_F(BiasAddGradTiling, BiasAddGrad_tiling4) | |||
| 89 | gert::TilingContextPara tilingContextPara( | 89 | gert::TilingContextPara tilingContextPara( |
| 90 | "BiasAddGrad", | 90 | "BiasAddGrad", |
| 91 | { | 91 | { |
| 92 | - {{{2, 4, 128, 128, 2, 16, 16}, {2, 4, 128, 128, 2, 16, 16}}, ge::DT_FLOAT16, ge::FORMAT_FRACTAL_Z_3D}, | 92 | + {{{2, 4, 128, 128}, {2, 4, 128, 128}}, ge::DT_FLOAT16, ge::FORMAT_ND}, |
| 93 | }, | 93 | }, |
| 94 | { | 94 | { |
| 95 | - {{{2, 4, 128, 128, 2, 16, 16}, {2, 4, 128, 128, 2, 16, 16}}, ge::DT_FLOAT16, ge::FORMAT_NHWC}, | 95 | + {{{2, 4, 128, 128}, {2, 4, 128, 128}}, ge::DT_FLOAT16, ge::FORMAT_ND}, |
| 96 | }, | 96 | }, |
| 97 | - {gert::TilingContextPara::OpAttr("data_format", Ops::Math::AnyValue::CreateFrom<std::string>("NHWC"))}, | 97 | + {gert::TilingContextPara::OpAttr("data_format", Ops::Math::AnyValue::CreateFrom<std::string>("NCHW"))}, |
| 98 | &compileInfo); | 98 | &compileInfo); |
| 99 | - uint64_t expectTilingKey = 3092; | 99 | + uint64_t expectTilingKey = 11839; |
| 100 | std::vector<size_t> expectWorkspaces = {16793600}; | 100 | std::vector<size_t> expectWorkspaces = {16793600}; |
| 101 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); | 101 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); |
| 102 | } | 102 | } |
| @@ -36,7 +36,7 @@ TEST_F(DotTiling, dot_test_tiling_001) | |||
| 36 | {{{8}, {8}}, ge::DT_FLOAT16, ge::FORMAT_ND},}, | 36 | {{{8}, {8}}, ge::DT_FLOAT16, ge::FORMAT_ND},}, |
| 37 | {{{{8}, {8}}, ge::DT_FLOAT16, ge::FORMAT_ND},}, | 37 | {{{{8}, {8}}, ge::DT_FLOAT16, ge::FORMAT_ND},}, |
| 38 | &compileInfo); | 38 | &compileInfo); |
| 39 | - uint64_t expectTilingKey = 2571; | 39 | + uint64_t expectTilingKey = 5143; |
| 40 | string expectTilingData = "1 1 1 1 1 1 1 1 19968 2304 4294967360 1040187392 1 8 0 0 0 0 0 0 0 8 1 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 1 8 0 0 0 0 0 0 0 8 1 0 0 0 0 0 0 0 "; | 40 | string expectTilingData = "1 1 1 1 1 1 1 1 19968 2304 4294967360 1040187392 1 8 0 0 0 0 0 0 0 8 1 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 1 8 0 0 0 0 0 0 0 8 1 0 0 0 0 0 0 0 "; |
| 41 | std::vector<size_t> expectWorkspaces = {16777216}; | 41 | std::vector<size_t> expectWorkspaces = {16777216}; |
| 42 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces); | 42 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces); |
| @@ -37,7 +37,9 @@ protected: | |||
| 37 | 37 | ||
| 38 | TEST_F(EqualTilingTest, equal_test_0) | 38 | TEST_F(EqualTilingTest, equal_test_0) |
| 39 | { | 39 | { |
| 40 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 40 | + optiling::BroadcastCompileInfo compileInfo; |
| 41 | + compileInfo.coreNum = 64; | ||
| 42 | + compileInfo.ubSize = 245760; | ||
| 41 | gert::TilingContextPara tilingContextPara( | 43 | gert::TilingContextPara tilingContextPara( |
| 42 | "Equal", | 44 | "Equal", |
| 43 | { | 45 | { |
| @@ -55,7 +57,9 @@ TEST_F(EqualTilingTest, equal_test_0) | |||
| 55 | 57 | ||
| 56 | TEST_F(EqualTilingTest, equal_test_1) | 58 | TEST_F(EqualTilingTest, equal_test_1) |
| 57 | { | 59 | { |
| 58 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 60 | + optiling::BroadcastCompileInfo compileInfo; |
| 61 | + compileInfo.coreNum = 64; | ||
| 62 | + compileInfo.ubSize = 245760; | ||
| 59 | gert::TilingContextPara tilingContextPara( | 63 | gert::TilingContextPara tilingContextPara( |
| 60 | "Equal", | 64 | "Equal", |
| 61 | { | 65 | { |
| @@ -73,7 +77,9 @@ TEST_F(EqualTilingTest, equal_test_1) | |||
| 73 | 77 | ||
| 74 | TEST_F(EqualTilingTest, equal_test_2) | 78 | TEST_F(EqualTilingTest, equal_test_2) |
| 75 | { | 79 | { |
| 76 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 80 | + optiling::BroadcastCompileInfo compileInfo; |
| 81 | + compileInfo.coreNum = 64; | ||
| 82 | + compileInfo.ubSize = 245760; | ||
| 77 | gert::TilingContextPara tilingContextPara( | 83 | gert::TilingContextPara tilingContextPara( |
| 78 | "Equal", | 84 | "Equal", |
| 79 | { | 85 | { |
| @@ -91,7 +97,9 @@ TEST_F(EqualTilingTest, equal_test_2) | |||
| 91 | 97 | ||
| 92 | TEST_F(EqualTilingTest, equal_test_3) | 98 | TEST_F(EqualTilingTest, equal_test_3) |
| 93 | { | 99 | { |
| 94 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 100 | + optiling::BroadcastCompileInfo compileInfo; |
| 101 | + compileInfo.coreNum = 64; | ||
| 102 | + compileInfo.ubSize = 245760; | ||
| 95 | gert::TilingContextPara tilingContextPara( | 103 | gert::TilingContextPara tilingContextPara( |
| 96 | "Equal", | 104 | "Equal", |
| 97 | { | 105 | { |
| @@ -109,7 +117,9 @@ TEST_F(EqualTilingTest, equal_test_3) | |||
| 109 | 117 | ||
| 110 | TEST_F(EqualTilingTest, equal_test_4) | 118 | TEST_F(EqualTilingTest, equal_test_4) |
| 111 | { | 119 | { |
| 112 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 120 | + optiling::BroadcastCompileInfo compileInfo; |
| 121 | + compileInfo.coreNum = 64; | ||
| 122 | + compileInfo.ubSize = 245760; | ||
| 113 | gert::TilingContextPara tilingContextPara( | 123 | gert::TilingContextPara tilingContextPara( |
| 114 | "Equal", | 124 | "Equal", |
| 115 | { | 125 | { |
| @@ -127,7 +137,9 @@ TEST_F(EqualTilingTest, equal_test_4) | |||
| 127 | 137 | ||
| 128 | TEST_F(EqualTilingTest, equal_test_5) | 138 | TEST_F(EqualTilingTest, equal_test_5) |
| 129 | { | 139 | { |
| 130 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 140 | + optiling::BroadcastCompileInfo compileInfo; |
| 141 | + compileInfo.coreNum = 64; | ||
| 142 | + compileInfo.ubSize = 245760; | ||
| 131 | gert::TilingContextPara tilingContextPara( | 143 | gert::TilingContextPara tilingContextPara( |
| 132 | "Equal", | 144 | "Equal", |
| 133 | { | 145 | { |
| @@ -145,7 +157,9 @@ TEST_F(EqualTilingTest, equal_test_5) | |||
| 145 | 157 | ||
| 146 | TEST_F(EqualTilingTest, equal_test_6) | 158 | TEST_F(EqualTilingTest, equal_test_6) |
| 147 | { | 159 | { |
| 148 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 160 | + optiling::BroadcastCompileInfo compileInfo; |
| 161 | + compileInfo.coreNum = 64; | ||
| 162 | + compileInfo.ubSize = 245760; | ||
| 149 | gert::TilingContextPara tilingContextPara( | 163 | gert::TilingContextPara tilingContextPara( |
| 150 | "Equal", | 164 | "Equal", |
| 151 | { | 165 | { |
| @@ -163,7 +177,9 @@ TEST_F(EqualTilingTest, equal_test_6) | |||
| 163 | 177 | ||
| 164 | TEST_F(EqualTilingTest, equal_test_7) | 178 | TEST_F(EqualTilingTest, equal_test_7) |
| 165 | { | 179 | { |
| 166 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 180 | + optiling::BroadcastCompileInfo compileInfo; |
| 181 | + compileInfo.coreNum = 64; | ||
| 182 | + compileInfo.ubSize = 245760; | ||
| 167 | gert::TilingContextPara tilingContextPara( | 183 | gert::TilingContextPara tilingContextPara( |
| 168 | "Equal", | 184 | "Equal", |
| 169 | { | 185 | { |
| @@ -181,7 +197,9 @@ TEST_F(EqualTilingTest, equal_test_7) | |||
| 181 | 197 | ||
| 182 | TEST_F(EqualTilingTest, equal_test_8) | 198 | TEST_F(EqualTilingTest, equal_test_8) |
| 183 | { | 199 | { |
| 184 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 200 | + optiling::BroadcastCompileInfo compileInfo; |
| 201 | + compileInfo.coreNum = 64; | ||
| 202 | + compileInfo.ubSize = 245760; | ||
| 185 | gert::TilingContextPara tilingContextPara( | 203 | gert::TilingContextPara tilingContextPara( |
| 186 | "Equal", | 204 | "Equal", |
| 187 | { | 205 | { |
| @@ -199,7 +217,9 @@ TEST_F(EqualTilingTest, equal_test_8) | |||
| 199 | 217 | ||
| 200 | TEST_F(EqualTilingTest, equal_test_9) | 218 | TEST_F(EqualTilingTest, equal_test_9) |
| 201 | { | 219 | { |
| 202 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 220 | + optiling::BroadcastCompileInfo compileInfo; |
| 221 | + compileInfo.coreNum = 64; | ||
| 222 | + compileInfo.ubSize = 245760; | ||
| 203 | gert::TilingContextPara tilingContextPara( | 223 | gert::TilingContextPara tilingContextPara( |
| 204 | "Equal", | 224 | "Equal", |
| 205 | { | 225 | { |
| @@ -217,7 +237,9 @@ TEST_F(EqualTilingTest, equal_test_9) | |||
| 217 | 237 | ||
| 218 | TEST_F(EqualTilingTest, equal_test_10) | 238 | TEST_F(EqualTilingTest, equal_test_10) |
| 219 | { | 239 | { |
| 220 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 240 | + optiling::BroadcastCompileInfo compileInfo; |
| 241 | + compileInfo.coreNum = 64; | ||
| 242 | + compileInfo.ubSize = 245760; | ||
| 221 | gert::TilingContextPara tilingContextPara( | 243 | gert::TilingContextPara tilingContextPara( |
| 222 | "Equal", | 244 | "Equal", |
| 223 | { | 245 | { |
| @@ -235,7 +257,9 @@ TEST_F(EqualTilingTest, equal_test_10) | |||
| 235 | 257 | ||
| 236 | TEST_F(EqualTilingTest, equal_test_11) | 258 | TEST_F(EqualTilingTest, equal_test_11) |
| 237 | { | 259 | { |
| 238 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 260 | + optiling::BroadcastCompileInfo compileInfo; |
| 261 | + compileInfo.coreNum = 64; | ||
| 262 | + compileInfo.ubSize = 245760; | ||
| 239 | gert::TilingContextPara tilingContextPara( | 263 | gert::TilingContextPara tilingContextPara( |
| 240 | "Equal", | 264 | "Equal", |
| 241 | { | 265 | { |
| @@ -253,7 +277,9 @@ TEST_F(EqualTilingTest, equal_test_11) | |||
| 253 | 277 | ||
| 254 | TEST_F(EqualTilingTest, equal_test_12) | 278 | TEST_F(EqualTilingTest, equal_test_12) |
| 255 | { | 279 | { |
| 256 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 280 | + optiling::BroadcastCompileInfo compileInfo; |
| 281 | + compileInfo.coreNum = 64; | ||
| 282 | + compileInfo.ubSize = 245760; | ||
| 257 | gert::TilingContextPara tilingContextPara( | 283 | gert::TilingContextPara tilingContextPara( |
| 258 | "Equal", | 284 | "Equal", |
| 259 | { | 285 | { |
| @@ -271,7 +297,9 @@ TEST_F(EqualTilingTest, equal_test_12) | |||
| 271 | 297 | ||
| 272 | TEST_F(EqualTilingTest, equal_test_13) | 298 | TEST_F(EqualTilingTest, equal_test_13) |
| 273 | { | 299 | { |
| 274 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 300 | + optiling::BroadcastCompileInfo compileInfo; |
| 301 | + compileInfo.coreNum = 64; | ||
| 302 | + compileInfo.ubSize = 245760; | ||
| 275 | gert::TilingContextPara tilingContextPara( | 303 | gert::TilingContextPara tilingContextPara( |
| 276 | "Equal", | 304 | "Equal", |
| 277 | { | 305 | { |
| @@ -289,7 +317,9 @@ TEST_F(EqualTilingTest, equal_test_13) | |||
| 289 | 317 | ||
| 290 | TEST_F(EqualTilingTest, equal_test_14) | 318 | TEST_F(EqualTilingTest, equal_test_14) |
| 291 | { | 319 | { |
| 292 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 320 | + optiling::BroadcastCompileInfo compileInfo; |
| 321 | + compileInfo.coreNum = 64; | ||
| 322 | + compileInfo.ubSize = 245760; | ||
| 293 | gert::TilingContextPara tilingContextPara( | 323 | gert::TilingContextPara tilingContextPara( |
| 294 | "Equal", | 324 | "Equal", |
| 295 | { | 325 | { |
| @@ -307,7 +337,9 @@ TEST_F(EqualTilingTest, equal_test_14) | |||
| 307 | 337 | ||
| 308 | TEST_F(EqualTilingTest, equal_test_15) | 338 | TEST_F(EqualTilingTest, equal_test_15) |
| 309 | { | 339 | { |
| 310 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 340 | + optiling::BroadcastCompileInfo compileInfo; |
| 341 | + compileInfo.coreNum = 64; | ||
| 342 | + compileInfo.ubSize = 245760; | ||
| 311 | gert::TilingContextPara tilingContextPara( | 343 | gert::TilingContextPara tilingContextPara( |
| 312 | "Equal", | 344 | "Equal", |
| 313 | { | 345 | { |
| @@ -325,7 +357,9 @@ TEST_F(EqualTilingTest, equal_test_15) | |||
| 325 | 357 | ||
| 326 | TEST_F(EqualTilingTest, equal_test_16) | 358 | TEST_F(EqualTilingTest, equal_test_16) |
| 327 | { | 359 | { |
| 328 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 360 | + optiling::BroadcastCompileInfo compileInfo; |
| 361 | + compileInfo.coreNum = 64; | ||
| 362 | + compileInfo.ubSize = 245760; | ||
| 329 | gert::TilingContextPara tilingContextPara( | 363 | gert::TilingContextPara tilingContextPara( |
| 330 | "Equal", | 364 | "Equal", |
| 331 | { | 365 | { |
| @@ -343,7 +377,9 @@ TEST_F(EqualTilingTest, equal_test_16) | |||
| 343 | 377 | ||
| 344 | TEST_F(EqualTilingTest, equal_test_17) | 378 | TEST_F(EqualTilingTest, equal_test_17) |
| 345 | { | 379 | { |
| 346 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 380 | + optiling::BroadcastCompileInfo compileInfo; |
| 381 | + compileInfo.coreNum = 64; | ||
| 382 | + compileInfo.ubSize = 245760; | ||
| 347 | gert::TilingContextPara tilingContextPara( | 383 | gert::TilingContextPara tilingContextPara( |
| 348 | "Equal", | 384 | "Equal", |
| 349 | { | 385 | { |
| @@ -361,7 +397,9 @@ TEST_F(EqualTilingTest, equal_test_17) | |||
| 361 | 397 | ||
| 362 | TEST_F(EqualTilingTest, equal_test_failed_different_dtype) | 398 | TEST_F(EqualTilingTest, equal_test_failed_different_dtype) |
| 363 | { | 399 | { |
| 364 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 400 | + optiling::BroadcastCompileInfo compileInfo; |
| 401 | + compileInfo.coreNum = 64; | ||
| 402 | + compileInfo.ubSize = 245760; | ||
| 365 | gert::TilingContextPara tilingContextPara( | 403 | gert::TilingContextPara tilingContextPara( |
| 366 | "Equal", | 404 | "Equal", |
| 367 | { | 405 | { |
| @@ -377,7 +415,9 @@ TEST_F(EqualTilingTest, equal_test_failed_different_dtype) | |||
| 377 | 415 | ||
| 378 | TEST_F(EqualTilingTest, equal_test_failed_invalid_dtype) | 416 | TEST_F(EqualTilingTest, equal_test_failed_invalid_dtype) |
| 379 | { | 417 | { |
| 380 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 418 | + optiling::BroadcastCompileInfo compileInfo; |
| 419 | + compileInfo.coreNum = 64; | ||
| 420 | + compileInfo.ubSize = 245760; | ||
| 381 | gert::TilingContextPara tilingContextPara( | 421 | gert::TilingContextPara tilingContextPara( |
| 382 | "Equal", | 422 | "Equal", |
| 383 | { | 423 | { |
| @@ -393,7 +433,9 @@ TEST_F(EqualTilingTest, equal_test_failed_invalid_dtype) | |||
| 393 | 433 | ||
| 394 | TEST_F(EqualTilingTest, equal_test_double_1) | 434 | TEST_F(EqualTilingTest, equal_test_double_1) |
| 395 | { | 435 | { |
| 396 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 436 | + optiling::BroadcastCompileInfo compileInfo; |
| 437 | + compileInfo.coreNum = 64; | ||
| 438 | + compileInfo.ubSize = 245760; | ||
| 397 | gert::TilingContextPara tilingContextPara( | 439 | gert::TilingContextPara tilingContextPara( |
| 398 | "Equal", | 440 | "Equal", |
| 399 | { | 441 | { |
| @@ -29,7 +29,9 @@ class LogicalOrTiling : public testing::Test { | |||
| 29 | 29 | ||
| 30 | TEST_F(LogicalOrTiling, logical_or_test_0) | 30 | TEST_F(LogicalOrTiling, logical_or_test_0) |
| 31 | { | 31 | { |
| 32 | - BroadcastCompileInfo compileInfo = {64, 245760}; | 32 | + BroadcastCompileInfo compileInfo; |
| 33 | + compileInfo.coreNum = 64; | ||
| 34 | + compileInfo.ubSize = 245760; | ||
| 33 | gert::TilingContextPara tilingContextPara( | 35 | gert::TilingContextPara tilingContextPara( |
| 34 | "LogicalOr", | 36 | "LogicalOr", |
| 35 | { | 37 | { |
| @@ -48,7 +50,9 @@ TEST_F(LogicalOrTiling, logical_or_test_0) | |||
| 48 | 50 | ||
| 49 | TEST_F(LogicalOrTiling, logical_or_test_1) | 51 | TEST_F(LogicalOrTiling, logical_or_test_1) |
| 50 | { | 52 | { |
| 51 | - BroadcastCompileInfo compileInfo = {64, 245760}; | 53 | + BroadcastCompileInfo compileInfo; |
| 54 | + compileInfo.coreNum = 64; | ||
| 55 | + compileInfo.ubSize = 245760; | ||
| 52 | gert::TilingContextPara tilingContextPara( | 56 | gert::TilingContextPara tilingContextPara( |
| 53 | "LogicalOr", | 57 | "LogicalOr", |
| 54 | { | 58 | { |
| @@ -37,7 +37,9 @@ protected: | |||
| 37 | 37 | ||
| 38 | TEST_F(NotEqualTilingTest, not_equal_test_0) | 38 | TEST_F(NotEqualTilingTest, not_equal_test_0) |
| 39 | { | 39 | { |
| 40 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 40 | + optiling::BroadcastCompileInfo compileInfo; |
| 41 | + compileInfo.coreNum = 64; | ||
| 42 | + compileInfo.ubSize = 245760; | ||
| 41 | gert::TilingContextPara tilingContextPara( | 43 | gert::TilingContextPara tilingContextPara( |
| 42 | "NotEqual", | 44 | "NotEqual", |
| 43 | { | 45 | { |
| @@ -55,7 +57,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_0) | |||
| 55 | 57 | ||
| 56 | TEST_F(NotEqualTilingTest, not_equal_test_1) | 58 | TEST_F(NotEqualTilingTest, not_equal_test_1) |
| 57 | { | 59 | { |
| 58 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 60 | + optiling::BroadcastCompileInfo compileInfo; |
| 61 | + compileInfo.coreNum = 64; | ||
| 62 | + compileInfo.ubSize = 245760; | ||
| 59 | gert::TilingContextPara tilingContextPara( | 63 | gert::TilingContextPara tilingContextPara( |
| 60 | "NotEqual", | 64 | "NotEqual", |
| 61 | { | 65 | { |
| @@ -73,7 +77,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_1) | |||
| 73 | 77 | ||
| 74 | TEST_F(NotEqualTilingTest, not_equal_test_2) | 78 | TEST_F(NotEqualTilingTest, not_equal_test_2) |
| 75 | { | 79 | { |
| 76 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 80 | + optiling::BroadcastCompileInfo compileInfo; |
| 81 | + compileInfo.coreNum = 64; | ||
| 82 | + compileInfo.ubSize = 245760; | ||
| 77 | gert::TilingContextPara tilingContextPara( | 83 | gert::TilingContextPara tilingContextPara( |
| 78 | "NotEqual", | 84 | "NotEqual", |
| 79 | { | 85 | { |
| @@ -91,7 +97,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_2) | |||
| 91 | 97 | ||
| 92 | TEST_F(NotEqualTilingTest, not_equal_test_3) | 98 | TEST_F(NotEqualTilingTest, not_equal_test_3) |
| 93 | { | 99 | { |
| 94 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 100 | + optiling::BroadcastCompileInfo compileInfo; |
| 101 | + compileInfo.coreNum = 64; | ||
| 102 | + compileInfo.ubSize = 245760; | ||
| 95 | gert::TilingContextPara tilingContextPara( | 103 | gert::TilingContextPara tilingContextPara( |
| 96 | "NotEqual", | 104 | "NotEqual", |
| 97 | { | 105 | { |
| @@ -109,7 +117,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_3) | |||
| 109 | 117 | ||
| 110 | TEST_F(NotEqualTilingTest, not_equal_test_4) | 118 | TEST_F(NotEqualTilingTest, not_equal_test_4) |
| 111 | { | 119 | { |
| 112 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 120 | + optiling::BroadcastCompileInfo compileInfo; |
| 121 | + compileInfo.coreNum = 64; | ||
| 122 | + compileInfo.ubSize = 245760; | ||
| 113 | gert::TilingContextPara tilingContextPara( | 123 | gert::TilingContextPara tilingContextPara( |
| 114 | "NotEqual", | 124 | "NotEqual", |
| 115 | { | 125 | { |
| @@ -127,7 +137,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_4) | |||
| 127 | 137 | ||
| 128 | TEST_F(NotEqualTilingTest, not_equal_test_5) | 138 | TEST_F(NotEqualTilingTest, not_equal_test_5) |
| 129 | { | 139 | { |
| 130 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 140 | + optiling::BroadcastCompileInfo compileInfo; |
| 141 | + compileInfo.coreNum = 64; | ||
| 142 | + compileInfo.ubSize = 245760; | ||
| 131 | gert::TilingContextPara tilingContextPara( | 143 | gert::TilingContextPara tilingContextPara( |
| 132 | "NotEqual", | 144 | "NotEqual", |
| 133 | { | 145 | { |
| @@ -145,7 +157,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_5) | |||
| 145 | 157 | ||
| 146 | TEST_F(NotEqualTilingTest, not_equal_test_6) | 158 | TEST_F(NotEqualTilingTest, not_equal_test_6) |
| 147 | { | 159 | { |
| 148 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 160 | + optiling::BroadcastCompileInfo compileInfo; |
| 161 | + compileInfo.coreNum = 64; | ||
| 162 | + compileInfo.ubSize = 245760; | ||
| 149 | gert::TilingContextPara tilingContextPara( | 163 | gert::TilingContextPara tilingContextPara( |
| 150 | "NotEqual", | 164 | "NotEqual", |
| 151 | { | 165 | { |
| @@ -163,7 +177,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_6) | |||
| 163 | 177 | ||
| 164 | TEST_F(NotEqualTilingTest, not_equal_test_7) | 178 | TEST_F(NotEqualTilingTest, not_equal_test_7) |
| 165 | { | 179 | { |
| 166 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 180 | + optiling::BroadcastCompileInfo compileInfo; |
| 181 | + compileInfo.coreNum = 64; | ||
| 182 | + compileInfo.ubSize = 245760; | ||
| 167 | gert::TilingContextPara tilingContextPara( | 183 | gert::TilingContextPara tilingContextPara( |
| 168 | "NotEqual", | 184 | "NotEqual", |
| 169 | { | 185 | { |
| @@ -181,7 +197,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_7) | |||
| 181 | 197 | ||
| 182 | TEST_F(NotEqualTilingTest, not_equal_test_8) | 198 | TEST_F(NotEqualTilingTest, not_equal_test_8) |
| 183 | { | 199 | { |
| 184 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 200 | + optiling::BroadcastCompileInfo compileInfo; |
| 201 | + compileInfo.coreNum = 64; | ||
| 202 | + compileInfo.ubSize = 245760; | ||
| 185 | gert::TilingContextPara tilingContextPara( | 203 | gert::TilingContextPara tilingContextPara( |
| 186 | "NotEqual", | 204 | "NotEqual", |
| 187 | { | 205 | { |
| @@ -199,7 +217,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_8) | |||
| 199 | 217 | ||
| 200 | TEST_F(NotEqualTilingTest, not_equal_test_9) | 218 | TEST_F(NotEqualTilingTest, not_equal_test_9) |
| 201 | { | 219 | { |
| 202 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 220 | + optiling::BroadcastCompileInfo compileInfo; |
| 221 | + compileInfo.coreNum = 64; | ||
| 222 | + compileInfo.ubSize = 245760; | ||
| 203 | gert::TilingContextPara tilingContextPara( | 223 | gert::TilingContextPara tilingContextPara( |
| 204 | "NotEqual", | 224 | "NotEqual", |
| 205 | { | 225 | { |
| @@ -217,7 +237,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_9) | |||
| 217 | 237 | ||
| 218 | TEST_F(NotEqualTilingTest, not_equal_test_10) | 238 | TEST_F(NotEqualTilingTest, not_equal_test_10) |
| 219 | { | 239 | { |
| 220 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 240 | + optiling::BroadcastCompileInfo compileInfo; |
| 241 | + compileInfo.coreNum = 64; | ||
| 242 | + compileInfo.ubSize = 245760; | ||
| 221 | gert::TilingContextPara tilingContextPara( | 243 | gert::TilingContextPara tilingContextPara( |
| 222 | "NotEqual", | 244 | "NotEqual", |
| 223 | { | 245 | { |
| @@ -235,7 +257,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_10) | |||
| 235 | 257 | ||
| 236 | TEST_F(NotEqualTilingTest, not_equal_test_11) | 258 | TEST_F(NotEqualTilingTest, not_equal_test_11) |
| 237 | { | 259 | { |
| 238 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 260 | + optiling::BroadcastCompileInfo compileInfo; |
| 261 | + compileInfo.coreNum = 64; | ||
| 262 | + compileInfo.ubSize = 245760; | ||
| 239 | gert::TilingContextPara tilingContextPara( | 263 | gert::TilingContextPara tilingContextPara( |
| 240 | "NotEqual", | 264 | "NotEqual", |
| 241 | { | 265 | { |
| @@ -253,7 +277,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_11) | |||
| 253 | 277 | ||
| 254 | TEST_F(NotEqualTilingTest, not_equal_test_12) | 278 | TEST_F(NotEqualTilingTest, not_equal_test_12) |
| 255 | { | 279 | { |
| 256 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 280 | + optiling::BroadcastCompileInfo compileInfo; |
| 281 | + compileInfo.coreNum = 64; | ||
| 282 | + compileInfo.ubSize = 245760; | ||
| 257 | gert::TilingContextPara tilingContextPara( | 283 | gert::TilingContextPara tilingContextPara( |
| 258 | "NotEqual", | 284 | "NotEqual", |
| 259 | { | 285 | { |
| @@ -271,7 +297,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_12) | |||
| 271 | 297 | ||
| 272 | TEST_F(NotEqualTilingTest, not_equal_test_13) | 298 | TEST_F(NotEqualTilingTest, not_equal_test_13) |
| 273 | { | 299 | { |
| 274 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 300 | + optiling::BroadcastCompileInfo compileInfo; |
| 301 | + compileInfo.coreNum = 64; | ||
| 302 | + compileInfo.ubSize = 245760; | ||
| 275 | gert::TilingContextPara tilingContextPara( | 303 | gert::TilingContextPara tilingContextPara( |
| 276 | "NotEqual", | 304 | "NotEqual", |
| 277 | { | 305 | { |
| @@ -289,7 +317,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_13) | |||
| 289 | 317 | ||
| 290 | TEST_F(NotEqualTilingTest, not_equal_test_14) | 318 | TEST_F(NotEqualTilingTest, not_equal_test_14) |
| 291 | { | 319 | { |
| 292 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 320 | + optiling::BroadcastCompileInfo compileInfo; |
| 321 | + compileInfo.coreNum = 64; | ||
| 322 | + compileInfo.ubSize = 245760; | ||
| 293 | gert::TilingContextPara tilingContextPara( | 323 | gert::TilingContextPara tilingContextPara( |
| 294 | "NotEqual", | 324 | "NotEqual", |
| 295 | { | 325 | { |
| @@ -307,7 +337,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_14) | |||
| 307 | 337 | ||
| 308 | TEST_F(NotEqualTilingTest, not_equal_test_15) | 338 | TEST_F(NotEqualTilingTest, not_equal_test_15) |
| 309 | { | 339 | { |
| 310 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 340 | + optiling::BroadcastCompileInfo compileInfo; |
| 341 | + compileInfo.coreNum = 64; | ||
| 342 | + compileInfo.ubSize = 245760; | ||
| 311 | gert::TilingContextPara tilingContextPara( | 343 | gert::TilingContextPara tilingContextPara( |
| 312 | "NotEqual", | 344 | "NotEqual", |
| 313 | { | 345 | { |
| @@ -325,7 +357,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_15) | |||
| 325 | 357 | ||
| 326 | TEST_F(NotEqualTilingTest, not_equal_test_16) | 358 | TEST_F(NotEqualTilingTest, not_equal_test_16) |
| 327 | { | 359 | { |
| 328 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 360 | + optiling::BroadcastCompileInfo compileInfo; |
| 361 | + compileInfo.coreNum = 64; | ||
| 362 | + compileInfo.ubSize = 245760; | ||
| 329 | gert::TilingContextPara tilingContextPara( | 363 | gert::TilingContextPara tilingContextPara( |
| 330 | "NotEqual", | 364 | "NotEqual", |
| 331 | { | 365 | { |
| @@ -343,7 +377,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_16) | |||
| 343 | 377 | ||
| 344 | TEST_F(NotEqualTilingTest, not_equal_test_17) | 378 | TEST_F(NotEqualTilingTest, not_equal_test_17) |
| 345 | { | 379 | { |
| 346 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 380 | + optiling::BroadcastCompileInfo compileInfo; |
| 381 | + compileInfo.coreNum = 64; | ||
| 382 | + compileInfo.ubSize = 245760; | ||
| 347 | gert::TilingContextPara tilingContextPara( | 383 | gert::TilingContextPara tilingContextPara( |
| 348 | "NotEqual", | 384 | "NotEqual", |
| 349 | { | 385 | { |
| @@ -361,7 +397,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_17) | |||
| 361 | 397 | ||
| 362 | TEST_F(NotEqualTilingTest, not_equal_test_failed_different_dtype) | 398 | TEST_F(NotEqualTilingTest, not_equal_test_failed_different_dtype) |
| 363 | { | 399 | { |
| 364 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 400 | + optiling::BroadcastCompileInfo compileInfo; |
| 401 | + compileInfo.coreNum = 64; | ||
| 402 | + compileInfo.ubSize = 245760; | ||
| 365 | gert::TilingContextPara tilingContextPara( | 403 | gert::TilingContextPara tilingContextPara( |
| 366 | "NotEqual", | 404 | "NotEqual", |
| 367 | { | 405 | { |
| @@ -377,7 +415,9 @@ TEST_F(NotEqualTilingTest, not_equal_test_failed_different_dtype) | |||
| 377 | 415 | ||
| 378 | TEST_F(NotEqualTilingTest, not_equal_test_failed_invalid_dtype) | 416 | TEST_F(NotEqualTilingTest, not_equal_test_failed_invalid_dtype) |
| 379 | { | 417 | { |
| 380 | - optiling::BroadcastCompileInfo compileInfo = {64, 245760}; | 418 | + optiling::BroadcastCompileInfo compileInfo; |
| 419 | + compileInfo.coreNum = 64; | ||
| 420 | + compileInfo.ubSize = 245760; | ||
| 381 | gert::TilingContextPara tilingContextPara( | 421 | gert::TilingContextPara tilingContextPara( |
| 382 | "NotEqual", | 422 | "NotEqual", |
| 383 | { | 423 | { |
| @@ -38,7 +38,9 @@ protected: | |||
| 38 | 38 | ||
| 39 | TEST_F(RealDivTiling, real_div_test_bf16) | 39 | TEST_F(RealDivTiling, real_div_test_bf16) |
| 40 | { | 40 | { |
| 41 | - Ops::Base::BroadcastCompileInfo compileInfo = {64, 245760}; | 41 | + Ops::Base::BroadcastCompileInfo compileInfo; |
| 42 | + compileInfo.coreNum = 64; | ||
| 43 | + compileInfo.ubSize = 245760; | ||
| 42 | gert::TilingContextPara tilingContextPara( | 44 | gert::TilingContextPara tilingContextPara( |
| 43 | "RealDiv", | 45 | "RealDiv", |
| 44 | { | 46 | { |
| @@ -57,7 +59,9 @@ TEST_F(RealDivTiling, real_div_test_bf16) | |||
| 57 | 59 | ||
| 58 | TEST_F(RealDivTiling, real_div_test_float16) | 60 | TEST_F(RealDivTiling, real_div_test_float16) |
| 59 | { | 61 | { |
| 60 | - Ops::Base::BroadcastCompileInfo compileInfo = {64, 245760}; | 62 | + Ops::Base::BroadcastCompileInfo compileInfo; |
| 63 | + compileInfo.coreNum = 64; | ||
| 64 | + compileInfo.ubSize = 245760; | ||
| 61 | gert::TilingContextPara tilingContextPara( | 65 | gert::TilingContextPara tilingContextPara( |
| 62 | "RealDiv", | 66 | "RealDiv", |
| 63 | { | 67 | { |
| @@ -76,7 +80,9 @@ TEST_F(RealDivTiling, real_div_test_float16) | |||
| 76 | 80 | ||
| 77 | TEST_F(RealDivTiling, real_div_test_int32) | 81 | TEST_F(RealDivTiling, real_div_test_int32) |
| 78 | { | 82 | { |
| 79 | - Ops::Base::BroadcastCompileInfo compileInfo = {64, 245760}; | 83 | + Ops::Base::BroadcastCompileInfo compileInfo; |
| 84 | + compileInfo.coreNum = 64; | ||
| 85 | + compileInfo.ubSize = 245760; | ||
| 80 | gert::TilingContextPara tilingContextPara( | 86 | gert::TilingContextPara tilingContextPara( |
| 81 | "RealDiv", | 87 | "RealDiv", |
| 82 | { | 88 | { |
| @@ -95,7 +101,9 @@ TEST_F(RealDivTiling, real_div_test_int32) | |||
| 95 | 101 | ||
| 96 | TEST_F(RealDivTiling, real_div_test_float32) | 102 | TEST_F(RealDivTiling, real_div_test_float32) |
| 97 | { | 103 | { |
| 98 | - Ops::Base::BroadcastCompileInfo compileInfo = {64, 245760}; | 104 | + Ops::Base::BroadcastCompileInfo compileInfo; |
| 105 | + compileInfo.coreNum = 64; | ||
| 106 | + compileInfo.ubSize = 245760; | ||
| 99 | gert::TilingContextPara tilingContextPara( | 107 | gert::TilingContextPara tilingContextPara( |
| 100 | "RealDiv", | 108 | "RealDiv", |
| 101 | { | 109 | { |
| @@ -114,7 +122,9 @@ TEST_F(RealDivTiling, real_div_test_float32) | |||
| 114 | 122 | ||
| 115 | TEST_F(RealDivTiling, real_div_test_bool) | 123 | TEST_F(RealDivTiling, real_div_test_bool) |
| 116 | { | 124 | { |
| 117 | - Ops::Base::BroadcastCompileInfo compileInfo = {64, 245760}; | 125 | + Ops::Base::BroadcastCompileInfo compileInfo; |
| 126 | + compileInfo.coreNum = 64; | ||
| 127 | + compileInfo.ubSize = 245760; | ||
| 118 | gert::TilingContextPara tilingContextPara( | 128 | gert::TilingContextPara tilingContextPara( |
| 119 | "RealDiv", | 129 | "RealDiv", |
| 120 | { | 130 | { |
| @@ -71,7 +71,7 @@ TEST_F(ReduceMaxDavidTiling, reduce_max_david_tiling1) | |||
| 71 | {input, axes}, | 71 | {input, axes}, |
| 72 | {y}, | 72 | {y}, |
| 73 | &compileInfo); | 73 | &compileInfo); |
| 74 | - uint64_t expectedTilingKey = 0; | 74 | + uint64_t expectedTilingKey = 1; |
| 75 | std::vector<size_t> expectedWorkspaces = { 16777216 }; | 75 | std::vector<size_t> expectedWorkspaces = { 16777216 }; |
| 76 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); | 76 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); |
| 77 | } | 77 | } |
| @@ -92,7 +92,7 @@ TEST_F(ReduceMaxDavidTiling, reduce_max_david_tiling2) | |||
| 92 | {input, axes}, | 92 | {input, axes}, |
| 93 | {y}, | 93 | {y}, |
| 94 | &compileInfo); | 94 | &compileInfo); |
| 95 | - uint64_t expectedTilingKey = 2571; | 95 | + uint64_t expectedTilingKey = 5143; |
| 96 | std::vector<size_t> expectedWorkspaces = { 16777216 }; | 96 | std::vector<size_t> expectedWorkspaces = { 16777216 }; |
| 97 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); | 97 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); |
| 98 | } | 98 | } |
| @@ -113,7 +113,7 @@ TEST_F(ReduceMaxDavidTiling, reduce_max_david_tiling3) | |||
| 113 | {input, axes}, | 113 | {input, axes}, |
| 114 | {y}, | 114 | {y}, |
| 115 | &compileInfo); | 115 | &compileInfo); |
| 116 | - uint64_t expectedTilingKey = 2571; | 116 | + uint64_t expectedTilingKey = 5143; |
| 117 | std::vector<size_t> expectedWorkspaces = { 16777216 }; | 117 | std::vector<size_t> expectedWorkspaces = { 16777216 }; |
| 118 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); | 118 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); |
| 119 | } | 119 | } |
| @@ -134,7 +134,7 @@ TEST_F(ReduceMaxDavidTiling, reduce_max_david_tiling4) | |||
| 134 | {input, axes}, | 134 | {input, axes}, |
| 135 | {y}, | 135 | {y}, |
| 136 | &compileInfo); | 136 | &compileInfo); |
| 137 | - uint64_t expectedTilingKey = 5908; | 137 | + uint64_t expectedTilingKey = 11817; |
| 138 | std::vector<size_t> expectedWorkspaces = { 16859136 }; | 138 | std::vector<size_t> expectedWorkspaces = { 16859136 }; |
| 139 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); | 139 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); |
| 140 | } | 140 | } |
| @@ -155,7 +155,7 @@ TEST_F(ReduceMaxDavidTiling, reduce_max_david_tiling5) | |||
| 155 | {input, axes}, | 155 | {input, axes}, |
| 156 | {y}, | 156 | {y}, |
| 157 | &compileInfo); | 157 | &compileInfo); |
| 158 | - uint64_t expectedTilingKey = 2571; | 158 | + uint64_t expectedTilingKey = 5143; |
| 159 | std::vector<size_t> expectedWorkspaces = { 16777216 }; | 159 | std::vector<size_t> expectedWorkspaces = { 16777216 }; |
| 160 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); | 160 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); |
| 161 | } | 161 | } |
| @@ -176,7 +176,7 @@ TEST_F(ReduceMaxDavidTiling, reduce_max_david_tiling6) | |||
| 176 | {input, axes}, | 176 | {input, axes}, |
| 177 | {y}, | 177 | {y}, |
| 178 | &compileInfo); | 178 | &compileInfo); |
| 179 | - uint64_t expectedTilingKey = 5908; | 179 | + uint64_t expectedTilingKey = 11817; |
| 180 | std::vector<size_t> expectedWorkspaces = { 16842752 }; | 180 | std::vector<size_t> expectedWorkspaces = { 16842752 }; |
| 181 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); | 181 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); |
| 182 | } | 182 | } |
| @@ -197,7 +197,7 @@ TEST_F(ReduceMaxDavidTiling, reduce_max_david_tiling7) | |||
| 197 | {input, axes}, | 197 | {input, axes}, |
| 198 | {y}, | 198 | {y}, |
| 199 | &compileInfo); | 199 | &compileInfo); |
| 200 | - uint64_t expectedTilingKey = 3092; | 200 | + uint64_t expectedTilingKey = 6185; |
| 201 | std::vector<size_t> expectedWorkspaces = { 16793600 }; | 201 | std::vector<size_t> expectedWorkspaces = { 16793600 }; |
| 202 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); | 202 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); |
| 203 | } | 203 | } |
| @@ -218,7 +218,7 @@ TEST_F(ReduceMaxDavidTiling, reduce_max_david_tiling8) | |||
| 218 | {input, axes}, | 218 | {input, axes}, |
| 219 | {y}, | 219 | {y}, |
| 220 | &compileInfo); | 220 | &compileInfo); |
| 221 | - uint64_t expectedTilingKey = 3092; | 221 | + uint64_t expectedTilingKey = 6185; |
| 222 | std::vector<size_t> expectedWorkspaces = { 16793600 }; | 222 | std::vector<size_t> expectedWorkspaces = { 16793600 }; |
| 223 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); | 223 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectedTilingKey, expectedWorkspaces); |
| 224 | } | 224 | } |
| @@ -47,7 +47,7 @@ TEST_F(ReduceStdV2Tiling, ReduceStdV2_test_tiling_001) | |||
| 47 | gert::TilingContextPara::OpAttr("keepdim", Ops::Math::AnyValue::CreateFrom<bool>(true)), | 47 | gert::TilingContextPara::OpAttr("keepdim", Ops::Math::AnyValue::CreateFrom<bool>(true)), |
| 48 | gert::TilingContextPara::OpAttr("is_mean_out", Ops::Math::AnyValue::CreateFrom<bool>(true))}, | 48 | gert::TilingContextPara::OpAttr("is_mean_out", Ops::Math::AnyValue::CreateFrom<bool>(true))}, |
| 49 | &compileInfo); | 49 | &compileInfo); |
| 50 | - uint64_t expectTilingKey = 2571; | 50 | + uint64_t expectTilingKey = 5143; |
| 51 | string expectTilingData = | 51 | string expectTilingData = |
| 52 | "1 64 1 1 1 1 1 64 27648 512 64 952945869 64 10240 0 0 0 0 0 0 0 10240 1 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 8 0 1 " | 52 | "1 64 1 1 1 1 1 64 27648 512 64 952945869 64 10240 0 0 0 0 0 0 0 10240 1 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 8 0 1 " |
| 53 | "0 4092916413600104448 952945869 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 " | 53 | "0 4092916413600104448 952945869 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 " |
| @@ -35,7 +35,9 @@ protected: | |||
| 35 | }; | 35 | }; |
| 36 | 36 | ||
| 37 | TEST_F(SelectV2Tiling, select_v2_test_0) { | 37 | TEST_F(SelectV2Tiling, select_v2_test_0) { |
| 38 | - Ops::Base::BroadcastCompileInfo compileInfo = {64, 245760}; | 38 | + Ops::Base::BroadcastCompileInfo compileInfo; |
| 39 | + compileInfo.coreNum = 64; | ||
| 40 | + compileInfo.ubSize = 245760; | ||
| 39 | gert::StorageShape conditionShape = {{16, 1, 4, 4, 8}, {16, 1, 4, 4, 8}}; | 41 | gert::StorageShape conditionShape = {{16, 1, 4, 4, 8}, {16, 1, 4, 4, 8}}; |
| 40 | gert::StorageShape x1Shape = {{16, 1, 4, 4, 8}, {16, 1, 4, 4, 8}}; | 42 | gert::StorageShape x1Shape = {{16, 1, 4, 4, 8}, {16, 1, 4, 4, 8}}; |
| 41 | gert::StorageShape x2Shape = {{16, 1, 4, 4, 8}, {16, 1, 4, 4, 8}}; | 43 | gert::StorageShape x2Shape = {{16, 1, 4, 4, 8}, {16, 1, 4, 4, 8}}; |
| @@ -54,7 +56,9 @@ TEST_F(SelectV2Tiling, select_v2_test_0) { | |||
| 54 | } | 56 | } |
| 55 | 57 | ||
| 56 | TEST_F(SelectV2Tiling, select_test_1) { | 58 | TEST_F(SelectV2Tiling, select_test_1) { |
| 57 | - Ops::Base::BroadcastCompileInfo compileInfo = {64, 245760}; | 59 | + Ops::Base::BroadcastCompileInfo compileInfo; |
| 60 | + compileInfo.coreNum = 64; | ||
| 61 | + compileInfo.ubSize = 245760; | ||
| 58 | gert::StorageShape conditionShape = {{8, 11, 12, 14, 6}, {8, 11, 12, 14, 6}}; | 62 | gert::StorageShape conditionShape = {{8, 11, 12, 14, 6}, {8, 11, 12, 14, 6}}; |
| 59 | gert::StorageShape x1Shape = {{8, 11, 12, 14, 6}, {8, 11, 12, 14, 6}}; | 63 | gert::StorageShape x1Shape = {{8, 11, 12, 14, 6}, {8, 11, 12, 14, 6}}; |
| 60 | gert::StorageShape x2Shape = {{8, 11, 12, 14, 6}, {8, 11, 12, 14, 6}}; | 64 | gert::StorageShape x2Shape = {{8, 11, 12, 14, 6}, {8, 11, 12, 14, 6}}; |
| @@ -73,7 +77,9 @@ TEST_F(SelectV2Tiling, select_test_1) { | |||
| 73 | } | 77 | } |
| 74 | 78 | ||
| 75 | TEST_F(SelectV2Tiling, select_test_2) { | 79 | TEST_F(SelectV2Tiling, select_test_2) { |
| 76 | - Ops::Base::BroadcastCompileInfo compileInfo = {64, 245760}; | 80 | + Ops::Base::BroadcastCompileInfo compileInfo; |
| 81 | + compileInfo.coreNum = 64; | ||
| 82 | + compileInfo.ubSize = 245760; | ||
| 77 | gert::StorageShape conditionShape = {{20, 5, 1, 9, 17, 10, 3}, {20, 5, 1, 9, 17, 10, 3}}; | 83 | gert::StorageShape conditionShape = {{20, 5, 1, 9, 17, 10, 3}, {20, 5, 1, 9, 17, 10, 3}}; |
| 78 | gert::StorageShape x1Shape = {{20, 5, 1, 9, 17, 10, 3}, {20, 5, 1, 9, 17, 10, 3}}; | 84 | gert::StorageShape x1Shape = {{20, 5, 1, 9, 17, 10, 3}, {20, 5, 1, 9, 17, 10, 3}}; |
| 79 | gert::StorageShape x2Shape = {{20, 5, 1, 9, 17, 10, 3}, {20, 5, 1, 9, 17, 10, 3}}; | 85 | gert::StorageShape x2Shape = {{20, 5, 1, 9, 17, 10, 3}, {20, 5, 1, 9, 17, 10, 3}}; |
| @@ -44,7 +44,7 @@ TEST_F(SquareSumV1Tiling, test_SquareSumV1Tiling_0) | |||
| 44 | {gert::TilingContextPara::OpAttr("axis", Ops::Math::AnyValue::CreateFrom<std::vector<int64_t>>({1})), | 44 | {gert::TilingContextPara::OpAttr("axis", Ops::Math::AnyValue::CreateFrom<std::vector<int64_t>>({1})), |
| 45 | gert::TilingContextPara::OpAttr("keep_dims", Ops::Math::AnyValue::CreateFrom<bool>(true))}, | 45 | gert::TilingContextPara::OpAttr("keep_dims", Ops::Math::AnyValue::CreateFrom<bool>(true))}, |
| 46 | &compileInfo); | 46 | &compileInfo); |
| 47 | - uint64_t expectTilingKey = 2571; | 47 | + uint64_t expectTilingKey = 5143; |
| 48 | std::vector<size_t> expectWorkspaces = {16777216}; | 48 | std::vector<size_t> expectWorkspaces = {16777216}; |
| 49 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); | 49 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); |
| 50 | } | 50 | } |
| @@ -65,7 +65,7 @@ TEST_F(SquareSumV1Tiling, test_SquareSumV1Tiling_1) | |||
| 65 | "axis", Ops::Math::AnyValue::CreateFrom<std::vector<int64_t>>({0, 1, 2, 3})), | 65 | "axis", Ops::Math::AnyValue::CreateFrom<std::vector<int64_t>>({0, 1, 2, 3})), |
| 66 | }, | 66 | }, |
| 67 | &compileInfo); | 67 | &compileInfo); |
| 68 | - uint64_t expectTilingKey = 3083; | 68 | + uint64_t expectTilingKey = 6167; |
| 69 | std::vector<size_t> expectWorkspaces = {16793600}; | 69 | std::vector<size_t> expectWorkspaces = {16793600}; |
| 70 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); | 70 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); |
| 71 | } | 71 | } |
| @@ -86,7 +86,7 @@ TEST_F(SquareSumV1Tiling, test_SquareSumV1Tiling_2) | |||
| 86 | "axis", Ops::Math::AnyValue::CreateFrom<std::vector<int64_t>>({0, 1, 2, 3})), | 86 | "axis", Ops::Math::AnyValue::CreateFrom<std::vector<int64_t>>({0, 1, 2, 3})), |
| 87 | }, | 87 | }, |
| 88 | &compileInfo); | 88 | &compileInfo); |
| 89 | - uint64_t expectTilingKey = 3083; | 89 | + uint64_t expectTilingKey = 6167; |
| 90 | std::vector<size_t> expectWorkspaces = {16793600}; | 90 | std::vector<size_t> expectWorkspaces = {16793600}; |
| 91 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); | 91 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); |
| 92 | } | 92 | } |
| @@ -106,7 +106,7 @@ TEST_F(SquareSumV1Tiling, test_SquareSumV1Tiling_3) | |||
| 106 | gert::TilingContextPara::OpAttr("axis", Ops::Math::AnyValue::CreateFrom<std::vector<int64_t>>({0, 1})), | 106 | gert::TilingContextPara::OpAttr("axis", Ops::Math::AnyValue::CreateFrom<std::vector<int64_t>>({0, 1})), |
| 107 | }, | 107 | }, |
| 108 | &compileInfo); | 108 | &compileInfo); |
| 109 | - uint64_t expectTilingKey = 5908; | 109 | + uint64_t expectTilingKey = 11817; |
| 110 | std::vector<size_t> expectWorkspaces = {16842752}; | 110 | std::vector<size_t> expectWorkspaces = {16842752}; |
| 111 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); | 111 | ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectWorkspaces); |
| 112 | } | 112 | } |
Mrandom/stateless_random_normal_v2/tests/ut/op_host/arch35/test_stateless_random_normal_v2_tiling.cpp+2-2
| @@ -34,7 +34,7 @@ class StatelessRandomNormalV2Tiling : public testing::Test { | |||
| 34 | TEST_F(StatelessRandomNormalV2Tiling, stateless_random_normal_v2_test_tiling_1) | 34 | TEST_F(StatelessRandomNormalV2Tiling, stateless_random_normal_v2_test_tiling_1) |
| 35 | { | 35 | { |
| 36 | optiling::StatelessRandomNormalV2CompileInfo compileInfo = {40, 196608}; | 36 | optiling::StatelessRandomNormalV2CompileInfo compileInfo = {40, 196608}; |
| 37 | - vector<uint64_t> keyValue = {1.0}; | 37 | + vector<uint64_t> keyValue = {1}; |
| 38 | vector<int64_t> counterValue = {8, 9}; | 38 | vector<int64_t> counterValue = {8, 9}; |
| 39 | vector<int64_t> algsetValue = {1}; | 39 | vector<int64_t> algsetValue = {1}; |
| 40 | gert::TilingContextPara tilingContextPara( | 40 | gert::TilingContextPara tilingContextPara( |
| @@ -61,7 +61,7 @@ TEST_F(StatelessRandomNormalV2Tiling, stateless_random_normal_v2_test_tiling_1) | |||
| 61 | TEST_F(StatelessRandomNormalV2Tiling, stateless_random_normal_v2_test_tiling_2) | 61 | TEST_F(StatelessRandomNormalV2Tiling, stateless_random_normal_v2_test_tiling_2) |
| 62 | { | 62 | { |
| 63 | optiling::StatelessRandomNormalV2CompileInfo compileInfo = {40, 196608}; | 63 | optiling::StatelessRandomNormalV2CompileInfo compileInfo = {40, 196608}; |
| 64 | - vector<int64_t> keyValue = {1.0}; | 64 | + vector<int64_t> keyValue = {1}; |
| 65 | vector<int64_t> counterValue = {8, 9}; | 65 | vector<int64_t> counterValue = {8, 9}; |
| 66 | vector<int64_t> algsetValue = {1}; | 66 | vector<int64_t> algsetValue = {1}; |
| 67 | gert::TilingContextPara tilingContextPara( | 67 | gert::TilingContextPara tilingContextPara( |