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

delete davinci_model_parser.cc

Browse Source
pull/1165/head
zhangxiaokun 4 years ago
parent 1caf6d8f30
commit 74563727da
23 changed files with 26 additions and 149 deletions
Show Stats Download Patch File Download Diff File

2
ge/CMakeLists.txt
Unescape View File

@ -133,7 +133,6 @@ set(TRAIN_SRC_LIST
"graph/load/model_manager/data_dumper.cc" "graph/load/model_manager/data_dumper.cc"
"graph/load/model_manager/data_inputer.cc" "graph/load/model_manager/data_inputer.cc"
"graph/load/model_manager/davinci_model.cc" "graph/load/model_manager/davinci_model.cc"
"graph/load/model_manager/davinci_model_parser.cc"
"graph/load/model_manager/model_manager.cc" "graph/load/model_manager/model_manager.cc"
"graph/load/model_manager/model_utils.cc" "graph/load/model_manager/model_utils.cc"
"graph/load/model_manager/aipp_utils.cc" "graph/load/model_manager/aipp_utils.cc"
@ -613,7 +612,6 @@ set(INFER_SRC_LIST
"graph/load/model_manager/model_manager.cc" "graph/load/model_manager/model_manager.cc"
"graph/load/model_manager/data_inputer.cc" "graph/load/model_manager/data_inputer.cc"
"graph/load/model_manager/davinci_model.cc" "graph/load/model_manager/davinci_model.cc"
"graph/load/model_manager/davinci_model_parser.cc"
"graph/load/model_manager/model_utils.cc" "graph/load/model_manager/model_utils.cc"
"graph/load/model_manager/aipp_utils.cc" "graph/load/model_manager/aipp_utils.cc"
"graph/load/model_manager/tbe_handle_store.cc" "graph/load/model_manager/tbe_handle_store.cc"

2
ge/common/CMakeLists.txt
Unescape View File

@ -54,7 +54,7 @@ set(SRC_LIST
"util.cc" "util.cc"
"properties_manager.cc" "properties_manager.cc"
"types.cc" "types.cc"
"model_parser/base.cc" "model_parser/model_parser.cc"
"kernel_store.cc" "kernel_store.cc"
"tbe_kernel_store.cc" "tbe_kernel_store.cc"
"cust_aicpu_kernel_store.cc" "cust_aicpu_kernel_store.cc"

15
ge/common/helper/model_cache_helper.cc
Unescape View File

@ -14,22 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
#include <climits> #include "common/helper/model_cache_helper.h"
#include <cstdio> #include <cstdio>
#include <fstream> #include <fstream>
#include <functional> #include <functional>
#include "common/ge/ge_util.h" #include "common/model_parser/model_parser.h"
#include "common/helper/model_cache_helper.h"
#include "common/types.h"
#include "framework/common/debug/ge_log.h"
#include "framework/common/ge_types.h"
#include "framework/common/helper/model_helper.h" #include "framework/common/helper/model_helper.h"
#include "framework/common/util.h"
#include "graph/detail/attributes_holder.h"
#include "graph/detail/model_serialize_imp.h" #include "graph/detail/model_serialize_imp.h"
#include "graph/load/model_manager/davinci_model_parser.h"
#include "graph/model.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 "init/gelib.h" #include "init/gelib.h"
@ -1682,7 +1675,7 @@ Status ModelCacheHelper::LoadOmModelFromCache(GeModelPtr &ge_model) const {
string key_path; string key_path;
int32_t priority = 0; int32_t priority = 0;
ModelData model_data; ModelData model_data;
ret = DavinciModelParser::LoadFromFile(om_path.c_str(), key_path.c_str(), priority, model_data); ret = ModelParserBase::LoadFromFile(om_path.c_str(), key_path.c_str(), priority, model_data);
if (ret != SUCCESS) { if (ret != SUCCESS) {
GELOGW("LoadOmModelFromCache: Load model from file failed. ret = %u", ret); GELOGW("LoadOmModelFromCache: Load model from file failed. ret = %u", ret);
return ret; return ret;

12
ge/common/helper/model_helper.cc
Unescape View File

@ -16,15 +16,9 @@
#include "framework/common/helper/model_helper.h" #include "framework/common/helper/model_helper.h"
#include "common/ge/ge_util.h" #include "common/model_parser/model_parser.h"
#include "common/util/error_manager/error_manager.h"
#include "framework/common/debug/log.h"
#include "framework/common/util.h"
#include "framework/common/debug/ge_log.h"
#include "framework/omg/version.h" #include "framework/omg/version.h"
#include "graph/debug/ge_attr_define.h" #include "graph/debug/ge_attr_define.h"
#include "graph/load/model_manager/davinci_model_parser.h"
#include "graph/utils/attr_utils.h"
#include "graph/utils/graph_utils.h" #include "graph/utils/graph_utils.h"
using std::string; using std::string;
@ -464,7 +458,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadModel(c
return ACL_ERROR_GE_EXEC_RELEASE_MODEL_DATA; return ACL_ERROR_GE_EXEC_RELEASE_MODEL_DATA;
} }
Status status = ge::DavinciModelParser::ParseModelContent(model_data, model_addr_tmp_, model_len_tmp_); Status status = ModelParserBase::ParseModelContent(model_data, model_addr_tmp_, model_len_tmp_);
if (status != SUCCESS) { if (status != SUCCESS) {
GELOGE(ACL_ERROR_GE_PARAM_INVALID, "Parse model content failed!"); GELOGE(ACL_ERROR_GE_PARAM_INVALID, "Parse model content failed!");
return ACL_ERROR_GE_PARAM_INVALID; return ACL_ERROR_GE_PARAM_INVALID;
@ -513,7 +507,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadRootMod
return INTERNAL_ERROR; return INTERNAL_ERROR;
} }
Status status = ge::DavinciModelParser::ParseModelContent(model_data, model_addr_tmp_, model_len_tmp_); Status status = ModelParserBase::ParseModelContent(model_data, model_addr_tmp_, model_len_tmp_);
if (status != SUCCESS) { if (status != SUCCESS) {
GELOGE(ACL_ERROR_GE_PARAM_INVALID, "Parse model content failed!"); GELOGE(ACL_ERROR_GE_PARAM_INVALID, "Parse model content failed!");
return ACL_ERROR_GE_PARAM_INVALID; return ACL_ERROR_GE_PARAM_INVALID;

11
ge/common/model_parser/base.cc → ge/common/model_parser/model_parser.cc
Unescape View File

@ -14,16 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
#include "common/model_parser/base.h" #include "common/model_parser/model_parser.h"
#include "common/helper/model_helper.h"
#include <securec.h>
#include <fstream> #include <fstream>
#include <memory>
#include <string> #include <string>
#include "framework/common/debug/ge_log.h" #include "securec.h"
#include "framework/common/debug/log.h" #include "common/helper/model_helper.h"
#include "framework/common/util.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() {}

0
ge/common/model_parser/base.h → ge/common/model_parser/model_parser.h
Unescape View File

1
ge/executor/CMakeLists.txt
Unescape View File

@ -33,7 +33,6 @@ set(SRC_LIST
"../model/ge_model.cc" "../model/ge_model.cc"
"../model/ge_root_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/davinci_model_parser.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"
"../graph/load/model_manager/cpu_queue_schedule.cc" "../graph/load/model_manager/cpu_queue_schedule.cc"

9
ge/executor/ge_executor.cc
Unescape View File

@ -16,7 +16,6 @@
#include "executor/ge_executor.h" #include "executor/ge_executor.h"
#include <cce/cce.h> #include <cce/cce.h>
#include <cce/compiler_stub.h>
#include <ctime> #include <ctime>
#include <iostream> #include <iostream>
#include "common/debug/log.h" #include "common/debug/log.h"
@ -24,19 +23,11 @@
#include "common/helper/model_helper.h" #include "common/helper/model_helper.h"
#include "common/profiling/profiling_manager.h" #include "common/profiling/profiling_manager.h"
#include "common/dump/dump_manager.h" #include "common/dump/dump_manager.h"
#include "common/util.h"
#include "framework/common/debug/ge_log.h"
#include "framework/common/util.h"
#include "graph/execute/graph_execute.h" #include "graph/execute/graph_execute.h"
#include "graph/load/graph_loader.h" #include "graph/load/graph_loader.h"
#include "graph/load/model_manager/davinci_model_parser.h"
#include "graph/load/model_manager/model_manager.h" #include "graph/load/model_manager/model_manager.h"
#include "graph/manager/graph_mem_allocator.h" #include "graph/manager/graph_mem_allocator.h"
#include "graph/model.h"
#include "graph/utils/graph_utils.h"
#include "mmpa/mmpa_api.h"
#include "single_op/single_op_manager.h" #include "single_op/single_op_manager.h"
#include "graph/manager/graph_var_manager.h"
#include "graph/load/model_manager/davinci_model.h" #include "graph/load/model_manager/davinci_model.h"
#include "opskernel_manager/ops_kernel_builder_manager.h" #include "opskernel_manager/ops_kernel_builder_manager.h"

4
ge/graph/execute/graph_execute.cc
Unescape View File

@ -19,12 +19,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "common/ge_inner_error_codes.h"
#include "common/model_parser/base.h"
#include "graph/load/model_manager/model_manager.h" #include "graph/load/model_manager/model_manager.h"
#include "omm/csa_interact.h" #include "omm/csa_interact.h"
#include "runtime/dev.h"
#include "runtime/mem.h"
namespace ge { namespace ge {
GraphExecutor::GraphExecutor() GraphExecutor::GraphExecutor()

14
ge/graph/load/graph_loader.cc
Unescape View File

@ -20,19 +20,13 @@
#include <vector> #include <vector>
#include "common/helper/model_helper.h" #include "common/helper/model_helper.h"
#include "common/util.h" #include "common/model_parser/model_parser.h"
#include "graph/ge_context.h" #include "graph/ge_context.h"
#include "graph/load/model_manager/davinci_model_parser.h"
#include "graph/load/model_manager/model_manager.h" #include "graph/load/model_manager/model_manager.h"
#include "graph/manager/graph_var_manager.h" #include "graph/manager/graph_var_manager.h"
#include "omm/csa_interact.h" #include "omm/csa_interact.h"
#include "runtime/dev.h"
namespace ge { namespace ge {
GraphLoader::GraphLoader() = default;
GraphLoader::~GraphLoader() = default;
Status GraphLoader::UnloadModel(uint32_t model_id) { Status GraphLoader::UnloadModel(uint32_t model_id) {
auto model_manager = ModelManager::GetInstance(); auto model_manager = ModelManager::GetInstance();
GE_CHECK_NOTNULL(model_manager); GE_CHECK_NOTNULL(model_manager);
@ -120,7 +114,6 @@ Status GraphLoader::GetMaxUsedMemory(uint32_t model_id, uint64_t &max_size) {
Status GraphLoader::LoadDataFromFile(const std::string &path, const std::string &key_path, int32_t priority, Status GraphLoader::LoadDataFromFile(const std::string &path, const std::string &key_path, int32_t priority,
ModelData &model_data) { ModelData &model_data) {
Status ret;
if (!CheckInputPathValid(path)) { if (!CheckInputPathValid(path)) {
GELOGE(ACL_ERROR_GE_EXEC_MODEL_PATH_INVALID, "model path is invalid: %s", path.c_str()); GELOGE(ACL_ERROR_GE_EXEC_MODEL_PATH_INVALID, "model path is invalid: %s", path.c_str());
return ACL_ERROR_GE_EXEC_MODEL_PATH_INVALID; return ACL_ERROR_GE_EXEC_MODEL_PATH_INVALID;
@ -132,16 +125,15 @@ Status GraphLoader::LoadDataFromFile(const std::string &path, const std::string
return ACL_ERROR_GE_PARAM_INVALID; return ACL_ERROR_GE_PARAM_INVALID;
} }
ret = DavinciModelParser::LoadFromFile(path.c_str(), key_path.c_str(), priority, model_data); Status ret = ModelParserBase::LoadFromFile(path.c_str(), key_path.c_str(), priority, model_data);
if (ret != SUCCESS) { if (ret != SUCCESS) {
GELOGE(ret, "LoadModelFromFile: Load failed. ret = %u", ret); GELOGE(ret, "LoadModelFromFile: Load failed. ret = %u", ret);
if (model_data.model_data != nullptr) { if (model_data.model_data != nullptr) {
delete[] static_cast<char *>(model_data.model_data); delete[] static_cast<char *>(model_data.model_data);
model_data.model_data = nullptr; model_data.model_data = nullptr;
} }
return ret;
} }
return SUCCESS; return ret;
} }
Status GraphLoader::CommandHandle(const Command &command) { Status GraphLoader::CommandHandle(const Command &command) {

4
ge/graph/load/graph_loader.h
Unescape View File

@ -32,9 +32,9 @@
namespace ge { namespace ge {
class GraphLoader { class GraphLoader {
public: public:
GraphLoader(); GraphLoader() = default;
virtual ~GraphLoader(); virtual ~GraphLoader() = default;
GraphLoader(const GraphLoader &in) = delete; GraphLoader(const GraphLoader &in) = delete;

23
ge/graph/load/model_manager/davinci_model_parser.cc
Unescape View File

@ -1,23 +0,0 @@
/**
* Copyright 2020 Huawei Technologies Co., Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "graph/load/model_manager/davinci_model_parser.h"
namespace ge {
DavinciModelParser::DavinciModelParser() {}
DavinciModelParser::~DavinciModelParser() {}
} // namespace ge

46
ge/graph/load/model_manager/davinci_model_parser.h
Unescape View File

@ -1,46 +0,0 @@
/**
* Copyright 2020 Huawei Technologies Co., Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef GE_GRAPH_LOAD_NEW_MODEL_MANAGER_DAVINCI_MODEL_PARSER_H_
#define GE_GRAPH_LOAD_NEW_MODEL_MANAGER_DAVINCI_MODEL_PARSER_H_
#include <securec.h>
#include <memory>
#include "common/debug/log.h"
#include "common/ge_types.h"
#include "common/model_parser/base.h"
#include "common/types.h"
#include "common/util.h"
namespace ge {
class DavinciModelParser : public ModelParserBase {
public:
///
/// @ingroup hiai
/// @brief constructor
///
DavinciModelParser();
///
/// @ingroup hiai
/// @brief destructor
///
~DavinciModelParser();
};
} // namespace ge
#endif // GE_GRAPH_LOAD_NEW_MODEL_MANAGER_DAVINCI_MODEL_PARSER_H_

12
ge/graph/load/model_manager/model_manager.cc
Unescape View File

@ -18,23 +18,15 @@
#include <string> #include <string>
#include "mmpa/mmpa_api.h"
#include "aicpu/aicpu_schedule/aicpu_op_type_list.h" #include "aicpu/aicpu_schedule/aicpu_op_type_list.h"
#include "common/model_parser/model_parser.h"
#include "common/dump/dump_manager.h" #include "common/dump/dump_manager.h"
#include "common/l2_cache_optimize.h" #include "common/l2_cache_optimize.h"
#include "common/profiling/profiling_manager.h" #include "common/profiling/profiling_manager.h"
#include "common/properties_manager.h"
#include "framework/common/debug/ge_log.h"
#include "framework/common/util.h"
#include "graph/common/ge_call_wrapper.h" #include "graph/common/ge_call_wrapper.h"
#include "graph/debug/ge_attr_define.h"
#include "graph/load/model_manager/davinci_model.h" #include "graph/load/model_manager/davinci_model.h"
#include "graph/load/model_manager/davinci_model_parser.h"
#include "model/ge_root_model.h" #include "model/ge_root_model.h"
#include "graph/common/local_context.h"
#include "graph/utils/attr_utils.h"
#include "common/formats/utils/formats_trans_utils.h" #include "common/formats/utils/formats_trans_utils.h"
#include "hybrid/hybrid_davinci_model.h"
namespace ge { namespace ge {
thread_local uint32_t device_count = 0; thread_local uint32_t device_count = 0;
@ -1403,7 +1395,7 @@ Status ModelManager::LaunchCustAicpuSo() {
Status ModelManager::GetModelMemAndWeightSize(const ModelData &model, size_t &mem_size, size_t &weight_size) { Status ModelManager::GetModelMemAndWeightSize(const ModelData &model, size_t &mem_size, size_t &weight_size) {
uint8_t *model_data = nullptr; uint8_t *model_data = nullptr;
uint32_t model_len = 0; uint32_t model_len = 0;
Status ret = DavinciModelParser::ParseModelContent(model, model_data, model_len); Status ret = ModelParserBase::ParseModelContent(model, model_data, model_len);
GE_CHK_BOOL_TRUE_EXEC_WITH_LOG(ret != SUCCESS, return ACL_ERROR_GE_PARAM_INVALID, "parse model content failed!"); GE_CHK_BOOL_TRUE_EXEC_WITH_LOG(ret != SUCCESS, return ACL_ERROR_GE_PARAM_INVALID, "parse model content failed!");
OmFileLoadHelper om_file_helper; OmFileLoadHelper om_file_helper;

2
ge/graph/preprocess/graph_preprocess.h
Unescape View File

@ -23,7 +23,7 @@
#include <vector> #include <vector>
#include "common/debug/log.h" #include "common/debug/log.h"
#include "common/debug/memory_dumper.h" #include "common/debug/memory_dumper.h"
#include "common/model_parser/base.h" #include "common/model_parser/model_parser.h"
#include "common/properties_manager.h" #include "common/properties_manager.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "common/types.h" #include "common/types.h"

2
ge/session/omg.cc
Unescape View File

@ -23,7 +23,7 @@
#include "common/debug/memory_dumper.h" #include "common/debug/memory_dumper.h"
#include "common/ge/ge_util.h" #include "common/ge/ge_util.h"
#include "common/helper/model_helper.h" #include "common/helper/model_helper.h"
#include "common/model_parser/base.h" #include "common/model_parser/model_parser.h"
#include "common/model_saver.h" #include "common/model_saver.h"
#include "common/properties_manager.h" #include "common/properties_manager.h"
#include "common/string_util.h" #include "common/string_util.h"

1
ge/single_op/single_op_model.h
Unescape View File

@ -24,7 +24,6 @@
#include <vector> #include <vector>
#include "common/helper/model_helper.h" #include "common/helper/model_helper.h"
#include "graph/load/model_manager/davinci_model_parser.h"
#include "single_op/single_op.h" #include "single_op/single_op.h"
#include "single_op/stream_resource.h" #include "single_op/stream_resource.h"

2
tests/depends/omg/src/omg_stub.cc
Unescape View File

@ -27,7 +27,7 @@
#include "common/util.h" #include "common/util.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "common/properties_manager.h" #include "common/properties_manager.h"
#include "common/model_parser/base.h" #include "common/model_parser/model_parser.h"
#include "graph/model.h" #include "graph/model.h"
#include "cce/dnn.h" #include "cce/dnn.h"
#include "ge/ge_api_types.h" #include "ge/ge_api_types.h"

7
tests/ut/ge/CMakeLists.txt
Unescape View File

@ -163,7 +163,7 @@ set(COMMON_SRC_FILES
"${GE_CODE_DIR}/ge/common/dump/dump_manager.cc" "${GE_CODE_DIR}/ge/common/dump/dump_manager.cc"
"${GE_CODE_DIR}/ge/common/helper/om_file_helper.cc" "${GE_CODE_DIR}/ge/common/helper/om_file_helper.cc"
"${GE_CODE_DIR}/ge/model/ge_root_model.cc" "${GE_CODE_DIR}/ge/model/ge_root_model.cc"
"${GE_CODE_DIR}/ge/common/model_parser/base.cc" "${GE_CODE_DIR}/ge/common/model_parser/model_parser.cc"
"${GE_CODE_DIR}/ge/graph/load/model_manager/data_dumper.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/data_dumper.cc"
"${GE_CODE_DIR}/ge/graph/manager/graph_manager.cc" "${GE_CODE_DIR}/ge/graph/manager/graph_manager.cc"
"${GE_CODE_DIR}/ge/common/dump/dump_server.cc" "${GE_CODE_DIR}/ge/common/dump/dump_server.cc"
@ -393,14 +393,13 @@ set(DISTINCT_GRAPH_LOAD_SRC_FILES
"${GE_CODE_DIR}/ge/graph/manager/util/debug.cc" "${GE_CODE_DIR}/ge/graph/manager/util/debug.cc"
"${GE_CODE_DIR}/ge/common/properties_manager.cc" "${GE_CODE_DIR}/ge/common/properties_manager.cc"
"${GE_CODE_DIR}/ge/common/profiling/profiling_manager.cc" "${GE_CODE_DIR}/ge/common/profiling/profiling_manager.cc"
"${GE_CODE_DIR}/ge/common/model_parser/base.cc" "${GE_CODE_DIR}/ge/common/model_parser/model_parser.cc"
"${GE_CODE_DIR}/ge/common/tbe_kernel_store.cc" "${GE_CODE_DIR}/ge/common/tbe_kernel_store.cc"
"${GE_CODE_DIR}/ge/common/util.cc" "${GE_CODE_DIR}/ge/common/util.cc"
"${GE_CODE_DIR}/ge/graph/load/model_manager/cpu_queue_schedule.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/cpu_queue_schedule.cc"
"${GE_CODE_DIR}/ge/graph/load/model_manager/data_dumper.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/data_dumper.cc"
"${GE_CODE_DIR}/ge/graph/load/model_manager/data_inputer.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/data_inputer.cc"
"${GE_CODE_DIR}/ge/graph/load/model_manager/davinci_model.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/davinci_model.cc"
"${GE_CODE_DIR}/ge/graph/load/model_manager/davinci_model_parser.cc"
"${GE_CODE_DIR}/ge/graph/load/model_manager/model_manager.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/model_manager.cc"
"${GE_CODE_DIR}/ge/graph/load/model_manager/model_utils.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/model_utils.cc"
"${GE_CODE_DIR}/ge/graph/load/model_manager/tbe_handle_store.cc" "${GE_CODE_DIR}/ge/graph/load/model_manager/tbe_handle_store.cc"
@ -458,7 +457,7 @@ set(GRAPH_BUILD_COMMON_SRC_FILES
"${GE_CODE_DIR}/ge/common/helper/om_file_helper.cc" "${GE_CODE_DIR}/ge/common/helper/om_file_helper.cc"
"${GE_CODE_DIR}/ge/common/tbe_kernel_store.cc" "${GE_CODE_DIR}/ge/common/tbe_kernel_store.cc"
"${GE_CODE_DIR}/ge/common/thread_pool.cc" "${GE_CODE_DIR}/ge/common/thread_pool.cc"
"${GE_CODE_DIR}/ge/common/model_parser/base.cc" "${GE_CODE_DIR}/ge/common/model_parser/model_parser.cc"
"${GE_CODE_DIR}/ge/graph/build/run_context.cc" "${GE_CODE_DIR}/ge/graph/build/run_context.cc"
"${GE_CODE_DIR}/ge/graph/common/local_context.cc" "${GE_CODE_DIR}/ge/graph/common/local_context.cc"
) )

1
tests/ut/ge/graph/ge_executor_unittest.cc
Unescape View File

@ -34,7 +34,6 @@
#include "common/types.h" #include "common/types.h"
#include "graph/load/graph_loader.h" #include "graph/load/graph_loader.h"
#include "graph/load/model_manager/davinci_model.h" #include "graph/load/model_manager/davinci_model.h"
#include "graph/load/model_manager/davinci_model_parser.h"
#include "graph/load/model_manager/model_manager.h" #include "graph/load/model_manager/model_manager.h"
#include "graph/load/model_manager/task_info/kernel_task_info.h" #include "graph/load/model_manager/task_info/kernel_task_info.h"
#include "graph/load/model_manager/task_info/kernel_ex_task_info.h" #include "graph/load/model_manager/task_info/kernel_ex_task_info.h"

1
tests/ut/ge/graph/graph_load_unittest.cc
Unescape View File

@ -24,7 +24,6 @@
#include "common/helper/model_helper.h" #include "common/helper/model_helper.h"
#include "common/op/ge_op_utils.h" #include "common/op/ge_op_utils.h"
#include "common/types.h" #include "common/types.h"
#include "graph/load/model_manager/davinci_model_parser.h"
#include "graph/op_desc.h" #include "graph/op_desc.h"
#include "graph/types.h" #include "graph/types.h"
#include "graph/utils/attr_utils.h" #include "graph/utils/attr_utils.h"

1
tests/ut/ge/graph/load/model_manager_unittest.cc
Unescape View File

@ -25,7 +25,6 @@
#include "common/op/ge_op_utils.h" #include "common/op/ge_op_utils.h"
#include "graph/load/graph_loader.h" #include "graph/load/graph_loader.h"
#include "graph/load/model_manager/davinci_model.h" #include "graph/load/model_manager/davinci_model.h"
#include "graph/load/model_manager/davinci_model_parser.h"
using namespace std; using namespace std;
using namespace testing; using namespace testing;

3
tests/ut/ge/graph/load/new_model_manager_model_manager_aicpu_unittest.cc
Unescape View File

@ -21,7 +21,7 @@
#include "common/debug/log.h" #include "common/debug/log.h"
#include "common/l2_cache_optimize.h" #include "common/l2_cache_optimize.h"
#include "common/model_parser/base.h" #include "common/model_parser/model_parser.h"
#include "common/properties_manager.h" #include "common/properties_manager.h"
#include "common/types.h" #include "common/types.h"
@ -31,7 +31,6 @@
#include "common/op/ge_op_utils.h" #include "common/op/ge_op_utils.h"
#include "graph/load/graph_loader.h" #include "graph/load/graph_loader.h"
#include "graph/load/model_manager/davinci_model.h" #include "graph/load/model_manager/davinci_model.h"
#include "graph/load/model_manager/davinci_model_parser.h"
#include "graph/load/model_manager/model_manager.h" #include "graph/load/model_manager/model_manager.h"
//#include "new_op_test_utils.h" //#include "new_op_test_utils.h"
#undef private #undef private

Write Preview
Loading…
Cancel
Save