py::array -> py::object

Author: gouzil

paddle/fluid/pybind/jit.cc

@@ -121,7 +121,7 @@ void BindGuard(pybind11::module *m) {
       *m,
       "NumPyArrayValueMatchGuard",
       R"DOC(NumPyArrayValueMatchGuard Class.)DOC")
-      .def(py::init<const py::array &>(), py::arg("array"));
+      .def(py::init<const py::object &>(), py::arg("array"));
 
   m->def(
       "merge_guard",

paddle/fluid/pybind/sot/guards.cc

@@ -158,7 +158,10 @@ bool NumPyArrayValueMatchGuard::check(PyObject* value) {
   }
 
   py::object py_value = py::cast<py::object>(value);
-  return expected_.attr("__eq__")(py_value).attr("all")().cast<bool>();
+  return py::cast<py::object>(expected_)
+      .attr("__eq__")(py_value)
+      .attr("all")()
+      .cast<bool>();
 }
 
 PyObject* ConstantExprNode::eval(FrameProxy* frame) { return value_ptr_; }

paddle/fluid/pybind/sot/guards.h

@@ -223,13 +223,17 @@ class NumpyDtypeMatchGuard : public GuardBase {
 
 class NumPyArrayValueMatchGuard : public GuardBase {
  public:
-  explicit NumPyArrayValueMatchGuard(const py::array& array)
-      : expected_(array) {}
+  explicit NumPyArrayValueMatchGuard(const py::object& array)
+      : expected_(array.ptr()) {
+    Py_INCREF(expected_);
+  }
+
+  ~NumPyArrayValueMatchGuard() override { Py_DECREF(expected_); }
 
   bool check(PyObject* value) override;
 
  private:
-  py::array expected_;
+  PyObject* expected_;
 };
 
 class GuardTreeNode {};