Browse Source

fix format

tags/v1.3.0
wjm 3 years ago
parent
commit
0de08b01b5
6 changed files with 13 additions and 12 deletions
  1. +2
    -2
      ge/graph/build/memory/graph_mem_assigner.cc
  2. +1
    -1
      ge/graph/build/memory/graph_mem_assigner.h
  3. +5
    -5
      ge/graph/preprocess/graph_preprocess.cc
  4. +2
    -1
      ge/host_kernels/slice_kernel.cc
  5. +1
    -1
      ge/host_kernels/slice_kernel.h
  6. +2
    -2
      ge/ir_build/ge_ir_build.cc

+ 2
- 2
ge/graph/build/memory/graph_mem_assigner.cc View File

@@ -608,8 +608,8 @@ Status GraphMemoryAssigner::ReAssignContinuousMemory(bool is_loop_graph) {
return ge::SUCCESS;
}

Status GraphMemoryAssigner::SetMemOffset(const ge::NodePtr &node, InDataAnchorPtr in_data_anchor, bool reverse_refresh,
int64_t &mem_offset, int64_t &continuous_mem_start) {
Status GraphMemoryAssigner::SetMemOffset(const ge::NodePtr &node, const InDataAnchorPtr &in_data_anchor,
bool reverse_refresh, int64_t &mem_offset, int64_t &continuous_mem_start) {
auto op_desc = node->GetOpDesc();
GE_CHECK_NOTNULL(op_desc);
vector<int64_t> output_list_this = op_desc->GetOutputOffset();


+ 1
- 1
ge/graph/build/memory/graph_mem_assigner.h View File

@@ -146,7 +146,7 @@ class GraphMemoryAssigner {
ge::Status FilterAtomicNodesForMemoryAssign(map<string, map<NodePtr, vector<NodePtr>>> &normal_atomic_nodes_map,
map<string, vector<NodePtr>> &connecting_output_atomic_nodes);

Status SetMemOffset(const ge::NodePtr &node, InDataAnchorPtr in_data_anchor, bool reverse_refresh,
Status SetMemOffset(const ge::NodePtr &node, const InDataAnchorPtr &in_data_anchor, bool reverse_refresh,
int64_t &mem_offset, int64_t &continuous_mem_start);

ge::Status AssignContinuousInputMemory(const ge::NodePtr &node, int64_t &continuous_mem_start,


+ 5
- 5
ge/graph/preprocess/graph_preprocess.cc View File

@@ -1430,12 +1430,12 @@ Status GraphPrepare::CheckInternalFormat(const NodePtr &input_node, const GeTens
if (need_check_internal_format) {
bool is_internal = TypeUtils::IsInternalFormat(format) || TypeUtils::IsInternalFormat(origin_format);
if (is_internal) {
ErrorManager::GetInstance().ATCReportErrMessage("E19025", {"situation", "reason"},
{"Input format[" + TypeUtils::FormatToSerialString(format) + "] or origin_format[" +
TypeUtils::FormatToSerialString(origin_format) + "]", "it is not support"});
ErrorManager::GetInstance().ATCReportErrMessage("E19025", {"situation", "reason"}, {"Input format[" +
TypeUtils::FormatToSerialString(format) + "] or origin_format[" +
TypeUtils::FormatToSerialString(origin_format) + "]",
"it is not support"});
GELOGE(PARAM_INVALID, "[Check][Param] Input format %s or origin_format %s is not support.",
TypeUtils::FormatToSerialString(format).c_str(),
TypeUtils::FormatToSerialString(origin_format).c_str());
TypeUtils::FormatToSerialString(format).c_str(), TypeUtils::FormatToSerialString(origin_format).c_str());
return FAILED;
}
}


+ 2
- 1
ge/host_kernels/slice_kernel.cc View File

@@ -155,7 +155,8 @@ Status SliceKernel::Compute(const OpDescPtr attr, const std::vector<ConstGeTenso
return SUCCESS;
}

Status SliceKernel::CheckInput(const ConstGeTensorPtr x_, const ConstGeTensorPtr begin, const ConstGeTensorPtr size) {
Status SliceKernel::CheckInput(const ConstGeTensorPtr &x_, const ConstGeTensorPtr &begin,
const ConstGeTensorPtr &size) {
if (x_ == nullptr || begin == nullptr || size == nullptr) {
GELOGW("input tensor is nullptr.");
return NOT_CHANGED;


+ 1
- 1
ge/host_kernels/slice_kernel.h View File

@@ -28,7 +28,7 @@ class SliceKernel : public Kernel {
vector<GeTensorPtr> &v_output) override;

Status CheckOutputDims(const std::vector<int64_t> &output_dims, const OpDescPtr attr);
Status CheckInput(const ConstGeTensorPtr x_, const ConstGeTensorPtr begin, const ConstGeTensorPtr size);
Status CheckInput(const ConstGeTensorPtr &x_, const ConstGeTensorPtr &begin, const ConstGeTensorPtr &size);
};
} // namespace ge



+ 2
- 2
ge/ir_build/ge_ir_build.cc View File

@@ -538,8 +538,8 @@ graphStatus Impl::Init(const Graph &graph, const std::map<std::string, std::stri
GE_CHK_BOOL_RET_STATUS_NOLOG(ge::CheckLogParamValidAndSetLogLevel(log) == 0, GRAPH_PARAM_INVALID);
options_[ge::ir_option::LOG_LEVEL] = log;

string input_shape = GetParam("input_shape");
string input_format = GetParam("input_format");
string input_shape = GetParam(ge::ir_option::INPUT_SHAPE);
string input_format = GetParam(ge::ir_option::INPUT_FORMAT);
string net_format = GetParam("net_format");

string dynamic_batch_size = GetParam(ge::ir_option::DYNAMIC_BATCH_SIZE);


Loading…
Cancel
Save