added prints

jrenaud90 · Nov 30, 2024 · b19afa8 · b19afa8
1 parent 701bdc3
commit b19afa8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/CyRK/cy/cysolver.cpp b/CyRK/cy/cysolver.cpp
@@ -1,5 +1,5 @@
 #include <cstring>
-
+#include <cstdio>
 #include "cysolver.hpp"
 #include "dense.hpp"
 #include "cysolution.hpp"
@@ -67,10 +67,13 @@ CySolverBase::CySolverBase(
     {
         // Allocate memory for the size of args.
         // Store void pointer to it.
+        printf("Pre Malloc\n");
         this->args_ptr = malloc(size_of_args);
 
         // Copy over contents of arg
+        printf("Pre Copy Over\n");
         std::memcpy(this->args_ptr, args_ptr, size_of_args);
+        printf("Post\n");
     }
 
     // Check for errors
@@ -175,7 +178,10 @@ CySolverBase::~CySolverBase()
     // Release args data
     if (args_built)
     {
-        free(this->args_ptr);
+        if (this->args_ptr)
+        {
+            free(this->args_ptr);
+        }
     }
 }
 

diff --git a/CyRK/cy/cysolver_test.pyx b/CyRK/cy/cysolver_test.pyx
@@ -284,6 +284,8 @@ def cy_extra_output_tester():
 
     return passed
 
+from libc.stdio cimport printf
+
 def cytester(
         int diffeq_number,
         tuple t_span = None,
@@ -462,13 +464,14 @@ def cytester(
         t_span_ptr[0] = t_span[0]
         t_span_ptr[1] = t_span[1]
         if args is not None:
-            args_ptr = <void*>&args[0]
+            args_ptr     = <void*>&args[0]
             size_of_args = sizeof(double) * args.size
         else:
-            args_ptr = NULL
+            args_ptr     = NULL
+            size_of_args = 0
 
     if cast_arg_dbl:
-        args_ptr = <void*>args_ptr_dbl
+        args_ptr     = <void*>args_ptr_dbl
         size_of_args = sizeof(args_arr)
 
     # Parse rtol
@@ -481,6 +484,9 @@ def cytester(
     if atol_array is not None:
         atols_ptr = &atol_array[0]
 
+
+    printf("EXTRA ARGS SIZE = %d; Ptr = %p\n", size_of_args, args_ptr)
+
     cdef CySolveOutput result = cysolve_ivp(
         diffeq,
         t_span_ptr,

diff --git a/Tests/E_CySolver_Tests/test_a_cysolve_ivp.py b/Tests/E_CySolver_Tests/test_a_cysolve_ivp.py
@@ -195,7 +195,7 @@ def test_cysolve_ivp_all_diffeqs(cysolve_test_func):
         on_macos = True
     if not result.success and on_macos and cysolve_test_func==5:
         pytest.skip("Weird macos bug on diffeq5")
-    on_macos = False
+    # on_macos = False
 
     assert result.success
     assert result.t.size > 0