use preloading in Grids

Author: Jammy2211

autoarray/dataset/grids.py

@@ -61,32 +61,70 @@ def __init__(
         self.over_sample_size_pixelization = over_sample_size_pixelization
         self.psf = psf
 
-        self.lp = Grid2D.from_mask(
+        self._lp = None
+        self._pixelization = None
+        self._blurring = None
+        self._border_relocator = None
+
+        self.use_w_tilde = use_w_tilde
+
+    @property
+    def lp(self):
+
+        if self._lp is not None:
+            return self._lp
+
+        self._lp = Grid2D.from_mask(
             mask=self.mask,
             over_sample_size=self.over_sample_size_lp,
         )
 
-        self.pixelization = Grid2D.from_mask(
+        return self._lp
+
+    @property
+    def pixelization(self):
+        if self._pixelization is not None:
+            return self._pixelization
+
+        self._pixelization = Grid2D.from_mask(
             mask=self.mask,
             over_sample_size=self.over_sample_size_pixelization,
         )
 
+        return self._pixelization
+
+    @property
+    def blurring(self):
+
+        if self._blurring is not None:
+            return self._blurring
+
         if self.psf is None:
-            self.blurring = None
+            self._blurring = None
         else:
             try:
-                self.blurring = self.lp.blurring_grid_via_kernel_shape_from(
+                self._blurring = self.lp.blurring_grid_via_kernel_shape_from(
                     kernel_shape_native=self.psf.shape_native,
                 )
             except exc.MaskException:
-                self.blurring = None
+                self._blurring = None
+
+        return self._blurring
 
-        self.border_relocator = BorderRelocator(
+    @property
+    def border_relocator(self) -> BorderRelocator:
+
+        if self._border_relocator is not None:
+            return self._border_relocator
+
+        self._border_relocator = BorderRelocator(
             mask=self.mask,
             sub_size=self.over_sample_size_pixelization,
-            use_w_tilde=use_w_tilde,
+            use_w_tilde=self.use_w_tilde,
         )
 
+        return self._border_relocator
+
 
 class GridsInterface:
     def __init__(

autoarray/fit/fit_dataset.py

@@ -150,6 +150,14 @@ def __init__(
         self.dataset = dataset
         self.use_mask_in_fit = use_mask_in_fit
         self.dataset_model = dataset_model or DatasetModel()
+
+        # Ensures preloaded in memory so repeated calls are fast
+
+        self.dataset.grids.lp
+        self.dataset.grids.pixelization
+        self.dataset.grids.blurring
+        self.dataset.grids.border_relocator
+
         self._xp = xp
 
     @property

autoarray/operators/over_sampling/over_sample_util.py

@@ -178,6 +178,15 @@ def grid_2d_slim_over_sampled_via_mask_from(
     skipping pixels where sub_size == 0 (to avoid divide-by-zero).
     """
 
+    import traceback
+
+    def debug_trace():
+        print("=== FULL CALL TRACE ===")
+        traceback.print_stack()
+        print("=======================")
+
+    debug_trace()
+
     H, W = mask_2d.shape
     sy, sx = pixel_scales
     oy, ox = origin

test_autoarray/dataset/abstract/test_dataset.py

@@ -84,8 +84,8 @@ def test__apply_over_sampling(image_7x7, noise_map_7x7):
     grid_sub_2 = dataset_7x7.grids.lp
     grids_pixelization_sub_2 = dataset_7x7.grids.pixelization
 
-    dataset_7x7.grids.__dict__["lp"][0][0] = 100.0
-    dataset_7x7.grids.__dict__["pixelization"][0][0] = 100.0
+    dataset_7x7.grids.__dict__["_lp"][0][0] = 100.0
+    dataset_7x7.grids.__dict__["_pixelization"][0][0] = 100.0
 
     assert dataset_7x7.grids.lp[0][0] == pytest.approx(100.0, 1.0e-4)
     assert dataset_7x7.grids.pixelization[0][0] == pytest.approx(100.0, 1.0e-4)