From 45b6600001134423ab85ddac032463bb29a3b109 Mon Sep 17 00:00:00 2001
From: liubuyu <liubuyu1@huawei.com>
Date: Wed, 12 Aug 2020 14:50:18 +0800
Subject: [PATCH] mv cc file that end with py to pybind

---
 mindspore/ccsrc/debug/anf_ir_utils.cc                         | 2 +-
 mindspore/ccsrc/frontend/operator/ops_front_infer_function.cc | 2 +-
 mindspore/ccsrc/frontend/optimizer/ad/kprim.cc                | 2 +-
 mindspore/ccsrc/frontend/optimizer/pattern.h                  | 4 ++--
 mindspore/ccsrc/frontend/optimizer/py_pass.cc                 | 2 +-
 mindspore/ccsrc/frontend/optimizer/py_pass_manager.h          | 2 +-
 .../ccsrc/pipeline/jit/static_analysis/static_analysis.h      | 2 +-
 mindspore/ccsrc/pipeline/pynative/base.h                      | 2 +-
 mindspore/ccsrc/pipeline/pynative/pynative_execute.cc         | 2 +-
 mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc      | 2 +-
 mindspore/ccsrc/{utils => pybind_api/ir}/anf_py.cc            | 0
 mindspore/ccsrc/{utils => pybind_api/ir}/base_ref_py.h        | 0
 mindspore/ccsrc/{utils => pybind_api/ir}/dtype_py.cc          | 0
 mindspore/ccsrc/{utils => pybind_api/ir}/func_graph_py.cc     | 0
 mindspore/ccsrc/{utils => pybind_api/ir}/log_adapter_py.cc    | 0
 mindspore/ccsrc/{utils => pybind_api/ir}/param_value_py.cc    | 0
 mindspore/ccsrc/{utils => pybind_api/ir}/primitive_py.cc      | 4 ++--
 mindspore/ccsrc/{utils => pybind_api/ir}/primitive_py.h       | 0
 mindspore/ccsrc/{utils => pybind_api/ir}/signature_py.cc      | 0
 mindspore/ccsrc/{utils => pybind_api/ir}/tensor_py.cc         | 2 +-
 mindspore/ccsrc/{utils => pybind_api/ir}/tensor_py.h          | 0
 mindspore/ccsrc/{utils => pybind_api/ir}/value_py.cc          | 0
 mindspore/ccsrc/utils/base_ref_extends.h                      | 2 +-
 mindspore/ccsrc/utils/context/context_extends.cc              | 2 +-
 mindspore/ccsrc/vm/vmimpl.cc                                  | 2 +-
 tests/ut/cpp/ir/meta_tensor_test.cc                           | 2 +-
 tests/ut/cpp/operator/ops_test.cc                             | 2 +-
 tests/ut/cpp/transform/graph_runner_test.cc                   | 2 +-
 tests/ut/cpp/transform/transform_base_test.cc                 | 2 +-
 29 files changed, 21 insertions(+), 21 deletions(-)
 rename mindspore/ccsrc/{utils => pybind_api/ir}/anf_py.cc (100%)
 rename mindspore/ccsrc/{utils => pybind_api/ir}/base_ref_py.h (100%)
 rename mindspore/ccsrc/{utils => pybind_api/ir}/dtype_py.cc (100%)
 rename mindspore/ccsrc/{utils => pybind_api/ir}/func_graph_py.cc (100%)
 rename mindspore/ccsrc/{utils => pybind_api/ir}/log_adapter_py.cc (100%)
 rename mindspore/ccsrc/{utils => pybind_api/ir}/param_value_py.cc (100%)
 rename mindspore/ccsrc/{utils => pybind_api/ir}/primitive_py.cc (99%)
 rename mindspore/ccsrc/{utils => pybind_api/ir}/primitive_py.h (100%)
 rename mindspore/ccsrc/{utils => pybind_api/ir}/signature_py.cc (100%)
 rename mindspore/ccsrc/{utils => pybind_api/ir}/tensor_py.cc (99%)
 rename mindspore/ccsrc/{utils => pybind_api/ir}/tensor_py.h (100%)
 rename mindspore/ccsrc/{utils => pybind_api/ir}/value_py.cc (100%)

diff --git a/mindspore/ccsrc/debug/anf_ir_utils.cc b/mindspore/ccsrc/debug/anf_ir_utils.cc
index 261e811c91..4d6edd18cb 100644
--- a/mindspore/ccsrc/debug/anf_ir_utils.cc
+++ b/mindspore/ccsrc/debug/anf_ir_utils.cc
@@ -27,7 +27,7 @@
 #include "utils/symbolic.h"
 #include "ir/meta_func_graph.h"
 #include "ir/param_value.h"
-#include "utils/tensor_py.h"
+#include "pybind_api/ir/tensor_py.h"
 #include "pipeline/jit/parse/python_adapter.h"
 #include "pipeline/jit/parse/resolve.h"
 #include "frontend/operator/composite/composite.h"
diff --git a/mindspore/ccsrc/frontend/operator/ops_front_infer_function.cc b/mindspore/ccsrc/frontend/operator/ops_front_infer_function.cc
index 90b9a6a5a2..e58959e026 100644
--- a/mindspore/ccsrc/frontend/operator/ops_front_infer_function.cc
+++ b/mindspore/ccsrc/frontend/operator/ops_front_infer_function.cc
@@ -24,7 +24,7 @@
 #include "abstract/abstract_value.h"
 #include "pipeline/jit/static_analysis/prim.h"
 #include "abstract/param_validator.h"
-#include "utils/tensor_py.h"
+#include "pybind_api/ir/tensor_py.h"
 #include "frontend/operator/ops.h"
 #include "abstract/infer_functions.h"
 namespace mindspore {
diff --git a/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc b/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc
index 4380d16282..2d22012aab 100644
--- a/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc
+++ b/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc
@@ -20,7 +20,7 @@
 #include <string>
 #include <utility>
 #include "ir/anf.h"
-#include "utils/primitive_py.h"
+#include "pybind_api/ir/primitive_py.h"
 #include "ir/meta_func_graph.h"
 #include "ir/func_graph_cloner.h"
 #include "ir/manager.h"
diff --git a/mindspore/ccsrc/frontend/optimizer/pattern.h b/mindspore/ccsrc/frontend/optimizer/pattern.h
index 8d567e5ab2..189a437846 100644
--- a/mindspore/ccsrc/frontend/optimizer/pattern.h
+++ b/mindspore/ccsrc/frontend/optimizer/pattern.h
@@ -23,8 +23,8 @@
 #include "base/base.h"
 #include "ir/anf.h"
 #include "ir/tensor.h"
-#include "utils/primitive_py.h"
-#include "utils/tensor_py.h"
+#include "pybind_api/ir/primitive_py.h"
+#include "pybind_api/ir/tensor_py.h"
 
 namespace mindspore {
 namespace opt {
diff --git a/mindspore/ccsrc/frontend/optimizer/py_pass.cc b/mindspore/ccsrc/frontend/optimizer/py_pass.cc
index 362427d227..d15a53705f 100644
--- a/mindspore/ccsrc/frontend/optimizer/py_pass.cc
+++ b/mindspore/ccsrc/frontend/optimizer/py_pass.cc
@@ -22,7 +22,7 @@
 
 #include "ir/func_graph.h"
 #include "ir/manager.h"
-#include "utils/primitive_py.h"
+#include "pybind_api/ir/primitive_py.h"
 #include "pipeline/jit/parse/parse_base.h"
 #include "pipeline/jit/resource.h"
 
diff --git a/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h b/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h
index 1bb619264e..8c78cee163 100644
--- a/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h
+++ b/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h
@@ -23,7 +23,7 @@
 
 #include "ir/anf.h"
 #include "ir/func_graph.h"
-#include "utils/primitive_py.h"
+#include "pybind_api/ir/primitive_py.h"
 #include "ir/graph_utils.h"
 #include "utils/ms_utils.h"
 
diff --git a/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.h b/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.h
index 57e78dcec8..0ebd9a0af4 100644
--- a/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.h
+++ b/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.h
@@ -33,7 +33,7 @@
 
 #include "utils/log_adapter.h"
 #include "ir/anf.h"
-#include "utils/primitive_py.h"
+#include "pybind_api/ir/primitive_py.h"
 #include "abstract/analysis_context.h"
 #include "abstract/abstract_function.h"
 #include "pipeline/jit/parse/parse.h"
diff --git a/mindspore/ccsrc/pipeline/pynative/base.h b/mindspore/ccsrc/pipeline/pynative/base.h
index 2fa238f2b8..38bca9e800 100644
--- a/mindspore/ccsrc/pipeline/pynative/base.h
+++ b/mindspore/ccsrc/pipeline/pynative/base.h
@@ -27,7 +27,7 @@
 
 #include "pybind11/pybind11.h"
 #include "ir/anf.h"
-#include "utils/primitive_py.h"
+#include "pybind_api/ir/primitive_py.h"
 #include "abstract/abstract_value.h"
 
 namespace mindspore {
diff --git a/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc b/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc
index 56388abbcd..59a54b68d2 100644
--- a/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc
+++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc
@@ -23,7 +23,7 @@
 #include <algorithm>
 
 #include "debug/trace.h"
-#include "utils/tensor_py.h"
+#include "pybind_api/ir/tensor_py.h"
 #include "ir/param_value.h"
 #include "utils/any.h"
 #include "utils/utils.h"
diff --git a/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc b/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc
index 994306ec2d..6552c11864 100644
--- a/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc
+++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc
@@ -28,7 +28,7 @@
 #include "pipeline/jit/parse/data_converter.h"
 #include "pipeline/jit/static_analysis/prim.h"
 #include "backend/session/session_factory.h"
-#include "utils/tensor_py.h"
+#include "pybind_api/ir/tensor_py.h"
 
 const char SINGLE_OP_GRAPH[] = "single_op_graph";
 
diff --git a/mindspore/ccsrc/utils/anf_py.cc b/mindspore/ccsrc/pybind_api/ir/anf_py.cc
similarity index 100%
rename from mindspore/ccsrc/utils/anf_py.cc
rename to mindspore/ccsrc/pybind_api/ir/anf_py.cc
diff --git a/mindspore/ccsrc/utils/base_ref_py.h b/mindspore/ccsrc/pybind_api/ir/base_ref_py.h
similarity index 100%
rename from mindspore/ccsrc/utils/base_ref_py.h
rename to mindspore/ccsrc/pybind_api/ir/base_ref_py.h
diff --git a/mindspore/ccsrc/utils/dtype_py.cc b/mindspore/ccsrc/pybind_api/ir/dtype_py.cc
similarity index 100%
rename from mindspore/ccsrc/utils/dtype_py.cc
rename to mindspore/ccsrc/pybind_api/ir/dtype_py.cc
diff --git a/mindspore/ccsrc/utils/func_graph_py.cc b/mindspore/ccsrc/pybind_api/ir/func_graph_py.cc
similarity index 100%
rename from mindspore/ccsrc/utils/func_graph_py.cc
rename to mindspore/ccsrc/pybind_api/ir/func_graph_py.cc
diff --git a/mindspore/ccsrc/utils/log_adapter_py.cc b/mindspore/ccsrc/pybind_api/ir/log_adapter_py.cc
similarity index 100%
rename from mindspore/ccsrc/utils/log_adapter_py.cc
rename to mindspore/ccsrc/pybind_api/ir/log_adapter_py.cc
diff --git a/mindspore/ccsrc/utils/param_value_py.cc b/mindspore/ccsrc/pybind_api/ir/param_value_py.cc
similarity index 100%
rename from mindspore/ccsrc/utils/param_value_py.cc
rename to mindspore/ccsrc/pybind_api/ir/param_value_py.cc
diff --git a/mindspore/ccsrc/utils/primitive_py.cc b/mindspore/ccsrc/pybind_api/ir/primitive_py.cc
similarity index 99%
rename from mindspore/ccsrc/utils/primitive_py.cc
rename to mindspore/ccsrc/pybind_api/ir/primitive_py.cc
index 8b1031e18f..e08f02f84c 100644
--- a/mindspore/ccsrc/utils/primitive_py.cc
+++ b/mindspore/ccsrc/pybind_api/ir/primitive_py.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "utils/primitive_py.h"
+#include "pybind_api/ir/primitive_py.h"
 #include <mutex>
 #include "ir/signature.h"
 #include "./common.h"
@@ -23,10 +23,10 @@
 #include "pybind11/pytypes.h"
 #include "utils/convert_utils_base.h"
 #include "utils/primitive_utils.h"
-#include "utils/base_ref_py.h"
 #include "utils/base_ref_extends.h"
 #include "pybind_api/api_register.h"
 #include "pybind_api/export_flags.h"
+#include "pybind_api/ir/base_ref_py.h"
 
 namespace mindspore {
 namespace {
diff --git a/mindspore/ccsrc/utils/primitive_py.h b/mindspore/ccsrc/pybind_api/ir/primitive_py.h
similarity index 100%
rename from mindspore/ccsrc/utils/primitive_py.h
rename to mindspore/ccsrc/pybind_api/ir/primitive_py.h
diff --git a/mindspore/ccsrc/utils/signature_py.cc b/mindspore/ccsrc/pybind_api/ir/signature_py.cc
similarity index 100%
rename from mindspore/ccsrc/utils/signature_py.cc
rename to mindspore/ccsrc/pybind_api/ir/signature_py.cc
diff --git a/mindspore/ccsrc/utils/tensor_py.cc b/mindspore/ccsrc/pybind_api/ir/tensor_py.cc
similarity index 99%
rename from mindspore/ccsrc/utils/tensor_py.cc
rename to mindspore/ccsrc/pybind_api/ir/tensor_py.cc
index 606b95527d..6216ff02f1 100644
--- a/mindspore/ccsrc/utils/tensor_py.cc
+++ b/mindspore/ccsrc/pybind_api/ir/tensor_py.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "utils/tensor_py.h"
+#include "pybind_api/ir/tensor_py.h"
 
 #include <functional>
 #include <numeric>
diff --git a/mindspore/ccsrc/utils/tensor_py.h b/mindspore/ccsrc/pybind_api/ir/tensor_py.h
similarity index 100%
rename from mindspore/ccsrc/utils/tensor_py.h
rename to mindspore/ccsrc/pybind_api/ir/tensor_py.h
diff --git a/mindspore/ccsrc/utils/value_py.cc b/mindspore/ccsrc/pybind_api/ir/value_py.cc
similarity index 100%
rename from mindspore/ccsrc/utils/value_py.cc
rename to mindspore/ccsrc/pybind_api/ir/value_py.cc
diff --git a/mindspore/ccsrc/utils/base_ref_extends.h b/mindspore/ccsrc/utils/base_ref_extends.h
index 18d51c2611..005c744ffc 100644
--- a/mindspore/ccsrc/utils/base_ref_extends.h
+++ b/mindspore/ccsrc/utils/base_ref_extends.h
@@ -19,7 +19,7 @@
 #include <memory>
 #include <string>
 
-#include "utils/base_ref_py.h"
+#include "pybind_api/ir/base_ref_py.h"
 #include "base/base_ref.h"
 
 namespace mindspore {
diff --git a/mindspore/ccsrc/utils/context/context_extends.cc b/mindspore/ccsrc/utils/context/context_extends.cc
index 0ba3289b64..aabd286ee9 100644
--- a/mindspore/ccsrc/utils/context/context_extends.cc
+++ b/mindspore/ccsrc/utils/context/context_extends.cc
@@ -329,7 +329,7 @@ bool FinalizeGe(const std::shared_ptr<MsContext> &ms_context_ptr, bool force) {
     if (ge::GEFinalize() != ge::GRAPH_SUCCESS) {
       MS_LOG(WARNING) << "Finalize GE failed!";
     }
-    ms_context_ptr->set_pynative_ge_init(fasle);
+    ms_context_ptr->set_pynative_ge_init(false);
   } else {
     MS_LOG(INFO) << "Ge is used, no need to finalize, tsd reference = " << ms_context_ptr->ge_ref() << ".";
   }
diff --git a/mindspore/ccsrc/vm/vmimpl.cc b/mindspore/ccsrc/vm/vmimpl.cc
index 530e6ba040..6751f8c38b 100644
--- a/mindspore/ccsrc/vm/vmimpl.cc
+++ b/mindspore/ccsrc/vm/vmimpl.cc
@@ -30,7 +30,7 @@
 #include "frontend/operator/ops.h"
 #include "ir/manager.h"
 #include "ir/func_graph_cloner.h"
-#include "utils/primitive_py.h"
+#include "pybind_api/ir/primitive_py.h"
 #include "utils/convert_utils.h"
 #include "utils/primitive_utils.h"
 #include "debug/draw.h"
diff --git a/tests/ut/cpp/ir/meta_tensor_test.cc b/tests/ut/cpp/ir/meta_tensor_test.cc
index 928e90a1a1..9980a44659 100644
--- a/tests/ut/cpp/ir/meta_tensor_test.cc
+++ b/tests/ut/cpp/ir/meta_tensor_test.cc
@@ -22,7 +22,7 @@
 
 #include "securec/include/securec.h"
 #include "ir/tensor.h"
-#include "utils/tensor_py.h"
+#include "pybind_api/ir/tensor_py.h"
 
 using mindspore::tensor::TensorPy;
 
diff --git a/tests/ut/cpp/operator/ops_test.cc b/tests/ut/cpp/operator/ops_test.cc
index 796bad8053..9ebbcfdba7 100644
--- a/tests/ut/cpp/operator/ops_test.cc
+++ b/tests/ut/cpp/operator/ops_test.cc
@@ -19,7 +19,7 @@
 
 #include "common/common_test.h"
 #include "ir/value.h"
-#include "utils/primitive_py.h"
+#include "pybind_api/ir/primitive_py.h"
 #include "frontend/operator/ops.h"
 #include "./common.h"
 
diff --git a/tests/ut/cpp/transform/graph_runner_test.cc b/tests/ut/cpp/transform/graph_runner_test.cc
index fed34b1c62..4b1586893e 100644
--- a/tests/ut/cpp/transform/graph_runner_test.cc
+++ b/tests/ut/cpp/transform/graph_runner_test.cc
@@ -18,7 +18,7 @@
 #include <memory>
 #include "common/common_test.h"
 #include "ir/dtype.h"
-#include "utils/tensor_py.h"
+#include "pybind_api/ir/tensor_py.h"
 #include "transform/transform_base_test.h"
 #include "common/py_func_graph_fetcher.h"
 #include "pipeline/jit/static_analysis/static_analysis.h"
diff --git a/tests/ut/cpp/transform/transform_base_test.cc b/tests/ut/cpp/transform/transform_base_test.cc
index 86c4e7b8e0..a032286750 100644
--- a/tests/ut/cpp/transform/transform_base_test.cc
+++ b/tests/ut/cpp/transform/transform_base_test.cc
@@ -16,7 +16,7 @@
 #include <iostream>
 #include "common/common_test.h"
 #include "transform/transform_base_test.h"
-#include "utils/tensor_py.h"
+#include "pybind_api/ir/tensor_py.h"
 
 using mindspore::tensor::TensorPy;