move SetOwnUserData functions to impl

balos1 · balos1 · commit ffe7d07a4020 · 2025-09-19T17:03:23.000-07:00
diff --git a/bindings/pysundials/arkode/pysundials_arkode.cpp b/bindings/pysundials/arkode/pysundials_arkode.cpp
@@ -27,6 +27,8 @@ class SUNStepperView;
 #include <arkode/arkode_ls.h>
 #include <arkode/arkode_sprk.hpp>
 
+#include "arkode/arkode_impl.h"
+
 #include "sundials_adjointcheckpointscheme_impl.h"
 
 #include "pysundials_arkode_usersupplied.hpp"
diff --git a/bindings/pysundials/cvodes/pysundials_cvodes.cpp b/bindings/pysundials/cvodes/pysundials_cvodes.cpp
@@ -28,6 +28,7 @@
 #include <cvodes/cvodes_proj.h>
 
 #include "sundials_adjointcheckpointscheme_impl.h"
+#include "cvodes/cvodes_impl.h"
 
 #include "pysundials_cvodes_usersupplied.hpp"
 
diff --git a/bindings/pysundials/idas/pysundials_idas.cpp b/bindings/pysundials/idas/pysundials_idas.cpp
@@ -24,6 +24,8 @@
 #include <idas/idas.hpp>
 #include <idas/idas_ls.h>
 
+#include "idas/idas_impl.h"
+
 #include "pysundials_idas_usersupplied.hpp"
 
 namespace nb = nanobind;
diff --git a/bindings/pysundials/kinsol/pysundials_kinsol.cpp b/bindings/pysundials/kinsol/pysundials_kinsol.cpp
@@ -18,10 +18,13 @@
 #include <nanobind/stl/tuple.h>
 #include <nanobind/stl/vector.h>
 
+#include <sundials/sundials_core.hpp>
+
 #include <kinsol/kinsol.h>
 #include <kinsol/kinsol.hpp>
 #include <kinsol/kinsol_ls.h>
-#include <sundials/sundials_core.hpp>
+
+#include "kinsol/kinsol_impl.h"
 
 namespace nb = nanobind;
 
diff --git a/include/arkode/arkode.h b/include/arkode/arkode.h
@@ -265,8 +265,6 @@ SUNDIALS_EXPORT int ARKodeClearStopTime(void* arkode_mem);
 SUNDIALS_EXPORT int ARKodeSetFixedStep(void* arkode_mem, sunrealtype hfixed);
 SUNDIALS_EXPORT int ARKodeSetStepDirection(void* arkode_mem, sunrealtype stepdir);
 SUNDIALS_EXPORT int ARKodeSetUserData(void* arkode_mem, void* user_data);
-SUNDIALS_EXPORT int ARKodeSetOwnUserData(void* ark_mem,
-                                         sunbooleantype own_user_data);
 SUNDIALS_EXPORT int ARKodeSetPostprocessStepFn(void* arkode_mem,
                                                ARKPostProcessFn ProcessStep);
 SUNDIALS_EXPORT int ARKodeSetPostprocessStageFn(void* arkode_mem,
diff --git a/include/cvode/cvode.h b/include/cvode/cvode.h
@@ -149,8 +149,6 @@ SUNDIALS_EXPORT int CVodeClearStopTime(void* cvode_mem);
 SUNDIALS_EXPORT int CVodeSetUseIntegratorFusedKernels(void* cvode_mem,
                                                       sunbooleantype onoff);
 SUNDIALS_EXPORT int CVodeSetUserData(void* cvode_mem, void* user_data);
-SUNDIALS_EXPORT int CVodeSetOwnUserData(void* cvode_mem,
-                                        sunbooleantype own_user_data);
 
 /* Optional step adaptivity input functions */
 SUNDIALS_EXPORT
diff --git a/include/cvodes/cvodes.h b/include/cvodes/cvodes.h
@@ -218,8 +218,6 @@ SUNDIALS_EXPORT int CVodeSetInterpolateStopTime(void* cvode_mem,
                                                 sunbooleantype interp);
 SUNDIALS_EXPORT int CVodeClearStopTime(void* cvode_mem);
 SUNDIALS_EXPORT int CVodeSetUserData(void* cvode_mem, void* user_data);
-SUNDIALS_EXPORT int CVodeSetOwnUserData(void* cvode_mem,
-                                        sunbooleantype own_user_data);
 
 /* Optional step adaptivity input functions */
 SUNDIALS_EXPORT
@@ -539,8 +537,6 @@ SUNDIALS_EXPORT int CVodeSetAdjNoSensi(void* cvode_mem);
 
 SUNDIALS_EXPORT int CVodeSetUserDataB(void* cvode_mem, int which,
                                       void* user_dataB);
-SUNDIALS_EXPORT int CVodeSetOwnUserDataB(void* cvode_mem, int which,
-                                         sunbooleantype own_user_data);
 SUNDIALS_EXPORT int CVodeSetMaxOrdB(void* cvode_mem, int which, int maxordB);
 SUNDIALS_EXPORT int CVodeSetMaxNumStepsB(void* cvode_mem, int which,
                                          long int mxstepsB);
diff --git a/include/ida/ida.h b/include/ida/ida.h
@@ -130,8 +130,6 @@ SUNDIALS_EXPORT int IDASetMaxBacksIC(void* ida_mem, int maxbacks);
 /* Optional input functions */
 SUNDIALS_EXPORT int IDASetDeltaCjLSetup(void* ida_max, sunrealtype dcj);
 SUNDIALS_EXPORT int IDASetUserData(void* ida_mem, void* user_data);
-SUNDIALS_EXPORT int IDASetOwnUserData(void* ida_mem,
-                                      sunbooleantype own_user_data);
 SUNDIALS_EXPORT int IDASetMaxOrd(void* ida_mem, int maxord);
 SUNDIALS_EXPORT int IDASetMaxNumSteps(void* ida_mem, long int mxsteps);
 SUNDIALS_EXPORT int IDASetInitStep(void* ida_mem, sunrealtype hin);
diff --git a/include/idas/idas.h b/include/idas/idas.h
@@ -194,8 +194,6 @@ SUNDIALS_EXPORT int IDASetMaxBacksIC(void* ida_mem, int maxbacks);
 /* Optional input functions */
 SUNDIALS_EXPORT int IDASetDeltaCjLSetup(void* ida_max, sunrealtype dcj);
 SUNDIALS_EXPORT int IDASetUserData(void* ida_mem, void* user_data);
-SUNDIALS_EXPORT int IDASetOwnUserData(void* ida_mem,
-                                      sunbooleantype own_user_data);
 SUNDIALS_EXPORT int IDASetMaxOrd(void* ida_mem, int maxord);
 SUNDIALS_EXPORT int IDASetMaxNumSteps(void* ida_mem, long int mxsteps);
 SUNDIALS_EXPORT int IDASetInitStep(void* ida_mem, sunrealtype hin);
diff --git a/include/kinsol/kinsol.h b/include/kinsol/kinsol.h
@@ -117,7 +117,6 @@ SUNDIALS_EXPORT int KINSol(void* kinmem, N_Vector uu, int strategy,
 SUNDIALS_EXPORT int KINSetOptions(void* kinmem, const char* kinid,
                                   const char* file_name, int argc, char* argv[]);
 SUNDIALS_EXPORT int KINSetUserData(void* kinmem, void* user_data);
-SUNDIALS_EXPORT int KINSetOwnUserData(void* kinmem, sunbooleantype own_user_data);
 SUNDIALS_EXPORT int KINSetDamping(void* kinmem, sunrealtype beta);
 SUNDIALS_EXPORT int KINSetMAA(void* kinmem, long int maa);
 SUNDIALS_EXPORT int KINSetOrthAA(void* kinmem, int orthaa);
diff --git a/src/arkode/arkode_impl.h b/src/arkode/arkode_impl.h
@@ -695,6 +695,10 @@ SUNErrCode arkSUNStepperSelfDestruct(SUNStepper stepper);
 int arkSetForcePass(void* arkode_mem, sunbooleantype force_pass);
 int arkGetLastKFlag(void* arkode_mem, int* last_kflag);
 
+/* Utility function to tell ARKode to free the user data.
+   This is used by the Python interfaces. */
+int ARKodeSetOwnUserData(void* ark_mem, sunbooleantype own_user_data);
+
 /*===============================================================
   Reusable ARKODE Error Messages
   ===============================================================*/
diff --git a/src/cvode/cvode_impl.h b/src/cvode/cvode_impl.h
@@ -662,6 +662,11 @@ int cvDiagSetup_buildM(const sunrealtype fract, const sunrealtype uround,
 int cvDiagSolve_updateM(const sunrealtype r, N_Vector M);
 #endif
 
+/* Utility function to tell CVODE to free the user data.
+   This is used by the Python interfaces. */
+
+int CVodeSetOwnUserData(void* cvode_mem, sunbooleantype own_user_data);
+
 /*
  * =================================================================
  *    E R R O R    M E S S A G E S
diff --git a/src/cvodes/cvodes_impl.h b/src/cvodes/cvodes_impl.h
@@ -1182,6 +1182,14 @@ int cvSensRhs1InternalDQ(int Ns, sunrealtype t, N_Vector y, N_Vector ydot,
                          int is, N_Vector yS, N_Vector ySdot, void* fS_data,
                          N_Vector tempv, N_Vector ftemp);
 
+/* Utility functions to tell CVODE to free the user data.
+   This is used by the Python interfaces. */
+
+int CVodeSetOwnUserData(void* cvode_mem, sunbooleantype own_user_data);
+
+int CVodeSetOwnUserDataB(void* cvode_mem, int which,
+                         sunbooleantype own_user_data);
+
 /*
  * =================================================================
  *    E R R O R    M E S S A G E S
diff --git a/src/ida/ida_impl.h b/src/ida/ida_impl.h
@@ -447,6 +447,11 @@ sunrealtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
 
 int idaNlsInit(IDAMem IDA_mem);
 
+/* Utility function to tell IDA to free the user data.
+   This is used by the Python interfaces. */
+
+int IDASetOwnUserData(void* ida_mem, sunbooleantype own_user_data);
+
 /*
  * =================================================================
  *    E R R O R    M E S S A G E S
diff --git a/src/idas/idas_impl.h b/src/idas/idas_impl.h
@@ -975,6 +975,11 @@ int IDASensResDQ(int Ns, sunrealtype t, N_Vector yy, N_Vector yp,
                  N_Vector* resvalS, void* user_dataS, N_Vector ytemp,
                  N_Vector yptemp, N_Vector restemp);
 
+/* Utility function to tell IDA to free the user data.
+   This is used by the Python interfaces. */
+
+int IDASetOwnUserData(void* ida_mem, sunbooleantype own_user_data);
+
 /*
  * =================================================================
  *    E R R O R    M E S S A G E S
diff --git a/src/kinsol/kinsol_impl.h b/src/kinsol/kinsol_impl.h
@@ -397,6 +397,10 @@ void KINFreeAA(KINMem kin_mem);
 int KINInitOrth(KINMem kin_mem);
 void KINFreeOrth(KINMem kin_mem);
 
+/* Utility function to tell KINSOL to free the user data.
+   This is used by the Python interfaces. */
+int KINSetOwnUserData(void* kinmem, sunbooleantype own_user_data);
+
 /*
  * =================================================================
  *   K I N S O L    E R R O R    M E S S A G E S
