Browse Source

!1892 fix sc

Merge pull request !1892 from 王笑天/master
tags/v1.5.1
i-robot Gitee 3 years ago
parent
commit
25b71d7daf
3 changed files with 7 additions and 3 deletions
  1. +1
    -1
      ge/ge_runtime/task/label_goto_task.cc
  2. +1
    -1
      ge/graph/preprocess/multi_batch_copy_graph.cc
  3. +5
    -1
      ge/single_op/task/op_task.h

+ 1
- 1
ge/ge_runtime/task/label_goto_task.cc View File

@@ -72,7 +72,7 @@ bool LabelGotoTask::Distribute() {
return false;
}

rt_ret = rtLabelListCpy((void**)label_list.data(), label_list.size(), label_info_, label_info_size);
rt_ret = rtLabelListCpy(reinterpret_cast<void**>(label_list.data()), label_list.size(), label_info_, label_info_size);
if (rt_ret != RT_ERROR_NONE) {
GELOGE(RT_FAILED, "Call rt api failed, ret: %#x", rt_ret);
return false;


+ 1
- 1
ge/graph/preprocess/multi_batch_copy_graph.cc View File

@@ -1206,7 +1206,7 @@ Status MultiBatchGraphCopyer::CheckCopyResult(const std::vector<NodePtr> &start_
auto dims = NodeUtils::GetOutputDesc(*node, kDataOutIndex).GetShape().GetDims();
if (!IsAllDimsPositive(dims)) {
REPORT_CALL_ERROR("E19999", "Failed to copy multi batch graph, the node %s still has unknown shape %s",
node->GetName().c_str(), formats::ShapeToString(dims).c_str());
node->GetName().c_str(), formats::ShapeToString(dims).c_str());
GELOGE(INTERNAL_ERROR, "[Check][Param] Failed to copy multi batch graph, the node %s still has unknown shape %s",
node->GetName().c_str(), formats::ShapeToString(dims).c_str());
return INTERNAL_ERROR;


+ 5
- 1
ge/single_op/task/op_task.h View File

@@ -33,6 +33,10 @@
#include "register/op_tiling.h"

namespace ge {
namespace {
const int kAddressNum = 2;
} // namespace

class StreamResource;
struct SingleOpModelParam;
class OpTask {
@@ -264,7 +268,7 @@ class MemcpyAsyncTask : public OpTask {
friend class SingleOpModel;
friend class RtsKernelTaskBuilder;

uintptr_t addresses_[2];
uintptr_t addresses_[kAddressNum];
size_t dst_max_;
size_t count_;
rtMemcpyKind_t kind_;


Loading…
Cancel
Save