pylops removed

Author: Jammy2211

autoarray/__init__.py

@@ -44,7 +44,6 @@
 from .inversion.inversion.imaging.w_tilde import InversionImagingWTilde
 from .inversion.inversion.interferometer.w_tilde import InversionInterferometerWTilde
 from .inversion.inversion.interferometer.mapping import InversionInterferometerMapping
-from .inversion.inversion.interferometer.lop import InversionInterferometerMappingPyLops
 from .inversion.linear_obj.linear_obj import LinearObj
 from .inversion.linear_obj.func_list import AbstractLinearObjFuncList
 from .mask.derive.indexes_2d import DeriveIndexes2D

autoarray/inversion/inversion/factory.py

@@ -9,9 +9,6 @@
 from autoarray.inversion.inversion.interferometer.w_tilde import (
     InversionInterferometerWTilde,
 )
-from autoarray.inversion.inversion.interferometer.lop import (
-    InversionInterferometerMappingPyLops,
-)
 from autoarray.inversion.inversion.dataset_interface import DatasetInterface
 from autoarray.inversion.linear_obj.linear_obj import LinearObj
 from autoarray.inversion.linear_obj.func_list import AbstractLinearObjFuncList
@@ -212,11 +209,3 @@ def inversion_interferometer_from(
                 settings=settings,
                 run_time_dict=run_time_dict,
             )
-
-    else:
-        return InversionInterferometerMappingPyLops(
-            dataset=dataset,
-            linear_obj_list=linear_obj_list,
-            settings=settings,
-            run_time_dict=run_time_dict,
-        )

autoarray/inversion/inversion/interferometer/lop.py

@@ -5,13 +5,6 @@
 if TYPE_CHECKING:
     from autoarray.inversion.linear_obj.linear_obj import LinearObj
 
-try:
-    import pylops
-
-    PyLopsOperator = pylops.LinearOperator
-except ModuleNotFoundError:
-    PyLopsOperator = object
-
 
 class AbstractRegularization:
     def __init__(self):
@@ -174,19 +167,3 @@ def regularization_matrix_from(self, linear_obj: LinearObj) -> np.ndarray:
         The regularization matrix.
         """
         raise NotImplementedError
-
-
-class RegularizationLop(PyLopsOperator):
-    def __init__(self, regularization_matrix):
-        self.regularization_matrix = regularization_matrix
-        self.pixels = regularization_matrix.shape[0]
-        self.dims = self.pixels
-        self.shape = (self.pixels, self.pixels)
-        self.dtype = dtype
-        self.explicit = False
-
-    def _matvec(self, x):
-        return np.dot(self.regularization_matrix, x)
-
-    def _rmatvec(self, x):
-        return np.dot(self.regularization_matrix.T, x)

autoarray/inversion/regularization/abstract.py

@@ -8,21 +8,11 @@ class NUFFTPlaceholder:
     pass
 
 
-class PyLopsPlaceholder:
-    pass
-
-
 try:
     from pynufft.linalg.nufft_cpu import NUFFT_cpu
 except ModuleNotFoundError:
     NUFFT_cpu = NUFFTPlaceholder
 
-try:
-    import pylops
-
-    PyLopsOperator = pylops.LinearOperator
-except ModuleNotFoundError:
-    PyLopsOperator = PyLopsPlaceholder
 
 from autoarray.structures.arrays.uniform_2d import Array2D
 from autoarray.structures.grids.uniform_2d import Grid2D
@@ -42,20 +32,8 @@ def pynufft_exception():
     )
 
 
-def pylops_exception():
-    raise ModuleNotFoundError(
-        "\n--------------------\n"
-        "You are attempting to perform interferometer analysis.\n\n"
-        "However, the optional library PyLops (https://github.com/PyLops/pylops) is not installed.\n\n"
-        "Install it via the command `pip install pylops==2.3.1`.\n\n"
-        "----------------------"
-    )
-
-
-class TransformerDFT(PyLopsOperator):
+class TransformerDFT:
     def __init__(self, uv_wavelengths, real_space_mask, preload_transform=True):
-        if isinstance(self, PyLopsPlaceholder):
-            pylops_exception()
 
         super().__init__()
 
@@ -146,14 +124,11 @@ def transform_mapping_matrix(self, mapping_matrix):
             )
 
 
-class TransformerNUFFT(NUFFT_cpu, PyLopsOperator):
+class TransformerNUFFT(NUFFT_cpu):
     def __init__(self, uv_wavelengths, real_space_mask):
         if isinstance(self, NUFFTPlaceholder):
             pynufft_exception()
 
-        if isinstance(self, PyLopsPlaceholder):
-            pylops_exception()
-
         super(TransformerNUFFT, self).__init__()
 
         self.uv_wavelengths = uv_wavelengths

autoarray/operators/transformer.py

@@ -198,13 +198,6 @@ def set_mapper_list(self, fit_0, fit_1):
         if fit_0.inversion.total(cls=AbstractMapper) == 0:
             return
 
-        from autoarray.inversion.inversion.interferometer.lop import (
-            InversionInterferometerMappingPyLops,
-        )
-
-        if isinstance(fit_0.inversion, InversionInterferometerMappingPyLops):
-            return
-
         inversion_0 = fit_0.inversion
         inversion_1 = fit_1.inversion
 
@@ -238,13 +231,6 @@ def set_operated_mapping_matrix_with_preloads(self, fit_0, fit_1):
 
         self.operated_mapping_matrix = None
 
-        from autoarray.inversion.inversion.interferometer.lop import (
-            InversionInterferometerMappingPyLops,
-        )
-
-        if isinstance(fit_0.inversion, InversionInterferometerMappingPyLops):
-            return
-
         inversion_0 = fit_0.inversion
         inversion_1 = fit_1.inversion
 

autoarray/preloads.py

@@ -213,9 +213,7 @@ def __init__(self, visibilities: Union[np.ndarray, List[complex]], *args, **kwar
         A collection of (real, imag) visibilities noise-map values which are used to represent the noise-map in
         an `Interferometer` dataset.
 
-        This data structure behaves the same as the `Visibilities` structure (see `AbstractVisibilities.__new__`). The
-        only difference is that it includes a `WeightOperator` used by `Inversion`'s which use `LinearOperators` and
-        the library `PyLops` to fit `Interferometer` data.
+        This data structure behaves the same as the `Visibilities` structure (see `AbstractVisibilities.__new__`).
 
         Parameters
         ----------

autoarray/structures/visibilities.py

@@ -1,4 +1,3 @@
-pylops>=1.10.0,<=2.3.1
 pynufft
 #jax==0.4.3
 #jaxlib==0.4.3

optional_requirements.txt

@@ -68,23 +68,6 @@ def test__data_vector_via_transformed_mapping_matrix_from():
     assert (data_vector_complex_via_blurred == data_vector_via_transformed).all()
 
 
-def test__inversion_interferometer__via_mapper(
-    interferometer_7_no_fft,
-    rectangular_mapper_7x7_3x3,
-    delaunay_mapper_9_3x3,
-    voronoi_mapper_9_3x3,
-    regularization_constant,
-):
-    inversion = aa.Inversion(
-        dataset=interferometer_7_no_fft,
-        linear_obj_list=[rectangular_mapper_7x7_3x3],
-        settings=aa.SettingsInversion(use_linear_operators=True),
-    )
-
-    assert isinstance(inversion.linear_obj_list[0], aa.MapperRectangular)
-    assert isinstance(inversion, aa.InversionInterferometerMappingPyLops)
-
-
 def test__w_tilde_curvature_interferometer_from():
     noise_map = np.array([1.0, 2.0, 3.0])
     uv_wavelengths = np.array([[0.0001, 2.0, 3000.0], [3000.0, 2.0, 0.0001]])