Feature/jax numba mix

autoarray/__init__.py

@@ -24,7 +24,6 @@
 from .fit.fit_imaging import FitImaging
 from .fit.fit_interferometer import FitInterferometer
 from .geometry.geometry_2d import Geometry2D
-from .inversion.convolver import Convolver
 from .inversion.pixelization.mappers.abstract import AbstractMapper
 from .inversion.pixelization import mesh
 from .inversion.pixelization import image_mesh

autoarray/dataset/imaging/dataset.py

@@ -15,7 +15,7 @@
 
 from autoarray import exc
 from autoarray.operators.over_sampling import over_sample_util
-from autoarray.inversion.inversion.imaging import inversion_imaging_util
+from autoarray.inversion.inversion.imaging import inversion_imaging_numba_util
 
 logger = logging.getLogger(__name__)
 
@@ -194,27 +194,6 @@ def __init__(
             psf=self.psf,
         )
 
-    @cached_property
-    def convolver(self):
-        """
-        Returns a `Convolver` from a mask and 2D PSF kernel.
-
-        The `Convolver` stores in memory the array indexing between the mask and PSF, enabling efficient 2D PSF
-        convolution of images and matrices used for linear algebra calculations (see `operators.convolver`).
-
-        This uses lazy allocation such that the calculation is only performed when the convolver is used, ensuring
-        efficient set up of the `Imaging` class.
-
-        Returns
-        -------
-        Convolver
-            The convolver given the masked imaging data's mask and PSF.
-        """
-
-        from autoarray.inversion.convolver import Convolver
-
-        return Convolver(mask=self.mask, kernel=self.psf)
-
     @cached_property
     def w_tilde(self):
         """
@@ -239,7 +218,7 @@ def w_tilde(self):
             curvature_preload,
             indexes,
             lengths,
-        ) = inversion_imaging_util.w_tilde_curvature_preload_imaging_from(
+        ) = inversion_imaging_numba_util.w_tilde_curvature_preload_imaging_from(
             noise_map_native=np.array(self.noise_map.native.array).astype("float64"),
             kernel_native=np.array(self.psf.native.array).astype("float64"),
             native_index_for_slim_index=np.array(

autoarray/dataset/imaging/w_tilde.py

@@ -1,4 +1,3 @@
-import copy
 import logging
 import numpy as np
 
@@ -7,6 +6,7 @@
 from autoarray.dataset.abstract.w_tilde import AbstractWTilde
 
 from autoarray.inversion.inversion.imaging import inversion_imaging_util
+from autoarray.inversion.inversion.imaging import inversion_imaging_numba_util
 
 logger = logging.getLogger(__name__)
 
@@ -85,7 +85,7 @@ def w_matrix(self):
             the curvature matrix.
         """
 
-        return inversion_imaging_util.w_tilde_curvature_imaging_from(
+        return inversion_imaging_numba_util.w_tilde_curvature_imaging_from(
             noise_map_native=np.array(self.noise_map.native.array).astype("float64"),
             kernel_native=np.array(self.psf.native.array).astype("float64"),
             native_index_for_slim_index=np.array(