Browse Source

!2574 Clean codex

Merge pull request !2574 from TronZhang/codex_0624
tags/v0.6.0-beta
mindspore-ci-bot Gitee 5 years ago
parent
commit
2291213b8b
3 changed files with 6 additions and 57 deletions
  1. +2
    -52
      mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_mod.cc
  2. +3
    -4
      mindspore/ccsrc/optimizer/irpass/merge_addn.h
  3. +1
    -1
      mindspore/ccsrc/pre_activate/pass/fuse_graph_kernel.cc

+ 2
- 52
mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_mod.cc View File

@@ -53,54 +53,6 @@ const std::vector<size_t> &AkgKernelMod::GetOutputSizeList() const { return outp

const std::vector<size_t> &AkgKernelMod::GetWorkspaceSizeList() const { return workspace_size_list_; }

void DumpData(const std::vector<AddressPtr> &inputs, const std::vector<AddressPtr> &outputs) {
const char *dump_data = getenv("MS_KERNEL_DUMP_DATA");
if (dump_data) {
int idx = 0;
for (const auto &x : inputs) {
std::vector<char> buf(x->size);
if (RT_ERROR_NONE != rtMemcpy(buf.data(), buf.size(), reinterpret_cast<const void *>(x->addr), x->size,
RT_MEMCPY_DEVICE_TO_HOST)) {
MS_LOG(WARNING) << "Call runtime rtMemcpy error.";
return;
}

std::string file_name("input_");
file_name += std::to_string(idx);
std::ofstream file(file_name, std::ios::binary);
if (file.is_open()) {
(void)file.write(buf.data(), SizeToLong(buf.size()));
file.close();
idx++;
} else {
MS_LOG(ERROR) << "Open file failed.";
return;
}
}
idx = 0;
for (const auto &x : outputs) {
std::vector<char> buf(x->size);
if (RT_ERROR_NONE != rtMemcpy(buf.data(), buf.size(), reinterpret_cast<const void *>(x->addr), x->size,
RT_MEMCPY_DEVICE_TO_HOST)) {
MS_LOG(WARNING) << "Call runtime rtMemcpy error.";
return;
}

std::string file_name("output_");
file_name += std::to_string(idx);
std::ofstream file(file_name, std::ios::binary);
if (file.is_open()) {
(void)file.write(buf.data(), SizeToLong(buf.size()));
file.close();
idx++;
} else {
MS_LOG(ERROR) << "Open file failed.";
return;
}
}
}
}

bool AkgKernelMod::Launch(const std::vector<AddressPtr> &inputs, const std::vector<AddressPtr> &,
const std::vector<AddressPtr> &outputs, void *stream_ptr) {
if (stream_ptr == 0) {
@@ -135,8 +87,6 @@ bool AkgKernelMod::Launch(const std::vector<AddressPtr> &inputs, const std::vect
return false;
}

DumpData(inputs, outputs);

return true;
}

@@ -147,10 +97,10 @@ std::vector<TaskInfoPtr> AkgKernelMod::GenTask(const std::vector<AddressPtr> &in
}

std::vector<uint8_t> args;
uint32_t args_size = 0;
const uint32_t args_size = 0;
std::vector<uint8_t> sm_desc;
void *binary = nullptr;
uint32_t binary_size = 0;
const uint32_t binary_size = 0;
std::vector<uint8_t> meta_data;
std::vector<void *> input_data_addrs;
std::vector<void *> output_data_addrs;


+ 3
- 4
mindspore/ccsrc/optimizer/irpass/merge_addn.h View File

@@ -224,10 +224,9 @@ class AddNEliminater : public AnfVisitor {
auto new_fg = TransformableClone(fg, std::make_shared<TraceTransform>("fg"));
mng->AddFuncGraph(new_fg);
need_update_ = false;
bool changed = false;
bool changed;
do {
changed = false;
changed |= Process(new_fg);
changed = Process(new_fg);
} while (changed);

if (!need_update_) {
@@ -315,7 +314,7 @@ class AddNEliminater : public AnfVisitor {
}
}

need_update_ |= changed;
need_update_ = need_update_ || changed;
return changed;
}



+ 1
- 1
mindspore/ccsrc/pre_activate/pass/fuse_graph_kernel.cc View File

@@ -452,7 +452,7 @@ void ReplaceNewFuseCNode(const std::shared_ptr<session::KernelGraph> &kernel_gra
}
}

AnfNodePtrList EliminateMakeTuple(FuncGraphPtr *fg, FuncGraphManagerPtr *mng) {
AnfNodePtrList EliminateMakeTuple(const FuncGraphPtr *fg, FuncGraphManagerPtr *mng) {
AnfNodePtrList outs;
auto out_node = (*fg)->output();
if (IsPrimitiveCNode(out_node, prim::kPrimMakeTuple)) {


Loading…
Cancel
Save