rename kernel/mng to kernel/rts

This commit is contained in:
dengwentao 2020-05-13 15:59:58 +08:00
parent 25b2424f9b
commit fa83fc3e02
30 changed files with 149 additions and 149 deletions

View File

@ -28,7 +28,7 @@
#include "kernel/tbe/tbe_kernel_parallel_build.h"
#include "kernel/aicpu/aicpu_kernel_build.h"
#include "kernel/hccl/hccl_kernel_build.h"
#include "kernel/mng/rt_kernel_build.h"
#include "kernel/rts/rt_kernel_build.h"
#include "kernel/tbe/tbe_utils.h"
#include "operator/ops.h"
#include "session/anf_runtime_algorithm.h"

View File

@ -11,7 +11,7 @@ if (ENABLE_D)
"kernel_fusion.cc"
"tbe/*.cc"
"aicpu/*.cc"
"mng/*.cc"
"rts/*.cc"
"hccl/*.cc"
)
add_compile_definitions(ENABLE_D)

View File

@ -18,7 +18,7 @@
#include <memory>
#include <algorithm>
#include "kernel/aicpu/aicpu_kernel_metadata.h"
#include "kernel/mng/rt_kernel_info.h"
#include "kernel/rts/rt_kernel_info.h"
#include "kernel/hccl/hccl_kernel_metadata.h"
#include "kernel/tbe/tbe_kernel_select.h"
#include "session/anf_runtime_algorithm.h"

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "kernel/mng/assign.h"
#include "kernel/rts/assign.h"
#include <memory>

View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_MNG_ASSIGN_H
#define MINDSPORE_CCSRC_KERNEL_MNG_ASSIGN_H
#ifndef MINDSPORE_CCSRC_KERNEL_RTS_ASSIGN_H
#define MINDSPORE_CCSRC_KERNEL_RTS_ASSIGN_H
#include <vector>
#include "kernel/mng/rt_kernel.h"
#include "kernel/mng/rt_kernel_info.h"
#include "kernel/rts/rt_kernel.h"
#include "kernel/rts/rt_kernel_info.h"
namespace mindspore {
namespace kernel {
@ -38,4 +38,4 @@ MS_REG_RTKERNEL(assign, AssignKernel);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_MNG_ASSIGN_H
#endif // MINDSPORE_CCSRC_KERNEL_RTS_ASSIGN_H

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "kernel/mng/label_goto.h"
#include "kernel/rts/label_goto.h"
#include <asm-generic/param.h>
#include <memory>
#include "runtime/stream.h"

View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_MNG_LABEL_GOTO_H
#define MINDSPORE_CCSRC_KERNEL_MNG_LABEL_GOTO_H
#ifndef MINDSPORE_CCSRC_KERNEL_RTS_LABEL_GOTO_H
#define MINDSPORE_CCSRC_KERNEL_RTS_LABEL_GOTO_H
#include <memory>
#include <vector>
#include "kernel/mng/rt_kernel.h"
#include "kernel/mng/rt_kernel_info.h"
#include "kernel/rts/rt_kernel.h"
#include "kernel/rts/rt_kernel_info.h"
namespace mindspore {
namespace kernel {
@ -44,4 +44,4 @@ MS_REG_RTKERNEL(labelgoto, LabelGotoKernel);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_MNG_LABEL_GOTO_H
#endif // MINDSPORE_CCSRC_KERNEL_RTS_LABEL_GOTO_H

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "kernel/mng/label_set.h"
#include "kernel/rts/label_set.h"
#include <asm-generic/param.h>
#include <memory>
#include "runtime/stream.h"

View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_MNG_LABEL_SET_H
#define MINDSPORE_CCSRC_KERNEL_MNG_LABEL_SET_H
#ifndef MINDSPORE_CCSRC_KERNEL_RTS_LABEL_SET_H
#define MINDSPORE_CCSRC_KERNEL_RTS_LABEL_SET_H
#include <memory>
#include <vector>
#include "kernel/mng/rt_kernel.h"
#include "kernel/mng/rt_kernel_info.h"
#include "kernel/rts/rt_kernel.h"
#include "kernel/rts/rt_kernel_info.h"
namespace mindspore {
namespace kernel {
@ -44,4 +44,4 @@ MS_REG_RTKERNEL(labelset, LabelSetKernel);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_MNG_LABEL_SET_H
#endif // MINDSPORE_CCSRC_KERNEL_RTS_LABEL_SET_H

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "kernel/mng/label_switch.h"
#include "kernel/rts/label_switch.h"
#include <asm-generic/param.h>
#include <memory>
#include "runtime/stream.h"

View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_MNG_LABEL_SWITCH_H
#define MINDSPORE_CCSRC_KERNEL_MNG_LABEL_SWITCH_H
#ifndef MINDSPORE_CCSRC_KERNEL_RTS_LABEL_SWITCH_H
#define MINDSPORE_CCSRC_KERNEL_RTS_LABEL_SWITCH_H
#include <memory>
#include <vector>
#include "kernel/mng/rt_kernel.h"
#include "kernel/mng/rt_kernel_info.h"
#include "kernel/rts/rt_kernel.h"
#include "kernel/rts/rt_kernel_info.h"
namespace mindspore {
namespace kernel {
@ -46,4 +46,4 @@ MS_REG_RTKERNEL(labelswitch, LabelSwitchKernel);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_MNG_LABEL_SWITCH_H
#endif // MINDSPORE_CCSRC_KERNEL_RTS_LABEL_SWITCH_H

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "kernel/mng/memcpy_async.h"
#include "kernel/rts/memcpy_async.h"
#include <memory>
#include <string>

View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_MNG_MEMCPY_ASYNC_H
#define MINDSPORE_CCSRC_KERNEL_MNG_MEMCPY_ASYNC_H
#ifndef MINDSPORE_CCSRC_KERNEL_RTS_MEMCPY_ASYNC_H
#define MINDSPORE_CCSRC_KERNEL_RTS_MEMCPY_ASYNC_H
#include <vector>
#include <memory>
#include "kernel/mng/rt_kernel.h"
#include "kernel/mng/rt_kernel_info.h"
#include "kernel/rts/rt_kernel.h"
#include "kernel/rts/rt_kernel_info.h"
namespace mindspore {
namespace kernel {
@ -53,4 +53,4 @@ MS_REG_RTKERNEL(memcpy_async, MemCpyAsyncKernel);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_MNG_MEMCPY_ASYNC_H
#endif // MINDSPORE_CCSRC_KERNEL_RTS_MEMCPY_ASYNC_H

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "kernel/mng/profiling_kernel_mod.h"
#include "kernel/rts/profiling_kernel_mod.h"
#include <vector>
#include <string>

View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef MINDSPORE_MINDSPORE_CCSRC_KERNEL_PROFILING_PROFILING_KERNEL_MOD_H_
#define MINDSPORE_MINDSPORE_CCSRC_KERNEL_PROFILING_PROFILING_KERNEL_MOD_H_
#ifndef MINDSPORE_MINDSPORE_CCSRC_KERNEL_RTS_PROFILING_KERNEL_MOD_H_
#define MINDSPORE_MINDSPORE_CCSRC_KERNEL_RTS_PROFILING_KERNEL_MOD_H_
#include <vector>
#include "kernel/mng/rt_kernel.h"
#include "kernel/rts/rt_kernel.h"
namespace mindspore {
namespace kernel {
class ProfilingKernelMod : public RtKernel {
@ -37,4 +37,4 @@ class ProfilingKernelMod : public RtKernel {
MS_REG_RTKERNEL(profiling, ProfilingKernelMod);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_MINDSPORE_CCSRC_KERNEL_PROFILING_PROFILING_KERNEL_MOD_H_
#endif // MINDSPORE_MINDSPORE_CCSRC_KERNEL_RTS_PROFILING_KERNEL_MOD_H_

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "kernel/mng/recv.h"
#include "kernel/rts/recv.h"
#include <memory>
#include "runtime/stream.h"
#include "utils/context/ms_context.h"

View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_MNG_RECV_H
#define MINDSPORE_CCSRC_KERNEL_MNG_RECV_H
#ifndef MINDSPORE_CCSRC_KERNEL_RTS_RECV_H
#define MINDSPORE_CCSRC_KERNEL_RTS_RECV_H
#include <memory>
#include <vector>
#include "kernel/mng/rt_kernel.h"
#include "kernel/mng/rt_kernel_info.h"
#include "kernel/rts/rt_kernel.h"
#include "kernel/rts/rt_kernel_info.h"
namespace mindspore {
namespace kernel {
@ -43,4 +43,4 @@ MS_REG_RTKERNEL(recv, RecvKernel);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_MNG_RECV_H
#endif // MINDSPORE_CCSRC_KERNEL_RTS_RECV_H

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "kernel/mng/rt_kernel.h"
#include "kernel/rts/rt_kernel.h"
namespace mindspore {
namespace kernel {

View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_MNG_RT_KERNEL_H
#define MINDSPORE_CCSRC_KERNEL_MNG_RT_KERNEL_H
#ifndef MINDSPORE_CCSRC_KERNEL_RTS_RT_KERNEL_H
#define MINDSPORE_CCSRC_KERNEL_RTS_RT_KERNEL_H
#include <vector>
#include <utility>
@ -74,4 +74,4 @@ class _RtKernelRegister {
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_MNG_RT_KERNEL_H
#endif // MINDSPORE_CCSRC_KERNEL_RTS_RT_KERNEL_H

View File

@ -14,14 +14,14 @@
* limitations under the License.
*/
#include "kernel/mng/rt_kernel_build.h"
#include "kernel/rts/rt_kernel_build.h"
#include <string>
#include <memory>
#include <utility>
#include <algorithm>
#include "kernel/mng/rt_kernel.h"
#include "kernel/rts/rt_kernel.h"
#include "session/anf_runtime_algorithm.h"
namespace mindspore {

View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_MNG_RT_KERNEL_BUILD_H
#define MINDSPORE_CCSRC_KERNEL_MNG_RT_KERNEL_BUILD_H
#ifndef MINDSPORE_CCSRC_KERNEL_RTS_RT_KERNEL_BUILD_H
#define MINDSPORE_CCSRC_KERNEL_RTS_RT_KERNEL_BUILD_H
#include <vector>
#include <memory>
@ -26,4 +26,4 @@ KernelModPtr RtOpBuild(const AnfNodePtr &anf_node);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_MNG_RT_KERNEL_BUILD_H
#endif // MINDSPORE_CCSRC_KERNEL_RTS_RT_KERNEL_BUILD_H

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "kernel/mng/rt_kernel_info.h"
#include "kernel/rts/rt_kernel_info.h"
#include <unordered_map>
#include <algorithm>
#include "utils/convert_utils.h"

View File

@ -1,75 +1,75 @@
/**
* Copyright 2019 Huawei Technologies Co., Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_MNG_RT_KERNEL_INFO_H
#define MINDSPORE_CCSRC_KERNEL_MNG_RT_KERNEL_INFO_H
#include <memory>
#include <functional>
#include <map>
#include <string>
#include <set>
#include <vector>
#include <utility>
#include "ir/dtype.h"
#include "kernel/kernel_build_info.h"
#include "kernel/kernel.h"
#include "utils/utils.h"
namespace mindspore {
namespace kernel {
class RtKerDesc {
public:
virtual ~RtKerDesc() {}
virtual std::vector<std::shared_ptr<kernel::KernelBuildInfo>> GetKernelInfo() {
return std::vector<std::shared_ptr<kernel::KernelBuildInfo>>{};
}
};
using RtKerDescCreater = std::function<std::shared_ptr<RtKerDesc>()>;
class RtKerDescFactory {
RtKerDescFactory() = default;
~RtKerDescFactory() = default;
public:
static RtKerDescFactory &Get();
void Register(const std::string &name, RtKerDescCreater &&fun);
static std::shared_ptr<RtKerDesc> Create(const std::string &name);
private:
std::map<std::string, RtKerDescCreater> fmap_;
};
class _RtKerDescRegister {
public:
_RtKerDescRegister(const std::string &name, RtKerDescCreater &&fun) {
RtKerDescFactory::Get().Register(name, std::move(fun));
}
~_RtKerDescRegister() = default;
};
#define _MS_REG_RTKERNEL_DESC_REG(KNAME, clazz) \
static_assert(std::is_base_of<RtKerDesc, clazz>::value, " must be base of RtKerDesc"); \
static const _RtKerDescRegister g_##KNAME##_##_rtkernel_desc_reg(#KNAME, []() { return std::make_shared<clazz>(); });
#define MS_REG_RTKERNEL_DESC(KNAME, clazz) _MS_REG_RTKERNEL_DESC_REG(KNAME, clazz)
void GetRtKelInfo(const CNodePtr &kernel_node, std::vector<std::shared_ptr<kernel::KernelBuildInfo>> *kernel_info_list);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_MNG_RT_KERNEL_INFO_H
/**
* Copyright 2019 Huawei Technologies Co., Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_RTS_RT_KERNEL_INFO_H
#define MINDSPORE_CCSRC_KERNEL_RTS_RT_KERNEL_INFO_H
#include <memory>
#include <functional>
#include <map>
#include <string>
#include <set>
#include <vector>
#include <utility>
#include "ir/dtype.h"
#include "kernel/kernel_build_info.h"
#include "kernel/kernel.h"
#include "utils/utils.h"
namespace mindspore {
namespace kernel {
class RtKerDesc {
public:
virtual ~RtKerDesc() {}
virtual std::vector<std::shared_ptr<kernel::KernelBuildInfo>> GetKernelInfo() {
return std::vector<std::shared_ptr<kernel::KernelBuildInfo>>{};
}
};
using RtKerDescCreater = std::function<std::shared_ptr<RtKerDesc>()>;
class RtKerDescFactory {
RtKerDescFactory() = default;
~RtKerDescFactory() = default;
public:
static RtKerDescFactory &Get();
void Register(const std::string &name, RtKerDescCreater &&fun);
static std::shared_ptr<RtKerDesc> Create(const std::string &name);
private:
std::map<std::string, RtKerDescCreater> fmap_;
};
class _RtKerDescRegister {
public:
_RtKerDescRegister(const std::string &name, RtKerDescCreater &&fun) {
RtKerDescFactory::Get().Register(name, std::move(fun));
}
~_RtKerDescRegister() = default;
};
#define _MS_REG_RTKERNEL_DESC_REG(KNAME, clazz) \
static_assert(std::is_base_of<RtKerDesc, clazz>::value, " must be base of RtKerDesc"); \
static const _RtKerDescRegister g_##KNAME##_##_rtkernel_desc_reg(#KNAME, []() { return std::make_shared<clazz>(); });
#define MS_REG_RTKERNEL_DESC(KNAME, clazz) _MS_REG_RTKERNEL_DESC_REG(KNAME, clazz)
void GetRtKelInfo(const CNodePtr &kernel_node, std::vector<std::shared_ptr<kernel::KernelBuildInfo>> *kernel_info_list);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_RTS_RT_KERNEL_INFO_H

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "kernel/mng/send.h"
#include "kernel/rts/send.h"
#include <memory>
#include "runtime/event.h"
#include "framework/ge_runtime/task_info.h"

View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_MNG_SEND_H
#define MINDSPORE_CCSRC_KERNEL_MNG_SEND_H
#ifndef MINDSPORE_CCSRC_KERNEL_RTS_SEND_H
#define MINDSPORE_CCSRC_KERNEL_RTS_SEND_H
#include <memory>
#include <vector>
#include "kernel/mng/rt_kernel.h"
#include "kernel/mng/rt_kernel_info.h"
#include "kernel/rts/rt_kernel.h"
#include "kernel/rts/rt_kernel_info.h"
namespace mindspore {
namespace kernel {
@ -41,4 +41,4 @@ MS_REG_RTKERNEL(send, SendKernel);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_MNG_SEND_H
#endif // MINDSPORE_CCSRC_KERNEL_RTS_SEND_H

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "kernel/mng/stream_active.h"
#include "kernel/rts/stream_active.h"
#include <asm-generic/param.h>
#include <memory>
#include "runtime/stream.h"

View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_MNG_STREAM_ACTIVE_H
#define MINDSPORE_CCSRC_KERNEL_MNG_STREAM_ACTIVE_H
#ifndef MINDSPORE_CCSRC_KERNEL_RTS_STREAM_ACTIVE_H
#define MINDSPORE_CCSRC_KERNEL_RTS_STREAM_ACTIVE_H
#include <memory>
#include <vector>
#include "kernel/mng/rt_kernel.h"
#include "kernel/mng/rt_kernel_info.h"
#include "kernel/rts/rt_kernel.h"
#include "kernel/rts/rt_kernel_info.h"
namespace mindspore {
namespace kernel {
@ -43,4 +43,4 @@ MS_REG_RTKERNEL(streamactive, StreamActiveKernel);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_MNG_STREAM_ACTIVE_H
#endif // MINDSPORE_CCSRC_KERNEL_RTS_STREAM_ACTIVE_H

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "kernel/mng/stream_switch.h"
#include "kernel/rts/stream_switch.h"
#include <memory>
#include <vector>

View File

@ -14,13 +14,13 @@
* limitations under the License.
*/
#ifndef MINDSPORE_CCSRC_KERNEL_MNG_STREAM_SWITCH_H
#define MINDSPORE_CCSRC_KERNEL_MNG_STREAM_SWITCH_H
#ifndef MINDSPORE_CCSRC_KERNEL_RTS_STREAM_SWITCH_H
#define MINDSPORE_CCSRC_KERNEL_RTS_STREAM_SWITCH_H
#include <memory>
#include <vector>
#include "kernel/mng/rt_kernel.h"
#include "kernel/mng/rt_kernel_info.h"
#include "kernel/rts/rt_kernel.h"
#include "kernel/rts/rt_kernel_info.h"
namespace mindspore {
namespace kernel {
@ -46,4 +46,4 @@ MS_REG_RTKERNEL(streamswitch, StreamSwitchKernel);
} // namespace kernel
} // namespace mindspore
#endif // MINDSPORE_CCSRC_KERNEL_MNG_STREAM_SWITCH_H
#endif // MINDSPORE_CCSRC_KERNEL_RTS_STREAM_SWITCH_H

View File

@ -70,7 +70,7 @@ file(GLOB_RECURSE MINDSPORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"../../../mindspore/ccsrc/kernel/akg/*.cc"
"../../../mindspore/ccsrc/kernel/kash/*.cc"
"../../../mindspore/ccsrc/kernel/cce/*.cc"
"../../../mindspore/ccsrc/kernel/mng/*.cc"
"../../../mindspore/ccsrc/kernel/rts/*.cc"
"../../../mindspore/ccsrc/kernel/hccl/*.cc"
"../../../mindspore/ccsrc/kernel/kernel_query.cc"
"../../../mindspore/ccsrc/kernel/kernel_build_info.cc"
@ -80,7 +80,7 @@ file(GLOB_RECURSE MINDSPORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"../../../mindspore/ccsrc/pre_activate/mem_reuse/*.cc"
"../../../mindspore/ccsrc/pre_activate/pass/*.cc"
"../../../mindspore/ccsrc/kernel/aicpu/aicpu_kernel_metadata.cc"
"../../../mindspore/ccsrc/kernel/mng/rt_kernel_info.cc"
"../../../mindspore/ccsrc/kernel/rts/rt_kernel_info.cc"
"../../../mindspore/ccsrc/kernel/common_utils.cc"
"../../../mindspore/ccsrc/kernel/oplib/*.cc"
"../../../mindspore/ccsrc/kernel/tbe/*.cc"