m53297601
/
graphengine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix graph

Browse Source
pull/1261/head
guopeian 4 years ago
parent 38e4de4c17
commit 3a220beb34
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File

24
ge/plugin/engine/dnnengines.cc
Unescape View File

@ -52,7 +52,7 @@ Status VectorCoreDNNEngine::Initialize(const std::map<std::string, std::string>
Status VectorCoreDNNEngine::Finalize() { return SUCCESS; } Status VectorCoreDNNEngine::Finalize() { return SUCCESS; }
void VectorCoreDNNEngine::GetAttributes(DNNEngineAttribute &attrs) const { attrs = engine_attribute_; } void VectorCoreDNNEngine::GetAttributes(DNNEngineAttribute &attrs) const { attrs = engine_attribute_; }
#ifndef ONLY_COMPILE_OPEN_SRC
AICpuDNNEngine::AICpuDNNEngine(const std::string &engine_name) { AICpuDNNEngine::AICpuDNNEngine(const std::string &engine_name) {
engine_attribute_.engine_name = engine_name; engine_attribute_.engine_name = engine_name;
engine_attribute_.compute_cost = COST_2; engine_attribute_.compute_cost = COST_2;
@ -60,15 +60,7 @@ AICpuDNNEngine::AICpuDNNEngine(const std::string &engine_name) {
engine_attribute_.engine_input_format = FORMAT_RESERVED; engine_attribute_.engine_input_format = FORMAT_RESERVED;
engine_attribute_.engine_output_format = FORMAT_RESERVED; engine_attribute_.engine_output_format = FORMAT_RESERVED;
} }
#else
AICpuDNNEngine::AICpuDNNEngine(const std::string &engine_name) {
engine_attribute_.engine_name = engine_name;
engine_attribute_.compute_cost = COST_3;
engine_attribute_.runtime_type = DEVICE;
engine_attribute_.engine_input_format = FORMAT_RESERVED;
engine_attribute_.engine_output_format = FORMAT_RESERVED;
}
#endif
AICpuDNNEngine::AICpuDNNEngine(const DNNEngineAttribute &attrs) { engine_attribute_ = attrs; } AICpuDNNEngine::AICpuDNNEngine(const DNNEngineAttribute &attrs) { engine_attribute_ = attrs; }
Status AICpuDNNEngine::Initialize(const std::map<std::string, std::string> &options) { return SUCCESS; } Status AICpuDNNEngine::Initialize(const std::map<std::string, std::string> &options) { return SUCCESS; }
@ -76,7 +68,7 @@ Status AICpuDNNEngine::Initialize(const std::map<std::string, std::string> &opti
Status AICpuDNNEngine::Finalize() { return SUCCESS; } Status AICpuDNNEngine::Finalize() { return SUCCESS; }
void AICpuDNNEngine::GetAttributes(DNNEngineAttribute &attrs) const { attrs = engine_attribute_; } void AICpuDNNEngine::GetAttributes(DNNEngineAttribute &attrs) const { attrs = engine_attribute_; }
#ifndef ONLY_COMPILE_OPEN_SRC
AICpuTFDNNEngine::AICpuTFDNNEngine(const std::string &engine_name) { AICpuTFDNNEngine::AICpuTFDNNEngine(const std::string &engine_name) {
engine_attribute_.engine_name = engine_name; engine_attribute_.engine_name = engine_name;
engine_attribute_.compute_cost = COST_3; engine_attribute_.compute_cost = COST_3;
@ -84,15 +76,7 @@ AICpuTFDNNEngine::AICpuTFDNNEngine(const std::string &engine_name) {
engine_attribute_.engine_input_format = FORMAT_RESERVED; engine_attribute_.engine_input_format = FORMAT_RESERVED;
engine_attribute_.engine_output_format = FORMAT_RESERVED; engine_attribute_.engine_output_format = FORMAT_RESERVED;
} }
#else
AICpuTFDNNEngine::AICpuTFDNNEngine(const std::string &engine_name) {
engine_attribute_.engine_name = engine_name;
engine_attribute_.compute_cost = COST_2;
engine_attribute_.runtime_type = DEVICE;
engine_attribute_.engine_input_format = FORMAT_RESERVED;
engine_attribute_.engine_output_format = FORMAT_RESERVED;
}
#endif
AICpuTFDNNEngine::AICpuTFDNNEngine(const DNNEngineAttribute &attrs) { engine_attribute_ = attrs; } AICpuTFDNNEngine::AICpuTFDNNEngine(const DNNEngineAttribute &attrs) { engine_attribute_ = attrs; }
Status AICpuTFDNNEngine::Initialize(const std::map<std::string, std::string> &options) { return SUCCESS; } Status AICpuTFDNNEngine::Initialize(const std::map<std::string, std::string> &options) { return SUCCESS; }

12
ge/plugin/engine/engine_manage.cc
Unescape View File

@ -92,11 +92,9 @@ void RegisterAiCpuEngine() {
const std::string vm_aicpu = "DNN_VM_AICPU_ASCEND"; const std::string vm_aicpu = "DNN_VM_AICPU_ASCEND";
std::vector<std::string> mem_type_aicpu; std::vector<std::string> mem_type_aicpu;
mem_type_aicpu.emplace_back(GE_ENGINE_ATTR_MEM_TYPE_HBM); mem_type_aicpu.emplace_back(GE_ENGINE_ATTR_MEM_TYPE_HBM);
#ifndef ONLY_COMPILE_OPEN_SRC
DNNEngineAttribute attr_aicpu = {vm_aicpu, mem_type_aicpu, COST_2, DEVICE, FORMAT_RESERVED, FORMAT_RESERVED}; DNNEngineAttribute attr_aicpu = {vm_aicpu, mem_type_aicpu, COST_2, DEVICE, FORMAT_RESERVED, FORMAT_RESERVED};
#else
DNNEngineAttribute attr_aicpu = {vm_aicpu, mem_type_aicpu, COST_3, DEVICE, FORMAT_RESERVED, FORMAT_RESERVED};
#endif
DNNEnginePtr vm_engine_ptr = MakeShared<AICpuDNNEngine>(attr_aicpu); DNNEnginePtr vm_engine_ptr = MakeShared<AICpuDNNEngine>(attr_aicpu);
if (vm_engine_ptr == nullptr) { if (vm_engine_ptr == nullptr) {
GELOGE(ge::FAILED, "make vm_engine_ptr failed"); GELOGE(ge::FAILED, "make vm_engine_ptr failed");
@ -111,11 +109,9 @@ void RegisterAiCpuTFEngine() {
const std::string vm_aicpu_tf = "DNN_VM_AICPU"; const std::string vm_aicpu_tf = "DNN_VM_AICPU";
std::vector<std::string> mem_type_aicpu_tf; std::vector<std::string> mem_type_aicpu_tf;
mem_type_aicpu_tf.emplace_back(GE_ENGINE_ATTR_MEM_TYPE_HBM); mem_type_aicpu_tf.emplace_back(GE_ENGINE_ATTR_MEM_TYPE_HBM);
#ifndef ONLY_COMPILE_OPEN_SRC
DNNEngineAttribute attr_aicpu_tf = {vm_aicpu_tf, mem_type_aicpu_tf, COST_3, DEVICE, FORMAT_RESERVED, FORMAT_RESERVED}; DNNEngineAttribute attr_aicpu_tf = {vm_aicpu_tf, mem_type_aicpu_tf, COST_3, DEVICE, FORMAT_RESERVED, FORMAT_RESERVED};
#else
DNNEngineAttribute attr_aicpu_tf = {vm_aicpu_tf, mem_type_aicpu_tf, COST_2, DEVICE, FORMAT_RESERVED, FORMAT_RESERVED};
#endif
DNNEnginePtr vm_engine_ptr = MakeShared<AICpuTFDNNEngine>(attr_aicpu_tf); DNNEnginePtr vm_engine_ptr = MakeShared<AICpuTFDNNEngine>(attr_aicpu_tf);
if (vm_engine_ptr == nullptr) { if (vm_engine_ptr == nullptr) {
GELOGE(ge::FAILED, "make vm_engine_ptr failed"); GELOGE(ge::FAILED, "make vm_engine_ptr failed");

Write Preview
Loading…
Cancel
Save