Browse Source

clean code

tags/v1.3.0
baihuawei 4 years ago
parent
commit
805fc08c6e
10 changed files with 20 additions and 23 deletions
  1. +2
    -3
      mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc
  2. +5
    -6
      mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc
  3. +0
    -1
      mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc
  4. +2
    -2
      mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc
  5. +2
    -2
      mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.cc
  6. +2
    -2
      mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.h
  7. +1
    -1
      mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc
  8. +2
    -2
      mindspore/ccsrc/backend/kernel_compiler/rts/send.cc
  9. +2
    -2
      mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc
  10. +2
    -2
      mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc

+ 2
- 3
mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc View File

@@ -47,9 +47,8 @@ bool AssignKernel::Launch(const std::vector<AddressPtr> &inputs, const std::vect
return true;
}

std::vector<TaskInfoPtr> AssignKernel::GenTask(const std::vector<AddressPtr> &inputs,
const std::vector<AddressPtr> &workspace,
const std::vector<AddressPtr> &outputs, uint32_t stream_id) {
std::vector<TaskInfoPtr> AssignKernel::GenTask(const std::vector<AddressPtr> &inputs, const std::vector<AddressPtr> &,
const std::vector<AddressPtr> &, uint32_t stream_id) {
if (inputs.size() != 2) {
MS_LOG(EXCEPTION) << "inputs size is not two";
}


+ 5
- 6
mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc View File

@@ -44,7 +44,7 @@ bool LabelSwitchKernel::Init(const AnfNodePtr &anf_node) {
auto primitive = AnfAlgo::GetCNodePrimitive(anf_node);
MS_EXCEPTION_IF_NULL(primitive);
label_list_ = GetValue<std::vector<uint32_t>>(primitive->GetAttr(kAttrLabelSwitchList));
label_size_ = label_list_.size();
label_size_ = SizeToUint(label_list_.size());
MS_LOG(INFO) << "LabelSwitchKernel get attr label size:" << label_size_;
for (auto label : label_list_) {
MS_LOG(INFO) << "label: " << label;
@@ -52,16 +52,15 @@ bool LabelSwitchKernel::Init(const AnfNodePtr &anf_node) {
return true;
}

bool LabelSwitchKernel::Launch(const std::vector<AddressPtr> & /*inputs*/,
const std::vector<AddressPtr> & /*workspace*/,
const std::vector<AddressPtr> & /*outputs*/, void * /*stream_ptr*/) {
bool LabelSwitchKernel::Launch(const std::vector<AddressPtr> &, const std::vector<AddressPtr> &,
const std::vector<AddressPtr> &, void *) {
MS_LOG(INFO) << "LabelSwitchKernel launch";
return true;
}

std::vector<TaskInfoPtr> LabelSwitchKernel::GenTask(const std::vector<AddressPtr> &inputs,
const std::vector<AddressPtr> &workspace,
const std::vector<AddressPtr> &outputs, uint32_t stream_id) {
const std::vector<AddressPtr> &, const std::vector<AddressPtr> &,
uint32_t stream_id) {
MS_LOG(INFO) << "LabelSwitchKernel GenTask label size:" << label_size_ << ", stream id:" << stream_id;
std::vector<TaskInfoPtr> task_info_list;
cond_ = inputs[0]->addr;


+ 0
- 1
mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc View File

@@ -27,7 +27,6 @@

using mindspore::ge::model_runner::MemcpyAsyncTaskInfo;
using MemcpyAsyncTaskInfoPtr = std::shared_ptr<MemcpyAsyncTaskInfo>;
using AddressPtrList = std::vector<mindspore::kernel::AddressPtr>;
using mindspore::device::ascend::MemcpyRtsDynamicKernel;
using MemcpyRtsDynamicKernelPtr = std::shared_ptr<MemcpyRtsDynamicKernel>;



+ 2
- 2
mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc View File

@@ -42,8 +42,8 @@ bool RecvKernel::Init(const AnfNodePtr &anf_node) {
return true;
}

bool RecvKernel::Launch(const std::vector<AddressPtr> &inputs, const std::vector<AddressPtr> &workspace,
const std::vector<AddressPtr> &outputs, void *stream_ptr) {
bool RecvKernel::Launch(const std::vector<AddressPtr> &, const std::vector<AddressPtr> &,
const std::vector<AddressPtr> &, void *stream_ptr) {
rtEvent_t stream_event{};
auto status = rtStreamWaitEvent(stream_ptr, stream_event);
if (status != RT_ERROR_NONE) {


+ 2
- 2
mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.cc View File

@@ -18,7 +18,7 @@

namespace mindspore {
namespace kernel {
void RtKernelFactory::Registe(const std::string &name, RtKernelCreater &&fun) {
void RtKernelFactory::Register(const std::string &name, RtKernelCreater &&fun) {
(void)fmap_.emplace(name, std::move(fun));
}

@@ -32,7 +32,7 @@ std::shared_ptr<RtKernel> RtKernelFactory::Create(const std::string &name) {
}

RtKernelFactory &RtKernelFactory::Get() {
static RtKernelFactory _this;
static RtKernelFactory _this{};
return _this;
}



+ 2
- 2
mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.h View File

@@ -51,7 +51,7 @@ class RtKernelFactory {

public:
static RtKernelFactory &Get();
void Registe(const std::string &name, RtKernelCreater &&fun);
void Register(const std::string &name, RtKernelCreater &&fun);
static std::shared_ptr<RtKernel> Create(const std::string &name);

private:
@@ -61,7 +61,7 @@ class RtKernelFactory {
class _RtKernelRegister {
public:
_RtKernelRegister(const std::string &name, RtKernelCreater &&fun) {
RtKernelFactory::Get().Registe(name, std::move(fun));
RtKernelFactory::Get().Register(name, std::move(fun));
}
~_RtKernelRegister() = default;
};


+ 1
- 1
mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc View File

@@ -40,7 +40,7 @@ std::shared_ptr<RtKerDesc> RtKerDescFactory::Create(const std::string &name) {
}

RtKerDescFactory &RtKerDescFactory::Get() {
static RtKerDescFactory _this;
static RtKerDescFactory _this{};
return _this;
}



+ 2
- 2
mindspore/ccsrc/backend/kernel_compiler/rts/send.cc View File

@@ -41,8 +41,8 @@ bool SendKernel::Init(const AnfNodePtr &anf_node) {
return true;
}

bool SendKernel::Launch(const std::vector<AddressPtr> &inputs, const std::vector<AddressPtr> &workspace,
const std::vector<AddressPtr> &outputs, void *stream_ptr) {
bool SendKernel::Launch(const std::vector<AddressPtr> &, const std::vector<AddressPtr> &,
const std::vector<AddressPtr> &, void *stream_ptr) {
rtEvent_t event{};
rtError_t status = rtEventRecord(event, stream_ptr);
if (status != RT_ERROR_NONE) {


+ 2
- 2
mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc View File

@@ -41,8 +41,8 @@ bool StreamActiveKernel::Init(const AnfNodePtr &anf_node) {
return true;
}

bool StreamActiveKernel::Launch(const std::vector<AddressPtr> &inputs, const std::vector<AddressPtr> &workspace,
const std::vector<AddressPtr> &outputs, void *stream_ptr) {
bool StreamActiveKernel::Launch(const std::vector<AddressPtr> &, const std::vector<AddressPtr> &,
const std::vector<AddressPtr> &, void *stream_ptr) {
MS_LOG(INFO) << "Stream active op launch start";

if (active_streams_index_.empty()) {


+ 2
- 2
mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc View File

@@ -58,8 +58,8 @@ bool StreamSwitchKernel::Init(const AnfNodePtr &anf_node) {
return true;
}

bool StreamSwitchKernel::Launch(const std::vector<AddressPtr> &inputs, const std::vector<AddressPtr> &workspace,
const std::vector<AddressPtr> &outputs, void *stream_ptr) {
bool StreamSwitchKernel::Launch(const std::vector<AddressPtr> &inputs, const std::vector<AddressPtr> &,
const std::vector<AddressPtr> &, void *stream_ptr) {
MS_LOG(INFO) << "stream switch op launch start";
if (inputs.size() != kStreamSwitchInputSize) {
MS_LOG(EXCEPTION) << "Stream switch inputs size is " << inputs.size() << ", only support 2";


Loading…
Cancel
Save