1f:{"diffs":[{"old_path":"src/framework/communicator/hccl_comm_host.cc","new_path":"src/framework/communicator/hccl_comm_host.cc","old_blob_id":"41b11d08a7995fb0dc7c38a185c3c8bd7f0ec1a4","new_blob_id":"f5af64da1bfa9953c9f08e6c4da2ff137cacf04e","file_path":"src/framework/communicator/hccl_comm_host.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -358,8 +358,10 @@ namespace hccl\n // 下kernel进行自定义算子aicpu侧通信域的公共初始化\n std::string kernelName = \"RunAicpuIndOpCommInit\";\n HCCL_INFO(\"AicpuAclKernelLaunch start\");\n+ u16 timeOut = NOTIFY_DEFAULT_WAIT_TIME > std::numeric_limits::max() ? \n+ std::numeric_limits::max() : NOTIFY_DEFAULT_WAIT_TIME;\n CHK_RET(AicpuAclKernelLaunch(localStream.ptr(), reinterpret_cast(&commAicpuParam_),\n- sizeof(commAicpuParam_), binHandle_, kernelName, true, NOTIFY_DEFAULT_WAIT_TIME));\n+ sizeof(commAicpuParam_), binHandle_, kernelName, true, timeOut));\n HCCL_INFO(\"AicpuAclKernelLaunch end, hcclStreamSynchronize start\");\n CHK_RET(hcclStreamSynchronize(localStream.ptr(), CommConfiger::GetInstance().GetCommConfigExecTimeOut(\"\")));\n \n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":3,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/communicator/impl/independent_op/channel/channel_manager.cc","new_path":"src/framework/communicator/impl/independent_op/channel/channel_manager.cc","old_blob_id":"e98cf1bfdd03f12fea7449478c6acbcabe7cc1cb","new_blob_id":"f277f82d3bcf25d399d54899626dd2fd9fb5c7e9","file_path":"src/framework/communicator/impl/independent_op/channel/channel_manager.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -607,8 +607,10 @@ HcclResult ChannelManager::AicpuChannelInit(const std::string &commId, const std\n customInitTask.context = reinterpret_cast(addr.ptr());\n customInitTask.isCustom = false;\n \n+ u16 timeOut = NOTIFY_DEFAULT_WAIT_TIME > std::numeric_limits::max() ? \n+ std::numeric_limits::max() : NOTIFY_DEFAULT_WAIT_TIME;\n CHK_RET(AicpuAclKernelLaunch(localStream.ptr(), reinterpret_cast(&customInitTask),\n- sizeof(customInitTask), binHandle_, kernelName, true, NOTIFY_DEFAULT_WAIT_TIME));\n+ sizeof(customInitTask), binHandle_, kernelName, true, timeOut));\n CHK_RET(hcclStreamSynchronize(localStream.ptr(), CommConfiger::GetInstance().GetCommConfigExecTimeOut(tag)));\n \n // 将device侧的channelList拷贝回host侧的channelList\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":3,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/communicator/impl/independent_op/independent_op.cc","new_path":"src/framework/communicator/impl/independent_op/independent_op.cc","old_blob_id":"382b46f0bbb4480d1176105e5a1fe794bf7538e5","new_blob_id":"9ef6a2f02cbec884b15da7c39a0f462c8ad5fdd6","file_path":"src/framework/communicator/impl/independent_op/independent_op.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -79,8 +79,10 @@ HcclResult IndependentOp::KernelLaunchAicpuCommInit()\n // 下kernel进行自定义算子aicpu侧通信域的公共初始化\n std::string kernelName = \"RunAicpuIndOpCommInit\";\n \n+ u16 timeOut = NOTIFY_DEFAULT_WAIT_TIME > std::numeric_limits::max() ? \n+ std::numeric_limits::max() : NOTIFY_DEFAULT_WAIT_TIME;\n CHK_RET(AicpuAclKernelLaunch(localStream.ptr(), reinterpret_cast(&commAicpuParam_),\n- sizeof(commAicpuParam_), binHandle_, kernelName, true, NOTIFY_DEFAULT_WAIT_TIME));\n+ sizeof(commAicpuParam_), binHandle_, kernelName, true, timeOut));\n CHK_RET(hcclStreamSynchronize(localStream.ptr(), CommConfiger::GetInstance().GetCommConfigExecTimeOut(\"\")));\n \n // 打印增加初始化对应的参数\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":3,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/communicator/impl/independent_op/resource/engine/aicpu_launch_manager.cc","new_path":"src/framework/communicator/impl/independent_op/resource/engine/aicpu_launch_manager.cc","old_blob_id":"965faac50f9a4648e1c448285c4d4778251627a1","new_blob_id":"9bbd946553ce210b7badb3688e6a094253d38958","file_path":"src/framework/communicator/impl/independent_op/resource/engine/aicpu_launch_manager.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -45,8 +45,10 @@ HcclResult AicpuLaunchMgr::KernelLaunchAicpuCustom(OpParam &opParam, std::string\n customInitTask.isCustom = false;\n \n // Step 3. 启动 \n+ u16 timeOut = NOTIFY_DEFAULT_WAIT_TIME > std::numeric_limits::max() ? \n+ std::numeric_limits::max() : NOTIFY_DEFAULT_WAIT_TIME;\n CHK_RET(AicpuAclKernelLaunch(aicpuInitStream, reinterpret_cast(&customInitTask),\n- sizeof(customInitTask), binCustomHandle, kernelName, true, NOTIFY_DEFAULT_WAIT_TIME));\n+ sizeof(customInitTask), binCustomHandle, kernelName, true, timeOut));\n return HCCL_SUCCESS;\n }\n \n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":3,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/communicator/impl/one_sided_service/hccl_one_sided_service.cc","new_path":"src/framework/communicator/impl/one_sided_service/hccl_one_sided_service.cc","old_blob_id":"f162540de2c3648a0c24202f36d695cadadabe6f","new_blob_id":"8b3c1e649d1ad1f25ab124b91960cb660a315894","file_path":"src/framework/communicator/impl/one_sided_service/hccl_one_sided_service.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$2d","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":8,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/next/comms/api_c_adpt/hcomm_c_adpt.cc","new_path":"src/framework/next/comms/api_c_adpt/hcomm_c_adpt.cc","old_blob_id":"9f47af523fb5db9afcf314abf07d1acf20258cb6","new_blob_id":"e4730cb89dab655ca90927eea983f06c23cebd72","file_path":"src/framework/next/comms/api_c_adpt/hcomm_c_adpt.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -338,14 +338,15 @@ HcclResult HcommChannelKernelLaunch(ChannelHandle *channelHandles, ChannelHandle\n InitTask customInitTask = {0};\n customInitTask.context = reinterpret_cast(addr.ptr());\n customInitTask.isCustom = false;\n-\n+ u16 timeOut = NOTIFY_DEFAULT_WAIT_TIME > std::numeric_limits::max() ? \n+ std::numeric_limits::max() : NOTIFY_DEFAULT_WAIT_TIME;\n CHK_RET(hccl::AicpuAclKernelLaunch(localStream.ptr(),\n reinterpret_cast(&customInitTask),\n sizeof(customInitTask),\n binHandle,\n kernelName,\n true,\n- NOTIFY_DEFAULT_WAIT_TIME));\n+ timeOut));\n \n CHK_RET(\n hcclStreamSynchronize(localStream.ptr(), hccl::CommConfiger::GetInstance().GetCommConfigExecTimeOut(commTag)));\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":3,"removed_lines":2,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/legacy/framework/communicator/communicator_impl.cc","new_path":"src/legacy/framework/communicator/communicator_impl.cc","old_blob_id":"d2ca884b6011939323ddd7869093919c67834604","new_blob_id":"de035a0f93a4704d9e99da667691e451ae8f3fa7","file_path":"src/legacy/framework/communicator/communicator_impl.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -3075,7 +3075,8 @@ HcclResult CommunicatorImpl::LaunchDpuKernel(aclrtFuncHandle &funcHandle)\n aclrtLaunchKernelCfg cfg;\n aclrtLaunchKernelAttr kernelAttr;\n kernelAttr.id = ACL_RT_LAUNCH_KERNEL_ATTR_TIMEOUT;\n- kernelAttr.value.timeout = NOTIFY_DEFAULT_WAIT_TIME;\n+ kernelAttr.value.timeout = NOTIFY_DEFAULT_WAIT_TIME > std::numeric_limits::max() ? \n+ std::numeric_limits::max() : NOTIFY_DEFAULT_WAIT_TIME;\n cfg.numAttrs = 1;\n cfg.attrs = &kernelAttr;\n constexpr u32 numBlocks = 1;\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":2,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/platform/resource/transport/host/transport_direct_npu.cc","new_path":"src/platform/resource/transport/host/transport_direct_npu.cc","old_blob_id":"282c8e21927d11bf46d3d3800e689d1f1835d4d3","new_blob_id":"a9d1bb181284e8b7e21a5f6a46543d77e852da5d","file_path":"src/platform/resource/transport/host/transport_direct_npu.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$2e","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":6,"removed_lines":2,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/platform/task/dispatcher_aicpu_pub.h","new_path":"src/platform/task/dispatcher_aicpu_pub.h","old_blob_id":"2d9b34bab081dd62968f83e8b2674440b338c951","new_blob_id":"7308d2c857aa1a7cd0578f24798f0c707b62fe35","file_path":"src/platform/task/dispatcher_aicpu_pub.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -104,7 +104,13 @@ public:\n \n void SetSqeTimeOut(const u64 timeOut)\n {\n- dfxTimeOutConfig_.sqeTimeOutTimeOut = timeOut;\n+ if (timeOut > notifyMaxWaitTime_) {\n+ dfxTimeOutConfig_.sqeTimeOutTimeOut = notifyMaxWaitTime_;\n+ HCCL_WARNING(\"[SetSqeTimeOut] timeOut[%llu] exceeds the maximum allowed value \"\n+ \"for notifyMaxWaitTime[%u].\", timeOut, notifyMaxWaitTime_);\n+ } else {\n+ dfxTimeOutConfig_.sqeTimeOutTimeOut = timeOut;\n+ }\n HCCL_INFO(\"[DispatcherAiCpu][SetSqeTimeOut]DFX timeout config init successfully with details: [%s]\",\n dfxTimeOutConfig_.ToString().c_str());\n return;\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":7,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null}],"diff_refs":{"base_sha":"9bcb1bdc9832162ac11db772a4f438e6213a22bb","head_sha":"484963d045ff7bbf0f194d5e0f4d29784347eb0d","start_sha":"9bcb1bdc9832162ac11db772a4f438e6213a22bb"},"added_lines":38,"removed_lines":11,"change_file_count":9,"change_line_count":49,"too_large":false,"total":9}