From b530125dc44672d9637f1b6b1ac504e5743783cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A9=B9=E9=9A=BD?= Date: Tue, 4 Nov 2025 15:40:05 +0000 Subject: [PATCH 1/2] =?UTF-8?q?!7077=20init=20func=20ptr=20to=20nullptr=20?= =?UTF-8?q?Merge=20pull=20request=20!7077=20from=20=E8=A9=B9=E9=9A=BD/init?= =?UTF-8?q?=5Ffunc=5Fnullptr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../registry/op_impl_space_registry_v2_impl.cc | 6 +++--- .../register/op_impl_kernel_registry.h | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/base/registry/op_impl_space_registry_v2_impl.cc b/base/registry/op_impl_space_registry_v2_impl.cc index 91c8c7cffe..9721f46d99 100644 --- a/base/registry/op_impl_space_registry_v2_impl.cc +++ b/base/registry/op_impl_space_registry_v2_impl.cc @@ -25,9 +25,9 @@ #define MERGE_FUNCTION(merged_funcs, src_funcs, op_type, func_name) \ if ((((merged_funcs).func_name) == nullptr) and ((src_funcs).func_name != nullptr)) { \ ((merged_funcs).func_name) = ((src_funcs).func_name); \ - GELOGD("op type %s %s func registered", (op_type), #func_name); \ - } else if (((merged_funcs).func_name) != nullptr) { \ - GELOGW("op type %s %s func has been registered", (op_type), #func_name); \ + GELOGD("op type %s %s func registered.", (op_type), #func_name); \ + } else if (((merged_funcs).func_name) != nullptr and ((src_funcs).func_name != nullptr)) { \ + GELOGW("op type %s %s func has been registered.", (op_type), #func_name); \ } else { \ /* 空分支，无需操作 */ \ } diff --git a/inc/external/register/op_impl_kernel_registry.h b/inc/external/register/op_impl_kernel_registry.h index b0143a7992..7dfb1896b6 100644 --- a/inc/external/register/op_impl_kernel_registry.h +++ b/inc/external/register/op_impl_kernel_registry.h @@ -144,13 +144,13 @@ struct OpImplKernelRegistry { return ge::GRAPH_SUCCESS; } - OpImplRegisterV2::InferShapeKernelFunc infer_shape; - OpImplRegisterV2::InferShapeRangeKernelFunc infer_shape_range; - OpImplRegisterV2::InferDataTypeKernelFunc infer_datatype; - OpImplRegisterV2::TilingKernelFunc tiling; - OpImplRegisterV2::KernelFunc tiling_parse; - OpImplRegisterV2::CompileInfoCreatorFunc compile_info_creator; - OpImplRegisterV2::CompileInfoDeleterFunc compile_info_deleter; + OpImplRegisterV2::InferShapeKernelFunc infer_shape = nullptr; + OpImplRegisterV2::InferShapeRangeKernelFunc infer_shape_range = nullptr; + OpImplRegisterV2::InferDataTypeKernelFunc infer_datatype = nullptr; + OpImplRegisterV2::TilingKernelFunc tiling = nullptr; + OpImplRegisterV2::KernelFunc tiling_parse = nullptr; + OpImplRegisterV2::CompileInfoCreatorFunc compile_info_creator = nullptr; + OpImplRegisterV2::CompileInfoDeleterFunc compile_info_deleter = nullptr; size_t max_tiling_data_size = 0UL; uint64_t inputs_dependency = 0UL; static constexpr size_t kByteBitCount = 8UL; @@ -158,9 +158,9 @@ struct OpImplKernelRegistry { // todo 去重和registry没关系，下一步从这里删除，移动到register中实现 OpImplRegisterV2::PrivateAttrSet unique_private_attrs; uint64_t host_inputs = 0UL; - OpImplRegisterV2::OpExecFunc op_execute_func; + OpImplRegisterV2::OpExecFunc op_execute_func = nullptr; uint64_t tiling_dependency = 0UL; - OpImplRegisterV2::GenSimplifiedKeyKernelFunc gen_simplifiedkey; + OpImplRegisterV2::GenSimplifiedKeyKernelFunc gen_simplifiedkey = nullptr; uint8_t tiling_dependency_placements = 0U; uint64_t output_shape_depend_compute = 0UL; }; -- Gitee From 75c39d9f0fd0d4901d326b570070f298f11392ca Mon Sep 17 00:00:00 2001 From: yangyongqiang Date: Tue, 4 Nov 2025 15:40:15 +0000 Subject: [PATCH 2/2] =?UTF-8?q?!7084=20=E4=BC=98=E5=8C=96GetBinDataFromFil?= =?UTF-8?q?e/GetBinFromFile=E6=8E=A5=E5=8F=A3=E6=80=A7=E8=83=BD=20Merge=20?= =?UTF-8?q?pull=20request=20!7084=20from=20yangyongqiang/optimize=5F1104?= =?UTF-8?q?=5F1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/utils/file_utils.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/utils/file_utils.cc b/base/utils/file_utils.cc index 6dde695ff5..0d01227408 100644 --- a/base/utils/file_utils.cc +++ b/base/utils/file_utils.cc @@ -160,7 +160,7 @@ std::unique_ptr GetBinDataFromFile(const std::string &path, uint32_t & (void) ifs.seekg(0, std::ifstream::end); const uint32_t len = static_cast(ifs.tellg()); (void) ifs.seekg(0, std::ifstream::beg); - auto bin_data = ComGraphMakeUnique(len); + auto bin_data = std::unique_ptr(new (std::nothrow) char_t[len]); if (bin_data == nullptr) { GELOGE(FAILED, "[Allocate][Mem]Allocate mem failed"); ifs.close(); @@ -184,7 +184,7 @@ std::unique_ptr GetBinFromFile(const std::string &path, size_t offset, s "Offset add length overflow size_t or file length"); ifs.clear(); (void) ifs.seekg(static_cast(offset), std::ifstream::beg); - auto bin_data = ComGraphMakeUnique(data_len); + auto bin_data = std::unique_ptr(new (std::nothrow) char_t[data_len]); GE_ASSERT_NOTNULL(bin_data, "[Allocate][Mem] Allocate mem failed"); (void) ifs.read(reinterpret_cast(bin_data.get()), static_cast(data_len)); ifs.close(); -- Gitee