Skip to content

Feature/remove preloads #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jammy2211 merged 4 commits into from
Feb 25, 2026
Merged

Feature/remove preloads #390

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
379c32c
full removal of preloads complete
Feb 24, 2026
f88fb4e
zeroing now handled internally with positive values
Feb 25, 2026
202c042
multiple mappers now supported
Feb 25, 2026
3634c38
Update test_autolens/imaging/test_simulate_and_fit_imaging.py
Jammy2211 Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions autolens/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
from autoarray.operators.convolver import Convolver
from autoarray.operators.transformer import TransformerDFT
from autoarray.operators.transformer import TransformerNUFFT
from autoarray.preloads import Preloads
from autoarray.preloads import mapper_indices_from
from autoarray.structures.arrays.uniform_1d import Array1D
from autoarray.structures.arrays.uniform_2d import Array2D
from autoarray.structures.arrays.rgb import Array2DRGB
Expand Down
2 changes: 0 additions & 2 deletions autolens/analysis/analysis/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ def __init__(
adapt_images: Optional[ag.AdaptImages] = None,
cosmology: ag.cosmo.LensingCosmology = None,
settings: aa.Settings = None,
preloads: aa.Preloads = None,
raise_inversion_positions_likelihood_exception: bool = True,
title_prefix: str = None,
use_jax: bool = True,
Expand Down Expand Up @@ -75,7 +74,6 @@ def __init__(
adapt_images=adapt_images,
cosmology=cosmology,
settings=settings,
preloads=preloads,
title_prefix=title_prefix,
use_jax=use_jax,
**kwargs,
Expand Down
3 changes: 0 additions & 3 deletions autolens/imaging/fit_imaging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ def __init__(
dataset_model : Optional[aa.DatasetModel] = None,
adapt_images: Optional[ag.AdaptImages] = None,
settings: aa.Settings = None,
preloads: aa.Preloads = None,
xp=np
):
"""
Expand Down Expand Up @@ -74,7 +73,6 @@ def __init__(

self.adapt_images = adapt_images
self.settings = settings or aa.Settings()
self.preloads = preloads

@property
def blurred_image(self) -> aa.Array2D:
Expand Down Expand Up @@ -120,7 +118,6 @@ def tracer_to_inversion(self) -> TracerToInversion:
tracer=self.tracer,
adapt_images=self.adapt_images,
settings=self.settings,
preloads=self.preloads,
xp=self._xp,
)

Expand Down
1 change: 0 additions & 1 deletion autolens/imaging/model/analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ def fit_from(
dataset_model=dataset_model,
adapt_images=adapt_images,
settings=self.settings,
preloads=self.preloads,
xp=self._xp
)

4 changes: 0 additions & 4 deletions autolens/interferometer/fit_interferometer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ def __init__(
dataset_model: Optional[aa.DatasetModel] = None,
adapt_images: Optional[ag.AdaptImages] = None,
settings: aa.Settings = None,
preloads: aa.Preloads = None,
xp=np,
):
"""
Expand Down Expand Up @@ -78,8 +77,6 @@ def __init__(
self=self, model_obj=tracer, settings=settings, xp=xp
)

self.preloads = preloads

self.use_jax = xp is not np

@property
Expand Down Expand Up @@ -123,7 +120,6 @@ def tracer_to_inversion(self) -> TracerToInversion:
tracer=self.tracer,
adapt_images=self.adapt_images,
settings=self.settings,
preloads=self.preloads,
xp=self._xp,
)

Expand Down
3 changes: 0 additions & 3 deletions autolens/interferometer/model/analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ def __init__(
adapt_images: Optional[ag.AdaptImages] = None,
cosmology: ag.cosmo.LensingCosmology = None,
settings: aa.Settings = None,
preloads: aa.Preloads = None,
raise_inversion_positions_likelihood_exception: bool = True,
title_prefix: str = None,
use_jax: bool = True,
Expand Down Expand Up @@ -82,7 +81,6 @@ def __init__(
adapt_images=adapt_images,
cosmology=cosmology,
settings=settings,
preloads=preloads,
raise_inversion_positions_likelihood_exception=raise_inversion_positions_likelihood_exception,
title_prefix=title_prefix,
use_jax=use_jax,
Expand Down Expand Up @@ -172,7 +170,6 @@ def fit_from(self, instance: af.ModelInstance) -> FitInterferometer:
tracer=tracer,
adapt_images=adapt_images,
settings=self.settings,
preloads=self.preloads,
xp=self._xp,
)

Expand Down
6 changes: 0 additions & 6 deletions autolens/lens/to_inversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ def __init__(
tracer,
adapt_images: Optional[ag.AdaptImages] = None,
settings: aa.Settings = None,
preloads: aa.Preloads = None,
xp=np,
):
"""
Expand Down Expand Up @@ -60,7 +59,6 @@ def __init__(
dataset=dataset,
adapt_images=adapt_images,
settings=settings,
preloads=preloads,
xp=xp,
)

Expand Down Expand Up @@ -189,7 +187,6 @@ def lp_linear_func_list_galaxy_dict(
galaxies=galaxies,
settings=self.settings,
adapt_images=self.adapt_images,
preloads=self.preloads,
xp=self._xp,
)

Expand Down Expand Up @@ -314,7 +311,6 @@ def image_plane_mesh_grid_pg_list(self) -> List[List]:
galaxies=galaxies,
adapt_images=self.adapt_images,
settings=self.settings,
preloads=self.preloads,
xp=self._xp,
)

Expand Down Expand Up @@ -411,7 +407,6 @@ def mapper_galaxy_dict(self) -> Dict[aa.Mapper, ag.Galaxy]:
galaxies=galaxies,
adapt_images=self.adapt_images,
settings=self.settings,
preloads=self.preloads,
xp=self._xp,
)

Expand Down Expand Up @@ -476,7 +471,6 @@ def inversion(self):
dataset=self.dataset,
linear_obj_list=self.linear_obj_list,
settings=self.settings,
preloads=self.preloads,
xp=self._xp,
)

Expand Down
41 changes: 7 additions & 34 deletions test_autolens/imaging/test_simulate_and_fit_imaging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,10 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization(
settings=al.Settings(
use_positive_only_solver=True,
),
preloads=al.Preloads(
mapper_indices=range(1, 10),
source_pixel_zeroed_indices=np.array([1, 2, 3, 4, 6, 7, 8, 9])
)
)

print(fit_linear.inversion.reconstruction)

Comment thread
Jammy2211 marked this conversation as resolved.
Outdated
assert fit_linear.inversion.reconstruction == pytest.approx(
np.array(
[
Expand Down Expand Up @@ -459,10 +457,6 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization_
settings=al.Settings(
use_positive_only_solver=True,
),
preloads=al.Preloads(
mapper_indices=range(1, 10),
source_pixel_zeroed_indices=np.array([1, 2, 3, 4, 6, 7, 8, 9])
)
)

assert fit_linear.inversion.reconstruction == pytest.approx(
Expand Down Expand Up @@ -533,7 +527,7 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization_
)

pixelization = al.Pixelization(
mesh=al.mesh.Delaunay(),
mesh=al.mesh.Delaunay(pixels=25, zeroed_pixels=5),
regularization=al.reg.AdaptSplit(inner_coefficient=0.01, outer_coefficient=0.1, signal_scale=0.1),
)

Expand All @@ -550,27 +544,13 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization_
galaxy_image_plane_mesh_grid_dict={source_galaxy_pix: image_plane_mesh_grid},
)

total_mapper_pixels = image_plane_mesh_grid.shape[0]

total_linear_light_profiles = 1

mapper_indices = al.mapper_indices_from(
total_linear_light_profiles=total_linear_light_profiles,
total_mapper_pixels=total_mapper_pixels,
)

preloads = al.Preloads(
mapper_indices=mapper_indices,
)

tracer_linear = al.Tracer(
galaxies=[lens_galaxy_linear, source_galaxy_pix]
)

fit_linear = al.FitImaging(
dataset=masked_dataset,
tracer=tracer_linear,
preloads=preloads,
adapt_images=adapt_images,
settings=al.Settings(use_positive_only_solver=False),
)
Expand Down Expand Up @@ -611,34 +591,27 @@ def test__simulate_imaging_data_and_fit__linear_light_profiles_and_pixelization_
0.180018267146, 1.0e-4
)

preloads = al.Preloads(
mapper_indices=mapper_indices,
source_pixel_zeroed_indices=[2, 4, 5, 7, 8, 9, 12, 14, 17, 19, 21, 22, 24]
)

fit_linear = al.FitImaging(
dataset=masked_dataset,
tracer=tracer_linear,
preloads=preloads,
adapt_images=adapt_images,
settings=al.Settings(
use_positive_only_solver=True,
use_edge_zeroed_pixels=True
),
)

print(fit_linear.inversion.reconstruction)
print(fit_linear.figure_of_merit)

assert fit_linear.inversion.reconstruction[0:2] == pytest.approx(
np.array(
[
100.00111892,
1.56139854
99.9785287998059,
0.8958653625423
]
),
1.0e-4,
)
assert fit_linear.figure_of_merit == pytest.approx(-190.665986828461, 1.0e-4)
assert fit_linear.figure_of_merit == pytest.approx(-190.6935526756, 1.0e-4)


def test__simulate_imaging_data_and_fit__complex_fit_compare_mapping_matrix_sparse_operator():
Expand Down
Loading