Browse Source

Pre Merge pull request !1235 from ldy2021/master

pull/1235/MERGE
ldy2021 Gitee 4 years ago
parent
commit
f82d4a2edb
3 changed files with 15 additions and 1 deletions
  1. +2
    -0
      ge/host_cpu_engine/engine/host_cpu_engine.cc
  2. +10
    -0
      ge/host_cpu_engine/ops_kernel_store/host_cpu_ops_kernel_builder.cc
  3. +3
    -1
      ge/host_cpu_engine/ops_kernel_store/op/op_factory.cc

+ 2
- 0
ge/host_cpu_engine/engine/host_cpu_engine.cc View File

@@ -35,6 +35,8 @@ Status HostCpuEngine::Initialize(const std::map<string, string> &options) {
ops_kernel_store_ = MakeShared<HostCpuOpsKernelInfoStore>();
if (ops_kernel_store_ == nullptr) {
GELOGE(FAILED, "Make HostCpuOpsKernelInfoStore failed.");
REPORT_INNER_ERROR("E19999", "Make HostCpuOpsKernelInfoStore failed.");
return FAILED;
}
}


+ 10
- 0
ge/host_cpu_engine/ops_kernel_store/host_cpu_ops_kernel_builder.cc View File

@@ -40,6 +40,7 @@ Status HostCpuOpsKernelBuilder::CalcOpRunningParam(Node &ge_node) {
OpDescPtr op_desc = ge_node.GetOpDesc();
if (op_desc == nullptr) {
GELOGE(FAILED, "CalcOpRunningParam failed, as op desc is null");
REPORT_INNER_ERROR("E19999", "CalcOpRunningParam failed, as op desc is null");
return FAILED;
}

@@ -76,6 +77,11 @@ Status HostCpuOpsKernelBuilder::CalcOpRunningParam(Node &ge_node) {
GELOGE(FAILED, "Calc op[%s:%s] out[%zu] mem size failed, mem_size=%ld, format=%s, data_type=%s.",
name.c_str(), type.c_str(), i, output_mem_size, TypeUtils::FormatToSerialString(format).c_str(),
TypeUtils::DataTypeToSerialString(data_type).c_str());
REPORT_INNER_ERROR("E19999", "Calc op[%s:%s] out[%zu] mem size failed, mem_size=%ld, format=%s, data_type=%s.",
name.c_str(), type.c_str(), i, output_mem_size, TypeUtils::FormatToSerialString(format).c_str(),
TypeUtils::DataTypeToSerialString(data_type).c_str());
return FAILED;
}
GELOGI("Calc op[%s:%s] out[%zu] mem size is %ld, format=%s, data_type=%s.",
@@ -86,6 +92,10 @@ Status HostCpuOpsKernelBuilder::CalcOpRunningParam(Node &ge_node) {
if (op_desc->UpdateOutputDesc(static_cast<uint32_t>(i), output_tensor) != GRAPH_SUCCESS) {
GELOGE(FAILED, "Update op[%s:%s] out[%zu] desc failed, format=%s, data_type=%s.", name.c_str(), type.c_str(), i,
TypeUtils::FormatToSerialString(format).c_str(), TypeUtils::DataTypeToSerialString(data_type).c_str());
REPORT_INNER_ERROR("E19999", "Update op[%s:%s] out[%zu] desc failed, format=%s, data_type=%s.", name.c_str(), type.c_str(), i,
TypeUtils::FormatToSerialString(format).c_str(), TypeUtils::DataTypeToSerialString(data_type).c_str());
return FAILED;
}
}


+ 3
- 1
ge/host_cpu_engine/ops_kernel_store/op/op_factory.cc View File

@@ -32,7 +32,9 @@ std::shared_ptr<Op> OpFactory::CreateOp(const Node &node, RunContext &run_contex
return iter->second(node, run_context);
}

GELOGE(FAILED, "Not supported OP, type = %s, name = %s", node.GetType().c_str(), node.GetName().c_str());
GELOGE(FAILED, "Create OP failed ! node_type = %s, node_name = %s", node.GetType().c_str(), node.GetName().c_str());
REPORT_INNER_ERROR("E19999", "CreateOp failed, node_type = %s, node_name = %s", node.GetType().c_str(), node.GetName().c_str());
return nullptr;
}



Loading…
Cancel
Save