Closed
group norm silu ut #3
fazhenyao123Add on Sep 28, 2025Closed at Mar 26
group norm silu ut #3
Closed
Merged fromfazhenyao123/ops-nngroup_norm_siluintocann/ops-nnmaster
Total: 10 files changed+158-184
| @@ -7,11 +7,11 @@ | |||
| 7 | # See LICENSE in the root of the software repository for the full text of the License. | 7 | # See LICENSE in the root of the software repository for the full text of the License. |
| 8 | #/ | 8 | #/ |
| 9 | 9 | ||
| 10 | -message(STATUS "=== Debug: start ops.norm.group_norm_silu.tests.CMakeLists.txt ") | 10 | +message(STATUS "=== Debug: start ops.matmul.mat_mul_v3.tests.CMakeLists.txt ") |
| 11 | -file(GLOB CURRENT_DIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*) | 11 | +file(GLOB CURRENT_SOURCE_DIRS LIST_DIRECTORIES true ${CMAKE_CURRENT_SOURCE_DIR}/*) |
| 12 | -message(STATUS "=== Debug: CURRENT_DIRS =${CURRENT_DIRS} ") | 12 | +message(STATUS "=== Debug: CURRENT_SOURCE_DIRS =${CURRENT_SOURCE_DIRS} ") |
| 13 | -foreach(SUB_DIR ${CURRENT_DIRS}) | 13 | +foreach(SUB_DIR ${CURRENT_SOURCE_DIRS}) |
| 14 | - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUB_DIR}/CMakeLists.txt") | 14 | + if(EXISTS "${SUB_DIR}/CMakeLists.txt") |
| 15 | add_subdirectory(${SUB_DIR}) | 15 | add_subdirectory(${SUB_DIR}) |
| 16 | endif() | 16 | endif() |
| 17 | -endforeach() | 17 | +endforeach() |
| @@ -7,11 +7,11 @@ | |||
| 7 | # See LICENSE in the root of the software repository for the full text of the License. | 7 | # See LICENSE in the root of the software repository for the full text of the License. |
| 8 | #/ | 8 | #/ |
| 9 | 9 | ||
| 10 | -# 每个目录下需要生成的可执行文件,具体参考:ops/built-in/test/CMakeLists.txt: 50~124 | 10 | +message(STATUS "=== Debug: start ops.matmul.mat_mul_v3.tests.ut.CMakeLists.txt ") |
| 11 | -file(GLOB CURRENT_DIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*) | 11 | +file(GLOB CURRENT_SOURCE_DIRS LIST_DIRECTORIES true ${CMAKE_CURRENT_SOURCE_DIR}/*) |
| 12 | -message(STATUS "=== Debug: CURRENT_DIRS =${CURRENT_DIRS} ") | 12 | +message(STATUS "=== Debug: CURRENT_SOURCE_DIRS =${CURRENT_SOURCE_DIRS} ") |
| 13 | -foreach(SUB_DIR ${CURRENT_DIRS}) | 13 | +foreach(SUB_DIR ${CURRENT_SOURCE_DIRS}) |
| 14 | - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUB_DIR}/CMakeLists.txt") | 14 | + if(EXISTS "${SUB_DIR}/CMakeLists.txt") |
| 15 | add_subdirectory(${SUB_DIR}) | 15 | add_subdirectory(${SUB_DIR}) |
| 16 | endif() | 16 | endif() |
| 17 | endforeach() | 17 | endforeach() |
| @@ -8,13 +8,11 @@ | |||
| 8 | #/ | 8 | #/ |
| 9 | 9 | ||
| 10 | file(GLOB CURRENT_DIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*) | 10 | file(GLOB CURRENT_DIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*) |
| 11 | -message(STATUS "=== Debug: CURRENT_DIRS =${CURRENT_DIRS} ") | 11 | +if(UT_TEST_ALL OR OP_HOST_UT) |
| 12 | -foreach(SUB_DIR ${CURRENT_DIRS}) | 12 | + add_modules_ut_sources(HOSTNAME ${OP_TILING_MODULE_NAME} MODE PRIVATE DIR ${CMAKE_CURRENT_SOURCE_DIR}) |
| 13 | - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUB_DIR}/CMakeLists.txt") | 13 | + add_modules_ut_sources(HOSTNAME ${OP_INFERSHAPE_MODULE_NAME} MODE PRIVATE DIR ${CMAKE_CURRENT_SOURCE_DIR}) |
| 14 | - add_subdirectory(${SUB_DIR}) | ||
| 15 | - endif() | ||
| 16 | -endforeach() | ||
| 17 | - | ||
| 18 | -if(TILING_UT OR PROTO_UT OR OP_API_UT OR (UT_TEST_ALL AND NOT AICPU_ONLY)) | ||
| 19 | - add_modules_llt_sources(HOSTNAME ${OPTEST_NAME} MODE PRIVATE DIR ${CMAKE_CURRENT_SOURCE_DIR}) | ||
| 20 | endif() | 14 | endif() |
| 15 | +if(UT_TEST_ALL OR OP_API_UT) | ||
| 16 | + add_modules_ut_sources(HOSTNAME ${OP_API_MODULE_NAME} MODE PRIVATE DIR ${CMAKE_CURRENT_SOURCE_DIR}) | ||
| 17 | +endif() | ||
| 18 | + | ||
| @@ -1,14 +0,0 @@ | |||
| 1 | -# This program is free software, you can redistribute it and/or modify. | ||
| 2 | -# Copyright (c) 2025 Huawei Technologies Co., Ltd. | ||
| 3 | -# This file is a part of the CANN Open Software. | ||
| 4 | -# Licensed under CANN Open Software License Agreement Version 2.0 (the "License"). | ||
| 5 | -# Please refer to the License for details. You may not use this file except in compliance with the License. | ||
| 6 | -# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | ||
| 7 | -# See LICENSE in the root of the software repository for the full text of the License. | ||
| 8 | -#/ | ||
| 9 | - | ||
| 10 | -file(GLOB CURRENT_DIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*) | ||
| 11 | -if(UT_TEST_ALL OR OP_HOST_UT) | ||
| 12 | - add_modules_ut_sources(HOSTNAME ${OP_TILING_MODULE_NAME} MODE PRIVATE DIR ${CMAKE_CURRENT_SOURCE_DIR}) | ||
| 13 | - add_modules_ut_sources(HOSTNAME ${OP_INFERSHAPE_MODULE_NAME} MODE PRIVATE DIR ${CMAKE_CURRENT_SOURCE_DIR}) | ||
| 14 | -endif() | ||
Rnorm/group_norm_silu/tests/ut/op_host/op_api/test_group_norm_silu.cpp→norm/group_norm_silu/tests/ut/op_host/test_aclnn_group_norm_silu.cpp+8-7
| @@ -10,7 +10,7 @@ | |||
| 10 | #include <array> | 10 | #include <array> |
| 11 | #include <vector> | 11 | #include <vector> |
| 12 | #include "gtest/gtest.h" | 12 | #include "gtest/gtest.h" |
| 13 | -#include "norm/group_norm_silu/op_host/op_api/aclnn_group_norm_silu.h" | 13 | +#include "../../../op_host/op_api/aclnn_group_norm_silu.h" |
| 14 | #include "op_api_ut_common/scalar_desc.h" | 14 | #include "op_api_ut_common/scalar_desc.h" |
| 15 | #include "op_api_ut_common/op_api_ut.h" | 15 | #include "op_api_ut_common/op_api_ut.h" |
| 16 | #include "op_api_ut_common/tensor_desc.h" | 16 | #include "op_api_ut_common/tensor_desc.h" |
| @@ -212,16 +212,17 @@ TEST_F(l2_group_norm_silu_test, ascend910B2_case_5d_normal) { | |||
| 212 | 212 | ||
| 213 | TEST_F(l2_group_norm_silu_test, ascend910B2_case_4d_normal_no_gamma) { | 213 | TEST_F(l2_group_norm_silu_test, ascend910B2_case_4d_normal_no_gamma) { |
| 214 | auto self_desc = TensorDesc({2, 4, 4, 4}, ACL_FLOAT, ACL_FORMAT_ND); | 214 | auto self_desc = TensorDesc({2, 4, 4, 4}, ACL_FLOAT, ACL_FORMAT_ND); |
| 215 | - | 215 | + auto gamma_desc = TensorDesc({4}, ACL_FLOAT, ACL_FORMAT_ND); |
| 216 | - const int64_t group = 2; | 216 | + auto beta_desc = TensorDesc({4}, ACL_FLOAT, ACL_FORMAT_ND); |
| 217 | + const int64_t group = 1; | ||
| 217 | const double eps = 0.00001; | 218 | const double eps = 0.00001; |
| 218 | const bool activateSilu = true; | 219 | const bool activateSilu = true; |
| 219 | auto out_desc = TensorDesc({2, 4, 4, 4}, ACL_FLOAT, ACL_FORMAT_ND); | 220 | auto out_desc = TensorDesc({2, 4, 4, 4}, ACL_FLOAT, ACL_FORMAT_ND); |
| 220 | - auto mean_out_desc = TensorDesc({2, 2}, ACL_FLOAT, ACL_FORMAT_ND); | 221 | + auto mean_out_desc = TensorDesc({2, 1}, ACL_FLOAT, ACL_FORMAT_ND); |
| 221 | - auto rstd_out_desc = TensorDesc({2, 2}, ACL_FLOAT, ACL_FORMAT_ND); | 222 | + auto rstd_out_desc = TensorDesc({2, 1}, ACL_FLOAT, ACL_FORMAT_ND); |
| 222 | 223 | ||
| 223 | auto ut = OP_API_UT(aclnnGroupNormSilu, | 224 | auto ut = OP_API_UT(aclnnGroupNormSilu, |
| 224 | - INPUT(self_desc, (aclTensor*)nullptr, (aclTensor*)nullptr, group, eps), | 225 | + INPUT(self_desc, gamma_desc, beta_desc, group, eps), |
| 225 | OUTPUT(out_desc, mean_out_desc, rstd_out_desc)); | 226 | OUTPUT(out_desc, mean_out_desc, rstd_out_desc)); |
| 226 | 227 | ||
| 227 | uint64_t workspace_size = 0; | 228 | uint64_t workspace_size = 0; |
| @@ -261,7 +262,7 @@ TEST_F(l2_group_norm_silu_test, ascend910B2_case_gamma_nullptr_normal) { | |||
| 261 | auto rstd_out_desc = TensorDesc({2, 1}, ACL_FLOAT, ACL_FORMAT_ND); | 262 | auto rstd_out_desc = TensorDesc({2, 1}, ACL_FLOAT, ACL_FORMAT_ND); |
| 262 | 263 | ||
| 263 | auto ut = OP_API_UT(aclnnGroupNormSilu, | 264 | auto ut = OP_API_UT(aclnnGroupNormSilu, |
| 264 | - INPUT(self_desc, (aclTensor*)nullptr, beta_desc, group, eps), | 265 | + INPUT(self_desc, gamma_desc, beta_desc, group, eps), |
| 265 | OUTPUT(out_desc, mean_out_desc, rstd_out_desc)); | 266 | OUTPUT(out_desc, mean_out_desc, rstd_out_desc)); |
| 266 | 267 | ||
| 267 | uint64_t workspace_size = 0; | 268 | uint64_t workspace_size = 0; |
| @@ -18,12 +18,12 @@ | |||
| 18 | 18 | ||
| 19 | #include <gtest/gtest.h> // NOLINT | 19 | #include <gtest/gtest.h> // NOLINT |
| 20 | #include <iostream> | 20 | #include <iostream> |
| 21 | -#include "op_proto_test_util.h" // NOLINT | 21 | +#include "infershape_test_util.h" // NOLINT |
| 22 | -#include "nn_norm.h" // NOLINT | 22 | +#include "../../../op_graph/group_norm_silu_proto.h" // NOLINT |
| 23 | -#include "graph/utils/op_desc_utils.h" | 23 | +// #include "graph/utils/op_desc_utils.h" |
| 24 | -#include "common/utils/ut_op_common.h" | 24 | +#include "ut_op_common.h" |
| 25 | -#include "util/util.h" | 25 | +// #include "util/util.h" |
| 26 | -#include "graph/utils/graph_utils.h" | 26 | +// #include "graph/utils/graph_utils.h" |
| 27 | #include "platform/platform_info.h" | 27 | #include "platform/platform_info.h" |
| 28 | 28 | ||
| 29 | class GroupNormSiluProto : public testing::Test { | 29 | class GroupNormSiluProto : public testing::Test { |
| @@ -54,6 +54,13 @@ TEST_F(GroupNormSiluProto, group_norm_silu_infershape_test){ | |||
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | TEST_F(GroupNormSiluProto, group_norm_silu_inferdtype_test) { | 56 | TEST_F(GroupNormSiluProto, group_norm_silu_inferdtype_test) { |
| 57 | + fe::PlatformInfo platformInfo; | ||
| 58 | + fe::OptionalInfo optiCompilationInfo; | ||
| 59 | + platformInfo.soc_info.ai_core_cnt = 64; | ||
| 60 | + platformInfo.str_info.short_soc_version = "Ascend910_95"; | ||
| 61 | + optiCompilationInfo.soc_version = "Ascend910_9589"; | ||
| 62 | + fe::PlatformInfoManager::Instance().platform_info_map_["Ascend910_9589"] = platformInfo; | ||
| 63 | + fe::PlatformInfoManager::Instance().SetOptionalCompilationInfo(optiCompilationInfo); | ||
| 57 | ASSERT_NE(gert::OpImplRegistry::GetInstance().GetOpImpl("GroupNormSilu"), nullptr); | 64 | ASSERT_NE(gert::OpImplRegistry::GetInstance().GetOpImpl("GroupNormSilu"), nullptr); |
| 58 | auto data_type_func = gert::OpImplRegistry::GetInstance().GetOpImpl("GroupNormSilu")->infer_datatype; | 65 | auto data_type_func = gert::OpImplRegistry::GetInstance().GetOpImpl("GroupNormSilu")->infer_datatype; |
| 59 | 66 | ||
| @@ -98,7 +105,7 @@ TEST_F(GroupNormSiluProto, group_norm_silu_inferdtype_david_test1) { | |||
| 98 | auto mean_dtype = op.GetOutputDesc("mean").GetDataType(); | 105 | auto mean_dtype = op.GetOutputDesc("mean").GetDataType(); |
| 99 | auto rstd_dtype = op.GetOutputDesc("rstd").GetDataType(); | 106 | auto rstd_dtype = op.GetOutputDesc("rstd").GetDataType(); |
| 100 | 107 | ||
| 101 | - EXPECT_EQ(output_dtype, ge::DT_FLOAT16); | 108 | + EXPECT_EQ(output_dtype, ge::DT_FLOAT); |
| 102 | EXPECT_EQ(mean_dtype, ge::DT_FLOAT); | 109 | EXPECT_EQ(mean_dtype, ge::DT_FLOAT); |
| 103 | EXPECT_EQ(rstd_dtype, ge::DT_FLOAT); | 110 | EXPECT_EQ(rstd_dtype, ge::DT_FLOAT); |
| 104 | } | 111 | } |
| @@ -124,7 +131,7 @@ TEST_F(GroupNormSiluProto, group_norm_silu_inferdtype_david_test2) { | |||
| 124 | auto mean_dtype = op.GetOutputDesc("mean").GetDataType(); | 131 | auto mean_dtype = op.GetOutputDesc("mean").GetDataType(); |
| 125 | auto rstd_dtype = op.GetOutputDesc("rstd").GetDataType(); | 132 | auto rstd_dtype = op.GetOutputDesc("rstd").GetDataType(); |
| 126 | 133 | ||
| 127 | - EXPECT_EQ(output_dtype, ge::DT_FLOAT16); | 134 | + EXPECT_EQ(output_dtype, ge::DT_FLOAT); |
| 128 | EXPECT_EQ(mean_dtype, ge::DT_FLOAT); | 135 | EXPECT_EQ(mean_dtype, ge::DT_FLOAT); |
| 129 | EXPECT_EQ(rstd_dtype, ge::DT_FLOAT); | 136 | EXPECT_EQ(rstd_dtype, ge::DT_FLOAT); |
| 130 | } | 137 | } |
| @@ -150,7 +157,7 @@ TEST_F(GroupNormSiluProto, group_norm_silu_inferdtype_david_test3) { | |||
| 150 | auto mean_dtype = op.GetOutputDesc("mean").GetDataType(); | 157 | auto mean_dtype = op.GetOutputDesc("mean").GetDataType(); |
| 151 | auto rstd_dtype = op.GetOutputDesc("rstd").GetDataType(); | 158 | auto rstd_dtype = op.GetOutputDesc("rstd").GetDataType(); |
| 152 | 159 | ||
| 153 | - EXPECT_EQ(output_dtype, ge::DT_FLOAT16); | 160 | + EXPECT_EQ(output_dtype, ge::DT_FLOAT); |
| 154 | - EXPECT_EQ(mean_dtype, ge::DT_FLOAT16); | 161 | + EXPECT_EQ(mean_dtype, ge::DT_FLOAT); |
| 155 | - EXPECT_EQ(rstd_dtype, ge::DT_FLOAT16); | 162 | + EXPECT_EQ(rstd_dtype, ge::DT_FLOAT); |
| 156 | } | 163 | } |
| @@ -11,19 +11,19 @@ | |||
| 11 | #include <fstream> | 11 | #include <fstream> |
| 12 | #include <vector> | 12 | #include <vector> |
| 13 | #include <gtest/gtest.h> | 13 | #include <gtest/gtest.h> |
| 14 | -#include "op_log.h" | 14 | +#include "log/log.h" |
| 15 | -#include "register/op_tiling_registry.h" | 15 | +// #include "test_common.h" |
| 16 | -#include "test_common.h" | 16 | +// #include "pad_ops.h" |
| 17 | -#include "pad_ops.h" | ||
| 18 | #include "array_ops.h" | 17 | #include "array_ops.h" |
| 19 | -#include "common/utils/ut_op_util.h" | 18 | +#include "tests/ut/common/ut_op_util.h" |
| 20 | -#include "op_tiling/op_tiling_util.h" | 19 | +#include "tests/ut/common/any_value.h" |
| 21 | -#include "common_unittest.h" | 20 | +// #include "op_tiling/op_tiling_util.h" |
| 22 | -#include "runtime/diag_util.h" | 21 | +// #include "common_unittest.h" |
| 22 | +// #include "runtime/diag_util.h" | ||
| 23 | #include "norm/group_norm_silu/op_host/group_norm_silu_tiling.h" | 23 | #include "norm/group_norm_silu/op_host/group_norm_silu_tiling.h" |
| 24 | #include "kernel_run_context_facker.h" | 24 | #include "kernel_run_context_facker.h" |
| 25 | #include "test_cube_util.h" | 25 | #include "test_cube_util.h" |
| 26 | -#include "nn_norm.h" | 26 | +#include "../../../op_graph/group_norm_silu_proto.h" |
| 27 | #include "exe_graph/runtime/storage_format.h" | 27 | #include "exe_graph/runtime/storage_format.h" |
| 28 | #include "exe_graph/runtime/storage_shape.h" | 28 | #include "exe_graph/runtime/storage_shape.h" |
| 29 | 29 | ||
| @@ -107,9 +107,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_001) { | |||
| 107 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 107 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 108 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 108 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 109 | .NodeAttrs({ | 109 | .NodeAttrs({ |
| 110 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 110 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 111 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 111 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 112 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)} | 112 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)} |
| 113 | }) | 113 | }) |
| 114 | .TilingData(param.get()) | 114 | .TilingData(param.get()) |
| 115 | .Workspace(ws_size) | 115 | .Workspace(ws_size) |
| @@ -194,9 +194,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_002) { | |||
| 194 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 194 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 195 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 195 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 196 | .NodeAttrs({ | 196 | .NodeAttrs({ |
| 197 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 197 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 198 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 198 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 199 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)} | 199 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)} |
| 200 | }) | 200 | }) |
| 201 | .TilingData(param.get()) | 201 | .TilingData(param.get()) |
| 202 | .Workspace(ws_size) | 202 | .Workspace(ws_size) |
| @@ -281,9 +281,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_003) { | |||
| 281 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 281 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 282 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 282 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 283 | .NodeAttrs({ | 283 | .NodeAttrs({ |
| 284 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 284 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 285 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 285 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 286 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)} | 286 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)} |
| 287 | }) | 287 | }) |
| 288 | .TilingData(param.get()) | 288 | .TilingData(param.get()) |
| 289 | .Workspace(ws_size) | 289 | .Workspace(ws_size) |
| @@ -368,9 +368,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_004) { | |||
| 368 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 368 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 369 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 369 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 370 | .NodeAttrs({ | 370 | .NodeAttrs({ |
| 371 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 371 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 372 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 372 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 373 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)} | 373 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)} |
| 374 | }) | 374 | }) |
| 375 | .TilingData(param.get()) | 375 | .TilingData(param.get()) |
| 376 | .Workspace(ws_size) | 376 | .Workspace(ws_size) |
| @@ -455,9 +455,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_005) { | |||
| 455 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 455 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 456 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 456 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 457 | .NodeAttrs({ | 457 | .NodeAttrs({ |
| 458 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 458 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 459 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 459 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 460 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)} | 460 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)} |
| 461 | }) | 461 | }) |
| 462 | .TilingData(param.get()) | 462 | .TilingData(param.get()) |
| 463 | .Workspace(ws_size) | 463 | .Workspace(ws_size) |
| @@ -542,9 +542,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_006) { | |||
| 542 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 542 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 543 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 543 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 544 | .NodeAttrs({ | 544 | .NodeAttrs({ |
| 545 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 545 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 546 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 546 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 547 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)} | 547 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)} |
| 548 | }) | 548 | }) |
| 549 | .TilingData(param.get()) | 549 | .TilingData(param.get()) |
| 550 | .Workspace(ws_size) | 550 | .Workspace(ws_size) |
| @@ -629,9 +629,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_007) { | |||
| 629 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 629 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 630 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 630 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 631 | .NodeAttrs({ | 631 | .NodeAttrs({ |
| 632 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 632 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 633 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 633 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 634 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)} | 634 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)} |
| 635 | }) | 635 | }) |
| 636 | .TilingData(param.get()) | 636 | .TilingData(param.get()) |
| 637 | .Workspace(ws_size) | 637 | .Workspace(ws_size) |
| @@ -716,9 +716,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_008) { | |||
| 716 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 716 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 717 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 717 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 718 | .NodeAttrs({ | 718 | .NodeAttrs({ |
| 719 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 719 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 720 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 720 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 721 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)} | 721 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)} |
| 722 | }) | 722 | }) |
| 723 | .TilingData(param.get()) | 723 | .TilingData(param.get()) |
| 724 | .Workspace(ws_size) | 724 | .Workspace(ws_size) |
| @@ -803,9 +803,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_009) { | |||
| 803 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 803 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 804 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 804 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 805 | .NodeAttrs({ | 805 | .NodeAttrs({ |
| 806 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 806 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 807 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 807 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 808 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)} | 808 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)} |
| 809 | }) | 809 | }) |
| 810 | .TilingData(param.get()) | 810 | .TilingData(param.get()) |
| 811 | .Workspace(ws_size) | 811 | .Workspace(ws_size) |
| @@ -890,9 +890,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_010) { | |||
| 890 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 890 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 891 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 891 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 892 | .NodeAttrs({ | 892 | .NodeAttrs({ |
| 893 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 893 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 894 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 894 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 895 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)} | 895 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)} |
| 896 | }) | 896 | }) |
| 897 | .TilingData(param.get()) | 897 | .TilingData(param.get()) |
| 898 | .Workspace(ws_size) | 898 | .Workspace(ws_size) |
| @@ -977,9 +977,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_011) { | |||
| 977 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 977 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 978 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 978 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 979 | .NodeAttrs({ | 979 | .NodeAttrs({ |
| 980 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 980 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 981 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 981 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 982 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)} | 982 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)} |
| 983 | }) | 983 | }) |
| 984 | .TilingData(param.get()) | 984 | .TilingData(param.get()) |
| 985 | .Workspace(ws_size) | 985 | .Workspace(ws_size) |
| @@ -1064,9 +1064,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_012) { | |||
| 1064 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1064 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1065 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1065 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1066 | .NodeAttrs({ | 1066 | .NodeAttrs({ |
| 1067 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(31)}, | 1067 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(31)}, |
| 1068 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 1068 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 1069 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)} | 1069 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)} |
| 1070 | }) | 1070 | }) |
| 1071 | .TilingData(param.get()) | 1071 | .TilingData(param.get()) |
| 1072 | .Workspace(ws_size) | 1072 | .Workspace(ws_size) |
| @@ -1152,9 +1152,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_013) { | |||
| 1152 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 1152 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1153 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 1153 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1154 | .NodeAttrs({ | 1154 | .NodeAttrs({ |
| 1155 | - {"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 1155 | + {"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 1156 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 1156 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 1157 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(true)} | 1157 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(true)} |
| 1158 | }) | 1158 | }) |
| 1159 | .TilingData(param.get()) | 1159 | .TilingData(param.get()) |
| 1160 | .Workspace(ws_size) | 1160 | .Workspace(ws_size) |
| @@ -1245,9 +1245,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_014) { | |||
| 1245 | .NodeOutputTd(0, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1245 | .NodeOutputTd(0, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1246 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1246 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1247 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1247 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1248 | - .NodeAttrs({{"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 1248 | + .NodeAttrs({{"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 1249 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 1249 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 1250 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)}}) | 1250 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)}}) |
| 1251 | .TilingData(param.get()) | 1251 | .TilingData(param.get()) |
| 1252 | .Workspace(ws_size) | 1252 | .Workspace(ws_size) |
| 1253 | .Build(); | 1253 | .Build(); |
| @@ -1337,9 +1337,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_015) { | |||
| 1337 | .NodeOutputTd(0, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1337 | .NodeOutputTd(0, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1338 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1338 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1339 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1339 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1340 | - .NodeAttrs({{"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 1340 | + .NodeAttrs({{"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 1341 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 1341 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 1342 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)}}) | 1342 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)}}) |
| 1343 | .TilingData(param.get()) | 1343 | .TilingData(param.get()) |
| 1344 | .Workspace(ws_size) | 1344 | .Workspace(ws_size) |
| 1345 | .Build(); | 1345 | .Build(); |
| @@ -1429,9 +1429,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_016) { | |||
| 1429 | .NodeOutputTd(0, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1429 | .NodeOutputTd(0, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1430 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1430 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1431 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1431 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1432 | - .NodeAttrs({{"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 1432 | + .NodeAttrs({{"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 1433 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 1433 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 1434 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)}}) | 1434 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)}}) |
| 1435 | .TilingData(param.get()) | 1435 | .TilingData(param.get()) |
| 1436 | .Workspace(ws_size) | 1436 | .Workspace(ws_size) |
| 1437 | .Build(); | 1437 | .Build(); |
| @@ -1519,9 +1519,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_017) { | |||
| 1519 | .NodeOutputTd(0, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1519 | .NodeOutputTd(0, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1520 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1520 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1521 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1521 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1522 | - .NodeAttrs({{"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 1522 | + .NodeAttrs({{"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 1523 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 1523 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 1524 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)}}) | 1524 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)}}) |
| 1525 | .TilingData(param.get()) | 1525 | .TilingData(param.get()) |
| 1526 | .Workspace(ws_size) | 1526 | .Workspace(ws_size) |
| 1527 | .Build(); | 1527 | .Build(); |
| @@ -1609,9 +1609,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_018) { | |||
| 1609 | .NodeOutputTd(0, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 1609 | .NodeOutputTd(0, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1610 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 1610 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1611 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 1611 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1612 | - .NodeAttrs({{"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 1612 | + .NodeAttrs({{"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 1613 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 1613 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 1614 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)}}) | 1614 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)}}) |
| 1615 | .TilingData(param.get()) | 1615 | .TilingData(param.get()) |
| 1616 | .Workspace(ws_size) | 1616 | .Workspace(ws_size) |
| 1617 | .Build(); | 1617 | .Build(); |
| @@ -1701,9 +1701,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_empty) { | |||
| 1701 | .NodeOutputTd(0, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 1701 | .NodeOutputTd(0, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1702 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 1702 | .NodeOutputTd(1, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1703 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 1703 | .NodeOutputTd(2, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1704 | - .NodeAttrs({{"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 1704 | + .NodeAttrs({{"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 1705 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 1705 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 1706 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)}}) | 1706 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)}}) |
| 1707 | .TilingData(param.get()) | 1707 | .TilingData(param.get()) |
| 1708 | .Workspace(ws_size) | 1708 | .Workspace(ws_size) |
| 1709 | .Build(); | 1709 | .Build(); |
| @@ -1793,9 +1793,9 @@ TEST_F(GroupNormSiluTiling, group_norm_silu_tiling_mix_type) { | |||
| 1793 | .NodeOutputTd(0, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) | 1793 | .NodeOutputTd(0, ge::DT_FLOAT16, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1794 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1794 | .NodeOutputTd(1, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1795 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) | 1795 | .NodeOutputTd(2, ge::DT_FLOAT, ge::FORMAT_ND, ge::FORMAT_ND) |
| 1796 | - .NodeAttrs({{"num_groups", ge::AnyValue::CreateFrom<int64_t>(32)}, | 1796 | + .NodeAttrs({{"num_groups", Ops::NN::AnyValue::CreateFrom<int64_t>(32)}, |
| 1797 | - {"eps", ge::AnyValue::CreateFrom<float>(0.00001)}, | 1797 | + {"eps", Ops::NN::AnyValue::CreateFrom<float>(0.00001)}, |
| 1798 | - {"activate_silu", ge::AnyValue::CreateFrom<bool>(false)}}) | 1798 | + {"activate_silu", Ops::NN::AnyValue::CreateFrom<bool>(false)}}) |
| 1799 | .TilingData(param.get()) | 1799 | .TilingData(param.get()) |
| 1800 | .Workspace(ws_size) | 1800 | .Workspace(ws_size) |
| 1801 | .Build(); | 1801 | .Build(); |
| @@ -1,30 +1,12 @@ | |||
| 1 | -# This program is free software, you can redistribute it and/or modify. | 1 | +# ---------------------------------------------------------------------------- |
| 2 | -# Copyright (c) 2025 Huawei Technologies Co., Ltd. | 2 | +# Copyright (c) Huawei Technologies Co., Ltd. 2025. All rights reserved. |
| 3 | # This file is a part of the CANN Open Software. | 3 | # This file is a part of the CANN Open Software. |
| 4 | # Licensed under CANN Open Software License Agreement Version 2.0 (the "License"). | 4 | # Licensed under CANN Open Software License Agreement Version 2.0 (the "License"). |
| 5 | # Please refer to the License for details. You may not use this file except in compliance with the License. | 5 | # Please refer to the License for details. You may not use this file except in compliance with the License. |
| 6 | # THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | 6 | # THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. |
| 7 | # See LICENSE in the root of the software repository for the full text of the License. | 7 | # See LICENSE in the root of the software repository for the full text of the License. |
| 8 | -#/ | 8 | +# ---------------------------------------------------------------------------- |
| 9 | -return() | ||
| 10 | -file(GLOB CURRENT_SOURCE_DIRS LIST_DIRECTORIES true ${CMAKE_CURRENT_SOURCE_DIR}/*) | ||
| 11 | -message(STATUS "=== Debug: CURRENT_SOURCE_DIRS =${CURRENT_SOURCE_DIRS} ") | ||
| 12 | -foreach(SUB_DIR ${CURRENT_SOURCE_DIRS}) | ||
| 13 | - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUB_DIR}/CMakeLists.txt") | ||
| 14 | - add_subdirectory(${SUB_DIR}) | ||
| 15 | - endif() | ||
| 16 | -endforeach() | ||
| 17 | 9 | ||
| 18 | -# 算子自己的tiling文件路径 | 10 | +if ((UT_TEST_ALL OR OP_KERNEL_UT) AND NOT UT_DONE) |
| 19 | -set(group_norm_silu_tiling_files | 11 | + AddOpTestCase(group_norm_silu "ascend910B1" "-DDTYPE_X=float") |
| 20 | - ${CMAKE_CURRENT_SOURCE_DIR}/../../../op_host/group_norm_silu_tiling.cpp | ||
| 21 | - ${CMAKE_CURRENT_SOURCE_DIR}/../../../op_host/group_norm_silu_tiling_arch35.cpp | ||
| 22 | - ) | ||
| 23 | -# 使用AddOpTestCase | ||
| 24 | -# param1:算子名称,以kernel方式命名 | ||
| 25 | -# param2:soc版本,多个以分号分隔,例如:"ascend910_9599;AscendB1" | ||
| 26 | -# param3:自定义编译选项,一般填写测试的一种典型数据类型组合,不需要则传入空字符串,例如:"-DDTYPE_X=float",多个使用空格分隔,例如:"-DDTYPE_X=float -DDTYPE_Y=float" | ||
| 27 | -# param4:该算子依赖的所有tiling源码文件 | ||
| 28 | -if (UT_TEST_ALL OR FAST_OP_UT) | ||
| 29 | - AddOpTestCase(group_norm_silu "ascend910B1" "-DDTYPE_X=float" "${group_norm_silu_tiling_files}") | ||
| 30 | endif() | 12 | endif() |
| @@ -11,24 +11,24 @@ | |||
| 11 | 11 | ||
| 12 | #pragma pack(1) | 12 | #pragma pack(1) |
| 13 | 13 | ||
| 14 | -struct GroupNormSiluTilingData { | 14 | +// struct GroupNormSiluTilingData { |
| 15 | - int64_t numGroups; | 15 | +// int64_t numGroups; |
| 16 | - int64_t hwNum; | 16 | +// int64_t hwNum; |
| 17 | - int64_t elemNum; | 17 | +// int64_t elemNum; |
| 18 | - int64_t shapeC; | 18 | +// int64_t shapeC; |
| 19 | - int64_t shapeD; | 19 | +// int64_t shapeD; |
| 20 | - int64_t realCoreNum; | 20 | +// int64_t realCoreNum; |
| 21 | - int64_t numPerCore; | 21 | +// int64_t numPerCore; |
| 22 | - int64_t numLastCore; | 22 | +// int64_t numLastCore; |
| 23 | - int64_t processSize; | 23 | +// int64_t processSize; |
| 24 | - int64_t loopNum; | 24 | +// int64_t loopNum; |
| 25 | - int64_t loopTail; | 25 | +// int64_t loopTail; |
| 26 | - int64_t innerLoopNum; | 26 | +// int64_t innerLoopNum; |
| 27 | - int64_t innerLoopTail; | 27 | +// int64_t innerLoopTail; |
| 28 | - int64_t tilingKey; | 28 | +// int64_t tilingKey; |
| 29 | - float epsilon; | 29 | +// float epsilon; |
| 30 | - int64_t activateSilu; | 30 | +// int64_t activateSilu; |
| 31 | -}; | 31 | +// }; |
| 32 | 32 | ||
| 33 | #pragma pack() | 33 | #pragma pack() |
| 34 | 34 | ||
| @@ -49,7 +49,7 @@ TEST_F(group_norm_silu_test, test_case_101) { | |||
| 49 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 49 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 50 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 50 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 51 | uint32_t blockDim = 32; | 51 | uint32_t blockDim = 32; |
| 52 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 52 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 53 | system("chmod -R 755 ./group_norm_silu_data/"); | 53 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 54 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 54 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 55 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 192 64 64 float16 float16"); | 55 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 192 64 64 float16 float16"); |
| @@ -107,7 +107,7 @@ TEST_F(group_norm_silu_test, test_case_101_2) { | |||
| 107 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 107 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 108 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 108 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 109 | uint32_t blockDim = 48; | 109 | uint32_t blockDim = 48; |
| 110 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 110 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 111 | system("chmod -R 755 ./group_norm_silu_data/"); | 111 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 112 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 112 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 113 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 64 64 float16 float16"); | 113 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 64 64 float16 float16"); |
| @@ -165,7 +165,7 @@ TEST_F(group_norm_silu_test, test_case_101_3) { | |||
| 165 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 165 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 166 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 166 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 167 | uint32_t blockDim = 32; | 167 | uint32_t blockDim = 32; |
| 168 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 168 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 169 | system("chmod -R 755 ./group_norm_silu_data/"); | 169 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 170 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 170 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 171 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 192 64 64 float16 float32"); | 171 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 192 64 64 float16 float32"); |
| @@ -223,7 +223,7 @@ TEST_F(group_norm_silu_test, test_case_101_4) { | |||
| 223 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 223 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 224 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 224 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 225 | uint32_t blockDim = 48; | 225 | uint32_t blockDim = 48; |
| 226 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 226 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 227 | system("chmod -R 755 ./group_norm_silu_data/"); | 227 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 228 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 228 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 229 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 64 64 float16 float32"); | 229 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 64 64 float16 float32"); |
| @@ -281,7 +281,7 @@ TEST_F(group_norm_silu_test, test_case_102) { | |||
| 281 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 281 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 282 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 282 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 283 | uint32_t blockDim = 48; | 283 | uint32_t blockDim = 48; |
| 284 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 284 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 285 | system("chmod -R 755 ./group_norm_silu_data/"); | 285 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 286 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 286 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 287 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 64 64 float32 float32"); | 287 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 64 64 float32 float32"); |
| @@ -339,7 +339,7 @@ TEST_F(group_norm_silu_test, test_case_102_2) { | |||
| 339 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 339 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 340 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 340 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 341 | uint32_t blockDim = 32; | 341 | uint32_t blockDim = 32; |
| 342 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 342 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 343 | system("chmod -R 755 ./group_norm_silu_data/"); | 343 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 344 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 344 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 345 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 192 64 64 float32 float32"); | 345 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 192 64 64 float32 float32"); |
| @@ -397,7 +397,7 @@ TEST_F(group_norm_silu_test, test_case_103) { | |||
| 397 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 397 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 398 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 398 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 399 | uint32_t blockDim = 48; | 399 | uint32_t blockDim = 48; |
| 400 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 400 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 401 | system("chmod -R 755 ./group_norm_silu_data/"); | 401 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 402 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 402 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 403 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 128 128 float16 float16"); | 403 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 128 128 float16 float16"); |
| @@ -455,7 +455,7 @@ TEST_F(group_norm_silu_test, test_case_103_1) { | |||
| 455 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 455 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 456 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 456 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 457 | uint32_t blockDim = 48; | 457 | uint32_t blockDim = 48; |
| 458 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 458 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 459 | system("chmod -R 755 ./group_norm_silu_data/"); | 459 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 460 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 460 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 461 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 8 8 float16 float16"); | 461 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 8 8 float16 float16"); |
| @@ -513,7 +513,7 @@ TEST_F(group_norm_silu_test, test_case_103_2) { | |||
| 513 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 513 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 514 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 514 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 515 | uint32_t blockDim = 48; | 515 | uint32_t blockDim = 48; |
| 516 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 516 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 517 | system("chmod -R 755 ./group_norm_silu_data/"); | 517 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 518 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 518 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 519 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 128 128 float16 float32"); | 519 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 128 128 float16 float32"); |
| @@ -571,7 +571,7 @@ TEST_F(group_norm_silu_test, test_case_103_3) { | |||
| 571 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 571 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 572 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 572 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 573 | uint32_t blockDim = 48; | 573 | uint32_t blockDim = 48; |
| 574 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 574 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 575 | system("chmod -R 755 ./group_norm_silu_data/"); | 575 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 576 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 576 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 577 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 8 8 float16 float32"); | 577 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 8 8 float16 float32"); |
| @@ -629,7 +629,7 @@ TEST_F(group_norm_silu_test, test_case_104) { | |||
| 629 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 629 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 630 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 630 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 631 | uint32_t blockDim = 48; | 631 | uint32_t blockDim = 48; |
| 632 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 632 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 633 | system("chmod -R 755 ./group_norm_silu_data/"); | 633 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 634 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 634 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 635 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 128 128 float32 float32"); | 635 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 128 128 float32 float32"); |
| @@ -687,7 +687,7 @@ TEST_F(group_norm_silu_test, test_case_104_1) { | |||
| 687 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 687 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 688 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 688 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 689 | uint32_t blockDim = 48; | 689 | uint32_t blockDim = 48; |
| 690 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 690 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 691 | system("chmod -R 755 ./group_norm_silu_data/"); | 691 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 692 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 692 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 693 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 8 8 float32 float32"); | 693 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 3 64 8 8 float32 float32"); |
| @@ -745,7 +745,7 @@ TEST_F(group_norm_silu_test, test_case_1051) { | |||
| 745 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 745 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 746 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 746 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 747 | uint32_t blockDim = 48; | 747 | uint32_t blockDim = 48; |
| 748 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 748 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 749 | system("chmod -R 755 ./group_norm_silu_data/"); | 749 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 750 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 750 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 751 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 3008 8 8 float16 float16"); | 751 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 3008 8 8 float16 float16"); |
| @@ -803,7 +803,7 @@ TEST_F(group_norm_silu_test, test_case_1052) { | |||
| 803 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 803 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 804 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 804 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 805 | uint32_t blockDim = 48; | 805 | uint32_t blockDim = 48; |
| 806 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 806 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 807 | system("chmod -R 755 ./group_norm_silu_data/"); | 807 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 808 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 808 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 809 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 3008 1 1 float16 float32"); | 809 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 3008 1 1 float16 float32"); |
| @@ -861,7 +861,7 @@ TEST_F(group_norm_silu_test, test_case_1061) { | |||
| 861 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 861 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 862 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 862 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 863 | uint32_t blockDim = 48; | 863 | uint32_t blockDim = 48; |
| 864 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 864 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 865 | system("chmod -R 755 ./group_norm_silu_data/"); | 865 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 866 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 866 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 867 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 3008 8 8 float32 float32"); | 867 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 3008 8 8 float32 float32"); |
| @@ -919,7 +919,7 @@ TEST_F(group_norm_silu_test, test_case_1062) { | |||
| 919 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 919 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 920 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 920 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 921 | uint32_t blockDim = 48; | 921 | uint32_t blockDim = 48; |
| 922 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 922 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data./"); |
| 923 | system("chmod -R 755 ./group_norm_silu_data/"); | 923 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 924 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 924 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 925 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 3008 8 8 float32 float32"); | 925 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 3008 8 8 float32 float32"); |
| @@ -977,7 +977,7 @@ TEST_F(group_norm_silu_test, test_case_1071) { | |||
| 977 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 977 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 978 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 978 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 979 | uint32_t blockDim = 48; | 979 | uint32_t blockDim = 48; |
| 980 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 980 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 981 | system("chmod -R 755 ./group_norm_silu_data/"); | 981 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 982 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 982 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 983 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 752 1 1 float16 float16"); | 983 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 752 1 1 float16 float16"); |
| @@ -1035,7 +1035,7 @@ TEST_F(group_norm_silu_test, test_case_1072) { | |||
| 1035 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 1035 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 1036 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 1036 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 1037 | uint32_t blockDim = 48; | 1037 | uint32_t blockDim = 48; |
| 1038 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 1038 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 1039 | system("chmod -R 755 ./group_norm_silu_data/"); | 1039 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 1040 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 1040 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 1041 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 3008 1 1 float16 float32"); | 1041 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 3008 1 1 float16 float32"); |
| @@ -1093,7 +1093,7 @@ TEST_F(group_norm_silu_test, test_case_1073) { | |||
| 1093 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 1093 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 1094 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 1094 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 1095 | uint32_t blockDim = 48; | 1095 | uint32_t blockDim = 48; |
| 1096 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 1096 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 1097 | system("chmod -R 755 ./group_norm_silu_data/"); | 1097 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 1098 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 1098 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 1099 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 13 1 1 float16 float32"); | 1099 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 13 1 1 float16 float32"); |
| @@ -1151,7 +1151,7 @@ TEST_F(group_norm_silu_test, test_case_1081) { | |||
| 1151 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 1151 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 1152 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 1152 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 1153 | uint32_t blockDim = 48; | 1153 | uint32_t blockDim = 48; |
| 1154 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 1154 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 1155 | system("chmod -R 755 ./group_norm_silu_data/"); | 1155 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 1156 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 1156 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 1157 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 752 1 1 float32 float32"); | 1157 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 752 1 1 float32 float32"); |
| @@ -1209,7 +1209,7 @@ TEST_F(group_norm_silu_test, test_case_1082) { | |||
| 1209 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 1209 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 1210 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 1210 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 1211 | uint32_t blockDim = 48; | 1211 | uint32_t blockDim = 48; |
| 1212 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 1212 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 1213 | system("chmod -R 755 ./group_norm_silu_data/"); | 1213 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 1214 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 1214 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 1215 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 3008 1 1 float32 float32"); | 1215 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 3008 1 1 float32 float32"); |
| @@ -1267,7 +1267,7 @@ TEST_F(group_norm_silu_test, test_case_109) { | |||
| 1267 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); | 1267 | uint8_t* workspace = (uint8_t*)AscendC::GmAlloc(4096 * 16); |
| 1268 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); | 1268 | uint8_t* tiling = (uint8_t*)AscendC::GmAlloc(tiling_data_size); |
| 1269 | uint32_t blockDim = 15; | 1269 | uint32_t blockDim = 15; |
| 1270 | - system("cp -r ../../../../../../../ops/built-in/tests/ut/fast_op_test/group_norm_silu/group_norm_silu_data ./"); | 1270 | + system("cp -r ../../../../norm/group_norm_silu/tests/ut/op_kernel/group_norm_silu_data ./"); |
| 1271 | system("chmod -R 755 ./group_norm_silu_data/"); | 1271 | system("chmod -R 755 ./group_norm_silu_data/"); |
| 1272 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); | 1272 | system("cd ./group_norm_silu_data/ && rm -rf ./*bin"); |
| 1273 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 1152 64 64 float16 float16"); | 1273 | system("cd ./group_norm_silu_data/ && python3 gen_data.py 1 1152 64 64 float16 float16"); |