Merge pull request #460 from raysect/development

Release v0.9.1

Author: CnlPepper

CHANGELOG.txt

@@ -1,6 +1,18 @@
 Raysect Changelog
 =================
 
+Release 0.9.1 (25 Aug 2025)
+---------------------------
+
+Bug fixes:
+* Fixed a typo in the meson.build files that was not caught by meson, due to a bug in meson's option handling.
+  - Versions of meson < 1.8.4 suffered regressions in option handling that were fixed in v1.8.4.
+  - Attempting to build Raysect with meson v1.8.4 resulted in an error.
+
+New:
+* Added pickle support to Interpolate1DArray, Interpolate2DArray and Interpolate3DArray.
+
+
 Release 0.9.0 (30 Jul 2025)
 ---------------------------
 

dev/root-meson.build

@@ -1,5 +1,5 @@
 project('raysect', 'cython',
-    default_options: ['python.install-env=auto'],
+    default_options: ['python.install_env=auto'],
     version: run_command(['dev/build/update_version.sh'], check: true).stdout().strip()
 )
 

meson.build

@@ -2,7 +2,7 @@
 # The template file used to generate this file is dev/root-meson.build.
 
 project('raysect', 'cython',
-    default_options: ['python.install-env=auto'],
+    default_options: ['python.install_env=auto'],
     version: run_command(['dev/build/update_version.sh'], check: true).stdout().strip()
 )
 

raysect/core/math/function/float/function1d/interpolate.pxd

@@ -75,6 +75,7 @@ cdef class _Extrapolator1D:
     cdef double evaluate(self, double px, int index) except? -1e999
     # cdef double _analytic_gradient(self, double px, int index, int order)
 
+
 cdef class _Extrapolator1DNone(_Extrapolator1D):
     pass
 

raysect/core/math/function/float/function1d/interpolate.pyx

@@ -148,6 +148,24 @@ cdef class Interpolator1DArray(Function1D):
         self._interpolator = id_to_interpolator[interpolation_type](self._x_mv, self._f_mv)
         self._extrapolator = id_to_extrapolator[extrapolation_type](self._x_mv, self._f_mv)
 
+    def __getstate__(self):
+        return self.x, self.f, self._interpolator.ID, self._extrapolator.ID, self._last_index, self._extrapolation_range
+
+    def __setstate__(self, state):
+
+        # Unpack.
+        self.x, self.f, interpolation_type, extrapolation_type, self._last_index, self._extrapolation_range = state
+
+        # Rebuild memory views.
+        self._x_mv, self._f_mv = self.x, self.f
+
+        # Recreate the interpolator and extrapolator objects.
+        self._interpolator = id_to_interpolator[interpolation_type](self._x_mv, self._f_mv)
+        self._extrapolator = id_to_extrapolator[extrapolation_type](self._x_mv, self._f_mv)
+
+    def __reduce__(self):
+        return self.__new__, (self.__class__, ), self.__getstate__()
+
     @cython.boundscheck(False)
     @cython.wraparound(False)
     @cython.initializedcheck(False)

raysect/core/math/function/float/function2d/interpolate/interpolator2darray.pyx

@@ -195,6 +195,7 @@ cdef class Interpolator2DArray(Function2D):
 
         self.x = x
         self.y = y
+        self.f = f
 
         # obtain memory views for fast data access
         self._x_mv = x
@@ -231,6 +232,37 @@ cdef class Interpolator2DArray(Function2D):
             self._x_mv, self._y_mv, self._f_mv, self._interpolator, extrapolation_range_x, extrapolation_range_y
         )
 
+    def __getstate__(self):
+        return (
+            self.x, self.y, self.f,
+            self._interpolator.ID, self._extrapolator.ID,
+            self._last_index_x, self._last_index_y,
+            self._extrapolation_range_x, self._extrapolation_range_y
+        )
+
+    def __setstate__(self, state):
+
+        # Unpack.
+        (
+            self.x, self.y, self.f,
+            interpolation_type, extrapolation_type,
+            self._last_index_x, self._last_index_y,
+            self._extrapolation_range_x, self._extrapolation_range_y
+        ) = state
+
+        # Rebuild memory views.
+        self._x_mv, self._y_mv, self._f_mv = self.x, self.y, self.f
+
+        # Recreate the interpolator and extrapolator objects.
+        self._interpolator = id_to_interpolator[interpolation_type](self._x_mv, self._y_mv, self._f_mv)
+        self._extrapolator = id_to_extrapolator[extrapolation_type](
+            self._x_mv, self._y_mv, self._f_mv, self._interpolator,
+            self._extrapolation_range_x, self._extrapolation_range_y
+        )
+
+    def __reduce__(self):
+        return self.__new__, (self.__class__, ), self.__getstate__()
+
     @cython.boundscheck(False)
     @cython.wraparound(False)
     @cython.initializedcheck(False)

raysect/core/math/function/float/function3d/interpolate/interpolator3darray.pyx

@@ -214,6 +214,7 @@ cdef class Interpolator3DArray(Function3D):
         self.x = x
         self.y = y
         self.z = z
+        self.f = f
 
         # obtain memory views for fast data access
         self._x_mv = x
@@ -259,6 +260,37 @@ cdef class Interpolator3DArray(Function3D):
             extrapolation_range_y, extrapolation_range_z
         )
 
+    def __getstate__(self):
+        return (
+            self.x, self.y, self.z, self.f,
+            self._interpolator.ID, self._extrapolator.ID,
+            self._last_index_x, self._last_index_y, self._last_index_z,
+            self._extrapolation_range_x, self._extrapolation_range_y, self._extrapolation_range_z
+        )
+
+    def __setstate__(self, state):
+
+        # Unpack.
+        (
+            self.x, self.y, self.z, self.f,
+            interpolation_type, extrapolation_type,
+            self._last_index_x, self._last_index_y, self._last_index_z,
+            self._extrapolation_range_x, self._extrapolation_range_y, self._extrapolation_range_z
+        ) = state
+
+        # Rebuild memory views.
+        self._x_mv, self._y_mv, self._z_mv, self._f_mv = self.x, self.y, self.z, self.f
+
+        # Recreate the interpolator and extrapolator objects.
+        self._interpolator = id_to_interpolator[interpolation_type](self._x_mv, self._y_mv, self._z_mv, self._f_mv)
+        self._extrapolator = id_to_extrapolator[extrapolation_type](
+            self._x_mv, self._y_mv, self._z_mv, self._f_mv, self._interpolator,
+            self._extrapolation_range_x, self._extrapolation_range_y, self._extrapolation_range_z
+        )
+
+    def __reduce__(self):
+        return self.__new__, (self.__class__, ), self.__getstate__()
+
     @cython.boundscheck(False)
     @cython.wraparound(False)
     @cython.initializedcheck(False)