From 3db6c70685e6654859291310273e5eccf3c0f7ce Mon Sep 17 00:00:00 2001 From: wangxiaotian22 Date: Mon, 31 May 2021 15:47:33 +0800 Subject: [PATCH] fix --- ge/graph/load/graph_loader.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/ge/graph/load/graph_loader.cc b/ge/graph/load/graph_loader.cc index 866f0a07..f1705d44 100755 --- a/ge/graph/load/graph_loader.cc +++ b/ge/graph/load/graph_loader.cc @@ -123,7 +123,6 @@ Status GraphLoader::GetMaxUsedMemory(uint32_t model_id, uint64_t &max_size) { return SUCCESS; } -<<<<<<< Updated upstream Status GraphLoader::LoadDataFromFile(const std::string &path, int32_t priority, ModelData &model_data) { if (!CheckInputPathValid(path, "model_file")) { GELOGE(ACL_ERROR_GE_EXEC_MODEL_PATH_INVALID, "[Check][Param] model path is invalid:%s", path.c_str());