Added dereferencing for Python in Dense output

jrenaud90 · Nov 13, 2024 · e7e2459 · e7e2459
1 parent 8063fe2
commit e7e2459
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 97 deletions.
diff --git a/CyRK/cy/cysolver.cpp b/CyRK/cy/cysolver.cpp
@@ -147,7 +147,7 @@ CySolverBase::CySolverBase(
 CySolverBase::~CySolverBase()
 {
     this->storage_ptr = nullptr;
-    if (this->use_pysolver)
+    if (this->deconstruct_python)
     {
         // Decrease reference count on the cython extension class instance
         Py_XDECREF(this->cython_extension_class_instance);
@@ -592,8 +592,8 @@ void CySolverBase::set_cython_extension_instance(PyObject* cython_extension_clas
         }
         else
         {
-            // TODO: Do we need to decref this at some point? During CySolver's deconstruction?
             Py_XINCREF(this->cython_extension_class_instance);
+            this->deconstruct_python = true;
         }
     }
 }

diff --git a/CyRK/cy/cysolver.hpp b/CyRK/cy/cysolver.hpp
@@ -123,6 +123,7 @@ class CySolverBase {
     bool reset_called   = false;
     bool capture_extra  = false;
     bool user_provided_max_num_steps = false;
+    bool deconstruct_python = false;
 
     // Dense (Interpolation) Attributes
     bool use_dense_output = false;

diff --git a/CyRK/cy/dense.cpp b/CyRK/cy/dense.cpp
@@ -1,7 +1,7 @@
 
 #include "dense.hpp"
 
-
+// Constructors
 CySolverDense::CySolverDense(
         int integrator_int,
         double t_old,
@@ -60,12 +60,22 @@ CySolverDense::CySolverDense(
     // Make a strong reference to the python class (if this dense output was built using the python hooks).
     if (cython_extension_class_instance)
     {
-        // TODO: Do we need to decref this at some point? During CySolver's deconstruction?
         Py_XINCREF(this->cython_extension_class_instance);
+        this->deconstruct_python = true;
     }
 
 }
 
+// Destructors
+CySolverDense::~CySolverDense()
+{
+    if (this->deconstruct_python)
+    {
+        // Decrease reference count on the cython extension class instance
+        Py_XDECREF(this->cython_extension_class_instance);
+    }
+}
+
 void CySolverDense::call(double t_interp, double* y_interp_ptr)
 {
     double step_factor = (t_interp - this->t_old) / this->step;

diff --git a/CyRK/cy/dense.hpp b/CyRK/cy/dense.hpp
@@ -41,6 +41,7 @@ class CySolverDense
     double* cysolver_y_now_ptr  = nullptr;
     double* cysolver_dy_now_ptr = nullptr;
     PyObject* cython_extension_class_instance = nullptr;
+    bool deconstruct_python = false;
 
     // Time step info
     double step = 0.0;
@@ -59,7 +60,7 @@ class CySolverDense
 protected:
 
 public:
-    virtual ~CySolverDense() { };
+    virtual ~CySolverDense();
     CySolverDense() {};
     CySolverDense(
         int integrator_int,