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

!8213 Fix pynative sens and weights map bug

Browse Source 
Merge pull request !8213 from zjun/sw_changed
pull/8213/MERGE
mindspore-ci-bot 5 years ago committed by Gitee
parent e62c116277 a3a13cd07a
commit 3f0aa9bbec
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

7
mindspore/ccsrc/pipeline/pynative/pynative_execute.cc
Unescape View File

@ -1846,8 +1846,9 @@ void MapClear(T *map, const std::string &flag) {
void PynativeExecutor::Clear(const std::string &flag) { void PynativeExecutor::Clear(const std::string &flag) {
if (!flag.empty()) { if (!flag.empty()) {
MS_LOG(DEBUG) << "Clear cell res"; MS_LOG(DEBUG) << "Clear cell res";
MapClear<std::unordered_map<std::string, std::pair<FuncGraphPtr, bool>>>(&cell_graph_map_, flag);
MapClear<std::unordered_map<std::string, ResourcePtr>>(&cell_resource_map_, flag); MapClear<std::unordered_map<std::string, ResourcePtr>>(&cell_resource_map_, flag);
MapClear<std::unordered_map<std::string, std::pair<FuncGraphPtr, bool>>>(&cell_graph_map_, flag);
MapClear<std::unordered_map<std::string, std::pair<std::string, std::string>>>(&cell_sw_map_, flag);
MapClear<std::unordered_map<std::string, std::pair<FuncGraphPtr, FuncGraphPtr>>>(&df_builder_map_, flag); MapClear<std::unordered_map<std::string, std::pair<FuncGraphPtr, FuncGraphPtr>>>(&df_builder_map_, flag);
// Maybe exit in the pynative runing op, so need reset pynative flag. // Maybe exit in the pynative runing op, so need reset pynative flag.
@ -1886,11 +1887,13 @@ void PynativeExecutor::Clean() {
void PynativeExecutor::ClearRes() { void PynativeExecutor::ClearRes() {
MS_LOG(DEBUG) << "PynativeExecutor destruct"; MS_LOG(DEBUG) << "PynativeExecutor destruct";
Clean();
cell_sw_map_.clear();
df_builder_map_.clear(); df_builder_map_.clear();
cell_graph_map_.clear(); cell_graph_map_.clear();
cell_resource_map_.clear(); cell_resource_map_.clear();
node_abs_map_.clear(); node_abs_map_.clear();
Clean(); top_graph_cells_.clear();
} }
void PynativeExecutor::NewGraph(const py::object &cell, const py::args &args) { void PynativeExecutor::NewGraph(const py::object &cell, const py::args &args) {

15
mindspore/ccsrc/pipeline/pynative/pynative_execute.h
Unescape View File

@ -56,13 +56,10 @@ py::object RunOpInVM(const OpExecInfoPtr &op_exec_info, PynativeStatusCode *stat
py::tuple RunOp(const py::args &args); py::tuple RunOp(const py::args &args);
void ConvertInputs(const PrimitivePyPtr &prim, const py::list &py_args, py::tuple *const out_args,
py::list *const out_args_list);
void ClearPyNativeSession(); void ClearPyNativeSession();
struct GraphInfo { struct GraphInfo {
std::unordered_set<std::string> params; // hold inpout parameters and cell weigths std::unordered_set<std::string> params; // hold input parameters and cell weigths
std::unordered_map<std::string, std::pair<AnfNodePtr, std::vector<int>>> node_map; std::unordered_map<std::string, std::pair<AnfNodePtr, std::vector<int>>> node_map;
AnfNodePtr output; AnfNodePtr output;
std::vector<std::string> objects; std::vector<std::string> objects;
@ -78,6 +75,8 @@ class PynativeExecutor : public std::enable_shared_from_this<PynativeExecutor> {
return executor_; return executor_;
} }
~PynativeExecutor(); ~PynativeExecutor();
PynativeExecutor(const PynativeExecutor &) = delete;
PynativeExecutor &operator=(const PynativeExecutor &) = delete;
bool grad_flag() { return grad_flag_; } bool grad_flag() { return grad_flag_; }
void set_grad_flag(bool flag) { grad_flag_ = flag; } void set_grad_flag(bool flag) { grad_flag_ = flag; }
@ -100,8 +99,6 @@ class PynativeExecutor : public std::enable_shared_from_this<PynativeExecutor> {
private: private:
PynativeExecutor() = default; PynativeExecutor() = default;
PynativeExecutor(const PynativeExecutor &) = delete;
PynativeExecutor &operator=(const PynativeExecutor &) = delete;
// run op // run op
AnfNodePtr GetInput(const py::object &obj, bool op_mask); AnfNodePtr GetInput(const py::object &obj, bool op_mask);
@ -146,13 +143,13 @@ class PynativeExecutor : public std::enable_shared_from_this<PynativeExecutor> {
// hold graph(forward and grad) info // hold graph(forward and grad) info
void set_pyobj(FuncGraphPtr g, const std::string obj) { graph_info_map_[g].objects.push_back(obj); } void set_pyobj(FuncGraphPtr g, const std::string obj) { graph_info_map_[g].objects.push_back(obj); }
void set_node_map(const FuncGraphPtr &g, const py::object &node, const AnfNodePtr &cnode, bool is_param = false); void set_node_map(const FuncGraphPtr &g, const py::object &node, const AnfNodePtr &cnode, bool is_param = false);
void set_node_map(FuncGraphPtr g, const std::string obj, AnfNodePtr node) { void set_node_map(const FuncGraphPtr &g, const std::string &obj, AnfNodePtr node) {
graph_info_map_[g].node_map[obj] = std::make_pair(node, std::vector<int>{-1}); graph_info_map_[g].node_map[obj] = std::make_pair(node, std::vector<int>{-1});
} }
void set_node_map(FuncGraphPtr g, const std::string obj, AnfNodePtr node, int index) { void set_node_map(const FuncGraphPtr &g, const std::string &obj, AnfNodePtr node, int index) {
graph_info_map_[g].node_map[obj] = std::make_pair(node, std::vector<int>{index}); graph_info_map_[g].node_map[obj] = std::make_pair(node, std::vector<int>{index});
} }
void set_node_map(FuncGraphPtr g, const std::string obj, AnfNodePtr node, std::vector<int> index) { void set_node_map(const FuncGraphPtr &g, const std::string &obj, AnfNodePtr node, std::vector<int> index) {
graph_info_map_[g].node_map[obj] = std::make_pair(node, index); graph_info_map_[g].node_map[obj] = std::make_pair(node, index);
} }
void set_tuple_node_map(const FuncGraphPtr &g, const py::object &node, const AnfNodePtr &cnode, void set_tuple_node_map(const FuncGraphPtr &g, const py::object &node, const AnfNodePtr &cnode,

Write Preview
Loading…
Cancel
Save