@@ -11,7 +11,7 @@ AlignTrailingComments: true | |||||
AllowAllParametersOfDeclarationOnNextLine: true | AllowAllParametersOfDeclarationOnNextLine: true | ||||
AllowShortBlocksOnASingleLine: false | AllowShortBlocksOnASingleLine: false | ||||
AllowShortCaseLabelsOnASingleLine: false | AllowShortCaseLabelsOnASingleLine: false | ||||
AllowShortFunctionsOnASingleLine: All | |||||
AllowShortFunctionsOnASingleLine: Empty | |||||
AllowShortIfStatementsOnASingleLine: true | AllowShortIfStatementsOnASingleLine: true | ||||
AllowShortLoopsOnASingleLine: true | AllowShortLoopsOnASingleLine: true | ||||
AlwaysBreakAfterDefinitionReturnType: None | AlwaysBreakAfterDefinitionReturnType: None | ||||
@@ -112,7 +112,6 @@ set(EXECUTOR_SRC_LIST | |||||
"analyzer/analyzer.cc" | "analyzer/analyzer.cc" | ||||
"common/dump/dump_manager.cc" | "common/dump/dump_manager.cc" | ||||
"common/dump/dump_op.cc" | "common/dump/dump_op.cc" | ||||
"common/dump/dump_properties.cc" | |||||
"common/dump/exception_dumper.cc" | "common/dump/exception_dumper.cc" | ||||
"common/dump/opdebug_register.cc" | "common/dump/opdebug_register.cc" | ||||
"common/formats/format_transfers/format_transfer_transpose.cc" | "common/formats/format_transfers/format_transfer_transpose.cc" | ||||
@@ -126,9 +125,6 @@ set(EXECUTOR_SRC_LIST | |||||
"executor/ge_executor.cc" | "executor/ge_executor.cc" | ||||
"ge_local_engine/engine/host_cpu_engine.cc" | "ge_local_engine/engine/host_cpu_engine.cc" | ||||
"graph/build/memory/var_mem_assign_util.cc" | "graph/build/memory/var_mem_assign_util.cc" | ||||
"graph/common/bcast.cc" | |||||
"graph/common/local_context.cc" | |||||
"graph/common/omg_util.cc" | |||||
"graph/execute/graph_execute.cc" | "graph/execute/graph_execute.cc" | ||||
"graph/execute/model_executor.cc" | "graph/execute/model_executor.cc" | ||||
"graph/load/graph_loader.cc" | "graph/load/graph_loader.cc" | ||||
@@ -255,8 +251,6 @@ set(EXECUTOR_SRC_LIST | |||||
"hybrid/node_executor/rts/rts_task_factory.cc" | "hybrid/node_executor/rts/rts_task_factory.cc" | ||||
"hybrid/node_executor/task_context.cc" | "hybrid/node_executor/task_context.cc" | ||||
"init/gelib.cc" | "init/gelib.cc" | ||||
"model/ge_model.cc" | |||||
"model/ge_root_model.cc" | |||||
"opskernel_manager/ops_kernel_builder_manager.cc" | "opskernel_manager/ops_kernel_builder_manager.cc" | ||||
"opskernel_manager/ops_kernel_manager.cc" | "opskernel_manager/ops_kernel_manager.cc" | ||||
"single_op/single_op.cc" | "single_op/single_op.cc" | ||||
@@ -274,7 +268,6 @@ set(EXECUTOR_SRC_LIST | |||||
################################################################## | ################################################################## | ||||
set(COMPILER_SRC_LIST | set(COMPILER_SRC_LIST | ||||
"analyzer/analyzer.cc" | "analyzer/analyzer.cc" | ||||
"common/dump/dump_manager.cc" | |||||
"common/dump/dump_op.cc" | "common/dump/dump_op.cc" | ||||
"common/dump/dump_properties.cc" | "common/dump/dump_properties.cc" | ||||
"common/formats/format_transfers/datatype_transfer.cc" | "common/formats/format_transfers/datatype_transfer.cc" | ||||
@@ -322,10 +315,6 @@ set(COMPILER_SRC_LIST | |||||
"graph/build/stream_allocator.cc" | "graph/build/stream_allocator.cc" | ||||
"graph/build/stream_graph_optimizer.cc" | "graph/build/stream_graph_optimizer.cc" | ||||
"graph/build/task_generator.cc" | "graph/build/task_generator.cc" | ||||
"graph/common/bcast.cc" | |||||
"graph/common/local_context.cc" | |||||
"graph/common/omg_util.cc" | |||||
"graph/common/transop_util.cc" | |||||
"graph/label/case_label_maker.cc" | "graph/label/case_label_maker.cc" | ||||
"graph/label/if_label_maker.cc" | "graph/label/if_label_maker.cc" | ||||
"graph/label/label_maker.cc" | "graph/label/label_maker.cc" | ||||
@@ -508,8 +497,6 @@ set(COMPILER_SRC_LIST | |||||
"ir_build/attr_options/weight_compress_option.cc" | "ir_build/attr_options/weight_compress_option.cc" | ||||
"ir_build/ge_ir_build.cc" | "ir_build/ge_ir_build.cc" | ||||
"ir_build/option_utils.cc" | "ir_build/option_utils.cc" | ||||
"model/ge_model.cc" | |||||
"model/ge_root_model.cc" | |||||
"opskernel_manager/ops_kernel_builder_manager.cc" | "opskernel_manager/ops_kernel_builder_manager.cc" | ||||
"opskernel_manager/ops_kernel_manager.cc" | "opskernel_manager/ops_kernel_manager.cc" | ||||
) | ) | ||||
@@ -29,7 +29,7 @@ | |||||
#include "graph/opsproto_manager.h" | #include "graph/opsproto_manager.h" | ||||
#include "graph/utils/type_utils.h" | #include "graph/utils/type_utils.h" | ||||
#include "graph/manager/util/rt_context_util.h" | #include "graph/manager/util/rt_context_util.h" | ||||
#include "graph/common/ge_call_wrapper.h" | |||||
#include "common/ge_call_wrapper.h" | |||||
#include "register/op_registry.h" | #include "register/op_registry.h" | ||||
#include "common/ge/tbe_plugin_manager.h" | #include "common/ge/tbe_plugin_manager.h" | ||||
#include "common/util/error_manager/error_manager.h" | #include "common/util/error_manager/error_manager.h" | ||||
@@ -2,16 +2,23 @@ set(SRC_LIST | |||||
"context/ctx.cc" | "context/ctx.cc" | ||||
"model_saver.cc" | "model_saver.cc" | ||||
"ge/datatype_util.cc" | "ge/datatype_util.cc" | ||||
"ge/plugin_manager.cc" | |||||
"ge/op_tiling_manager.cc" | |||||
"helper/om_file_helper.cc" | "helper/om_file_helper.cc" | ||||
"helper/model_helper.cc" | "helper/model_helper.cc" | ||||
"../model/ge_model.cc" | |||||
"../model/ge_root_model.cc" | |||||
"model/ge_model.cc" | |||||
"model/ge_root_model.cc" | |||||
"bcast.cc" | |||||
"local_context.cc" | |||||
"omg_util.cc" | |||||
"transop_util.cc" | |||||
"auth/file_saver.cc" | "auth/file_saver.cc" | ||||
"fp16_t.cc" | "fp16_t.cc" | ||||
"math/fp16_math.cc" | "math/fp16_math.cc" | ||||
"debug/memory_dumper.cc" | "debug/memory_dumper.cc" | ||||
"formats/utils/formats_trans_utils.cc" | "formats/utils/formats_trans_utils.cc" | ||||
"dump/dump_properties.cc" | "dump/dump_properties.cc" | ||||
"dump/dump_manager.cc" | |||||
"formats/format_transfers/datatype_transfer.cc" | "formats/format_transfers/datatype_transfer.cc" | ||||
"formats/format_transfers/format_transfer_transpose.cc" | "formats/format_transfers/format_transfer_transpose.cc" | ||||
"formats/format_transfers/format_transfer_nchw_nc1hwc0.cc" | "formats/format_transfers/format_transfer_nchw_nc1hwc0.cc" | ||||
@@ -63,7 +70,7 @@ target_compile_definitions(ge_common PRIVATE | |||||
) | ) | ||||
target_compile_options(ge_common PRIVATE | target_compile_options(ge_common PRIVATE | ||||
-fvisibility=hidden | |||||
-fvisibility=default | |||||
-O2 | -O2 | ||||
-Werror | -Werror | ||||
-Wno-deprecated-declarations | -Wno-deprecated-declarations | ||||
@@ -183,7 +190,7 @@ target_compile_definitions(ge_common PRIVATE | |||||
) | ) | ||||
target_compile_options(ge_common PRIVATE | target_compile_options(ge_common PRIVATE | ||||
-fvisibility=hidden | |||||
-fvisibility=default | |||||
-O2 | -O2 | ||||
-Werror | -Werror | ||||
-Wno-deprecated-declarations | -Wno-deprecated-declarations | ||||
@@ -238,7 +238,7 @@ Status FileSaver::SaveToBuffWithFileHeader(const ModelFileHeader &file_header, | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status FileSaver::CheckPath(const std::string &file_path) { | |||||
Status FileSaver::CheckPath(const std::string &file_path) { | |||||
// Determine file path length | // Determine file path length | ||||
if (file_path.size() >= MMPA_MAX_PATH) { | if (file_path.size() >= MMPA_MAX_PATH) { | ||||
GELOGE(FAILED, "[Check][FilePath]Failed, file path's length:%zu > mmpa_max_path:%d", | GELOGE(FAILED, "[Check][FilePath]Failed, file path's length:%zu > mmpa_max_path:%d", | ||||
@@ -271,8 +271,8 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status FileSaver::CheckPath(con | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status | |||||
FileSaver::SaveToFile(const string &file_path, const ge::ModelData &model, const ModelFileHeader *model_file_header) { | |||||
Status FileSaver::SaveToFile(const string &file_path, const ge::ModelData &model, | |||||
const ModelFileHeader *model_file_header) { | |||||
if (file_path.empty() || model.model_data == nullptr || model.model_len == 0) { | if (file_path.empty() || model.model_data == nullptr || model.model_len == 0) { | ||||
GELOGE(FAILED, "[Save][File]Incorrect input param, " | GELOGE(FAILED, "[Save][File]Incorrect input param, " | ||||
"file_path is empty or model_data is nullptr or model_len is 0"); | "file_path is empty or model_data is nullptr or model_len is 0"); | ||||
@@ -301,19 +301,18 @@ FileSaver::SaveToFile(const string &file_path, const ge::ModelData &model, const | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status | |||||
FileSaver::SaveToFile(const string &file_path, ModelFileHeader &file_header, ModelPartitionTable &model_partition_table, | |||||
const std::vector<ModelPartition> &partition_datas) { | |||||
Status FileSaver::SaveToFile(const string &file_path, ModelFileHeader &file_header, | |||||
ModelPartitionTable &model_partition_table, | |||||
const std::vector<ModelPartition> &partition_datas) { | |||||
const Status ret = SaveWithFileHeader(file_path, file_header, model_partition_table, partition_datas); | const Status ret = SaveWithFileHeader(file_path, file_header, model_partition_table, partition_datas); | ||||
GE_CHK_BOOL_RET_STATUS(ret == SUCCESS, FAILED, "save file failed, file_path:%s, file header len:%u.", | GE_CHK_BOOL_RET_STATUS(ret == SUCCESS, FAILED, "save file failed, file_path:%s, file header len:%u.", | ||||
file_path.c_str(), file_header.length); | file_path.c_str(), file_header.length); | ||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status | |||||
FileSaver::SaveToFile(const string &file_path, ModelFileHeader &file_header, | |||||
vector<ModelPartitionTable *> &model_partition_tables, | |||||
const vector<vector<ModelPartition>> &all_partition_datas) { | |||||
Status FileSaver::SaveToFile(const string &file_path, ModelFileHeader &file_header, | |||||
vector<ModelPartitionTable *> &model_partition_tables, | |||||
const vector<vector<ModelPartition>> &all_partition_datas) { | |||||
const Status ret = SaveWithFileHeader(file_path, file_header, model_partition_tables, all_partition_datas); | const Status ret = SaveWithFileHeader(file_path, file_header, model_partition_tables, all_partition_datas); | ||||
GE_CHK_BOOL_RET_STATUS(ret == SUCCESS, FAILED, "save file failed, file_path:%s, file header len:%u.", | GE_CHK_BOOL_RET_STATUS(ret == SUCCESS, FAILED, "save file failed, file_path:%s, file header len:%u.", | ||||
file_path.c_str(), file_header.length); | file_path.c_str(), file_header.length); | ||||
@@ -372,8 +371,7 @@ Status FileSaver::SaveWithFileHeader(const std::string &file_path, const ModelFi | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status FileSaver::SaveToFile(const string &file_path, const void *data, | |||||
int len) { | |||||
Status FileSaver::SaveToFile(const string &file_path, const void *data, int len) { | |||||
if (data == nullptr || len <= 0) { | if (data == nullptr || len <= 0) { | ||||
GELOGE(FAILED, "[Check][Param]Failed, model_data is null or the " | GELOGE(FAILED, "[Check][Param]Failed, model_data is null or the " | ||||
"length[%d] is less than 1.", len); | "length[%d] is less than 1.", len); | ||||
@@ -14,12 +14,12 @@ | |||||
* limitations under the License. | * limitations under the License. | ||||
*/ | */ | ||||
#include "graph/common/bcast.h" | |||||
#include "common/bcast.h" | |||||
#include <vector> | #include <vector> | ||||
#include "common/math_util.h" | #include "common/math_util.h" | ||||
#include "framework/common/util.h" | |||||
#include "common/util.h" | |||||
using domi::Status; | using domi::Status; | ||||
@@ -21,11 +21,11 @@ | |||||
#include <functional> | #include <functional> | ||||
#include <vector> | #include <vector> | ||||
#include "framework/common/debug/log.h" | |||||
#include "framework/common/types.h" | |||||
#include "common/debug/log.h" | |||||
#include "common/types.h" | |||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "framework/common/ge_inner_error_codes.h" | #include "framework/common/ge_inner_error_codes.h" | ||||
#include "external/graph/attr_value.h" | |||||
#include "graph/attr_value.h" | |||||
#include "graph/ge_tensor.h" | #include "graph/ge_tensor.h" | ||||
#include "graph/utils/tensor_adapter.h" | #include "graph/utils/tensor_adapter.h" | ||||
@@ -18,7 +18,7 @@ | |||||
using ge::OmgContext; | using ge::OmgContext; | ||||
namespace domi { | namespace domi { | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY OmgContext &GetContext() { | |||||
OmgContext &GetContext() { | |||||
static OmgContext context; | static OmgContext context; | ||||
return context; | return context; | ||||
} | } | ||||
@@ -21,7 +21,7 @@ | |||||
namespace ge { | namespace ge { | ||||
class FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY CustAICPUKernelStore : public KernelStore { | |||||
class CustAICPUKernelStore : public KernelStore { | |||||
public: | public: | ||||
CustAICPUKernelStore(); | CustAICPUKernelStore(); | ||||
~CustAICPUKernelStore() {} | ~CustAICPUKernelStore() {} | ||||
@@ -30,13 +30,12 @@ const int kInvalidFd = (-1); | |||||
} // namespace | } // namespace | ||||
namespace ge { | namespace ge { | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY MemoryDumper::MemoryDumper() : fd_(kInvalidFd) {} | |||||
MemoryDumper::MemoryDumper() : fd_(kInvalidFd) {} | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY MemoryDumper::~MemoryDumper() { Close(); } | |||||
MemoryDumper::~MemoryDumper() { Close(); } | |||||
// Dump the data to the file | // Dump the data to the file | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status MemoryDumper::DumpToFile(const char *filename, void *data, | |||||
int64_t len) { | |||||
Status MemoryDumper::DumpToFile(const char *filename, void *data, int64_t len) { | |||||
#ifdef FMK_SUPPORT_DUMP | #ifdef FMK_SUPPORT_DUMP | ||||
GE_CHECK_NOTNULL(filename); | GE_CHECK_NOTNULL(filename); | ||||
GE_CHECK_NOTNULL(data); | GE_CHECK_NOTNULL(data); | ||||
@@ -81,7 +80,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status MemoryDumper::DumpToFile | |||||
} | } | ||||
// Open file | // Open file | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status MemoryDumper::Open(const char *filename) { | |||||
Status MemoryDumper::Open(const char *filename) { | |||||
GE_CHK_BOOL_RET_STATUS(filename != nullptr, FAILED, "Incorrect parameter. filename is nullptr"); | GE_CHK_BOOL_RET_STATUS(filename != nullptr, FAILED, "Incorrect parameter. filename is nullptr"); | ||||
// Try to remove file first for reduce the close time by overwriting way | // Try to remove file first for reduce the close time by overwriting way | ||||
@@ -104,7 +103,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status MemoryDumper::Open(const | |||||
} | } | ||||
// Dump the data to file | // Dump the data to file | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status MemoryDumper::Dump(void *data, uint32_t len) const { | |||||
Status MemoryDumper::Dump(void *data, uint32_t len) const { | |||||
GE_CHK_BOOL_RET_STATUS(data != nullptr, FAILED, "Incorrect parameter. data is nullptr"); | GE_CHK_BOOL_RET_STATUS(data != nullptr, FAILED, "Incorrect parameter. data is nullptr"); | ||||
#ifdef FMK_SUPPORT_DUMP | #ifdef FMK_SUPPORT_DUMP | ||||
@@ -15,6 +15,7 @@ | |||||
*/ | */ | ||||
#include "common/dump/dump_manager.h" | #include "common/dump/dump_manager.h" | ||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "framework/common/debug/log.h" | #include "framework/common/debug/log.h" | ||||
@@ -26,7 +27,7 @@ const uint64_t kInferSessionId = 0; | |||||
const uint32_t kAllOverflow = 3; | const uint32_t kAllOverflow = 3; | ||||
} // namespace | } // namespace | ||||
namespace ge { | namespace ge { | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY DumpManager &DumpManager::GetInstance() { | |||||
DumpManager &DumpManager::GetInstance() { | |||||
static DumpManager instance; | static DumpManager instance; | ||||
return instance; | return instance; | ||||
} | } | ||||
@@ -74,7 +75,7 @@ void DumpManager::SetDumpList(const DumpConfig &dump_config, DumpProperties &dum | |||||
Status DumpManager::SetNormalDumpConf(const DumpConfig &dump_config, DumpProperties &dump_properties) { | Status DumpManager::SetNormalDumpConf(const DumpConfig &dump_config, DumpProperties &dump_properties) { | ||||
if (dump_config.dump_status == kDumpOn) { | if (dump_config.dump_status == kDumpOn) { | ||||
GELOGI("Only do normal dump process, dump status is %s.", dump_config.dump_status.c_str()); | |||||
GELOGI("Only do normal dump process, dump status is %s", dump_config.dump_status.c_str()); | |||||
dump_properties.SetDumpStatus(dump_config.dump_status); | dump_properties.SetDumpStatus(dump_config.dump_status); | ||||
std::string dump_op_switch = dump_config.dump_op_switch; | std::string dump_op_switch = dump_config.dump_op_switch; | ||||
dump_properties.SetDumpOpSwitch(dump_op_switch); | dump_properties.SetDumpOpSwitch(dump_op_switch); | ||||
@@ -104,8 +105,8 @@ Status DumpManager::SetNormalDumpConf(const DumpConfig &dump_config, DumpPropert | |||||
Status DumpManager::SetDumpPath(const DumpConfig &dump_config, DumpProperties &dump_properties) { | Status DumpManager::SetDumpPath(const DumpConfig &dump_config, DumpProperties &dump_properties) { | ||||
std::string dump_path = dump_config.dump_path; | std::string dump_path = dump_config.dump_path; | ||||
if (dump_path.empty()) { | if (dump_path.empty()) { | ||||
GELOGE(PARAM_INVALID, "[Check][DumpPath]It is empty"); | |||||
REPORT_INNER_ERROR("E19999", "Dump path check is empty"); | |||||
GELOGE(PARAM_INVALID, "[Check][DumpPath]It is empty."); | |||||
REPORT_INNER_ERROR("E19999", "Dump path check is empty."); | |||||
return PARAM_INVALID; | return PARAM_INVALID; | ||||
} | } | ||||
if (dump_path[dump_path.size() - 1] != '/') { | if (dump_path[dump_path.size() - 1] != '/') { | ||||
@@ -117,7 +118,7 @@ Status DumpManager::SetDumpPath(const DumpConfig &dump_config, DumpProperties &d | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpManager::SetDumpConf(const DumpConfig &dump_config) { | |||||
Status DumpManager::SetDumpConf(const DumpConfig &dump_config) { | |||||
DumpProperties dump_properties; | DumpProperties dump_properties; | ||||
if (!NeedDoDump(dump_config, dump_properties)) { | if (!NeedDoDump(dump_config, dump_properties)) { | ||||
GELOGD("No need do dump process."); | GELOGD("No need do dump process."); | ||||
@@ -131,8 +132,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpManager::SetDumpConf | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY const DumpProperties &DumpManager::GetDumpProperties( | |||||
uint64_t session_id) { | |||||
const DumpProperties &DumpManager::GetDumpProperties(uint64_t session_id) { | |||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
auto iter = dump_properties_map_.find(session_id); | auto iter = dump_properties_map_.find(session_id); | ||||
if (iter != dump_properties_map_.end()) { | if (iter != dump_properties_map_.end()) { | ||||
@@ -142,13 +142,12 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY const DumpProperties &DumpManag | |||||
return default_properties; | return default_properties; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpManager::AddDumpProperties( | |||||
uint64_t session_id, const DumpProperties &dump_properties) { | |||||
void DumpManager::AddDumpProperties(uint64_t session_id, const DumpProperties &dump_properties) { | |||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
dump_properties_map_.emplace(session_id, dump_properties); | dump_properties_map_.emplace(session_id, dump_properties); | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpManager::RemoveDumpProperties(uint64_t session_id) { | |||||
void DumpManager::RemoveDumpProperties(uint64_t session_id) { | |||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
auto iter = dump_properties_map_.find(session_id); | auto iter = dump_properties_map_.find(session_id); | ||||
if (iter != dump_properties_map_.end()) { | if (iter != dump_properties_map_.end()) { | ||||
@@ -38,9 +38,7 @@ const uint32_t kAtomicOverflow = (0x1 << 1); | |||||
const uint32_t kAllOverflow = (kAicoreOverflow | kAtomicOverflow); | const uint32_t kAllOverflow = (kAicoreOverflow | kAtomicOverflow); | ||||
} // namespace | } // namespace | ||||
namespace ge { | namespace ge { | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::Split(const std::string &s, | |||||
std::vector<std::string> &result, | |||||
const char *delchar) { | |||||
void DumpProperties::Split(const std::string &s, std::vector<std::string> &result, const char *delchar) { | |||||
if (s.empty()) { | if (s.empty()) { | ||||
return; | return; | ||||
} | } | ||||
@@ -68,7 +66,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::Split(cons | |||||
delete[] buffer; | delete[] buffer; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpProperties::CheckDumpStep(const std::string &dump_step) { | |||||
Status DumpProperties::CheckDumpStep(const std::string &dump_step) { | |||||
std::string modified_dum_step = dump_step + "|"; | std::string modified_dum_step = dump_step + "|"; | ||||
std::smatch result; | std::smatch result; | ||||
std::vector<string> match_vecs; | std::vector<string> match_vecs; | ||||
@@ -126,7 +124,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpProperties::CheckDum | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpProperties::CheckDumpMode(const std::string &dump_mode) { | |||||
Status DumpProperties::CheckDumpMode(const std::string &dump_mode) { | |||||
const std::set<string> dump_mode_list = {"input", "output", "all"}; | const std::set<string> dump_mode_list = {"input", "output", "all"}; | ||||
std::set<string>::iterator iter; | std::set<string>::iterator iter; | ||||
@@ -143,7 +141,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpProperties::CheckDum | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpProperties::CheckDumpPath(const std::string &input) { | |||||
Status DumpProperties::CheckDumpPath(const std::string &input) { | |||||
if (mmIsDir(input.c_str()) != EN_OK) { | if (mmIsDir(input.c_str()) != EN_OK) { | ||||
REPORT_INPUT_ERROR("E10001", std::vector<std::string>({"parameter", "value", "reason"}), | REPORT_INPUT_ERROR("E10001", std::vector<std::string>({"parameter", "value", "reason"}), | ||||
std::vector<std::string>({ | std::vector<std::string>({ | ||||
@@ -175,7 +173,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpProperties::CheckDum | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpProperties::CheckEnableDump(const std::string &input) { | |||||
Status DumpProperties::CheckEnableDump(const std::string &input) { | |||||
std::set<string> enable_dump_option_list = {"1", "0"}; | std::set<string> enable_dump_option_list = {"1", "0"}; | ||||
auto it = enable_dump_option_list.find(input); | auto it = enable_dump_option_list.find(input); | ||||
if (it == enable_dump_option_list.end()) { | if (it == enable_dump_option_list.end()) { | ||||
@@ -191,17 +189,16 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpProperties::CheckEna | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY DumpProperties::DumpProperties(const DumpProperties &other) { | |||||
DumpProperties::DumpProperties(const DumpProperties &other) { | |||||
CopyFrom(other); | CopyFrom(other); | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY DumpProperties &DumpProperties::operator=( | |||||
const DumpProperties &other) { | |||||
DumpProperties &DumpProperties::operator=(const DumpProperties &other) { | |||||
CopyFrom(other); | CopyFrom(other); | ||||
return *this; | return *this; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpProperties::SetDumpOptions() { | |||||
Status DumpProperties::SetDumpOptions() { | |||||
if (enable_dump_ == kEnableFlag) { | if (enable_dump_ == kEnableFlag) { | ||||
std::string dump_step; | std::string dump_step; | ||||
if (GetContext().GetOption(OPTION_EXEC_DUMP_STEP, dump_step) == GRAPH_SUCCESS && !dump_step.empty()) { | if (GetContext().GetOption(OPTION_EXEC_DUMP_STEP, dump_step) == GRAPH_SUCCESS && !dump_step.empty()) { | ||||
@@ -220,7 +217,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpProperties::SetDumpO | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpProperties::InitByOptions() { | |||||
Status DumpProperties::InitByOptions() { | |||||
enable_dump_.clear(); | enable_dump_.clear(); | ||||
enable_dump_debug_.clear(); | enable_dump_debug_.clear(); | ||||
dump_path_.clear(); | dump_path_.clear(); | ||||
@@ -281,8 +278,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpProperties::InitByOp | |||||
} | } | ||||
// The following is the new dump scenario of the fusion operator | // The following is the new dump scenario of the fusion operator | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::AddPropertyValue( | |||||
const std::string &model, const std::set<std::string> &layers) { | |||||
void DumpProperties::AddPropertyValue(const std::string &model, const std::set<std::string> &layers) { | |||||
for (const std::string &layer : layers) { | for (const std::string &layer : layers) { | ||||
GELOGI("This model %s config to dump layer %s", model.c_str(), layer.c_str()); | GELOGI("This model %s config to dump layer %s", model.c_str(), layer.c_str()); | ||||
} | } | ||||
@@ -290,18 +286,18 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::AddPropert | |||||
model_dump_properties_map_[model] = layers; | model_dump_properties_map_[model] = layers; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::DeletePropertyValue(const std::string &model) { | |||||
void DumpProperties::DeletePropertyValue(const std::string &model) { | |||||
auto iter = model_dump_properties_map_.find(model); | auto iter = model_dump_properties_map_.find(model); | ||||
if (iter != model_dump_properties_map_.end()) { | if (iter != model_dump_properties_map_.end()) { | ||||
model_dump_properties_map_.erase(iter); | model_dump_properties_map_.erase(iter); | ||||
} | } | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::ClearDumpPropertyValue() { | |||||
void DumpProperties::ClearDumpPropertyValue() { | |||||
model_dump_properties_map_.clear(); | model_dump_properties_map_.clear(); | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::ClearDumpInfo() { | |||||
void DumpProperties::ClearDumpInfo() { | |||||
enable_dump_.clear(); | enable_dump_.clear(); | ||||
enable_dump_debug_.clear(); | enable_dump_debug_.clear(); | ||||
dump_path_.clear(); | dump_path_.clear(); | ||||
@@ -314,7 +310,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::ClearDumpI | |||||
op_debug_mode_ = 0; | op_debug_mode_ = 0; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::set<std::string> DumpProperties::GetAllDumpModel() const { | |||||
std::set<std::string> DumpProperties::GetAllDumpModel() const { | |||||
std::set<std::string> model_list; | std::set<std::string> model_list; | ||||
for (auto &iter : model_dump_properties_map_) { | for (auto &iter : model_dump_properties_map_) { | ||||
model_list.insert(iter.first); | model_list.insert(iter.first); | ||||
@@ -323,8 +319,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::set<std::string> DumpPrope | |||||
return model_list; | return model_list; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::set<std::string> DumpProperties::GetPropertyValue( | |||||
const std::string &model) const { | |||||
std::set<std::string> DumpProperties::GetPropertyValue(const std::string &model) const { | |||||
auto iter = model_dump_properties_map_.find(model); | auto iter = model_dump_properties_map_.find(model); | ||||
if (iter != model_dump_properties_map_.end()) { | if (iter != model_dump_properties_map_.end()) { | ||||
return iter->second; | return iter->second; | ||||
@@ -332,8 +327,8 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::set<std::string> DumpPrope | |||||
return {}; | return {}; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool DumpProperties::IsLayerNeedDump( | |||||
const std::string &model, const std::string &om_name, const std::string &op_name) const { | |||||
bool DumpProperties::IsLayerNeedDump(const std::string &model, const std::string &om_name, | |||||
const std::string &op_name) const { | |||||
// if dump all | // if dump all | ||||
GELOGD("model name is %s om name is %s op is %s in layer need dump", model.c_str(), om_name.c_str(), op_name.c_str()); | GELOGD("model name is %s om name is %s op is %s in layer need dump", model.c_str(), om_name.c_str(), op_name.c_str()); | ||||
if (model_dump_properties_map_.find(DUMP_ALL_MODEL) != model_dump_properties_map_.end()) { | if (model_dump_properties_map_.find(DUMP_ALL_MODEL) != model_dump_properties_map_.end()) { | ||||
@@ -353,67 +348,66 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool DumpProperties::IsLayerNee | |||||
return model_iter->second.find(op_name) != model_iter->second.end(); | return model_iter->second.find(op_name) != model_iter->second.end(); | ||||
} | } | ||||
GELOGD("Model %s is not seated to be dump.", model.c_str()); | |||||
GELOGD("Model %s is not seated to be dump", model.c_str()); | |||||
return false; | return false; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::SetDumpPath(const std::string &path) { | |||||
void DumpProperties::SetDumpPath(const std::string &path) { | |||||
dump_path_ = path; | dump_path_ = path; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY const std::string &DumpProperties::GetDumpPath() const { | |||||
const std::string &DumpProperties::GetDumpPath() const { | |||||
return dump_path_; | return dump_path_; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::SetDumpStep(const std::string &step) { | |||||
void DumpProperties::SetDumpStep(const std::string &step) { | |||||
dump_step_ = step; | dump_step_ = step; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY const std::string &DumpProperties::GetDumpStep() const { | |||||
const std::string &DumpProperties::GetDumpStep() const { | |||||
return dump_step_; | return dump_step_; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::SetDumpMode(const std::string &mode) { | |||||
void DumpProperties::SetDumpMode(const std::string &mode) { | |||||
dump_mode_ = mode; | dump_mode_ = mode; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY const std::string &DumpProperties::GetDumpMode() const { | |||||
const std::string &DumpProperties::GetDumpMode() const { | |||||
return dump_mode_; | return dump_mode_; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::SetDumpStatus(const std::string &status) { | |||||
void DumpProperties::SetDumpStatus(const std::string &status) { | |||||
dump_status_ = status; | dump_status_ = status; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY const std::string &DumpProperties::GetDumpStatus() const { | |||||
const std::string &DumpProperties::GetDumpStatus() const { | |||||
return dump_status_; | return dump_status_; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::InitInferOpDebug() { | |||||
void DumpProperties::InitInferOpDebug() { | |||||
is_infer_op_debug_ = true; | is_infer_op_debug_ = true; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::SetOpDebugMode(const uint32_t &op_debug_mode) { | |||||
void DumpProperties::SetOpDebugMode(const uint32_t &op_debug_mode) { | |||||
op_debug_mode_ = op_debug_mode; | op_debug_mode_ = op_debug_mode; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::SetDumpOpSwitch( | |||||
const std::string &dump_op_switch) { | |||||
void DumpProperties::SetDumpOpSwitch(const std::string &dump_op_switch) { | |||||
dump_op_switch_ = dump_op_switch; | dump_op_switch_ = dump_op_switch; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY const std::string &DumpProperties::GetDumpOpSwitch() const { | |||||
const std::string &DumpProperties::GetDumpOpSwitch() const { | |||||
return dump_op_switch_; | return dump_op_switch_; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool DumpProperties::IsSingleOpNeedDump() const { | |||||
bool DumpProperties::IsSingleOpNeedDump() const { | |||||
if (dump_op_switch_ == kDumpStatusOpen) { | if (dump_op_switch_ == kDumpStatusOpen) { | ||||
return true; | return true; | ||||
} | } | ||||
return false; | return false; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool DumpProperties::IsDumpOpen() const { | |||||
bool DumpProperties::IsDumpOpen() const { | |||||
if (enable_dump_ == kEnableFlag || dump_status_ == kDumpStatusOpen) { | if (enable_dump_ == kEnableFlag || dump_status_ == kDumpStatusOpen) { | ||||
return true; | return true; | ||||
} | } | ||||
@@ -441,7 +435,7 @@ Status DumpProperties::SetDumpDebugOptions() { | |||||
if (enable_dump_debug_ == kEnableFlag) { | if (enable_dump_debug_ == kEnableFlag) { | ||||
std::string dump_debug_mode; | std::string dump_debug_mode; | ||||
if (GetContext().GetOption(OPTION_EXEC_DUMP_DEBUG_MODE, dump_debug_mode) == GRAPH_SUCCESS) { | if (GetContext().GetOption(OPTION_EXEC_DUMP_DEBUG_MODE, dump_debug_mode) == GRAPH_SUCCESS) { | ||||
GELOGD("Get ge.exec.dumpDebugMode %s successfully", dump_debug_mode.c_str()); | |||||
GELOGD("Get ge.exec.dumpDebugMode %s successfully.", dump_debug_mode.c_str()); | |||||
} else { | } else { | ||||
GELOGW("ge.exec.dumpDebugMode is not set."); | GELOGW("ge.exec.dumpDebugMode is not set."); | ||||
return SUCCESS; | return SUCCESS; | ||||
@@ -469,7 +463,7 @@ Status DumpProperties::SetDumpDebugOptions() { | |||||
return PARAM_INVALID; | return PARAM_INVALID; | ||||
} | } | ||||
} else { | } else { | ||||
GELOGI("ge.exec.enableDumpDebug is false or is not set."); | |||||
GELOGI("ge.exec.enableDumpDebug is false or is not set"); | |||||
} | } | ||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
@@ -17,19 +17,18 @@ | |||||
#include "framework/common/fmk_error_codes.h" | #include "framework/common/fmk_error_codes.h" | ||||
namespace domi { | namespace domi { | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY StatusFactory *StatusFactory::Instance() { | |||||
StatusFactory *StatusFactory::Instance() { | |||||
static StatusFactory instance; | static StatusFactory instance; | ||||
return &instance; | return &instance; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void StatusFactory::RegisterErrorNo(uint32_t err, | |||||
const std::string &desc) { | |||||
void StatusFactory::RegisterErrorNo(uint32_t err, const std::string &desc) { | |||||
if (err_desc_.find(err) != err_desc_.end()) { | if (err_desc_.find(err) != err_desc_.end()) { | ||||
return; | return; | ||||
} | } | ||||
err_desc_[err] = desc; | err_desc_[err] = desc; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::string StatusFactory::GetErrDesc(uint32_t err) { | |||||
std::string StatusFactory::GetErrDesc(uint32_t err) { | |||||
auto iter_find = err_desc_.find(err); | auto iter_find = err_desc_.find(err); | ||||
if (iter_find == err_desc_.end()) { | if (iter_find == err_desc_.end()) { | ||||
return ""; | return ""; | ||||
@@ -33,7 +33,6 @@ Status TransposeWithShapeCheck(const uint8_t *src, const std::vector<int64_t> &s | |||||
Status GetPermByForamt(Format src_format, Format dst_format, std::vector<int64_t> &perm); | Status GetPermByForamt(Format src_format, Format dst_format, std::vector<int64_t> &perm); | ||||
class FormatTransferTranspose : public FormatTransfer { | class FormatTransferTranspose : public FormatTransfer { | ||||
public: | public: | ||||
Status TransFormat(const TransArgs &args, TransResult &result) override; | Status TransFormat(const TransArgs &args, TransResult &result) override; | ||||
@@ -17,6 +17,7 @@ | |||||
#include "common/formats/formats.h" | #include "common/formats/formats.h" | ||||
#include <securec.h> | #include <securec.h> | ||||
#include <cmath> | #include <cmath> | ||||
#include <cstring> | #include <cstring> | ||||
#include <functional> | #include <functional> | ||||
@@ -32,7 +33,7 @@ | |||||
namespace ge { | namespace ge { | ||||
namespace formats { | namespace formats { | ||||
GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY Status TransFormat(const TransArgs &args, TransResult &result) { | |||||
Status TransFormat(const TransArgs &args, TransResult &result) { | |||||
auto transfer = BuildFormatTransfer(args); | auto transfer = BuildFormatTransfer(args); | ||||
if (transfer == nullptr) { | if (transfer == nullptr) { | ||||
std::string error = "Failed to trans data from format " + | std::string error = "Failed to trans data from format " + | ||||
@@ -56,11 +57,8 @@ GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY Status TransFormat(const TransArg | |||||
return transfer->TransFormat(args, result); | return transfer->TransFormat(args, result); | ||||
} | } | ||||
GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY Status TransShape(Format src_format, | |||||
const std::vector<int64_t> &src_shape, | |||||
DataType data_type, | |||||
Format dst_format, | |||||
std::vector<int64_t> &dst_shape) { | |||||
Status TransShape(Format src_format, const std::vector<int64_t> &src_shape, DataType data_type, Format dst_format, | |||||
std::vector<int64_t> &dst_shape) { | |||||
formats::TransArgs args; | formats::TransArgs args; | ||||
args.src_format = src_format; | args.src_format = src_format; | ||||
args.dst_format = dst_format; | args.dst_format = dst_format; | ||||
@@ -76,7 +74,7 @@ GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY Status TransShape(Format src_form | |||||
return transfer->TransShape(src_format, src_shape, data_type, dst_format, dst_shape); | return transfer->TransShape(src_format, src_shape, data_type, dst_format, dst_shape); | ||||
} | } | ||||
GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY Status TransDataType(const CastArgs &args, TransResult &result) { | |||||
Status TransDataType(const CastArgs &args, TransResult &result) { | |||||
auto transfer = BuildDataTypeTransfer(args); | auto transfer = BuildDataTypeTransfer(args); | ||||
if (transfer == nullptr) { | if (transfer == nullptr) { | ||||
std::string error = "Failed to trans data from datatype " + | std::string error = "Failed to trans data from datatype " + | ||||
@@ -95,11 +93,11 @@ GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY Status TransDataType(const CastAr | |||||
return transfer->TransDataType(args, result); | return transfer->TransDataType(args, result); | ||||
} | } | ||||
GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY bool IsTransFormatSupport(const TransArgs &args) { | |||||
bool IsTransFormatSupport(const TransArgs &args) { | |||||
return FormatTransferExists(args); | return FormatTransferExists(args); | ||||
} | } | ||||
GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY bool IsTransDataTypeSupport(const CastArgs &args) { | |||||
bool IsTransDataTypeSupport(const CastArgs &args) { | |||||
return DataTypeTransferExists(args); | return DataTypeTransferExists(args); | ||||
} | } | ||||
} // namespace formats | } // namespace formats | ||||
@@ -41,15 +41,14 @@ int64_t GetCubeSizeByDataType(DataType data_type) { | |||||
} | } | ||||
} | } | ||||
GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY std::string ShapeToString(const GeShape &shape) { | |||||
std::string ShapeToString(const GeShape &shape) { | |||||
return ShapeToString(shape.GetDims()); | return ShapeToString(shape.GetDims()); | ||||
} | } | ||||
GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY std::string ShapeToString(const std::vector<int64_t> &shape) { | |||||
std::string ShapeToString(const std::vector<int64_t> &shape) { | |||||
return JoinToString(shape); | return JoinToString(shape); | ||||
} | } | ||||
GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY | |||||
std::string RangeToString(const std::vector<std::pair<int64_t, int64_t>> &ranges) { | std::string RangeToString(const std::vector<std::pair<int64_t, int64_t>> &ranges) { | ||||
bool first = true; | bool first = true; | ||||
std::stringstream ss; | std::stringstream ss; | ||||
@@ -1180,20 +1180,40 @@ fp16_t &fp16_t::operator=(const double &d_val) { | |||||
} | } | ||||
// convert | // convert | ||||
fp16_t::operator float() const { return Fp16ToFloat(val); } | |||||
fp16_t::operator double() const { return Fp16ToDouble(val); } | |||||
fp16_t::operator int8_t() const { return Fp16ToInt8(val); } | |||||
fp16_t::operator uint8_t() const { return Fp16ToUInt8(val); } | |||||
fp16_t::operator int16_t() const { return Fp16ToInt16(val); } | |||||
fp16_t::operator uint16_t() const { return Fp16ToUInt16(val); } | |||||
fp16_t::operator int32_t() const { return Fp16ToInt32(val); } | |||||
fp16_t::operator uint32_t() const { return Fp16ToUInt32(val); } | |||||
fp16_t::operator float() const { | |||||
return Fp16ToFloat(val); | |||||
} | |||||
fp16_t::operator double() const { | |||||
return Fp16ToDouble(val); | |||||
} | |||||
fp16_t::operator int8_t() const { | |||||
return Fp16ToInt8(val); | |||||
} | |||||
fp16_t::operator uint8_t() const { | |||||
return Fp16ToUInt8(val); | |||||
} | |||||
fp16_t::operator int16_t() const { | |||||
return Fp16ToInt16(val); | |||||
} | |||||
fp16_t::operator uint16_t() const { | |||||
return Fp16ToUInt16(val); | |||||
} | |||||
fp16_t::operator int32_t() const { | |||||
return Fp16ToInt32(val); | |||||
} | |||||
fp16_t::operator uint32_t() const { | |||||
return Fp16ToUInt32(val); | |||||
} | |||||
// Cannot be used, just in order to solve the compile error | // Cannot be used, just in order to solve the compile error | ||||
fp16_t::operator int64_t() const { return 0; } | |||||
fp16_t::operator int64_t() const { | |||||
return 0; | |||||
} | |||||
// Cannot be used, just in order to solve the compile error | // Cannot be used, just in order to solve the compile error | ||||
fp16_t::operator uint64_t() const { return 0; } | |||||
fp16_t::operator uint64_t() const { | |||||
return 0; | |||||
} | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY int fp16_t::IsInf() { | |||||
int fp16_t::IsInf() { | |||||
if ((val & kFp16AbsMax) == kFp16ExpMask) { | if ((val & kFp16AbsMax) == kFp16ExpMask) { | ||||
if (val & kFp16SignMask) { | if (val & kFp16SignMask) { | ||||
return -1; | return -1; | ||||
@@ -1205,12 +1225,28 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY int fp16_t::IsInf() { | |||||
} | } | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY float fp16_t::ToFloat() const { return Fp16ToFloat(val); } | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY double fp16_t::ToDouble() const { return Fp16ToDouble(val); } | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY int8_t fp16_t::ToInt8() const { return Fp16ToInt8(val); } | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY uint8_t fp16_t::ToUInt8() const { return Fp16ToUInt8(val); } | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY int16_t fp16_t::ToInt16() const { return Fp16ToInt16(val); } | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY uint16_t fp16_t::ToUInt16() const { return Fp16ToUInt16(val); } | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY int32_t fp16_t::ToInt32() const { return Fp16ToInt32(val); } | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY uint32_t fp16_t::ToUInt32() const { return Fp16ToUInt32(val); } | |||||
float fp16_t::ToFloat() const { | |||||
return Fp16ToFloat(val); | |||||
} | |||||
double fp16_t::ToDouble() const { | |||||
return Fp16ToDouble(val); | |||||
} | |||||
int8_t fp16_t::ToInt8() const { | |||||
return Fp16ToInt8(val); | |||||
} | |||||
uint8_t fp16_t::ToUInt8() const { | |||||
return Fp16ToUInt8(val); | |||||
} | |||||
int16_t fp16_t::ToInt16() const { | |||||
return Fp16ToInt16(val); | |||||
} | |||||
uint16_t fp16_t::ToUInt16() const { | |||||
return Fp16ToUInt16(val); | |||||
} | |||||
int32_t fp16_t::ToInt32() const { | |||||
return Fp16ToInt32(val); | |||||
} | |||||
uint32_t fp16_t::ToUInt32() const { | |||||
return Fp16ToUInt32(val); | |||||
} | |||||
} // namespace ge | } // namespace ge |
@@ -42,7 +42,7 @@ static std::map<ge::DataType, int32_t> CONST_OPDATA_TYPE_SIZE_MAP = { | |||||
{ge::DT_UINT8, kGeSizeUint8}, {ge::DT_UINT16, kGeSizeUint16}, {ge::DT_UINT32, kGeSizeUint32}, | {ge::DT_UINT8, kGeSizeUint8}, {ge::DT_UINT16, kGeSizeUint16}, {ge::DT_UINT32, kGeSizeUint32}, | ||||
{ge::DT_UINT64, kGeSizeUint64}, {ge::DT_DOUBLE, kGeSizeDouble}, {ge::DT_BOOL, kGeSizeBool}}; | {ge::DT_UINT64, kGeSizeUint64}, {ge::DT_DOUBLE, kGeSizeDouble}, {ge::DT_BOOL, kGeSizeBool}}; | ||||
class GE_FUNC_HOST_VISIBILITY GE_FUNC_DEV_VISIBILITY DataTypeUtil { | |||||
class DataTypeUtil { | |||||
public: | public: | ||||
static bool DataTypeTranslatable(const ge::DataType &src_out_data_type, const ge::DataType &dst_in_data_type); | static bool DataTypeTranslatable(const ge::DataType &src_out_data_type, const ge::DataType &dst_in_data_type); | ||||
static const std::vector<ge::DataType> &GetTranslatableDataTypesBySrc(const ge::DataType &src_out_data_type); | static const std::vector<ge::DataType> &GetTranslatableDataTypesBySrc(const ge::DataType &src_out_data_type); | ||||
@@ -42,7 +42,7 @@ const int kBaseInt = 10; | |||||
std::map<string, string> TBEPluginManager::options_ = {}; | std::map<string, string> TBEPluginManager::options_ = {}; | ||||
// Get Singleton Instance | // Get Singleton Instance | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY TBEPluginManager &TBEPluginManager::Instance() { | |||||
TBEPluginManager &TBEPluginManager::Instance() { | |||||
static TBEPluginManager instance_ptr_; | static TBEPluginManager instance_ptr_; | ||||
return instance_ptr_; | return instance_ptr_; | ||||
} | } | ||||
@@ -61,7 +61,7 @@ Status TBEPluginManager::ClearHandles_() { | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status TBEPluginManager::Finalize() { | |||||
Status TBEPluginManager::Finalize() { | |||||
Status ret = ClearHandles_(); | Status ret = ClearHandles_(); | ||||
return ret; | return ret; | ||||
} | } | ||||
@@ -207,7 +207,6 @@ void TBEPluginManager::LoadCustomOpLib() { | |||||
} | } | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY | |||||
void TBEPluginManager::LoadPluginSo(const std::map<string, string> &options) { | void TBEPluginManager::LoadPluginSo(const std::map<string, string> &options) { | ||||
vector<string> file_list; | vector<string> file_list; | ||||
string caffe_parser_path; | string caffe_parser_path; | ||||
@@ -246,7 +245,6 @@ void TBEPluginManager::LoadPluginSo(const std::map<string, string> &options) { | |||||
} | } | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY | |||||
void TBEPluginManager::InitPreparation(const std::map<string, string> &options) { | void TBEPluginManager::InitPreparation(const std::map<string, string> &options) { | ||||
options_.insert(options.begin(), options.end()); | options_.insert(options.begin(), options.end()); | ||||
// Load TBE plugin | // Load TBE plugin | ||||
@@ -18,9 +18,7 @@ | |||||
#include "common/formats/formats.h" | #include "common/formats/formats.h" | ||||
namespace ge { | namespace ge { | ||||
GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY Status GeFormatUtil::TransShape(const TensorDesc &src_desc, | |||||
Format dst_format, | |||||
std::vector<int64_t> &dst_shape) { | |||||
Status GeFormatUtil::TransShape(const TensorDesc &src_desc, Format dst_format, std::vector<int64_t> &dst_shape) { | |||||
return formats::TransShape(src_desc.GetFormat(), src_desc.GetShape().GetDims(), src_desc.GetDataType(), dst_format, | return formats::TransShape(src_desc.GetFormat(), src_desc.GetShape().GetDims(), src_desc.GetDataType(), dst_format, | ||||
dst_shape); | dst_shape); | ||||
} | } | ||||
@@ -24,7 +24,7 @@ | |||||
#include "external/ge/ge_api_error_codes.h" | #include "external/ge/ge_api_error_codes.h" | ||||
#include "graph/compute_graph.h" | #include "graph/compute_graph.h" | ||||
#include "graph/manager/graph_var_manager.h" | #include "graph/manager/graph_var_manager.h" | ||||
#include "model/ge_model.h" | |||||
#include "common/model/ge_model.h" | |||||
namespace ge { | namespace ge { | ||||
using Json = nlohmann::json; | using Json = nlohmann::json; | ||||
@@ -33,7 +33,7 @@ const uint32_t kStatiOmFileModelNum = 1; | |||||
namespace ge { | namespace ge { | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ModelHelper::~ModelHelper() { (void)ReleaseLocalModelData(); } | |||||
ModelHelper::~ModelHelper() { (void)ReleaseLocalModelData(); } | |||||
Status ModelHelper::SaveModelPartition(std::shared_ptr<OmFileSaveHelper> &om_file_save_helper, ModelPartitionType type, | Status ModelHelper::SaveModelPartition(std::shared_ptr<OmFileSaveHelper> &om_file_save_helper, ModelPartitionType type, | ||||
const uint8_t *data, size_t size, size_t model_index) { | const uint8_t *data, size_t size, size_t model_index) { | ||||
@@ -108,8 +108,8 @@ Status ModelHelper::SaveSizeToModelDef(const GeModelPtr &ge_model) { | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
Status ModelHelper::SaveModelDef(std::shared_ptr<OmFileSaveHelper> &om_file_save_helper, | |||||
const GeModelPtr &ge_model, ge::Buffer &model_buffer, size_t model_index) { | |||||
Status ModelHelper::SaveModelDef(std::shared_ptr<OmFileSaveHelper> &om_file_save_helper, const GeModelPtr &ge_model, | |||||
ge::Buffer &model_buffer, size_t model_index) { | |||||
ModelPtr model_tmp = ge::MakeShared<ge::Model>(ge_model->GetName(), ge_model->GetPlatformVersion()); | ModelPtr model_tmp = ge::MakeShared<ge::Model>(ge_model->GetName(), ge_model->GetPlatformVersion()); | ||||
if (model_tmp == nullptr) { | if (model_tmp == nullptr) { | ||||
GELOGE(FAILED, "[Creat][Model]Failed, Model %s Ptr", ge_model->GetName().c_str()); | GELOGE(FAILED, "[Creat][Model]Failed, Model %s Ptr", ge_model->GetName().c_str()); | ||||
@@ -143,8 +143,8 @@ Status ModelHelper::SaveModelDef(std::shared_ptr<OmFileSaveHelper> &om_file_save | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
Status ModelHelper::SaveModelWeights(std::shared_ptr<OmFileSaveHelper> &om_file_save_helper, | |||||
const GeModelPtr &ge_model, size_t model_index) { | |||||
Status ModelHelper::SaveModelWeights(std::shared_ptr<OmFileSaveHelper> &om_file_save_helper, const GeModelPtr &ge_model, | |||||
size_t model_index) { | |||||
auto ge_model_weight = ge_model->GetWeight(); | auto ge_model_weight = ge_model->GetWeight(); | ||||
GELOGD("WEIGHTS_DATA size is %zu, %p", ge_model_weight.GetSize(), ge_model_weight.GetData()); | GELOGD("WEIGHTS_DATA size is %zu, %p", ge_model_weight.GetSize(), ge_model_weight.GetData()); | ||||
// weight is not necessary | // weight is not necessary | ||||
@@ -187,8 +187,8 @@ Status ModelHelper::SaveModelCustAICPU(std::shared_ptr<OmFileSaveHelper> &om_fil | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
Status ModelHelper::SaveModelTaskDef(std::shared_ptr<OmFileSaveHelper> &om_file_save_helper, | |||||
const GeModelPtr &ge_model, ge::Buffer &task_buffer, size_t model_index) { | |||||
Status ModelHelper::SaveModelTaskDef(std::shared_ptr<OmFileSaveHelper> &om_file_save_helper, const GeModelPtr &ge_model, | |||||
ge::Buffer &task_buffer, size_t model_index) { | |||||
std::shared_ptr<ModelTaskDef> model_task_def = ge_model->GetModelTaskDefPtr(); | std::shared_ptr<ModelTaskDef> model_task_def = ge_model->GetModelTaskDefPtr(); | ||||
if (model_task_def == nullptr) { | if (model_task_def == nullptr) { | ||||
GELOGE(ACL_ERROR_GE_MEMORY_ALLOCATION, "[Creat][ModelTaskDef]Failed, it is nullptr, " | GELOGE(ACL_ERROR_GE_MEMORY_ALLOCATION, "[Creat][ModelTaskDef]Failed, it is nullptr, " | ||||
@@ -231,8 +231,8 @@ Status ModelHelper::SaveModelTaskDef(std::shared_ptr<OmFileSaveHelper> &om_file_ | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
Status ModelHelper::SaveModelHeader(std::shared_ptr<OmFileSaveHelper> &om_file_save_helper, | |||||
const GeModelPtr &ge_model, size_t model_num) { | |||||
Status ModelHelper::SaveModelHeader(std::shared_ptr<OmFileSaveHelper> &om_file_save_helper, const GeModelPtr &ge_model, | |||||
size_t model_num) { | |||||
// Save target/version to model_header | // Save target/version to model_header | ||||
ModelFileHeader &model_header = om_file_save_helper->GetModelFileHeader(); | ModelFileHeader &model_header = om_file_save_helper->GetModelFileHeader(); | ||||
model_header.platform_type = ge_model->GetPlatformType(); | model_header.platform_type = ge_model->GetPlatformType(); | ||||
@@ -246,8 +246,10 @@ Status ModelHelper::SaveModelHeader(std::shared_ptr<OmFileSaveHelper> &om_file_s | |||||
if (err != EOK) { | if (err != EOK) { | ||||
GELOGE(ACL_ERROR_GE_MEMORY_ALLOCATION, | GELOGE(ACL_ERROR_GE_MEMORY_ALLOCATION, | ||||
"[Save][Model]Failed while allocating memory for platform_version %s, model %s, " | "[Save][Model]Failed while allocating memory for platform_version %s, model %s, " | ||||
"errno %d", platform_version.c_str(), ge_model->GetName().c_str(), err); | |||||
REPORT_CALL_ERROR("E19999", "ModelHelper save model %s failed while " | |||||
"errno %d", | |||||
platform_version.c_str(), ge_model->GetName().c_str(), err); | |||||
REPORT_CALL_ERROR("E19999", | |||||
"ModelHelper save model %s failed while " | |||||
"allocating memory for platform_version %s, errno %d", | "allocating memory for platform_version %s, errno %d", | ||||
ge_model->GetName().c_str(), platform_version.c_str(), err); | ge_model->GetName().c_str(), platform_version.c_str(), err); | ||||
return ACL_ERROR_GE_MEMORY_ALLOCATION; | return ACL_ERROR_GE_MEMORY_ALLOCATION; | ||||
@@ -271,9 +273,9 @@ Status ModelHelper::SaveModelHeader(std::shared_ptr<OmFileSaveHelper> &om_file_s | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
Status ModelHelper::SaveAllModelPartiton(std::shared_ptr<OmFileSaveHelper>& om_file_save_helper, | |||||
const GeModelPtr &ge_model, ge::Buffer &model_buffer, | |||||
ge::Buffer &task_buffer, size_t model_index) { | |||||
Status ModelHelper::SaveAllModelPartiton(std::shared_ptr<OmFileSaveHelper> &om_file_save_helper, | |||||
const GeModelPtr &ge_model, ge::Buffer &model_buffer, ge::Buffer &task_buffer, | |||||
size_t model_index) { | |||||
if (SaveModelDef(om_file_save_helper, ge_model, model_buffer, model_index) != SUCCESS) { | if (SaveModelDef(om_file_save_helper, ge_model, model_buffer, model_index) != SUCCESS) { | ||||
GELOGE(FAILED, "[Save][ModelDef]Failed, model %s, model index %zu", | GELOGE(FAILED, "[Save][ModelDef]Failed, model %s, model index %zu", | ||||
ge_model->GetName().c_str(), model_index); | ge_model->GetName().c_str(), model_index); | ||||
@@ -316,10 +318,8 @@ Status ModelHelper::SaveAllModelPartiton(std::shared_ptr<OmFileSaveHelper>& om_f | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::SaveToOmModel(const GeModelPtr &ge_model, | |||||
const SaveParam &save_param, | |||||
const std::string &output_file, | |||||
ModelBufferData& model) { | |||||
Status ModelHelper::SaveToOmModel(const GeModelPtr &ge_model, const SaveParam &save_param, | |||||
const std::string &output_file, ModelBufferData &model) { | |||||
if (output_file.empty()) { | if (output_file.empty()) { | ||||
GELOGE(FAILED, "[Save][Model]GraphBuilder SaveModel received invalid file name prefix, " | GELOGE(FAILED, "[Save][Model]GraphBuilder SaveModel received invalid file name prefix, " | ||||
"model %s", ge_model->GetName().c_str()); | "model %s", ge_model->GetName().c_str()); | ||||
@@ -367,13 +367,8 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::SaveToOmMod | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::SaveToOmRootModel( | |||||
const GeRootModelPtr &ge_root_model, | |||||
const SaveParam &save_param, | |||||
const std::string &output_file, | |||||
ModelBufferData& model, | |||||
bool is_unknown_shape) { | |||||
Status ModelHelper::SaveToOmRootModel(const GeRootModelPtr &ge_root_model, const SaveParam &save_param, | |||||
const std::string &output_file, ModelBufferData &model, bool is_unknown_shape) { | |||||
GE_CHECK_NOTNULL(ge_root_model); | GE_CHECK_NOTNULL(ge_root_model); | ||||
GE_IF_BOOL_EXEC(ge_root_model == nullptr, | GE_IF_BOOL_EXEC(ge_root_model == nullptr, | ||||
GELOGE(FAILED, "[Check][GERootModel]Ge_root_model is nullptr"); | GELOGE(FAILED, "[Check][GERootModel]Ge_root_model is nullptr"); | ||||
@@ -466,8 +461,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::SaveToOmRoo | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status | |||||
ModelHelper::SaveOriginalGraphToOmModel(const ge::Graph &graph, const std::string &output_file) { | |||||
Status ModelHelper::SaveOriginalGraphToOmModel(const ge::Graph &graph, const std::string &output_file) { | |||||
if (output_file.empty()) { | if (output_file.empty()) { | ||||
GELOGE(FAILED, "[Save][Model]Received invalid file name prefix, output_file %s", output_file.c_str()); | GELOGE(FAILED, "[Save][Model]Received invalid file name prefix, output_file %s", output_file.c_str()); | ||||
REPORT_INNER_ERROR("E19999", "Save model received invalid file name prefix, output_file %s", output_file.c_str()); | REPORT_INNER_ERROR("E19999", "Save model received invalid file name prefix, output_file %s", output_file.c_str()); | ||||
@@ -545,7 +539,7 @@ ModelHelper::SaveOriginalGraphToOmModel(const ge::Graph &graph, const std::strin | |||||
return (ret == SUCCESS ? SUCCESS : FAILED); | return (ret == SUCCESS ? SUCCESS : FAILED); | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadModel(const ge::ModelData &model_data) { | |||||
Status ModelHelper::LoadModel(const ge::ModelData &model_data) { | |||||
if (model_data.model_data == nullptr || model_data.model_len == 0) { | if (model_data.model_data == nullptr || model_data.model_len == 0) { | ||||
GELOGE(ACL_ERROR_GE_EXEC_MODEL_DATA_SIZE_INVALID, | GELOGE(ACL_ERROR_GE_EXEC_MODEL_DATA_SIZE_INVALID, | ||||
"[Load][Model]Model_data is nullptr or model_data_size is 0"); | "[Load][Model]Model_data is nullptr or model_data_size is 0"); | ||||
@@ -597,7 +591,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadModel(c | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadRootModel(const ge::ModelData &model_data) { | |||||
Status ModelHelper::LoadRootModel(const ge::ModelData &model_data) { | |||||
if (model_data.model_data == nullptr || model_data.model_len == 0) { | if (model_data.model_data == nullptr || model_data.model_len == 0) { | ||||
GELOGE(ACL_ERROR_GE_EXEC_MODEL_DATA_SIZE_INVALID, "[Load][RootModel] " | GELOGE(ACL_ERROR_GE_EXEC_MODEL_DATA_SIZE_INVALID, "[Load][RootModel] " | ||||
"Model_data is nullptr or model data is empty."); | "Model_data is nullptr or model data is empty."); | ||||
@@ -783,7 +777,6 @@ Status ModelHelper::LoadModelData(OmFileLoadHelper &om_load_helper, GeModelPtr & | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
Status ModelHelper::LoadWeights(OmFileLoadHelper &om_load_helper) { | Status ModelHelper::LoadWeights(OmFileLoadHelper &om_load_helper) { | ||||
ModelPartition partition; | ModelPartition partition; | ||||
if (om_load_helper.GetModelPartition(ModelPartitionType::WEIGHTS_DATA, partition) != SUCCESS) { | if (om_load_helper.GetModelPartition(ModelPartitionType::WEIGHTS_DATA, partition) != SUCCESS) { | ||||
@@ -814,7 +807,7 @@ Status ModelHelper::LoadWeights(OmFileLoadHelper &om_load_helper, GeModelPtr &cu | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadTask(OmFileLoadHelper &om_load_helper) { | |||||
Status ModelHelper::LoadTask(OmFileLoadHelper &om_load_helper) { | |||||
ModelPartition task_partition; | ModelPartition task_partition; | ||||
if (om_load_helper.GetModelPartition(ModelPartitionType::TASK_INFO, task_partition) != SUCCESS) { | if (om_load_helper.GetModelPartition(ModelPartitionType::TASK_INFO, task_partition) != SUCCESS) { | ||||
GELOGE(FAILED, "[Get][ModelTaskPartition]Failed, task_partition size:%u", task_partition.size); | GELOGE(FAILED, "[Get][ModelTaskPartition]Failed, task_partition size:%u", task_partition.size); | ||||
@@ -838,9 +831,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadTask(Om | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadTask(OmFileLoadHelper &om_load_helper, | |||||
GeModelPtr &cur_model, | |||||
size_t mode_index) { | |||||
Status ModelHelper::LoadTask(OmFileLoadHelper &om_load_helper, GeModelPtr &cur_model, size_t mode_index) { | |||||
ModelPartition task_partition; | ModelPartition task_partition; | ||||
if (om_load_helper.GetModelPartition(ModelPartitionType::TASK_INFO, task_partition, mode_index) != SUCCESS) { | if (om_load_helper.GetModelPartition(ModelPartitionType::TASK_INFO, task_partition, mode_index) != SUCCESS) { | ||||
GELOGE(FAILED, "Get task model partition failed."); | GELOGE(FAILED, "Get task model partition failed."); | ||||
@@ -915,8 +906,8 @@ Status ModelHelper::LoadCustAICPUKernelStore(OmFileLoadHelper &om_load_helper) { | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
Status ModelHelper::LoadCustAICPUKernelStore(OmFileLoadHelper &om_load_helper, | |||||
GeModelPtr &cur_model, size_t mode_index) { | |||||
Status ModelHelper::LoadCustAICPUKernelStore(OmFileLoadHelper &om_load_helper, GeModelPtr &cur_model, | |||||
size_t mode_index) { | |||||
// Load cust aicpu kernels | // Load cust aicpu kernels | ||||
ModelPartition partition_kernel_def; | ModelPartition partition_kernel_def; | ||||
CustAICPUKernelStore kernel_store; | CustAICPUKernelStore kernel_store; | ||||
@@ -933,7 +924,7 @@ Status ModelHelper::LoadCustAICPUKernelStore(OmFileLoadHelper &om_load_helper, | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY GeModelPtr ModelHelper::GetGeModel() { | |||||
GeModelPtr ModelHelper::GetGeModel() { | |||||
if (model_ != nullptr) { | if (model_ != nullptr) { | ||||
return model_; | return model_; | ||||
} | } | ||||
@@ -946,7 +937,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY GeModelPtr ModelHelper::GetGeMo | |||||
return out_model; | return out_model; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY GeRootModelPtr ModelHelper::GetGeRootModel() { | |||||
GeRootModelPtr ModelHelper::GetGeRootModel() { | |||||
if (root_model_ != nullptr) { | if (root_model_ != nullptr) { | ||||
return root_model_; | return root_model_; | ||||
} | } | ||||
@@ -959,7 +950,6 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY GeRootModelPtr ModelHelper::Get | |||||
return out_model; | return out_model; | ||||
} | } | ||||
Status ModelHelper::ReleaseLocalModelData() noexcept { | Status ModelHelper::ReleaseLocalModelData() noexcept { | ||||
Status result = SUCCESS; | Status result = SUCCESS; | ||||
if (model_addr_tmp_ != nullptr) { | if (model_addr_tmp_ != nullptr) { | ||||
@@ -976,8 +966,7 @@ Status ModelHelper::ReleaseLocalModelData() noexcept { | |||||
return result; | return result; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::GetBaseNameFromFileName( | |||||
const string &file_name, string &base_name) { | |||||
Status ModelHelper::GetBaseNameFromFileName(const string &file_name, string &base_name) { | |||||
GELOGD("Get base_name from file, file_name:%s", file_name.c_str()); | GELOGD("Get base_name from file, file_name:%s", file_name.c_str()); | ||||
GE_CHK_BOOL_EXEC_WARN(!file_name.empty(), return FAILED, "File path may not valid, check params --output"); | GE_CHK_BOOL_EXEC_WARN(!file_name.empty(), return FAILED, "File path may not valid, check params --output"); | ||||
size_t start_position = 0; | size_t start_position = 0; | ||||
@@ -992,8 +981,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::GetBaseName | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::GetModelNameFromMergedGraphName( | |||||
const string &graph_name, string &model_name) { | |||||
Status ModelHelper::GetModelNameFromMergedGraphName(const string &graph_name, string &model_name) { | |||||
GELOGD("Get model_name from graph_name, graph_name:%s", graph_name.c_str()); | GELOGD("Get model_name from graph_name, graph_name:%s", graph_name.c_str()); | ||||
// this can only be used after merged graph(graph name will be append with "_x", x is index); | // this can only be used after merged graph(graph name will be append with "_x", x is index); | ||||
GE_CHK_BOOL_EXEC_WARN(!graph_name.empty(), return FAILED, "File path may not valid, check params --output"); | GE_CHK_BOOL_EXEC_WARN(!graph_name.empty(), return FAILED, "File path may not valid, check params --output"); | ||||
@@ -1035,8 +1023,7 @@ Status ModelTool::GetModelInfoFromOm(const char *model_file, ge::proto::ModelDef | |||||
ErrorManager::GetInstance().ATCReportErrMessage("E10003", | ErrorManager::GetInstance().ATCReportErrMessage("E10003", | ||||
{"parameter", "value", "reason"}, {"om", model_file, "invalid om file, can't be parsed"}); | {"parameter", "value", "reason"}, {"om", model_file, "invalid om file, can't be parsed"}); | ||||
GELOGE(ACL_ERROR_GE_PARAM_INVALID, | GELOGE(ACL_ERROR_GE_PARAM_INVALID, | ||||
"[Parse][ModelContent]Failed because of invalid om file %s, please check om param", | |||||
model_file); | |||||
"[Parse][ModelContent]Failed because of invalid om file %s, please check om param", model_file); | |||||
return ret; | return ret; | ||||
} | } | ||||
@@ -18,10 +18,11 @@ | |||||
#include <string> | #include <string> | ||||
#include <vector> | #include <vector> | ||||
#include "common/math/math_util.h" | |||||
#include "common/auth/file_saver.h" | #include "common/auth/file_saver.h" | ||||
#include "framework/common/debug/log.h" | |||||
#include "common/math/math_util.h" | |||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "framework/common/debug/log.h" | |||||
#include "framework/common/ge_inner_error_codes.h" | #include "framework/common/ge_inner_error_codes.h" | ||||
#include "framework/common/util.h" | #include "framework/common/util.h" | ||||
@@ -32,7 +33,7 @@ const int32_t kOptionalNum = 2; | |||||
} | } | ||||
namespace ge { | namespace ge { | ||||
// For Load | // For Load | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OmFileLoadHelper::Init(const ge::ModelData &model) { | |||||
Status OmFileLoadHelper::Init(const ge::ModelData &model) { | |||||
if (CheckModelValid(model) != SUCCESS) { | if (CheckModelValid(model) != SUCCESS) { | ||||
return FAILED; | return FAILED; | ||||
} | } | ||||
@@ -42,8 +43,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OmFileLoadHelper::Init(c | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OmFileLoadHelper::Init(uint8_t *model_data, | |||||
const uint32_t model_data_size) { | |||||
Status OmFileLoadHelper::Init(uint8_t *model_data, const uint32_t model_data_size) { | |||||
Status status = LoadModelPartitionTable(model_data, model_data_size); | Status status = LoadModelPartitionTable(model_data, model_data_size); | ||||
if (status != SUCCESS) { | if (status != SUCCESS) { | ||||
return status; | return status; | ||||
@@ -52,9 +52,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OmFileLoadHelper::Init(u | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OmFileLoadHelper::Init(uint8_t *model_data, | |||||
uint32_t model_data_size, | |||||
uint32_t model_num) { | |||||
Status OmFileLoadHelper::Init(uint8_t *model_data, uint32_t model_data_size, uint32_t model_num) { | |||||
Status status = LoadModelPartitionTable(model_data, model_data_size, model_num); | Status status = LoadModelPartitionTable(model_data, model_data_size, model_num); | ||||
if (status != SUCCESS) { | if (status != SUCCESS) { | ||||
return status; | return status; | ||||
@@ -64,8 +62,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OmFileLoadHelper::Init(u | |||||
} | } | ||||
// Use both | // Use both | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OmFileLoadHelper::GetModelPartition(ModelPartitionType type, | |||||
ModelPartition &partition) { | |||||
Status OmFileLoadHelper::GetModelPartition(ModelPartitionType type, ModelPartition &partition) { | |||||
if (!is_inited_) { | if (!is_inited_) { | ||||
GELOGE(PARAM_INVALID, "OmFileLoadHelper has not been initialized!"); | GELOGE(PARAM_INVALID, "OmFileLoadHelper has not been initialized!"); | ||||
return PARAM_INVALID; | return PARAM_INVALID; | ||||
@@ -90,9 +87,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OmFileLoadHelper::GetMod | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OmFileLoadHelper::GetModelPartition(ModelPartitionType type, | |||||
ModelPartition &partition, | |||||
size_t model_index) { | |||||
Status OmFileLoadHelper::GetModelPartition(ModelPartitionType type, ModelPartition &partition, size_t model_index) { | |||||
if (!is_inited_) { | if (!is_inited_) { | ||||
GELOGE(PARAM_INVALID, "OmFileLoadHelper has not been initialized!"); | GELOGE(PARAM_INVALID, "OmFileLoadHelper has not been initialized!"); | ||||
return PARAM_INVALID; | return PARAM_INVALID; | ||||
@@ -248,12 +243,11 @@ Status OmFileLoadHelper::LoadModelPartitionTable(uint8_t *model_data, uint32_t m | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY const std::vector<ModelPartition> | |||||
&OmFileSaveHelper::GetModelPartitions() const { | |||||
const std::vector<ModelPartition> &OmFileSaveHelper::GetModelPartitions() const { | |||||
return context_.partition_datas_; | return context_.partition_datas_; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ModelPartitionTable *OmFileSaveHelper::GetPartitionTable() { | |||||
ModelPartitionTable *OmFileSaveHelper::GetPartitionTable() { | |||||
auto partition_size = static_cast<uint32_t>(context_.partition_datas_.size()); | auto partition_size = static_cast<uint32_t>(context_.partition_datas_.size()); | ||||
// Build ModelPartitionTable, flex array | // Build ModelPartitionTable, flex array | ||||
context_.partition_table_.clear(); | context_.partition_table_.clear(); | ||||
@@ -272,8 +266,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ModelPartitionTable *OmFileSave | |||||
return partition_table; | return partition_table; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ModelPartitionTable *OmFileSaveHelper::GetPartitionTable( | |||||
size_t cur_ctx_index) { | |||||
ModelPartitionTable *OmFileSaveHelper::GetPartitionTable(size_t cur_ctx_index) { | |||||
auto &cur_ctx = model_contexts_[cur_ctx_index]; | auto &cur_ctx = model_contexts_[cur_ctx_index]; | ||||
auto partition_size = static_cast<uint32_t>(cur_ctx.partition_datas_.size()); | auto partition_size = static_cast<uint32_t>(cur_ctx.partition_datas_.size()); | ||||
// Build ModelPartitionTable, flex array | // Build ModelPartitionTable, flex array | ||||
@@ -293,8 +286,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ModelPartitionTable *OmFileSave | |||||
return partition_table; | return partition_table; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OmFileSaveHelper::AddPartition(ModelPartition &partition) { | |||||
Status OmFileSaveHelper::AddPartition(ModelPartition &partition) { | |||||
if (ge::CheckUint32AddOverflow(context_.model_data_len_, partition.size) != SUCCESS) { | if (ge::CheckUint32AddOverflow(context_.model_data_len_, partition.size) != SUCCESS) { | ||||
GELOGE(FAILED, "UINT32 %u and %u addition can result in overflow!", context_.model_data_len_, partition.size); | GELOGE(FAILED, "UINT32 %u and %u addition can result in overflow!", context_.model_data_len_, partition.size); | ||||
return FAILED; | return FAILED; | ||||
@@ -379,8 +371,8 @@ Status OmFileSaveHelper::SaveModelToFile(const char *output_file, ModelBufferDat | |||||
#endif | #endif | ||||
} | } | ||||
Status OmFileSaveHelper::SaveRootModel(const SaveParam &save_param, const char *output_file, | |||||
ModelBufferData &model, bool is_offline) { | |||||
Status OmFileSaveHelper::SaveRootModel(const SaveParam &save_param, const char *output_file, ModelBufferData &model, | |||||
bool is_offline) { | |||||
(void)save_param.cert_file; | (void)save_param.cert_file; | ||||
(void)save_param.ek_file; | (void)save_param.ek_file; | ||||
(void)save_param.encode_mode; | (void)save_param.encode_mode; | ||||
@@ -409,8 +401,8 @@ Status OmFileSaveHelper::SaveRootModel(const SaveParam &save_param, const char * | |||||
model_header_.length += size_of_table + cur_model_data_len; | model_header_.length += size_of_table + cur_model_data_len; | ||||
model_partition_tabels.push_back(tmp_table); | model_partition_tabels.push_back(tmp_table); | ||||
all_model_partitions.push_back(cur_ctx.partition_datas_); | all_model_partitions.push_back(cur_ctx.partition_datas_); | ||||
GELOGD("sizeof(ModelPartitionTable):%u, cur_model_data_len:%u, cur_context_index:%zu", | |||||
size_of_table, cur_model_data_len, ctx_index); | |||||
GELOGD("sizeof(ModelPartitionTable):%u, cur_model_data_len:%u, cur_context_index:%zu", size_of_table, | |||||
cur_model_data_len, ctx_index); | |||||
} | } | ||||
Status ret; | Status ret; | ||||
if (is_offline) { | if (is_offline) { | ||||
@@ -48,7 +48,7 @@ struct KernelStoreItemHead { | |||||
uint32_t bin_len; | uint32_t bin_len; | ||||
}; | }; | ||||
class FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY KernelStore { | |||||
class KernelStore { | |||||
public: | public: | ||||
KernelStore() = default; | KernelStore() = default; | ||||
virtual ~KernelStore() = default; | virtual ~KernelStore() = default; | ||||
@@ -14,7 +14,7 @@ | |||||
* limitations under the License. | * limitations under the License. | ||||
*/ | */ | ||||
#include "graph/common/local_context.h" | |||||
#include "common/local_context.h" | |||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
@@ -18,7 +18,7 @@ | |||||
#include "external/register/register_types.h" | #include "external/register/register_types.h" | ||||
namespace ge { | namespace ge { | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t sqrt(fp16_t fp) { | |||||
fp16_t sqrt(fp16_t fp) { | |||||
fp16_t ret; | fp16_t ret; | ||||
// Convert half precision float number to double | // Convert half precision float number to double | ||||
double dVal = fp; | double dVal = fp; | ||||
@@ -29,7 +29,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t sqrt(fp16_t fp) { | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t rsqrt(fp16_t fp) { | |||||
fp16_t rsqrt(fp16_t fp) { | |||||
fp16_t ret; | fp16_t ret; | ||||
// Convert half precision float number to double | // Convert half precision float number to double | ||||
double dVal = fp; | double dVal = fp; | ||||
@@ -40,7 +40,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t rsqrt(fp16_t fp) { | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t rcp(fp16_t fp) { | |||||
fp16_t rcp(fp16_t fp) { | |||||
fp16_t ret; | fp16_t ret; | ||||
// Convert half precision float number to double | // Convert half precision float number to double | ||||
double dVal = fp; | double dVal = fp; | ||||
@@ -51,7 +51,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t rcp(fp16_t fp) { | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t exp(fp16_t fp) { | |||||
fp16_t exp(fp16_t fp) { | |||||
fp16_t ret; | fp16_t ret; | ||||
// Convert half precision float number to double | // Convert half precision float number to double | ||||
double dVal = fp; | double dVal = fp; | ||||
@@ -63,7 +63,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t exp(fp16_t fp) { | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t pow2(fp16_t fp) { | |||||
fp16_t pow2(fp16_t fp) { | |||||
fp16_t ret; | fp16_t ret; | ||||
// Convert half precision float number to double | // Convert half precision float number to double | ||||
double dVal = fp; | double dVal = fp; | ||||
@@ -75,7 +75,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t pow2(fp16_t fp) { | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t pow10(fp16_t fp) { | |||||
fp16_t pow10(fp16_t fp) { | |||||
fp16_t ret; | fp16_t ret; | ||||
// Convert half precision float number to double | // Convert half precision float number to double | ||||
double dVal = fp; | double dVal = fp; | ||||
@@ -87,7 +87,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t pow10(fp16_t fp) { | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t ln(fp16_t fp) { | |||||
fp16_t ln(fp16_t fp) { | |||||
fp16_t ret; | fp16_t ret; | ||||
// Convert half precision float number to double | // Convert half precision float number to double | ||||
double dVal = fp; | double dVal = fp; | ||||
@@ -99,7 +99,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t ln(fp16_t fp) { | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t log2(fp16_t fp) { | |||||
fp16_t log2(fp16_t fp) { | |||||
fp16_t ret; | fp16_t ret; | ||||
// Convert half precision float number to double | // Convert half precision float number to double | ||||
double dVal = fp; | double dVal = fp; | ||||
@@ -111,7 +111,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t log2(fp16_t fp) { | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t log10(fp16_t fp) { | |||||
fp16_t log10(fp16_t fp) { | |||||
fp16_t ret; | fp16_t ret; | ||||
// Convert half precision float number to double | // Convert half precision float number to double | ||||
double dVal = fp; | double dVal = fp; | ||||
@@ -123,7 +123,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t log10(fp16_t fp) { | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t cos(fp16_t fp) { | |||||
fp16_t cos(fp16_t fp) { | |||||
fp16_t ret; | fp16_t ret; | ||||
// Convert half precision float number to double | // Convert half precision float number to double | ||||
double dVal = fp; | double dVal = fp; | ||||
@@ -135,7 +135,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t cos(fp16_t fp) { | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t sin(fp16_t fp) { | |||||
fp16_t sin(fp16_t fp) { | |||||
fp16_t ret; | fp16_t ret; | ||||
// Convert half precision float number to double | // Convert half precision float number to double | ||||
double dVal = fp; | double dVal = fp; | ||||
@@ -147,13 +147,13 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t sin(fp16_t fp) { | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t abs(fp16_t fp) { | |||||
fp16_t abs(fp16_t fp) { | |||||
fp16_t ret; | fp16_t ret; | ||||
ret.val = (fp.val & kFp16AbsMax); | ret.val = (fp.val & kFp16AbsMax); | ||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t max(fp16_t fp1, fp16_t fp2) { | |||||
fp16_t max(fp16_t fp1, fp16_t fp2) { | |||||
if (fp1 >= fp2) { | if (fp1 >= fp2) { | ||||
return fp1; | return fp1; | ||||
} else { | } else { | ||||
@@ -161,7 +161,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t max(fp16_t fp1, fp16_t f | |||||
} | } | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY fp16_t min(fp16_t fp1, fp16_t fp2) { | |||||
fp16_t min(fp16_t fp1, fp16_t fp2) { | |||||
if (fp1 <= fp2) { | if (fp1 <= fp2) { | ||||
return fp1; | return fp1; | ||||
} else { | } else { | ||||
@@ -14,7 +14,7 @@ | |||||
* limitations under the License. | * limitations under the License. | ||||
*/ | */ | ||||
#include "model/ge_model.h" | |||||
#include "common/model/ge_model.h" | |||||
#include <utility> | #include <utility> | ||||
#include "framework/common/debug/log.h" | #include "framework/common/debug/log.h" | ||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" |
@@ -31,7 +31,7 @@ | |||||
namespace ge { | namespace ge { | ||||
const uint32_t INVALID_MODEL_ID = 0xFFFFFFFFUL; | const uint32_t INVALID_MODEL_ID = 0xFFFFFFFFUL; | ||||
class GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY GeModel : public AttrHolder { | |||||
class GeModel : public AttrHolder { | |||||
public: | public: | ||||
GeModel(); | GeModel(); | ||||
~GeModel() = default; | ~GeModel() = default; | ||||
@@ -82,13 +82,13 @@ class GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY GeModel : public AttrHolder | |||||
private: | private: | ||||
void Init(); | void Init(); | ||||
ProtoAttrMapHelper attrs_; | |||||
ProtoAttrMapHelper attrs_; /*lint !e148*/ | |||||
Graph graph_; | Graph graph_; | ||||
std::shared_ptr<domi::ModelTaskDef> task_; | |||||
TBEKernelStore tbe_kernal_store_; | |||||
CustAICPUKernelStore cust_aicpu_kernal_store_; | |||||
Buffer weights_buffer_; | |||||
std::shared_ptr<domi::ModelTaskDef> task_; /*lint !e148*/ | |||||
TBEKernelStore tbe_kernal_store_; /*lint !e148*/ | |||||
CustAICPUKernelStore cust_aicpu_kernal_store_; /*lint !e148*/ | |||||
Buffer weights_buffer_; /*lint !e148*/ | |||||
std::string name_; | std::string name_; | ||||
uint32_t version_ = {0}; | uint32_t version_ = {0}; |
@@ -14,8 +14,9 @@ | |||||
* limitations under the License. | * limitations under the License. | ||||
*/ | */ | ||||
#include "model/ge_root_model.h" | |||||
#include "common/model/ge_root_model.h" | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
namespace ge { | namespace ge { | ||||
void GeRootModel::SetSubgraphInstanceNameToModel(string instance_name, GeModelPtr ge_model) { | void GeRootModel::SetSubgraphInstanceNameToModel(string instance_name, GeModelPtr ge_model) { | ||||
subgraph_instance_name_to_model_.insert(std::pair<string, GeModelPtr>(instance_name, ge_model)); | subgraph_instance_name_to_model_.insert(std::pair<string, GeModelPtr>(instance_name, ge_model)); |
@@ -15,7 +15,7 @@ | |||||
*/ | */ | ||||
#include <map> | #include <map> | ||||
#include "graph/compute_graph.h" | #include "graph/compute_graph.h" | ||||
#include "model/ge_model.h" | |||||
#include "common/model/ge_model.h" | |||||
#ifndef GE_MODEL_GE_ROOT_MODEL_H_ | #ifndef GE_MODEL_GE_ROOT_MODEL_H_ | ||||
#define GE_MODEL_GE_ROOT_MODEL_H_ | #define GE_MODEL_GE_ROOT_MODEL_H_ |
@@ -23,12 +23,10 @@ | |||||
#include "framework/common/helper/model_helper.h" | #include "framework/common/helper/model_helper.h" | ||||
namespace ge { | namespace ge { | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ModelParserBase::ModelParserBase() {} | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ModelParserBase::~ModelParserBase() {} | |||||
ModelParserBase::ModelParserBase() {} | |||||
ModelParserBase::~ModelParserBase() {} | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelParserBase::LoadFromFile(const char *model_path, | |||||
int32_t priority, | |||||
ge::ModelData &model_data) { | |||||
Status ModelParserBase::LoadFromFile(const char *model_path, int32_t priority, ge::ModelData &model_data) { | |||||
std::string real_path = RealPath(model_path); | std::string real_path = RealPath(model_path); | ||||
if (real_path.empty()) { | if (real_path.empty()) { | ||||
GELOGE(ACL_ERROR_GE_EXEC_MODEL_PATH_INVALID, "[Check][Param]Model file path %s is invalid", | GELOGE(ACL_ERROR_GE_EXEC_MODEL_PATH_INVALID, "[Check][Param]Model file path %s is invalid", | ||||
@@ -81,9 +79,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelParserBase::LoadFro | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelParserBase::ParseModelContent(const ge::ModelData &model, | |||||
uint8_t *&model_data, | |||||
uint32_t &model_len) { | |||||
Status ModelParserBase::ParseModelContent(const ge::ModelData &model, uint8_t *&model_data, uint32_t &model_len) { | |||||
// Parameter validity check | // Parameter validity check | ||||
GE_CHECK_NOTNULL(model.model_data); | GE_CHECK_NOTNULL(model.model_data); | ||||
@@ -29,8 +29,7 @@ | |||||
namespace ge { | namespace ge { | ||||
const uint32_t kInteval = 2; | const uint32_t kInteval = 2; | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelSaver::SaveJsonToFile(const char *file_path, | |||||
const Json &model) { | |||||
Status ModelSaver::SaveJsonToFile(const char *file_path, const Json &model) { | |||||
Status ret = SUCCESS; | Status ret = SUCCESS; | ||||
if (file_path == nullptr || SUCCESS != CheckPath(file_path)) { | if (file_path == nullptr || SUCCESS != CheckPath(file_path)) { | ||||
GELOGE(FAILED, "[Check][OutputFile]Failed, file %s", file_path); | GELOGE(FAILED, "[Check][OutputFile]Failed, file %s", file_path); | ||||
@@ -14,7 +14,7 @@ | |||||
* limitations under the License. | * limitations under the License. | ||||
*/ | */ | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/utils/graph_utils.h" | #include "graph/utils/graph_utils.h" | ||||
@@ -59,8 +59,8 @@ Status SetStreamLabel(const ge::NodePtr &node, const std::string &label) { | |||||
if (!AttrUtils::SetStr(tmp_desc, ge::ATTR_NAME_STREAM_LABEL, label)) { | if (!AttrUtils::SetStr(tmp_desc, ge::ATTR_NAME_STREAM_LABEL, label)) { | ||||
REPORT_INNER_ERROR("E19999", "Set Attr:%s fail for op:%s(%s)", ATTR_NAME_STREAM_LABEL.c_str(), | REPORT_INNER_ERROR("E19999", "Set Attr:%s fail for op:%s(%s)", ATTR_NAME_STREAM_LABEL.c_str(), | ||||
node->GetName().c_str(), node->GetType().c_str()); | node->GetName().c_str(), node->GetType().c_str()); | ||||
GELOGE(FAILED, "[Set][Attr] %s fail for op:%s(%s)", ATTR_NAME_STREAM_LABEL.c_str(), | |||||
node->GetName().c_str(), node->GetType().c_str()); | |||||
GELOGE(FAILED, "[Set][Attr] %s fail for op:%s(%s)", ATTR_NAME_STREAM_LABEL.c_str(), node->GetName().c_str(), | |||||
node->GetType().c_str()); | |||||
return FAILED; | return FAILED; | ||||
} | } | ||||
@@ -100,8 +100,8 @@ Status SetActiveLabelList(const ge::NodePtr &node, const std::vector<std::string | |||||
if (!AttrUtils::SetListStr(tmp_desc, ge::ATTR_NAME_ACTIVE_LABEL_LIST, active_label_list)) { | if (!AttrUtils::SetListStr(tmp_desc, ge::ATTR_NAME_ACTIVE_LABEL_LIST, active_label_list)) { | ||||
REPORT_INNER_ERROR("E19999", "Set Attr:%s fail for op:%s(%s)", ATTR_NAME_ACTIVE_LABEL_LIST.c_str(), | REPORT_INNER_ERROR("E19999", "Set Attr:%s fail for op:%s(%s)", ATTR_NAME_ACTIVE_LABEL_LIST.c_str(), | ||||
node->GetName().c_str(), node->GetType().c_str()); | node->GetName().c_str(), node->GetType().c_str()); | ||||
GELOGE(FAILED, "[Set][Attr] %s fail for op:%s(%s)", ATTR_NAME_ACTIVE_LABEL_LIST.c_str(), | |||||
node->GetName().c_str(), node->GetType().c_str()); | |||||
GELOGE(FAILED, "[Set][Attr] %s fail for op:%s(%s)", ATTR_NAME_ACTIVE_LABEL_LIST.c_str(), node->GetName().c_str(), | |||||
node->GetType().c_str()); | |||||
return FAILED; | return FAILED; | ||||
} | } | ||||
@@ -163,8 +163,8 @@ Status SetOriginalNodeName(const ge::NodePtr &node, const std::string &orig_name | |||||
if (!AttrUtils::SetStr(tmp_desc, ge::ATTR_NAME_ORIG_NODE_NAME, orig_name)) { | if (!AttrUtils::SetStr(tmp_desc, ge::ATTR_NAME_ORIG_NODE_NAME, orig_name)) { | ||||
REPORT_INNER_ERROR("E19999", "Set Attr:%s fail for op:%s(%s)", ATTR_NAME_ORIG_NODE_NAME.c_str(), | REPORT_INNER_ERROR("E19999", "Set Attr:%s fail for op:%s(%s)", ATTR_NAME_ORIG_NODE_NAME.c_str(), | ||||
node->GetName().c_str(), node->GetType().c_str()); | node->GetName().c_str(), node->GetType().c_str()); | ||||
GELOGE(FAILED, "[Set][Attr] %s fail for op:%s(%s)", ATTR_NAME_ORIG_NODE_NAME.c_str(), | |||||
node->GetName().c_str(), node->GetType().c_str()); | |||||
GELOGE(FAILED, "[Set][Attr] %s fail for op:%s(%s)", ATTR_NAME_ORIG_NODE_NAME.c_str(), node->GetName().c_str(), | |||||
node->GetType().c_str()); | |||||
return FAILED; | return FAILED; | ||||
} | } | ||||
@@ -207,8 +207,8 @@ Status SetNextIteration(const NodePtr &node, const NodePtr &next) { | |||||
if (!AttrUtils::SetStr(op_desc, ATTR_NAME_NEXT_ITERATION, name)) { | if (!AttrUtils::SetStr(op_desc, ATTR_NAME_NEXT_ITERATION, name)) { | ||||
REPORT_INNER_ERROR("E19999", "Set Attr:%s fail for op:%s(%s)", ATTR_NAME_NEXT_ITERATION.c_str(), | REPORT_INNER_ERROR("E19999", "Set Attr:%s fail for op:%s(%s)", ATTR_NAME_NEXT_ITERATION.c_str(), | ||||
op_desc->GetName().c_str(), op_desc->GetType().c_str()); | op_desc->GetName().c_str(), op_desc->GetType().c_str()); | ||||
GELOGE(FAILED, "[Set][Attr] %s fail for op:%s(%s)", ATTR_NAME_NEXT_ITERATION.c_str(), | |||||
op_desc->GetName().c_str(), op_desc->GetType().c_str()); | |||||
GELOGE(FAILED, "[Set][Attr] %s fail for op:%s(%s)", ATTR_NAME_NEXT_ITERATION.c_str(), op_desc->GetName().c_str(), | |||||
op_desc->GetType().c_str()); | |||||
return FAILED; | return FAILED; | ||||
} | } | ||||
return SUCCESS; | return SUCCESS; | ||||
@@ -290,8 +290,8 @@ void SetControlFlowGroup(const NodePtr &node, int64_t group) { | |||||
if (!AttrUtils::SetInt(op_desc, ATTR_NAME_CONTROL_FLOW_GROUP, group)) { | if (!AttrUtils::SetInt(op_desc, ATTR_NAME_CONTROL_FLOW_GROUP, group)) { | ||||
REPORT_INNER_ERROR("E19999", "Set Attr:%s fail for op:%s(%s)", ATTR_NAME_CONTROL_FLOW_GROUP.c_str(), | REPORT_INNER_ERROR("E19999", "Set Attr:%s fail for op:%s(%s)", ATTR_NAME_CONTROL_FLOW_GROUP.c_str(), | ||||
node->GetName().c_str(), node->GetType().c_str()); | node->GetName().c_str(), node->GetType().c_str()); | ||||
GELOGE(FAILED, "[Set][Attr] %s fail for op:%s(%s)", ATTR_NAME_CONTROL_FLOW_GROUP.c_str(), | |||||
node->GetName().c_str(), node->GetType().c_str()); | |||||
GELOGE(FAILED, "[Set][Attr] %s fail for op:%s(%s)", ATTR_NAME_CONTROL_FLOW_GROUP.c_str(), node->GetName().c_str(), | |||||
node->GetType().c_str()); | |||||
} | } | ||||
} | } | ||||
} // namespace ge | } // namespace ge |
@@ -77,37 +77,33 @@ DEFINE_SET_ATTR_VALUE_LIST(const std::string &, s); | |||||
} \ | } \ | ||||
} while (0); | } while (0); | ||||
#define DEFINE_ADD_ATTR_VALUE(KEY_TYPE, VALUE_TYPE) \ | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void AddOpAttr(KEY_TYPE map_key, VALUE_TYPE value, OpDef *op_def) { \ | |||||
GE_CHECK_NOTNULL_JUST_RETURN(op_def); \ | |||||
auto attr = op_def->mutable_attr(); \ | |||||
ADD_TO_ATTR_MAP(map_key, value, attr) \ | |||||
} \ | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void AddOpAttr(KEY_TYPE map_key, VALUE_TYPE value, \ | |||||
AttrDefMap *attr_map) { \ | |||||
ADD_TO_ATTR_MAP(map_key, value, attr_map) \ | |||||
} \ | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void AddModelAttr(KEY_TYPE map_key, VALUE_TYPE value, \ | |||||
ModelDef *model_def) { \ | |||||
GE_CHECK_NOTNULL_JUST_RETURN(model_def); \ | |||||
auto attr = model_def->mutable_attr(); \ | |||||
ADD_TO_ATTR_MAP(map_key, value, attr) \ | |||||
#define DEFINE_ADD_ATTR_VALUE(KEY_TYPE, VALUE_TYPE) \ | |||||
void AddOpAttr(KEY_TYPE map_key, VALUE_TYPE value, OpDef *op_def) { \ | |||||
GE_CHECK_NOTNULL_JUST_RETURN(op_def); \ | |||||
auto attr = op_def->mutable_attr(); \ | |||||
ADD_TO_ATTR_MAP(map_key, value, attr) \ | |||||
} \ | |||||
void AddOpAttr(KEY_TYPE map_key, VALUE_TYPE value, AttrDefMap *attr_map) { \ | |||||
ADD_TO_ATTR_MAP(map_key, value, attr_map) \ | |||||
} \ | |||||
void AddModelAttr(KEY_TYPE map_key, VALUE_TYPE value, ModelDef *model_def) { \ | |||||
GE_CHECK_NOTNULL_JUST_RETURN(model_def); \ | |||||
auto attr = model_def->mutable_attr(); \ | |||||
ADD_TO_ATTR_MAP(map_key, value, attr) \ | |||||
} | } | ||||
#define DEFINE_ADD_ATTR_VALUE_LIST(KEY_TYPE, VALUE_TYPE) \ | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void AddOpAttrList(KEY_TYPE map_key, VALUE_TYPE value, \ | |||||
OpDef *op_def) { \ | |||||
GE_CHECK_NOTNULL_JUST_RETURN(op_def); \ | |||||
auto attr = op_def->mutable_attr(); \ | |||||
ADD_TO_ATTR_MAP_LIST(map_key, value, attr) \ | |||||
} \ | |||||
FMK_FUNC_DEV_VISIBILITY void AddOpAttrList(KEY_TYPE map_key, VALUE_TYPE value, AttrDefMap *attr_map) { \ | |||||
ADD_TO_ATTR_MAP_LIST(map_key, value, attr_map) \ | |||||
} \ | |||||
FMK_FUNC_DEV_VISIBILITY void AddModelAttrList(KEY_TYPE map_key, VALUE_TYPE value, ModelDef *model_def) { \ | |||||
GE_CHECK_NOTNULL_JUST_RETURN(model_def); \ | |||||
auto attr = model_def->mutable_attr(); \ | |||||
ADD_TO_ATTR_MAP_LIST(map_key, value, attr) \ | |||||
#define DEFINE_ADD_ATTR_VALUE_LIST(KEY_TYPE, VALUE_TYPE) \ | |||||
void AddOpAttrList(KEY_TYPE map_key, VALUE_TYPE value, OpDef *op_def) { \ | |||||
GE_CHECK_NOTNULL_JUST_RETURN(op_def); \ | |||||
auto attr = op_def->mutable_attr(); \ | |||||
ADD_TO_ATTR_MAP_LIST(map_key, value, attr) \ | |||||
} \ | |||||
void AddOpAttrList(KEY_TYPE map_key, VALUE_TYPE value, AttrDefMap *attr_map) { \ | |||||
ADD_TO_ATTR_MAP_LIST(map_key, value, attr_map)} FMK_FUNC_DEV_VISIBILITY void \ | |||||
AddModelAttrList(KEY_TYPE map_key, VALUE_TYPE value, ModelDef *model_def) { \ | |||||
GE_CHECK_NOTNULL_JUST_RETURN(model_def); \ | |||||
auto attr = model_def->mutable_attr(); \ | |||||
ADD_TO_ATTR_MAP_LIST(map_key, value, attr) \ | |||||
} | } | ||||
DEFINE_ADD_ATTR_VALUE(const std::string &, const std::string &); | DEFINE_ADD_ATTR_VALUE(const std::string &, const std::string &); | ||||
@@ -127,46 +123,42 @@ DEFINE_ADD_ATTR_VALUE_LIST(const std::string &, const bool); | |||||
DEFINE_ADD_ATTR_VALUE_LIST(const std::string &, const int64_t); | DEFINE_ADD_ATTR_VALUE_LIST(const std::string &, const int64_t); | ||||
DEFINE_ADD_ATTR_VALUE_LIST(const std::string &, const std::string &); | DEFINE_ADD_ATTR_VALUE_LIST(const std::string &, const std::string &); | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void AddOpAttr(const std::string &map_key, AttrDef &attr, | |||||
OpDef *op_def) { | |||||
void AddOpAttr(const std::string &map_key, AttrDef &attr, OpDef *op_def) { | |||||
GE_CHECK_NOTNULL_JUST_RETURN(op_def); | GE_CHECK_NOTNULL_JUST_RETURN(op_def); | ||||
GE_CHECK_NOTNULL_JUST_RETURN(op_def->mutable_attr()); | GE_CHECK_NOTNULL_JUST_RETURN(op_def->mutable_attr()); | ||||
(void)op_def->mutable_attr()->insert(AttrDefPair(map_key, attr)); | (void)op_def->mutable_attr()->insert(AttrDefPair(map_key, attr)); | ||||
} | } | ||||
#define DEFINE_GET_ATTR_VALUE(ARG_TYPE_KEY, ARG_TYPE_VALUE, FIELD) \ | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool GetAttrDefValue(ARG_TYPE_KEY map_key, ARG_TYPE_VALUE value, \ | |||||
const AttrDefMap &attr) { \ | |||||
auto it = attr.find(map_key); \ | |||||
if (it != attr.end()) { \ | |||||
*value = it->second.FIELD(); \ | |||||
return true; \ | |||||
} \ | |||||
return false; \ | |||||
#define DEFINE_GET_ATTR_VALUE(ARG_TYPE_KEY, ARG_TYPE_VALUE, FIELD) \ | |||||
bool GetAttrDefValue(ARG_TYPE_KEY map_key, ARG_TYPE_VALUE value, const AttrDefMap &attr) { \ | |||||
auto it = attr.find(map_key); \ | |||||
if (it != attr.end()) { \ | |||||
*value = it->second.FIELD(); \ | |||||
return true; \ | |||||
} \ | |||||
return false; \ | |||||
} | } | ||||
#define DEFINE_GET_ATTR_POINT_REF(ARG_TYPE_KEY, ARG_TYPE_VALUE, FIELD) \ | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool GetAttrDefValue(ARG_TYPE_KEY map_key, ARG_TYPE_VALUE *&value, \ | |||||
AttrDefMap *attr) { \ | |||||
GE_RT_FALSE_CHECK_NOTNULL(attr); \ | |||||
auto it = attr->find(map_key); \ | |||||
if (it != attr->end()) { \ | |||||
value = it->second.mutable_##FIELD(); \ | |||||
return true; \ | |||||
} \ | |||||
return false; \ | |||||
#define DEFINE_GET_ATTR_POINT_REF(ARG_TYPE_KEY, ARG_TYPE_VALUE, FIELD) \ | |||||
bool GetAttrDefValue(ARG_TYPE_KEY map_key, ARG_TYPE_VALUE *&value, AttrDefMap *attr) { \ | |||||
GE_RT_FALSE_CHECK_NOTNULL(attr); \ | |||||
auto it = attr->find(map_key); \ | |||||
if (it != attr->end()) { \ | |||||
value = it->second.mutable_##FIELD(); \ | |||||
return true; \ | |||||
} \ | |||||
return false; \ | |||||
} | } | ||||
#define DEFINE_GET_ATTR_CONST_POINT_REF(ARG_TYPE_KEY, ARG_TYPE_VALUE, FIELD) \ | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool GetAttrDefValue( \ | |||||
ARG_TYPE_KEY map_key, const ARG_TYPE_VALUE *&value, const AttrDefMap &attr) { \ | |||||
auto it = attr.find(map_key); \ | |||||
if (it == attr.end()) { \ | |||||
return false; \ | |||||
} \ | |||||
\ | |||||
value = &(it->second.FIELD()); \ | |||||
return true; \ | |||||
#define DEFINE_GET_ATTR_CONST_POINT_REF(ARG_TYPE_KEY, ARG_TYPE_VALUE, FIELD) \ | |||||
bool GetAttrDefValue(ARG_TYPE_KEY map_key, const ARG_TYPE_VALUE *&value, const AttrDefMap &attr) { \ | |||||
auto it = attr.find(map_key); \ | |||||
if (it == attr.end()) { \ | |||||
return false; \ | |||||
} \ | |||||
\ | |||||
value = &(it->second.FIELD()); \ | |||||
return true; \ | |||||
} | } | ||||
#define DEFINE_GET_BYTES_ATTR_VALUE(ARG_TYPE_KEY, ARG_TYPE_VALUE) \ | #define DEFINE_GET_BYTES_ATTR_VALUE(ARG_TYPE_KEY, ARG_TYPE_VALUE) \ | ||||
@@ -216,16 +208,14 @@ DEFINE_GET_ATTR_CONST_POINT_REF(const std::string &, NamedAttrs, func); | |||||
DEFINE_GET_BYTES_ATTR_VALUE(const std::string &, std::string *); | DEFINE_GET_BYTES_ATTR_VALUE(const std::string &, std::string *); | ||||
#define DEFINE_GET_OP_ATTR(ARG_TYPE_KEY, ARG_TYPE_VALUE) \ | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool GetOpAttr(ARG_TYPE_KEY map_key, ARG_TYPE_VALUE value, \ | |||||
const OpDef *op_def) { \ | |||||
GE_RT_FALSE_CHECK_NOTNULL(op_def); \ | |||||
return GetAttrDefValue(map_key, value, op_def->attr()); \ | |||||
} \ | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool GetModelAttr(ARG_TYPE_KEY map_key, ARG_TYPE_VALUE value, \ | |||||
const ModelDef *model_def) { \ | |||||
GE_RT_FALSE_CHECK_NOTNULL(model_def); \ | |||||
return GetAttrDefValue(map_key, value, model_def->attr()); \ | |||||
#define DEFINE_GET_OP_ATTR(ARG_TYPE_KEY, ARG_TYPE_VALUE) \ | |||||
bool GetOpAttr(ARG_TYPE_KEY map_key, ARG_TYPE_VALUE value, const OpDef *op_def) { \ | |||||
GE_RT_FALSE_CHECK_NOTNULL(op_def); \ | |||||
return GetAttrDefValue(map_key, value, op_def->attr()); \ | |||||
} \ | |||||
bool GetModelAttr(ARG_TYPE_KEY map_key, ARG_TYPE_VALUE value, const ModelDef *model_def) { \ | |||||
GE_RT_FALSE_CHECK_NOTNULL(model_def); \ | |||||
return GetAttrDefValue(map_key, value, model_def->attr()); \ | |||||
} | } | ||||
DEFINE_GET_OP_ATTR(const std::string &, std::string *); | DEFINE_GET_OP_ATTR(const std::string &, std::string *); | ||||
@@ -238,8 +228,7 @@ DEFINE_GET_OP_ATTR(const std::string &, bool *); | |||||
DEFINE_GET_OP_ATTR(const std::string &, AttrDef_ListValue *); | DEFINE_GET_OP_ATTR(const std::string &, AttrDef_ListValue *); | ||||
#define DEFINE_GET_BT_ATTR(ARG_TYPE_KEY, ARG_TYPE_VALUE) \ | #define DEFINE_GET_BT_ATTR(ARG_TYPE_KEY, ARG_TYPE_VALUE) \ | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool GetBytesAttr(ARG_TYPE_KEY key, ARG_TYPE_VALUE value, \ | |||||
const OpDef *op_def) { \ | |||||
bool GetBytesAttr(ARG_TYPE_KEY key, ARG_TYPE_VALUE value, const OpDef *op_def) { \ | |||||
GE_RT_FALSE_CHECK_NOTNULL(op_def); \ | GE_RT_FALSE_CHECK_NOTNULL(op_def); \ | ||||
return GetBytesValue(key, value, op_def->attr()); \ | return GetBytesValue(key, value, op_def->attr()); \ | ||||
} \ | } \ | ||||
@@ -250,7 +239,7 @@ DEFINE_GET_OP_ATTR(const std::string &, AttrDef_ListValue *); | |||||
DEFINE_GET_BT_ATTR(const std::string &, std::string *); | DEFINE_GET_BT_ATTR(const std::string &, std::string *); | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool HasOpAttr(const OpDef *op_def, const std::string &attr_name) { | |||||
bool HasOpAttr(const OpDef *op_def, const std::string &attr_name) { | |||||
if (op_def == nullptr) { | if (op_def == nullptr) { | ||||
return false; | return false; | ||||
} | } | ||||
@@ -263,8 +252,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool HasOpAttr(const OpDef *op_ | |||||
return false; | return false; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void AddModelAttr(const std::string &map_key, const void *value, | |||||
size_t size, ModelDef *model_def) { | |||||
void AddModelAttr(const std::string &map_key, const void *value, size_t size, ModelDef *model_def) { | |||||
if (model_def == nullptr) { | if (model_def == nullptr) { | ||||
return; | return; | ||||
} | } | ||||
@@ -280,8 +268,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void AddModelAttr(const std::st | |||||
} | } | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void AddOpBytesAttr(const std::string &key, const void *value, | |||||
size_t size, OpDef *op_def) { | |||||
void AddOpBytesAttr(const std::string &key, const void *value, size_t size, OpDef *op_def) { | |||||
if (op_def == nullptr) { | if (op_def == nullptr) { | ||||
return; | return; | ||||
} | } | ||||
@@ -115,8 +115,7 @@ const int NORMAL_TENSOR_SIZE = 4; | |||||
#define AIPP_CONVERT_LIST_FLOAT(KEY, REQUIRED) AIPP_CONVERT_LIST_FORMAT(KEY, float, REQUIRED, GeAttrValue::FLOAT) | #define AIPP_CONVERT_LIST_FLOAT(KEY, REQUIRED) AIPP_CONVERT_LIST_FORMAT(KEY, float, REQUIRED, GeAttrValue::FLOAT) | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status | |||||
OpUtils::ConvertAippParams(const GeAttrValue::NAMED_ATTRS &aipp_attr, domi::AippOpParams *aipp_params) { | |||||
Status OpUtils::ConvertAippParams(const GeAttrValue::NAMED_ATTRS &aipp_attr, domi::AippOpParams *aipp_params) { | |||||
GE_CHECK_NOTNULL(aipp_params); | GE_CHECK_NOTNULL(aipp_params); | ||||
AIPP_CONVERT_FORMAT_EX(aipp_mode, domi::AippOpParams::AippMode, int32_t, GeAttrValue::INT); | AIPP_CONVERT_FORMAT_EX(aipp_mode, domi::AippOpParams::AippMode, int32_t, GeAttrValue::INT); | ||||
AIPP_CONVERT_INT(related_input_rank); | AIPP_CONVERT_INT(related_input_rank); | ||||
@@ -178,8 +177,7 @@ OpUtils::ConvertAippParams(const GeAttrValue::NAMED_ATTRS &aipp_attr, domi::Aipp | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OpUtils::TransferDim(const std::vector<int64_t> &dim, | |||||
std::vector<int64_t> &dim_vector) { | |||||
Status OpUtils::TransferDim(const std::vector<int64_t> &dim, std::vector<int64_t> &dim_vector) { | |||||
size_t input_shape_size = dim.size(); | size_t input_shape_size = dim.size(); | ||||
std::list<uint32_t> new_dim_list; | std::list<uint32_t> new_dim_list; | ||||
for (auto dim_temp : dim) { | for (auto dim_temp : dim) { | ||||
@@ -301,9 +299,9 @@ Status OpUtils::SetOutputSliceDataByDataType(void *data, int64_t data_size, cons | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OpUtils::SetOutputSliceData( | |||||
void *data, int64_t data_size, int32_t data_type, std::vector<int64_t> &input_dims, std::vector<int64_t> &begin, | |||||
std::vector<int64_t> &output_dims, GeTensor *output, std::vector<int64_t> &stride) { | |||||
Status OpUtils::SetOutputSliceData(void *data, int64_t data_size, int32_t data_type, std::vector<int64_t> &input_dims, | |||||
std::vector<int64_t> &begin, std::vector<int64_t> &output_dims, GeTensor *output, | |||||
std::vector<int64_t> &stride) { | |||||
if (data == nullptr || output == nullptr) { | if (data == nullptr || output == nullptr) { | ||||
GELOGE(PARAM_INVALID, "[Check][Param]Input param is nullptr"); | GELOGE(PARAM_INVALID, "[Check][Param]Input param is nullptr"); | ||||
REPORT_INNER_ERROR("E19999", "Input param is nullptr"); | REPORT_INNER_ERROR("E19999", "Input param is nullptr"); | ||||
@@ -352,9 +350,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OpUtils::SetOutputSliceD | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void OpUtils::TransDataHWCK2KCHW(const void *input, int64_t h, | |||||
int64_t w, int64_t c, int64_t k, | |||||
void **output) { | |||||
void OpUtils::TransDataHWCK2KCHW(const void *input, int64_t h, int64_t w, int64_t c, int64_t k, void **output) { | |||||
if (input == nullptr) { | if (input == nullptr) { | ||||
return; | return; | ||||
} | } | ||||
@@ -386,9 +382,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void OpUtils::TransDataHWCK2KCH | |||||
*output = buf; | *output = buf; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void OpUtils::TransDataKCHW2HWCK(const void *input, int64_t k, | |||||
int64_t c, int64_t h, int64_t w, | |||||
void *output) { | |||||
void OpUtils::TransDataKCHW2HWCK(const void *input, int64_t k, int64_t c, int64_t h, int64_t w, void *output) { | |||||
if ((input == nullptr) || (output == nullptr)) { | if ((input == nullptr) || (output == nullptr)) { | ||||
GELOGD("%s[%d]: input param is nullptr.", __FILE__, __LINE__); | GELOGD("%s[%d]: input param is nullptr.", __FILE__, __LINE__); | ||||
return; | return; | ||||
@@ -417,31 +411,22 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void OpUtils::TransDataKCHW2HWC | |||||
vector<ConstGeTensorPtr> OpUtils::GetWeights(const ge::Node &node) { return OpDescUtils::GetWeights(node); } | vector<ConstGeTensorPtr> OpUtils::GetWeights(const ge::Node &node) { return OpDescUtils::GetWeights(node); } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY vector<ConstGeTensorPtr> OpUtils::GetWeights(ge::ConstNodePtr node) { | |||||
return OpDescUtils::GetWeights(node); | |||||
} | |||||
vector<ConstGeTensorPtr> OpUtils::GetWeights(ge::ConstNodePtr node) { return OpDescUtils::GetWeights(node); } | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY vector<GeTensorPtr> OpUtils::MutableWeights(const ge::Node &node) { | |||||
return OpDescUtils::MutableWeights(node); | |||||
} | |||||
vector<GeTensorPtr> OpUtils::MutableWeights(const ge::Node &node) { return OpDescUtils::MutableWeights(node); } | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY vector<GeTensorPtr> OpUtils::MutableWeights(const ge::NodePtr node) { | |||||
return OpDescUtils::MutableWeights(node); | |||||
} | |||||
vector<GeTensorPtr> OpUtils::MutableWeights(const ge::NodePtr node) { return OpDescUtils::MutableWeights(node); } | |||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OpUtils::SetWeights(ge::Node &node, | |||||
const vector<ge::GeTensorPtr> &weights) { | |||||
Status OpUtils::SetWeights(ge::Node &node, const vector<ge::GeTensorPtr> &weights) { | |||||
return OpDescUtils::SetWeights(node, weights); | return OpDescUtils::SetWeights(node, weights); | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status OpUtils::SetWeights(ge::NodePtr node, | |||||
const vector<ge::GeTensorPtr> &weights) { | |||||
Status OpUtils::SetWeights(ge::NodePtr node, const vector<ge::GeTensorPtr> &weights) { | |||||
return OpDescUtils::SetWeights(node, weights); | return OpDescUtils::SetWeights(node, weights); | ||||
} | } | ||||
// The caller guarantees that the input sensor is constant | // The caller guarantees that the input sensor is constant | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status | |||||
OpUtils::GetShapeDataFromConstTensor(const ConstGeTensorPtr &tensor, DataType type, std::vector<int64_t> &dims) { | |||||
Status OpUtils::GetShapeDataFromConstTensor(const ConstGeTensorPtr &tensor, DataType type, std::vector<int64_t> &dims) { | |||||
if (tensor == nullptr) { | if (tensor == nullptr) { | ||||
GELOGE(PARAM_INVALID, "[Check][Param]Input tensor is nullptr"); | GELOGE(PARAM_INVALID, "[Check][Param]Input tensor is nullptr"); | ||||
REPORT_INNER_ERROR("E19999", "Input tensor is nullptr"); | REPORT_INNER_ERROR("E19999", "Input tensor is nullptr"); | ||||
@@ -23,7 +23,7 @@ | |||||
#include "graph/ge_context.h" | #include "graph/ge_context.h" | ||||
#include "init/gelib.h" | #include "init/gelib.h" | ||||
#include "framework/common/ge_inner_error_codes.h" | #include "framework/common/ge_inner_error_codes.h" | ||||
#include "model/ge_model.h" | |||||
#include "common/model/ge_model.h" | |||||
#include "framework/omg/omg_inner_types.h" | #include "framework/omg/omg_inner_types.h" | ||||
namespace { | namespace { | ||||
@@ -77,12 +77,12 @@ ProfilingManager::ProfilingManager() | |||||
ProfilingManager::~ProfilingManager() {} | ProfilingManager::~ProfilingManager() {} | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ProfilingManager &ProfilingManager::Instance() { | |||||
ProfilingManager &ProfilingManager::Instance() { | |||||
static ProfilingManager profiling_manager; | static ProfilingManager profiling_manager; | ||||
return profiling_manager; | return profiling_manager; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ge::Status ProfilingManager::Init(const Options &options) { | |||||
ge::Status ProfilingManager::Init(const Options &options) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
vector<int32_t>().swap(device_id_); | vector<int32_t>().swap(device_id_); | ||||
subscribe_count_ = 0; | subscribe_count_ = 0; | ||||
@@ -221,7 +221,7 @@ ge::Status ProfilingManager::ParseOptions(const std::string &options) { | |||||
return ge::SUCCESS; | return ge::SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::StopProfiling() { | |||||
void ProfilingManager::StopProfiling() { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
uint64_t module = GetProfilingModule(); | uint64_t module = GetProfilingModule(); | ||||
// The following if case will not be executed in normal case, inc case of ProfStopProfiling is abnormal | // The following if case will not be executed in normal case, inc case of ProfStopProfiling is abnormal | ||||
@@ -259,8 +259,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::StopProf | |||||
#endif | #endif | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::ProfilingOpInputOutInfo( | |||||
const TaskDescInfo &task, Json &task_json) { | |||||
void ProfilingManager::ProfilingOpInputOutInfo(const TaskDescInfo &task, Json &task_json) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
for (size_t i = 0; i < task.input_format.size(); i++) { | for (size_t i = 0; i < task.input_format.size(); i++) { | ||||
Json tmp_input; | Json tmp_input; | ||||
@@ -286,8 +285,8 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::Profilin | |||||
#endif | #endif | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::ProfilingTaskDescInfo( | |||||
uint32_t model_id, const std::vector<TaskDescInfo> &task_desc_info, const int32_t &device_id) { | |||||
void ProfilingManager::ProfilingTaskDescInfo(uint32_t model_id, const std::vector<TaskDescInfo> &task_desc_info, | |||||
const int32_t &device_id) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
for (const auto &task : task_desc_info) { | for (const auto &task : task_desc_info) { | ||||
Json task_info; | Json task_info; | ||||
@@ -324,8 +323,8 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::Profilin | |||||
#endif | #endif | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfileStepInfo( | |||||
uint64_t index_id, uint64_t model_id, uint16_t tag_id, rtStream_t stream, int32_t device_id) { | |||||
Status ProfilingManager::ProfileStepInfo(uint64_t index_id, uint64_t model_id, uint16_t tag_id, rtStream_t stream, | |||||
int32_t device_id) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
if (!is_load_profiling_ && subscribe_count_ == 0) { | if (!is_load_profiling_ && subscribe_count_ == 0) { | ||||
GELOGD("Profiling is not turned on, no need to profile step info."); | GELOGD("Profiling is not turned on, no need to profile step info."); | ||||
@@ -385,8 +384,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::Profil | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::ReportData( | |||||
const int32_t &device_id, const string &data, const string &tag_name) { | |||||
void ProfilingManager::ReportData(const int32_t &device_id, const string &data, const string &tag_name) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
ReporterData reporter_data{}; | ReporterData reporter_data{}; | ||||
int ret = -1; | int ret = -1; | ||||
@@ -426,8 +424,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::ReportDa | |||||
#endif | #endif | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::ReportProfilingData( | |||||
uint32_t model_id, const std::vector<TaskDescInfo> &task_desc_info) { | |||||
void ProfilingManager::ReportProfilingData(uint32_t model_id, const std::vector<TaskDescInfo> &task_desc_info) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
int32_t logic_device_id = 0; | int32_t logic_device_id = 0; | ||||
rtError_t rt_ret = rtGetDevice(&logic_device_id); | rtError_t rt_ret = rtGetDevice(&logic_device_id); | ||||
@@ -443,7 +440,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::ReportPr | |||||
#endif | #endif | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY uint64_t ProfilingManager::GetProfilingModule() { | |||||
uint64_t ProfilingManager::GetProfilingModule() { | |||||
uint64_t module = PROF_MODEL_EXECUTE_MASK | | uint64_t module = PROF_MODEL_EXECUTE_MASK | | ||||
PROF_RUNTIME_API_MASK | | PROF_RUNTIME_API_MASK | | ||||
PROF_RUNTIME_TRACE_MASK | | PROF_RUNTIME_TRACE_MASK | | ||||
@@ -485,8 +482,7 @@ void ProfilingManager::UpdateSubscribeDeviceModuleMap(std::string prof_type, uin | |||||
#endif | #endif | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfModelSubscribe( | |||||
uint64_t module, void *model) { | |||||
Status ProfilingManager::ProfModelSubscribe(uint64_t module, void *model) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
uint64_t model_load_mask = module & PROF_MODEL_LOAD_MASK; | uint64_t model_load_mask = module & PROF_MODEL_LOAD_MASK; | ||||
@@ -526,8 +522,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfMo | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfModelUnsubscribe( | |||||
void *model) { | |||||
Status ProfilingManager::ProfModelUnsubscribe(void *model) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
if (subscribe_count_ == 0) { | if (subscribe_count_ == 0) { | ||||
@@ -568,7 +563,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfMo | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfInit(uint64_t module) { | |||||
Status ProfilingManager::ProfInit(uint64_t module) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
uint64_t model_load_mask = module & PROF_MODEL_LOAD_MASK; | uint64_t model_load_mask = module & PROF_MODEL_LOAD_MASK; | ||||
@@ -602,7 +597,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfIn | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfFinalize() { | |||||
Status ProfilingManager::ProfFinalize() { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
is_load_profiling_ = false; | is_load_profiling_ = false; | ||||
@@ -697,8 +692,8 @@ Status ProfilingManager::ProfParseDeviceId(const std::map<std::string, std::stri | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
Status ProfilingManager::ProfParseParam(const std::map<std::string, std::string> &config_para, | |||||
int32_t &device_num, vector<int32_t> &device_list) { | |||||
Status ProfilingManager::ProfParseParam(const std::map<std::string, std::string> &config_para, int32_t &device_num, | |||||
vector<int32_t> &device_list) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
// device num | // device num | ||||
auto iter = config_para.find(kConfigNumsdev); | auto iter = config_para.find(kConfigNumsdev); | ||||
@@ -747,8 +742,7 @@ Status ProfilingManager::ProfParseParam(const std::map<std::string, std::string> | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfStartProfiling( | |||||
uint64_t module, const std::map<std::string, std::string> &config_para) { | |||||
Status ProfilingManager::ProfStartProfiling(uint64_t module, const std::map<std::string, std::string> &config_para) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
uint64_t training_trace_mask = module & PROF_TRAINING_TRACE_MASK; | uint64_t training_trace_mask = module & PROF_TRAINING_TRACE_MASK; | ||||
@@ -803,8 +797,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfSt | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfStopProfiling(uint64_t module, | |||||
const std::map<std::string, std::string> &config_para) { | |||||
Status ProfilingManager::ProfStopProfiling(uint64_t module, const std::map<std::string, std::string> &config_para) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
int32_t device_num = 0; | int32_t device_num = 0; | ||||
@@ -855,8 +848,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::ProfSt | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::UpdateDeviceIdModuleMap(string prof_type, | |||||
uint64_t module, const vector<int32_t> &device_list) { | |||||
void ProfilingManager::UpdateDeviceIdModuleMap(string prof_type, uint64_t module, const vector<int32_t> &device_list) { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
if (prof_type == kProfStart) { | if (prof_type == kProfStart) { | ||||
for (uint32_t i = 0; i < device_list.size(); i++) { | for (uint32_t i = 0; i < device_list.size(); i++) { | ||||
@@ -886,7 +878,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::UpdateDe | |||||
#endif | #endif | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool ProfilingManager::ProfilingModelExecuteOn() const { | |||||
bool ProfilingManager::ProfilingModelExecuteOn() const { | |||||
int32_t logic_device_id = 0; | int32_t logic_device_id = 0; | ||||
rtError_t rt_ret = rtGetDevice(&logic_device_id); | rtError_t rt_ret = rtGetDevice(&logic_device_id); | ||||
if (rt_ret != RT_ERROR_NONE) { | if (rt_ret != RT_ERROR_NONE) { | ||||
@@ -904,7 +896,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool ProfilingManager::Profilin | |||||
return execute_model_prof_on; | return execute_model_prof_on; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::PluginInit() { | |||||
Status ProfilingManager::PluginInit() { | |||||
if (prof_cb_.msprofReporterCallback == nullptr) { | if (prof_cb_.msprofReporterCallback == nullptr) { | ||||
GELOGE(ge::PARAM_INVALID, "[Check][Param]MsprofReporterCallback callback is nullptr"); | GELOGE(ge::PARAM_INVALID, "[Check][Param]MsprofReporterCallback callback is nullptr"); | ||||
REPORT_INNER_ERROR("E19999", "MsprofReporterCallback callback is nullptr"); | REPORT_INNER_ERROR("E19999", "MsprofReporterCallback callback is nullptr"); | ||||
@@ -933,7 +925,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::Plugin | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::PluginUnInit() const { | |||||
void ProfilingManager::PluginUnInit() const { | |||||
#ifdef DAVINCI_SUPPORT_PROFILING | #ifdef DAVINCI_SUPPORT_PROFILING | ||||
if (prof_cb_.msprofReporterCallback == nullptr) { | if (prof_cb_.msprofReporterCallback == nullptr) { | ||||
GELOGE(ge::PARAM_INVALID, "[Check][Param]MsprofReporterCallback callback is nullptr"); | GELOGE(ge::PARAM_INVALID, "[Check][Param]MsprofReporterCallback callback is nullptr"); | ||||
@@ -950,8 +942,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::PluginUn | |||||
#endif | #endif | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ProfilingManager::CallMsprofReport( | |||||
ReporterData &reporter_data) const { | |||||
Status ProfilingManager::CallMsprofReport(ReporterData &reporter_data) const { | |||||
if (prof_cb_.msprofReporterCallback == nullptr) { | if (prof_cb_.msprofReporterCallback == nullptr) { | ||||
GELOGE(ge::PARAM_INVALID, "[Check][Param]MsprofReporterCallback callback is nullptr"); | GELOGE(ge::PARAM_INVALID, "[Check][Param]MsprofReporterCallback callback is nullptr"); | ||||
REPORT_INNER_ERROR("E19999", "MsprofReporterCallback callback is nullptr"); | REPORT_INNER_ERROR("E19999", "MsprofReporterCallback callback is nullptr"); | ||||
@@ -1007,14 +998,12 @@ void ProfilingManager::GetOpOutputInfo(const OpDescPtr &op, TaskDescInfo &task_d | |||||
task_desc_info.output_data_type = output_data_type.empty() ? data_type_default : output_data_type; | task_desc_info.output_data_type = output_data_type.empty() ? data_type_default : output_data_type; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::GetOpInputOutputInfo( | |||||
const OpDescPtr &op, TaskDescInfo &task_desc_info) const { | |||||
void ProfilingManager::GetOpInputOutputInfo(const OpDescPtr &op, TaskDescInfo &task_desc_info) const { | |||||
GetOpInputInfo(op, task_desc_info); | GetOpInputInfo(op, task_desc_info); | ||||
GetOpOutputInfo(op, task_desc_info); | GetOpOutputInfo(op, task_desc_info); | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::GetFpBpPoint( | |||||
std::string &fp_point, std::string &bp_point) { | |||||
void ProfilingManager::GetFpBpPoint(std::string &fp_point, std::string &bp_point) { | |||||
// Env or options mode, fp_point_/bp_point_ have initiliazed on profiling init | // Env or options mode, fp_point_/bp_point_ have initiliazed on profiling init | ||||
if (!fp_point_.empty() && !bp_point_.empty()) { | if (!fp_point_.empty() && !bp_point_.empty()) { | ||||
fp_point = fp_point_; | fp_point = fp_point_; | ||||
@@ -1025,7 +1014,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::GetFpBpP | |||||
} | } | ||||
// ProfApi mode and training trace is set | // ProfApi mode and training trace is set | ||||
// Parse options first | // Parse options first | ||||
char env_profiling_options[MSPROF_OPTIONS_DEF_LEN_MAX] = { 0x00 }; | |||||
char env_profiling_options[MSPROF_OPTIONS_DEF_LEN_MAX] = {0x00}; | |||||
bool is_profiling_valid = false; | bool is_profiling_valid = false; | ||||
std::string profiling_options; | std::string profiling_options; | ||||
if (ge::GetContext().GetOption(OPTION_EXEC_PROFILING_OPTIONS, profiling_options) == SUCCESS && | if (ge::GetContext().GetOption(OPTION_EXEC_PROFILING_OPTIONS, profiling_options) == SUCCESS && | ||||
@@ -73,7 +73,7 @@ struct MsprofCallback { | |||||
MsprofReporterCallback msprofReporterCallback; | MsprofReporterCallback msprofReporterCallback; | ||||
}; | }; | ||||
class FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ProfilingManager { | |||||
class ProfilingManager { | |||||
public: | public: | ||||
ProfilingManager(); | ProfilingManager(); | ||||
virtual ~ProfilingManager(); | virtual ~ProfilingManager(); | ||||
@@ -35,13 +35,13 @@ PropertiesManager::PropertiesManager() : is_inited_(false), delimiter("=") {} | |||||
PropertiesManager::~PropertiesManager() {} | PropertiesManager::~PropertiesManager() {} | ||||
// singleton | // singleton | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY PropertiesManager &PropertiesManager::Instance() { | |||||
PropertiesManager &PropertiesManager::Instance() { | |||||
static PropertiesManager instance; | static PropertiesManager instance; | ||||
return instance; | return instance; | ||||
} | } | ||||
// Initialize property configuration | // Initialize property configuration | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool PropertiesManager::Init(const std::string &file_path) { | |||||
bool PropertiesManager::Init(const std::string &file_path) { | |||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
if (is_inited_) { | if (is_inited_) { | ||||
GELOGW("Already inited, will be initialized again"); | GELOGW("Already inited, will be initialized again"); | ||||
@@ -139,8 +139,7 @@ std::string PropertiesManager::Trim(const std::string &str) { | |||||
} | } | ||||
// Get property value, if not found, return "" | // Get property value, if not found, return "" | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::string PropertiesManager::GetPropertyValue( | |||||
const std::string &map_key) { | |||||
std::string PropertiesManager::GetPropertyValue(const std::string &map_key) { | |||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
auto iter = properties_map_.find(map_key); | auto iter = properties_map_.find(map_key); | ||||
if (properties_map_.end() != iter) { | if (properties_map_.end() != iter) { | ||||
@@ -151,21 +150,19 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::string PropertiesManager:: | |||||
} | } | ||||
// Set property value | // Set property value | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void PropertiesManager::SetPropertyValue(const std::string &map_key, | |||||
const std::string &value) { | |||||
void PropertiesManager::SetPropertyValue(const std::string &map_key, const std::string &value) { | |||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
properties_map_[map_key] = value; | properties_map_[map_key] = value; | ||||
} | } | ||||
// return properties_map_ | // return properties_map_ | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::map<std::string, std::string> | |||||
PropertiesManager::GetPropertyMap() { | |||||
std::map<std::string, std::string> PropertiesManager::GetPropertyMap() { | |||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
return properties_map_; | return properties_map_; | ||||
} | } | ||||
// Set separator | // Set separator | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void PropertiesManager::SetPropertyDelimiter(const std::string &de) { | |||||
void PropertiesManager::SetPropertyDelimiter(const std::string &de) { | |||||
std::lock_guard<std::mutex> lock(mutex_); | std::lock_guard<std::mutex> lock(mutex_); | ||||
delimiter = de; | delimiter = de; | ||||
} | } | ||||
@@ -21,7 +21,7 @@ | |||||
namespace ge { | namespace ge { | ||||
class FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY TBEKernelStore : public KernelStore { | |||||
class TBEKernelStore : public KernelStore { | |||||
public: | public: | ||||
TBEKernelStore(); | TBEKernelStore(); | ||||
~TBEKernelStore() {} | ~TBEKernelStore() {} | ||||
@@ -26,7 +26,7 @@ | |||||
#include "external/register/register_types.h" | #include "external/register/register_types.h" | ||||
namespace ge { | namespace ge { | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ThreadPool::ThreadPool(uint32_t size) : is_stoped_(false) { | |||||
ThreadPool::ThreadPool(uint32_t size) : is_stoped_(false) { | |||||
idle_thrd_num_ = size < 1 ? 1 : size; | idle_thrd_num_ = size < 1 ? 1 : size; | ||||
for (uint32_t i = 0; i < idle_thrd_num_; ++i) { | for (uint32_t i = 0; i < idle_thrd_num_; ++i) { | ||||
@@ -34,7 +34,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ThreadPool::ThreadPool(uint32_t | |||||
} | } | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY ThreadPool::~ThreadPool() { | |||||
ThreadPool::~ThreadPool() { | |||||
is_stoped_.store(true); | is_stoped_.store(true); | ||||
{ | { | ||||
std::unique_lock<std::mutex> lock{m_lock_}; | std::unique_lock<std::mutex> lock{m_lock_}; | ||||
@@ -37,7 +37,7 @@ | |||||
namespace ge { | namespace ge { | ||||
using ThreadTask = std::function<void()>; | using ThreadTask = std::function<void()>; | ||||
class GE_FUNC_DEV_VISIBILITY GE_FUNC_HOST_VISIBILITY ThreadPool { | |||||
class ThreadPool { | |||||
public: | public: | ||||
explicit ThreadPool(uint32_t size = 4); | explicit ThreadPool(uint32_t size = 4); | ||||
~ThreadPool(); | ~ThreadPool(); | ||||
@@ -14,9 +14,9 @@ | |||||
* limitations under the License. | * limitations under the License. | ||||
*/ | */ | ||||
#include "graph/common/transop_util.h" | |||||
#include "common/transop_util.h" | |||||
#include "framework/common/types.h" | |||||
#include "common/types.h" | |||||
#include "graph/utils/type_utils.h" | #include "graph/utils/type_utils.h" | ||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
@@ -23,7 +23,7 @@ | |||||
#include "graph/node.h" | #include "graph/node.h" | ||||
namespace ge { | namespace ge { | ||||
class GE_FUNC_HOST_VISIBILITY GE_FUNC_DEV_VISIBILITY TransOpUtil { | |||||
class TransOpUtil { | |||||
public: | public: | ||||
static bool IsTransOp(const NodePtr &node); | static bool IsTransOp(const NodePtr &node); | ||||
@@ -70,7 +70,7 @@ static bool ReadProtoFromCodedInputStream(CodedInputStream &coded_stream, Messag | |||||
return proto->ParseFromCodedStream(&coded_stream); | return proto->ParseFromCodedStream(&coded_stream); | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool ReadProtoFromArray(const void *data, int size, Message *proto) { | |||||
bool ReadProtoFromArray(const void *data, int size, Message *proto) { | |||||
GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((proto == nullptr || data == nullptr || size == 0), return false, | GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((proto == nullptr || data == nullptr || size == 0), return false, | ||||
"incorrect parameter. proto is nullptr || data is nullptr || size is 0"); | "incorrect parameter. proto is nullptr || data is nullptr || size is 0"); | ||||
@@ -112,8 +112,7 @@ long GetFileLength(const std::string &input_file) { | |||||
* @return false fail | * @return false fail | ||||
* @return true success | * @return true success | ||||
*/ | */ | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool ReadBytesFromBinaryFile(const char *file_name, char **buffer, | |||||
int &length) { | |||||
bool ReadBytesFromBinaryFile(const char *file_name, char **buffer, int &length) { | |||||
GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((file_name == nullptr), return false, "incorrect parameter. file is nullptr"); | GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((file_name == nullptr), return false, "incorrect parameter. file is nullptr"); | ||||
GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((buffer == nullptr), return false, "incorrect parameter. buffer is nullptr"); | GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((buffer == nullptr), return false, "incorrect parameter. buffer is nullptr"); | ||||
@@ -141,8 +140,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool ReadBytesFromBinaryFile(co | |||||
return true; | return true; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool ReadBytesFromBinaryFile(const char *file_name, | |||||
std::vector<char> &buffer) { | |||||
bool ReadBytesFromBinaryFile(const char *file_name, std::vector<char> &buffer) { | |||||
GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((file_name == nullptr), return false, "incorrect parameter. file path is null"); | GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((file_name == nullptr), return false, "incorrect parameter. file path is null"); | ||||
std::string real_path = RealPath(file_name); | std::string real_path = RealPath(file_name); | ||||
@@ -177,7 +175,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool ReadBytesFromBinaryFile(co | |||||
* @return -1 fail | * @return -1 fail | ||||
* @return 0 success | * @return 0 success | ||||
*/ | */ | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY int CreateDirectory(const std::string &directory_path) { | |||||
int CreateDirectory(const std::string &directory_path) { | |||||
GE_CHK_BOOL_EXEC(!directory_path.empty(), return -1, "directory path is empty."); | GE_CHK_BOOL_EXEC(!directory_path.empty(), return -1, "directory path is empty."); | ||||
auto dir_path_len = directory_path.length(); | auto dir_path_len = directory_path.length(); | ||||
if (dir_path_len >= MMPA_MAX_PATH) { | if (dir_path_len >= MMPA_MAX_PATH) { | ||||
@@ -219,7 +217,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY int CreateDirectory(const std:: | |||||
return 0; | return 0; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::string CurrentTimeInStr() { | |||||
std::string CurrentTimeInStr() { | |||||
std::time_t now = std::time(nullptr); | std::time_t now = std::time(nullptr); | ||||
std::tm *ptm = std::localtime(&now); | std::tm *ptm = std::localtime(&now); | ||||
if (ptm == nullptr) { | if (ptm == nullptr) { | ||||
@@ -235,8 +233,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::string CurrentTimeInStr() | |||||
return std::string(buffer); | return std::string(buffer); | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool ReadProtoFromText(const char *file, | |||||
google::protobuf::Message *message) { | |||||
bool ReadProtoFromText(const char *file, google::protobuf::Message *message) { | |||||
GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((file == nullptr || message == nullptr), return false, | GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((file == nullptr || message == nullptr), return false, | ||||
"incorrect parameter. nullptr == file || nullptr == message"); | "incorrect parameter. nullptr == file || nullptr == message"); | ||||
@@ -266,8 +263,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool ReadProtoFromText(const ch | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool ReadProtoFromMem(const char *data, int size, | |||||
google::protobuf::Message *message) { | |||||
bool ReadProtoFromMem(const char *data, int size, google::protobuf::Message *message) { | |||||
GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((data == nullptr || message == nullptr), return false, | GE_CHK_BOOL_TRUE_EXEC_WITH_LOG((data == nullptr || message == nullptr), return false, | ||||
"incorrect parameter. data is nullptr || message is nullptr"); | "incorrect parameter. data is nullptr || message is nullptr"); | ||||
std::string str(data, static_cast<size_t>(size)); | std::string str(data, static_cast<size_t>(size)); | ||||
@@ -281,7 +277,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool ReadProtoFromMem(const cha | |||||
return ret; | return ret; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY uint64_t GetCurrentTimestamp() { | |||||
uint64_t GetCurrentTimestamp() { | |||||
mmTimeval tv{}; | mmTimeval tv{}; | ||||
int ret = mmGetTimeOfDay(&tv, nullptr); | int ret = mmGetTimeOfDay(&tv, nullptr); | ||||
GE_LOGE_IF(ret != EN_OK, "Func gettimeofday may failed, ret:%d, errmsg:%s", ret, strerror(errno)); | GE_LOGE_IF(ret != EN_OK, "Func gettimeofday may failed, ret:%d, errmsg:%s", ret, strerror(errno)); | ||||
@@ -289,7 +285,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY uint64_t GetCurrentTimestamp() | |||||
return static_cast<uint64_t>(total_use_time); | return static_cast<uint64_t>(total_use_time); | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY uint32_t GetCurrentSecondTimestap() { | |||||
uint32_t GetCurrentSecondTimestap() { | |||||
mmTimeval tv{}; | mmTimeval tv{}; | ||||
int ret = mmGetTimeOfDay(&tv, nullptr); | int ret = mmGetTimeOfDay(&tv, nullptr); | ||||
GE_LOGE_IF(ret != EN_OK, "Func gettimeofday may failed, ret:%d, errmsg:%s", ret, strerror(errno)); | GE_LOGE_IF(ret != EN_OK, "Func gettimeofday may failed, ret:%d, errmsg:%s", ret, strerror(errno)); | ||||
@@ -297,7 +293,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY uint32_t GetCurrentSecondTimest | |||||
return static_cast<uint32_t>(total_use_time); | return static_cast<uint32_t>(total_use_time); | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool CheckInt64MulOverflow(int64_t a, int64_t b) { | |||||
bool CheckInt64MulOverflow(int64_t a, int64_t b) { | |||||
if (a > 0) { | if (a > 0) { | ||||
if (b > 0) { | if (b > 0) { | ||||
if (a > (INT64_MAX / b)) { | if (a > (INT64_MAX / b)) { | ||||
@@ -322,7 +318,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool CheckInt64MulOverflow(int6 | |||||
return true; | return true; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::string RealPath(const char *path) { | |||||
std::string RealPath(const char *path) { | |||||
GE_CHK_BOOL_TRUE_EXEC_WITH_LOG(path == nullptr, return "", "path pointer is NULL."); | GE_CHK_BOOL_TRUE_EXEC_WITH_LOG(path == nullptr, return "", "path pointer is NULL."); | ||||
GE_CHK_BOOL_TRUE_EXEC_WITH_LOG(strlen(path) >= MMPA_MAX_PATH, | GE_CHK_BOOL_TRUE_EXEC_WITH_LOG(strlen(path) >= MMPA_MAX_PATH, | ||||
ErrorManager::GetInstance().ATCReportErrMessage("E19002", {"filepath", "size"}, | ErrorManager::GetInstance().ATCReportErrMessage("E19002", {"filepath", "size"}, | ||||
@@ -349,8 +345,7 @@ void PathValidErrReport(const std::string &file_path, const std::string &atc_par | |||||
} | } | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool CheckInputPathValid(const std::string &file_path, | |||||
const std::string &atc_param) { | |||||
bool CheckInputPathValid(const std::string &file_path, const std::string &atc_param) { | |||||
// The specified path is empty | // The specified path is empty | ||||
std::map<std::string, std::string> args_map; | std::map<std::string, std::string> args_map; | ||||
if (file_path.empty()) { | if (file_path.empty()) { | ||||
@@ -395,8 +390,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool CheckInputPathValid(const | |||||
return true; | return true; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool CheckOutputPathValid(const std::string &file_path, | |||||
const std::string &atc_param) { | |||||
bool CheckOutputPathValid(const std::string &file_path, const std::string &atc_param) { | |||||
// The specified path is empty | // The specified path is empty | ||||
if (file_path.empty()) { | if (file_path.empty()) { | ||||
if (!atc_param.empty()) { | if (!atc_param.empty()) { | ||||
@@ -552,7 +546,7 @@ FMK_FUNC_HOST_VISIBILITY bool IsValidFile(const char *file_path) { | |||||
return true; | return true; | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status CheckPath(const char *path, size_t length) { | |||||
Status CheckPath(const char *path, size_t length) { | |||||
if (path == nullptr) { | if (path == nullptr) { | ||||
GELOGE(PARAM_INVALID, "[Check][Param]Config path is invalid"); | GELOGE(PARAM_INVALID, "[Check][Param]Config path is invalid"); | ||||
REPORT_CALL_ERROR("E19999", "Config path is invalid"); | REPORT_CALL_ERROR("E19999", "Config path is invalid"); | ||||
@@ -1,13 +1,9 @@ | |||||
set(SRC_LIST | set(SRC_LIST | ||||
"ge_executor.cc" | "ge_executor.cc" | ||||
"../common/profiling/profiling_manager.cc" | "../common/profiling/profiling_manager.cc" | ||||
"../common/ge/plugin_manager.cc" | |||||
"../common/ge/op_tiling_manager.cc" | |||||
"../common/dump/dump_properties.cc" | |||||
"../common/dump/exception_dumper.cc" | |||||
"../common/dump/dump_manager.cc" | |||||
"../common/dump/dump_op.cc" | "../common/dump/dump_op.cc" | ||||
"../common/dump/opdebug_register.cc" | "../common/dump/opdebug_register.cc" | ||||
"../common/dump/exception_dumper.cc" | |||||
"../common/profiling/ge_profiling.cc" | "../common/profiling/ge_profiling.cc" | ||||
"../graph/load/graph_loader.cc" | "../graph/load/graph_loader.cc" | ||||
"../graph/execute/graph_execute.cc" | "../graph/execute/graph_execute.cc" | ||||
@@ -22,8 +18,6 @@ set(SRC_LIST | |||||
"../graph/manager/rdma_pool_allocator.cc" | "../graph/manager/rdma_pool_allocator.cc" | ||||
"../graph/manager/host_mem_allocator.cc" | "../graph/manager/host_mem_allocator.cc" | ||||
"../hybrid/node_executor/aicpu/aicpu_ext_info.cc" | "../hybrid/node_executor/aicpu/aicpu_ext_info.cc" | ||||
"../model/ge_model.cc" | |||||
"../model/ge_root_model.cc" | |||||
"../graph/load/model_manager/davinci_model.cc" | "../graph/load/model_manager/davinci_model.cc" | ||||
"../graph/load/model_manager/model_manager.cc" | "../graph/load/model_manager/model_manager.cc" | ||||
"../graph/load/model_manager/tbe_handle_store.cc" | "../graph/load/model_manager/tbe_handle_store.cc" | ||||
@@ -55,7 +49,6 @@ set(SRC_LIST | |||||
"../graph/load/model_manager/task_info/model_exit_task_info.cc" | "../graph/load/model_manager/task_info/model_exit_task_info.cc" | ||||
"../graph/load/model_manager/task_info/super_kernel/super_kernel_factory.cc" | "../graph/load/model_manager/task_info/super_kernel/super_kernel_factory.cc" | ||||
"../graph/load/model_manager/task_info/super_kernel/super_kernel.cc" | "../graph/load/model_manager/task_info/super_kernel/super_kernel.cc" | ||||
"../graph/common/local_context.cc" | |||||
"../opskernel_manager/ops_kernel_builder_manager.cc" | "../opskernel_manager/ops_kernel_builder_manager.cc" | ||||
"../single_op/single_op_manager.cc" | "../single_op/single_op_manager.cc" | ||||
"../single_op/single_op_model.cc" | "../single_op/single_op_model.cc" | ||||
@@ -102,7 +95,6 @@ set(SRC_LIST | |||||
"../hybrid/node_executor/task_context.cc" | "../hybrid/node_executor/task_context.cc" | ||||
"../hybrid/hybrid_davinci_model.cc" | "../hybrid/hybrid_davinci_model.cc" | ||||
"../ge_local_engine/engine/host_cpu_engine.cc" | "../ge_local_engine/engine/host_cpu_engine.cc" | ||||
"../graph/common/omg_util.cc" | |||||
"../graph/manager/host_mem_manager.cc" | "../graph/manager/host_mem_manager.cc" | ||||
"../graph/build/memory/var_mem_assign_util.cc" | "../graph/build/memory/var_mem_assign_util.cc" | ||||
"../host_kernels/transpose_kernel.cc" | "../host_kernels/transpose_kernel.cc" | ||||
@@ -144,10 +136,6 @@ set(SRC_LIST | |||||
"../host_kernels/transdata_kernel.cc" | "../host_kernels/transdata_kernel.cc" | ||||
"../host_kernels/unpack_kernel.cc" | "../host_kernels/unpack_kernel.cc" | ||||
"../graph/passes/pass_utils.cc" | "../graph/passes/pass_utils.cc" | ||||
"../graph/common/bcast.cc" | |||||
"../common/fp16_t.cc" | |||||
"../common/formats/format_transfers/format_transfer_transpose.cc" | |||||
"../common/formats/utils/formats_trans_utils.cc" | |||||
) | ) | ||||
######## libge_executor.a ######## | ######## libge_executor.a ######## | ||||
@@ -63,7 +63,7 @@ local_ge_executor_src_files := \ | |||||
../single_op/task/aicpu_task_builder.cc \ | ../single_op/task/aicpu_task_builder.cc \ | ||||
../single_op/task/aicpu_kernel_task_builder.cc \ | ../single_op/task/aicpu_kernel_task_builder.cc \ | ||||
../hybrid/node_executor/aicpu/aicpu_ext_info.cc \ | ../hybrid/node_executor/aicpu/aicpu_ext_info.cc \ | ||||
../graph/common/local_context.cc \ | |||||
../common/local_context.cc \ | |||||
../hybrid/common/tensor_value.cc \ | ../hybrid/common/tensor_value.cc \ | ||||
../hybrid/common/npu_memory_allocator.cc \ | ../hybrid/common/npu_memory_allocator.cc \ | ||||
../hybrid/executor/rt_callback_manager.cc \ | ../hybrid/executor/rt_callback_manager.cc \ | ||||
@@ -102,7 +102,7 @@ local_ge_executor_src_files := \ | |||||
../hybrid/node_executor/task_context.cc \ | ../hybrid/node_executor/task_context.cc \ | ||||
../hybrid/hybrid_davinci_model.cc \ | ../hybrid/hybrid_davinci_model.cc \ | ||||
../ge_local_engine/engine/host_cpu_engine.cc \ | ../ge_local_engine/engine/host_cpu_engine.cc \ | ||||
../graph/common/omg_util.cc \ | |||||
../common/omg_util.cc \ | |||||
../graph/manager/host_mem_manager.cc \ | ../graph/manager/host_mem_manager.cc \ | ||||
../graph/build/memory/var_mem_assign_util.cc \ | ../graph/build/memory/var_mem_assign_util.cc \ | ||||
../host_kernels/transpose_kernel.cc \ | ../host_kernels/transpose_kernel.cc \ | ||||
@@ -144,7 +144,7 @@ local_ge_executor_src_files := \ | |||||
../host_kernels/transdata_kernel.cc \ | ../host_kernels/transdata_kernel.cc \ | ||||
../host_kernels/unpack_kernel.cc \ | ../host_kernels/unpack_kernel.cc \ | ||||
../graph/passes/pass_utils.cc \ | ../graph/passes/pass_utils.cc \ | ||||
../graph/common/bcast.cc \ | |||||
../common/bcast.cc \ | |||||
../common/fp16_t.cc \ | ../common/fp16_t.cc \ | ||||
../common/formats/format_transfers/format_transfer_transpose.cc \ | ../common/formats/format_transfers/format_transfer_transpose.cc \ | ||||
../common/formats/utils/formats_trans_utils.cc \ | ../common/formats/utils/formats_trans_utils.cc \ | ||||
@@ -80,7 +80,7 @@ ANALYZER_SRC_FILES:= \ | |||||
OMG_HOST_SRC_FILES := \ | OMG_HOST_SRC_FILES := \ | ||||
model/ge_model.cc \ | model/ge_model.cc \ | ||||
model/ge_root_model.cc \ | model/ge_root_model.cc \ | ||||
graph/common/transop_util.cc \ | |||||
common/transop_util.cc \ | |||||
graph/passes/pass_manager.cc \ | graph/passes/pass_manager.cc \ | ||||
graph/passes/resource_pair_add_control_pass.cc \ | graph/passes/resource_pair_add_control_pass.cc \ | ||||
graph/passes/resource_pair_remove_control_pass.cc \ | graph/passes/resource_pair_remove_control_pass.cc \ | ||||
@@ -115,9 +115,9 @@ OMG_HOST_SRC_FILES := \ | |||||
graph/passes/mark_graph_unknown_status_pass.cc \ | graph/passes/mark_graph_unknown_status_pass.cc \ | ||||
graph/passes/mark_node_unknown_shape_pass.cc \ | graph/passes/mark_node_unknown_shape_pass.cc \ | ||||
graph/passes/mark_agnostic_pass.cc \ | graph/passes/mark_agnostic_pass.cc \ | ||||
graph/common/omg_util.cc \ | |||||
graph/common/bcast.cc \ | |||||
graph/common/local_context.cc \ | |||||
common/omg_util.cc \ | |||||
common/bcast.cc \ | |||||
common/local_context.cc \ | |||||
graph/passes/dimension_compute_pass.cc \ | graph/passes/dimension_compute_pass.cc \ | ||||
graph/passes/dimension_adjust_pass.cc \ | graph/passes/dimension_adjust_pass.cc \ | ||||
graph/passes/get_original_format_pass.cc \ | graph/passes/get_original_format_pass.cc \ | ||||
@@ -43,10 +43,10 @@ LIBGE_LOCAL_SRC_FILES := \ | |||||
graph/build/stream_allocator.cc \ | graph/build/stream_allocator.cc \ | ||||
graph/build/stream_graph_optimizer.cc \ | graph/build/stream_graph_optimizer.cc \ | ||||
graph/build/task_generator.cc \ | graph/build/task_generator.cc \ | ||||
graph/common/bcast.cc \ | |||||
graph/common/local_context.cc \ | |||||
graph/common/omg_util.cc \ | |||||
graph/common/transop_util.cc \ | |||||
common/bcast.cc \ | |||||
common/local_context.cc \ | |||||
common/omg_util.cc \ | |||||
common/transop_util.cc \ | |||||
graph/execute/graph_execute.cc \ | graph/execute/graph_execute.cc \ | ||||
graph/label/case_label_maker.cc \ | graph/label/case_label_maker.cc \ | ||||
graph/label/if_label_maker.cc \ | graph/label/if_label_maker.cc \ | ||||
@@ -36,7 +36,7 @@ | |||||
#include "graph/utils/graph_utils.h" | #include "graph/utils/graph_utils.h" | ||||
#include "graph/utils/type_utils.h" | #include "graph/utils/type_utils.h" | ||||
#include "init/gelib.h" | #include "init/gelib.h" | ||||
#include "model/ge_model.h" | |||||
#include "common/model/ge_model.h" | |||||
#include "analyzer/analyzer.h" | #include "analyzer/analyzer.h" | ||||
using std::map; | using std::map; | ||||
@@ -21,14 +21,14 @@ | |||||
#include "graph/build/logical_stream_allocator.h" | #include "graph/build/logical_stream_allocator.h" | ||||
#include "graph/build/run_context.h" | #include "graph/build/run_context.h" | ||||
#include "graph/build/stream_graph_optimizer.h" | #include "graph/build/stream_graph_optimizer.h" | ||||
#include "graph/common/ge_call_wrapper.h" | |||||
#include "common/ge_call_wrapper.h" | |||||
#include "graph/ge_context.h" | #include "graph/ge_context.h" | ||||
#include "graph/manager/graph_var_manager.h" | #include "graph/manager/graph_var_manager.h" | ||||
#include "graph/passes/mark_same_addr_pass.h" | #include "graph/passes/mark_same_addr_pass.h" | ||||
#include "graph/utils/node_utils.h" | #include "graph/utils/node_utils.h" | ||||
#include "graph/utils/type_utils.h" | #include "graph/utils/type_utils.h" | ||||
#include "init/gelib.h" | #include "init/gelib.h" | ||||
#include "model/ge_model.h" | |||||
#include "common/model/ge_model.h" | |||||
#include "graph/ge_context.h" | #include "graph/ge_context.h" | ||||
#include "opskernel_manager/ops_kernel_builder_manager.h" | #include "opskernel_manager/ops_kernel_builder_manager.h" | ||||
#include "graph/utils/op_desc_utils.h" | #include "graph/utils/op_desc_utils.h" | ||||
@@ -38,7 +38,7 @@ | |||||
#include "graph/partition/graph_partition.h" | #include "graph/partition/graph_partition.h" | ||||
#include "graph/utils/graph_utils.h" | #include "graph/utils/graph_utils.h" | ||||
#include "graph/utils/tensor_utils.h" | #include "graph/utils/tensor_utils.h" | ||||
#include "model/ge_root_model.h" | |||||
#include "common/model/ge_root_model.h" | |||||
namespace ge { | namespace ge { | ||||
class GraphBuilder { | class GraphBuilder { | ||||
@@ -22,7 +22,7 @@ | |||||
#include "framework/common/types.h" | #include "framework/common/types.h" | ||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/utils/graph_utils.h" | #include "graph/utils/graph_utils.h" | ||||
#include "graph/common/ge_call_wrapper.h" | |||||
#include "common/ge_call_wrapper.h" | |||||
using std::map; | using std::map; | ||||
using std::set; | using std::set; | ||||
@@ -34,7 +34,7 @@ | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/common/local_context.h" | |||||
#include "common/local_context.h" | |||||
#include "graph/optimize/common/params.h" | #include "graph/optimize/common/params.h" | ||||
#include "framework/omg/omg_inner_types.h" | #include "framework/omg/omg_inner_types.h" | ||||
#include "runtime/mem.h" | #include "runtime/mem.h" | ||||
@@ -15,7 +15,7 @@ | |||||
*/ | */ | ||||
#include "graph/build/memory/buffer_pool_mem_assigner.h" | #include "graph/build/memory/buffer_pool_mem_assigner.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/utils/tensor_utils.h" | #include "graph/utils/tensor_utils.h" | ||||
#include "framework/common/util.h" | #include "framework/common/util.h" | ||||
#include "graph/compute_graph.h" | #include "graph/compute_graph.h" | ||||
@@ -24,7 +24,7 @@ | |||||
#include "graph/build/memory/hybrid_mem_assigner.h" | #include "graph/build/memory/hybrid_mem_assigner.h" | ||||
#include "graph/build/memory/var_mem_assign_util.h" | #include "graph/build/memory/var_mem_assign_util.h" | ||||
#include "graph/build/memory/block_mem_assigner.h" | #include "graph/build/memory/block_mem_assigner.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/ge_attr_value.h" | #include "graph/ge_attr_value.h" | ||||
#include "graph/manager/graph_var_manager.h" | #include "graph/manager/graph_var_manager.h" | ||||
@@ -18,7 +18,7 @@ | |||||
#include <vector> | #include <vector> | ||||
#include "framework/common/types.h" | #include "framework/common/types.h" | ||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "graph/common/transop_util.h" | |||||
#include "common/transop_util.h" | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/manager/graph_mem_allocator.h" | #include "graph/manager/graph_mem_allocator.h" | ||||
#include "graph/manager/graph_var_manager.h" | #include "graph/manager/graph_var_manager.h" | ||||
@@ -25,9 +25,9 @@ | |||||
#include "external/graph/attr_value.h" | #include "external/graph/attr_value.h" | ||||
#include "graph/buffer.h" | #include "graph/buffer.h" | ||||
#include "graph/build/stream_allocator.h" | #include "graph/build/stream_allocator.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "graph/common/ge_call_wrapper.h" | |||||
#include "graph/common/local_context.h" | |||||
#include "common/omg_util.h" | |||||
#include "common/ge_call_wrapper.h" | |||||
#include "common/local_context.h" | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/ge_attr_value.h" | #include "graph/ge_attr_value.h" | ||||
#include "graph/ge_context.h" | #include "graph/ge_context.h" | ||||
@@ -32,7 +32,7 @@ | |||||
#include "graph/manager/graph_manager_utils.h" | #include "graph/manager/graph_manager_utils.h" | ||||
#include "graph/model.h" | #include "graph/model.h" | ||||
#include "graph/node.h" | #include "graph/node.h" | ||||
#include "model/ge_model.h" | |||||
#include "common/model/ge_model.h" | |||||
#include "framework/omg/omg_inner_types.h" | #include "framework/omg/omg_inner_types.h" | ||||
namespace ge { | namespace ge { | ||||
@@ -18,7 +18,7 @@ | |||||
#include "framework/common/util.h" | #include "framework/common/util.h" | ||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
namespace ge { | namespace ge { | ||||
RunContextUtil::~RunContextUtil() { DestroyRtModelResources(); } | RunContextUtil::~RunContextUtil() { DestroyRtModelResources(); } | ||||
@@ -22,7 +22,7 @@ | |||||
#include "framework/common/fmk_error_codes.h" | #include "framework/common/fmk_error_codes.h" | ||||
#include "framework/common/types.h" | #include "framework/common/types.h" | ||||
#include "graph/build/logical_stream_allocator.h" | #include "graph/build/logical_stream_allocator.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/ge_context.h" | #include "graph/ge_context.h" | ||||
#include "graph/utils/graph_utils.h" | #include "graph/utils/graph_utils.h" | ||||
@@ -29,7 +29,7 @@ | |||||
#include "graph/utils/node_utils.h" | #include "graph/utils/node_utils.h" | ||||
#include "graph/utils/tensor_utils.h" | #include "graph/utils/tensor_utils.h" | ||||
#include "graph/utils/type_utils.h" | #include "graph/utils/type_utils.h" | ||||
#include "graph/common/ge_call_wrapper.h" | |||||
#include "common/ge_call_wrapper.h" | |||||
#include "init/gelib.h" | #include "init/gelib.h" | ||||
#include "graph/ge_local_context.h" | #include "graph/ge_local_context.h" | ||||
#include "external/ge/ge_api_types.h" | #include "external/ge/ge_api_types.h" | ||||
@@ -18,8 +18,8 @@ | |||||
#include "graph/ge_context.h" | #include "graph/ge_context.h" | ||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/common/ge_call_wrapper.h" | |||||
#include "graph/common/local_context.h" | |||||
#include "common/ge_call_wrapper.h" | |||||
#include "common/local_context.h" | |||||
#include "graph/manager/graph_var_manager.h" | #include "graph/manager/graph_var_manager.h" | ||||
#include "graph/utils/tensor_adapter.h" | #include "graph/utils/tensor_adapter.h" | ||||
#include "graph/load/graph_loader.h" | #include "graph/load/graph_loader.h" | ||||
@@ -32,7 +32,7 @@ | |||||
#include "common/thread_pool.h" | #include "common/thread_pool.h" | ||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "framework/common/util.h" | #include "framework/common/util.h" | ||||
#include "graph/common/ge_call_wrapper.h" | |||||
#include "common/ge_call_wrapper.h" | |||||
#include "graph/compute_graph.h" | #include "graph/compute_graph.h" | ||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/ge_context.h" | #include "graph/ge_context.h" | ||||
@@ -57,9 +57,9 @@ | |||||
#include "runtime/rt_model.h" | #include "runtime/rt_model.h" | ||||
#include "runtime/stream.h" | #include "runtime/stream.h" | ||||
#include "securec.h" | #include "securec.h" | ||||
#include "graph/common/local_context.h" | |||||
#include "common/local_context.h" | |||||
#include "common/formats/utils/formats_trans_utils.h" | #include "common/formats/utils/formats_trans_utils.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/build/memory/block_mem_assigner.h" | #include "graph/build/memory/block_mem_assigner.h" | ||||
#include "graph/manager/session_scope_mem_allocator.h" | #include "graph/manager/session_scope_mem_allocator.h" | ||||
#include "framework/omg/omg_inner_types.h" | #include "framework/omg/omg_inner_types.h" | ||||
@@ -49,7 +49,7 @@ | |||||
#include "mmpa/mmpa_api.h" | #include "mmpa/mmpa_api.h" | ||||
#include "proto/task.pb.h" | #include "proto/task.pb.h" | ||||
#include "graph/load/model_manager/task_info/task_info.h" | #include "graph/load/model_manager/task_info/task_info.h" | ||||
#include "graph/common/local_context.h" | |||||
#include "common/local_context.h" | |||||
using std::mutex; | using std::mutex; | ||||
using std::thread; | using std::thread; | ||||
@@ -23,9 +23,9 @@ | |||||
#include "common/dump/dump_manager.h" | #include "common/dump/dump_manager.h" | ||||
#include "framework/common/l2_cache_optimize.h" | #include "framework/common/l2_cache_optimize.h" | ||||
#include "common/profiling/profiling_manager.h" | #include "common/profiling/profiling_manager.h" | ||||
#include "graph/common/ge_call_wrapper.h" | |||||
#include "common/ge_call_wrapper.h" | |||||
#include "graph/load/model_manager/davinci_model.h" | #include "graph/load/model_manager/davinci_model.h" | ||||
#include "model/ge_root_model.h" | |||||
#include "common/model/ge_root_model.h" | |||||
#include "common/formats/utils/formats_trans_utils.h" | #include "common/formats/utils/formats_trans_utils.h" | ||||
namespace ge { | namespace ge { | ||||
@@ -17,7 +17,7 @@ | |||||
#ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_MODEL_MANAGER_H_ | #ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_MODEL_MANAGER_H_ | ||||
#define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_MODEL_MANAGER_H_ | #define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_MODEL_MANAGER_H_ | ||||
#include <model/ge_root_model.h> | |||||
#include <common/model/ge_root_model.h> | |||||
#include <stdint.h> | #include <stdint.h> | ||||
#include <algorithm> | #include <algorithm> | ||||
#include <map> | #include <map> | ||||
@@ -29,9 +29,9 @@ | |||||
#include "common/dump/dump_manager.h" | #include "common/dump/dump_manager.h" | ||||
#include "ge_opt_info/ge_opt_info.h" | #include "ge_opt_info/ge_opt_info.h" | ||||
#include "analyzer/analyzer.h" | #include "analyzer/analyzer.h" | ||||
#include "graph/common/ge_call_wrapper.h" | |||||
#include "graph/common/local_context.h" | |||||
#include "graph/common/transop_util.h" | |||||
#include "common/ge_call_wrapper.h" | |||||
#include "common/local_context.h" | |||||
#include "common/transop_util.h" | |||||
#include "graph/ge_context.h" | #include "graph/ge_context.h" | ||||
#include "graph/ge_global_options.h" | #include "graph/ge_global_options.h" | ||||
#include "graph/manager/util/rt_context_util.h" | #include "graph/manager/util/rt_context_util.h" | ||||
@@ -103,8 +103,8 @@ | |||||
#include "inc/pass_manager.h" | #include "inc/pass_manager.h" | ||||
#include "init/gelib.h" | #include "init/gelib.h" | ||||
#include "ir_build/option_utils.h" | #include "ir_build/option_utils.h" | ||||
#include "graph/common/local_context.h" | |||||
#include "graph/common/omg_util.h" | |||||
#include "common/local_context.h" | |||||
#include "common/omg_util.h" | |||||
#include "common/formats/utils/formats_trans_utils.h" | #include "common/formats/utils/formats_trans_utils.h" | ||||
#include "register/custom_pass_helper.h" | #include "register/custom_pass_helper.h" | ||||
#include "external/graph/types.h" | #include "external/graph/types.h" | ||||
@@ -38,7 +38,7 @@ | |||||
#include "graph/partition/graph_partition.h" | #include "graph/partition/graph_partition.h" | ||||
#include "graph/preprocess/graph_preprocess.h" | #include "graph/preprocess/graph_preprocess.h" | ||||
#include "graph/tuning_utils.h" | #include "graph/tuning_utils.h" | ||||
#include "model/ge_model.h" | |||||
#include "common/model/ge_model.h" | |||||
#include "common/executor.h" | #include "common/executor.h" | ||||
namespace ge { | namespace ge { | ||||
@@ -33,11 +33,11 @@ | |||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "framework/common/ge_inner_error_codes.h" | #include "framework/common/ge_inner_error_codes.h" | ||||
#include "graph/compute_graph.h" | #include "graph/compute_graph.h" | ||||
#include "graph/common/local_context.h" | |||||
#include "common/local_context.h" | |||||
#include "external/graph/graph.h" | #include "external/graph/graph.h" | ||||
#include "graph/model.h" | #include "graph/model.h" | ||||
#include "model/ge_model.h" | |||||
#include "model/ge_root_model.h" | |||||
#include "common/model/ge_model.h" | |||||
#include "common/model/ge_root_model.h" | |||||
#include "external/register/register_fmk_types.h" | #include "external/register/register_fmk_types.h" | ||||
#include "external/ge/ge_api_types.h" | #include "external/ge/ge_api_types.h" | ||||
@@ -17,7 +17,7 @@ | |||||
#include "graph/optimize/graph_optimize.h" | #include "graph/optimize/graph_optimize.h" | ||||
#include "graph/ge_context.h" | #include "graph/ge_context.h" | ||||
#include "graph/common/local_context.h" | |||||
#include "common/local_context.h" | |||||
#include "graph/passes/dimension_adjust_pass.h" | #include "graph/passes/dimension_adjust_pass.h" | ||||
#include "inc/pass_manager.h" | #include "inc/pass_manager.h" | ||||
#include "init/gelib.h" | #include "init/gelib.h" | ||||
@@ -17,7 +17,7 @@ | |||||
#include <vector> | #include <vector> | ||||
#include "common/ge/ge_util.h" | #include "common/ge/ge_util.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/optimize/graph_optimize.h" | #include "graph/optimize/graph_optimize.h" | ||||
#include "graph/utils/graph_utils.h" | #include "graph/utils/graph_utils.h" | ||||
@@ -31,7 +31,7 @@ | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/utils/graph_utils.h" | #include "graph/utils/graph_utils.h" | ||||
#include "graph/utils/op_desc_utils.h" | #include "graph/utils/op_desc_utils.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#define REQUIRE(cond, ...) \ | #define REQUIRE(cond, ...) \ | ||||
do { \ | do { \ | ||||
@@ -28,7 +28,7 @@ | |||||
#include "framework/common/types.h" | #include "framework/common/types.h" | ||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/manager/graph_manager_utils.h" | #include "graph/manager/graph_manager_utils.h" | ||||
#include "graph/common/ge_call_wrapper.h" | |||||
#include "common/ge_call_wrapper.h" | |||||
#include "graph/utils/graph_utils.h" | #include "graph/utils/graph_utils.h" | ||||
#include "graph/utils/op_desc_utils.h" | #include "graph/utils/op_desc_utils.h" | ||||
#include "graph/utils/type_utils.h" | #include "graph/utils/type_utils.h" | ||||
@@ -70,6 +70,8 @@ class GraphPartitioner { | |||||
// Return all subgraphs | // Return all subgraphs | ||||
const Graph2SubGraphInfoList &GetSubGraphMap(); | const Graph2SubGraphInfoList &GetSubGraphMap(); | ||||
const Graph2InputNodesSubGraphInfo &GetSubGraphInfoMap() {return graph_2_input_subgraph_; } | |||||
private: | private: | ||||
Status MergeSubGraph(ge::ComputeGraphPtr &output_merged_compute_graph, | Status MergeSubGraph(ge::ComputeGraphPtr &output_merged_compute_graph, | ||||
const ge::ComputeGraphPtr &original_compute_graph); | const ge::ComputeGraphPtr &original_compute_graph); | ||||
@@ -24,7 +24,7 @@ | |||||
#include "framework/common/ge_inner_error_codes.h" | #include "framework/common/ge_inner_error_codes.h" | ||||
#include "common/ge/ge_util.h" | #include "common/ge/ge_util.h" | ||||
#include "graph/common/ge_call_wrapper.h" | |||||
#include "common/ge_call_wrapper.h" | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/utils/node_utils.h" | #include "graph/utils/node_utils.h" | ||||
#include "init/gelib.h" | #include "init/gelib.h" | ||||
@@ -16,7 +16,7 @@ | |||||
#include "graph/passes/attach_stream_label_pass.h" | #include "graph/passes/attach_stream_label_pass.h" | ||||
#include "external/ge/ge_api_types.h" | #include "external/ge/ge_api_types.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
using std::string; | using std::string; | ||||
@@ -18,7 +18,7 @@ | |||||
#include <string> | #include <string> | ||||
#include <vector> | #include <vector> | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/utils/node_utils.h" | #include "graph/utils/node_utils.h" | ||||
#include "graph/utils/tensor_utils.h" | #include "graph/utils/tensor_utils.h" | ||||
#include "graph/utils/op_desc_utils.h" | #include "graph/utils/op_desc_utils.h" | ||||
@@ -18,7 +18,7 @@ | |||||
#include <string> | #include <string> | ||||
#include <vector> | #include <vector> | ||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "graph/common/transop_util.h" | |||||
#include "common/transop_util.h" | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/utils/type_utils.h" | #include "graph/utils/type_utils.h" | ||||
@@ -22,7 +22,7 @@ | |||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "framework/common/ge_inner_error_codes.h" | #include "framework/common/ge_inner_error_codes.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/passes/pass_utils.h" | #include "graph/passes/pass_utils.h" | ||||
#include "graph/utils/node_utils.h" | #include "graph/utils/node_utils.h" | ||||
@@ -22,7 +22,7 @@ | |||||
#include "framework/common/ge_inner_error_codes.h" | #include "framework/common/ge_inner_error_codes.h" | ||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/common/ge_call_wrapper.h" | |||||
#include "common/ge_call_wrapper.h" | |||||
#include "graph/op_desc.h" | #include "graph/op_desc.h" | ||||
using domi::ImplyType; | using domi::ImplyType; | ||||
@@ -17,7 +17,7 @@ | |||||
#include "graph/passes/control_trigger_pass.h" | #include "graph/passes/control_trigger_pass.h" | ||||
#include <stack> | #include <stack> | ||||
#include "common/ge/ge_util.h" | #include "common/ge/ge_util.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/utils/type_utils.h" | #include "graph/utils/type_utils.h" | ||||
namespace ge { | namespace ge { | ||||
@@ -21,7 +21,7 @@ | |||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "framework/common/ge_inner_error_codes.h" | #include "framework/common/ge_inner_error_codes.h" | ||||
#include "framework/common/types.h" | #include "framework/common/types.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/passes/base_pass.h" | #include "graph/passes/base_pass.h" | ||||
#include "graph/utils/attr_utils.h" | #include "graph/utils/attr_utils.h" | ||||
#include "graph/utils/graph_utils.h" | #include "graph/utils/graph_utils.h" | ||||
@@ -22,7 +22,7 @@ | |||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "common/ge/ge_util.h" | #include "common/ge/ge_util.h" | ||||
#include "graph/manager/graph_var_manager.h" | #include "graph/manager/graph_var_manager.h" | ||||
#include "graph/passes/pass_utils.h" | #include "graph/passes/pass_utils.h" | ||||
@@ -25,7 +25,7 @@ | |||||
#include "framework/omg/omg_inner_types.h" | #include "framework/omg/omg_inner_types.h" | ||||
#include "graph/utils/attr_utils.h" | #include "graph/utils/attr_utils.h" | ||||
#include "graph/utils/op_desc_utils.h" | #include "graph/utils/op_desc_utils.h" | ||||
#include "graph/common/local_context.h" | |||||
#include "common/local_context.h" | |||||
using domi::DOMI_TENSOR_NCHW; | using domi::DOMI_TENSOR_NCHW; | ||||
using domi::DOMI_TENSOR_NHWC; | using domi::DOMI_TENSOR_NHWC; | ||||
@@ -21,7 +21,7 @@ | |||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "framework/common/ge_inner_error_codes.h" | #include "framework/common/ge_inner_error_codes.h" | ||||
#include "framework/common/types.h" | #include "framework/common/types.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/utils/attr_utils.h" | #include "graph/utils/attr_utils.h" | ||||
#include "graph/utils/graph_utils.h" | #include "graph/utils/graph_utils.h" | ||||
#include "graph/utils/type_utils.h" | #include "graph/utils/type_utils.h" | ||||
@@ -14,7 +14,7 @@ | |||||
* limitations under the License. | * limitations under the License. | ||||
*/ | */ | ||||
#include "graph/passes/hccl_tailing_optimization_pass.h" | #include "graph/passes/hccl_tailing_optimization_pass.h" | ||||
#include "graph/common/transop_util.h" | |||||
#include "common/transop_util.h" | |||||
namespace ge { | namespace ge { | ||||
Status HcclTailingOptimizationPass::Run(ComputeGraphPtr graph) { | Status HcclTailingOptimizationPass::Run(ComputeGraphPtr graph) { | ||||
@@ -19,7 +19,7 @@ | |||||
#include <string> | #include <string> | ||||
#include <vector> | #include <vector> | ||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/utils/node_utils.h" | #include "graph/utils/node_utils.h" | ||||
#include "graph/utils/attr_utils.h" | #include "graph/utils/attr_utils.h" | ||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
@@ -22,7 +22,7 @@ | |||||
#include "graph/shape_refiner.h" | #include "graph/shape_refiner.h" | ||||
#include "graph/utils/graph_utils.h" | #include "graph/utils/graph_utils.h" | ||||
#include "graph/utils/node_utils.h" | #include "graph/utils/node_utils.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/utils/tensor_utils.h" | #include "graph/utils/tensor_utils.h" | ||||
#include "graph/utils/type_utils.h" | #include "graph/utils/type_utils.h" | ||||
@@ -26,7 +26,7 @@ | |||||
#include "common/ge/ge_util.h" | #include "common/ge/ge_util.h" | ||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "graph/anchor.h" | #include "graph/anchor.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "external/graph/graph.h" | #include "external/graph/graph.h" | ||||
#include "graph/node.h" | #include "graph/node.h" | ||||
#include "graph/passes/pass_utils.h" | #include "graph/passes/pass_utils.h" | ||||
@@ -17,7 +17,7 @@ | |||||
#include "graph/passes/mark_force_unknown_for_cond_pass.h" | #include "graph/passes/mark_force_unknown_for_cond_pass.h" | ||||
#include "graph/utils/node_utils.h" | #include "graph/utils/node_utils.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
namespace ge { | namespace ge { | ||||
namespace { | namespace { | ||||
@@ -17,7 +17,7 @@ | |||||
#include "graph/passes/mark_node_unknown_shape_pass.h" | #include "graph/passes/mark_node_unknown_shape_pass.h" | ||||
#include "graph/utils/node_utils.h" | #include "graph/utils/node_utils.h" | ||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/common/local_context.h" | |||||
#include "common/local_context.h" | |||||
namespace ge { | namespace ge { | ||||
namespace { | namespace { | ||||
@@ -18,7 +18,7 @@ | |||||
#include "common/ge/ge_util.h" | #include "common/ge/ge_util.h" | ||||
#include "external/ge/ge_api_types.h" | #include "external/ge/ge_api_types.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
namespace ge { | namespace ge { | ||||
Status MergeInputMemcpyPass::Run(ComputeGraphPtr graph) { | Status MergeInputMemcpyPass::Run(ComputeGraphPtr graph) { | ||||
@@ -22,7 +22,7 @@ | |||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "common/ge/ge_util.h" | #include "common/ge/ge_util.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/debug/ge_attr_define.h" | #include "graph/debug/ge_attr_define.h" | ||||
#include "graph/utils/graph_utils.h" | #include "graph/utils/graph_utils.h" | ||||
#include "graph/passes/pass_utils.h" | #include "graph/passes/pass_utils.h" | ||||
@@ -17,7 +17,7 @@ | |||||
#include "graph/passes/merge_to_stream_merge_pass.h" | #include "graph/passes/merge_to_stream_merge_pass.h" | ||||
#include "common/ge/ge_util.h" | #include "common/ge/ge_util.h" | ||||
#include "external/ge/ge_api_types.h" | #include "external/ge/ge_api_types.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
namespace ge { | namespace ge { | ||||
Status MergeToStreamMergePass::Run(ComputeGraphPtr graph) { | Status MergeToStreamMergePass::Run(ComputeGraphPtr graph) { | ||||
@@ -18,14 +18,14 @@ | |||||
#include "common/formats/utils/formats_trans_utils.h" | #include "common/formats/utils/formats_trans_utils.h" | ||||
#include "common/ge/ge_util.h" | #include "common/ge/ge_util.h" | ||||
#include "graph/common/local_context.h" | |||||
#include "common/local_context.h" | |||||
#include "graph/preprocess/multi_batch_options.h" | #include "graph/preprocess/multi_batch_options.h" | ||||
#include "graph/utils/node_utils.h" | #include "graph/utils/node_utils.h" | ||||
#include "graph/utils/op_desc_utils.h" | #include "graph/utils/op_desc_utils.h" | ||||
#include "graph/utils/tensor_utils.h" | #include "graph/utils/tensor_utils.h" | ||||
#include "graph/utils/type_utils.h" | #include "graph/utils/type_utils.h" | ||||
#include "register/op_registry.h" | #include "register/op_registry.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
namespace ge { | namespace ge { | ||||
namespace { | namespace { | ||||
@@ -19,7 +19,7 @@ | |||||
#include <stack> | #include <stack> | ||||
#include <unordered_set> | #include <unordered_set> | ||||
#include "common/ge/ge_util.h" | #include "common/ge/ge_util.h" | ||||
#include "graph/common/omg_util.h" | |||||
#include "common/omg_util.h" | |||||
#include "graph/utils/type_utils.h" | #include "graph/utils/type_utils.h" | ||||
#include "common/formats/utils/formats_trans_utils.h" | #include "common/formats/utils/formats_trans_utils.h" | ||||