Skip to content

Commit 5d577d4

Browse files
Jammy2211Jammy2211
authored andcommitted
black
1 parent 5a5d683 commit 5d577d4

File tree

12 files changed

+48
-23
lines changed

12 files changed

+48
-23
lines changed

autoarray/dataset/imaging/dataset.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,17 @@ def w_tilde(self):
214214

215215
logger.info("IMAGING - Computing W-Tilde... May take a moment.")
216216

217+
try:
218+
import numba
219+
except ModuleNotFoundError:
220+
raise exc.InversionException(
221+
"Inversion w-tilde functionality (pixelized reconstructions) is "
222+
"disabled if numba is not installed.\n\n"
223+
"This is because the run-times without numba are too slow.\n\n"
224+
"Please install numba, which is described at the following web page:\n\n"
225+
"https://pyautolens.readthedocs.io/en/latest/installation/overview.html"
226+
)
227+
217228
(
218229
curvature_preload,
219230
indexes,

autoarray/dataset/imaging/w_tilde.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ def w_matrix(self):
8686
"""
8787

8888
return inversion_imaging_numba_util.w_tilde_curvature_imaging_from(
89-
noise_map_native=np.array(self.noise_map.native.array).astype("float64"),
90-
kernel_native=np.array(self.psf.native.array).astype("float64"),
89+
noise_map_native=self.noise_map.native.array,
90+
kernel_native=self.psf.native.array,
9191
native_index_for_slim_index=np.array(
9292
self.mask.derive_indexes.native_for_slim
9393
).astype("int"),
@@ -97,7 +97,7 @@ def w_matrix(self):
9797
def psf_operator_matrix_dense(self):
9898

9999
return inversion_imaging_util.psf_operator_matrix_dense_from(
100-
kernel_native=np.array(self.psf.native.array).astype("float64"),
100+
kernel_native=self.psf.native.array,
101101
native_index_for_slim_index=np.array(
102102
self.mask.derive_indexes.native_for_slim
103103
).astype("int"),

autoarray/dataset/interferometer/dataset.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,17 @@ def w_tilde(self):
186186

187187
logger.info("INTERFEROMETER - Computing W-Tilde... May take a moment.")
188188

189+
try:
190+
import numba
191+
except ModuleNotFoundError:
192+
raise exc.InversionException(
193+
"Inversion w-tilde functionality (pixelized reconstructions) is "
194+
"disabled if numba is not installed.\n\n"
195+
"This is because the run-times without numba are too slow.\n\n"
196+
"Please install numba, which is described at the following web page:\n\n"
197+
"https://pyautolens.readthedocs.io/en/latest/installation/overview.html"
198+
)
199+
189200
curvature_preload = (
190201
inversion_interferometer_util.w_tilde_curvature_preload_interferometer_from(
191202
noise_map_real=np.array(self.noise_map.real),

autoarray/inversion/inversion/imaging/w_tilde.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ def mapped_reconstructed_data_dict(self) -> Dict[LinearObj, Array2D]:
515515
data_to_pix_unique=linear_obj.unique_mappings.data_to_pix_unique,
516516
data_weights=linear_obj.unique_mappings.data_weights,
517517
pix_lengths=linear_obj.unique_mappings.pix_lengths,
518-
reconstruction=reconstruction,
518+
reconstruction=np.array(reconstruction),
519519
)
520520

521521
mapped_reconstructed_image = self.psf.convolve_image_no_blurring(

autoarray/inversion/inversion/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
class SettingsInversion:
1111
def __init__(
1212
self,
13-
use_w_tilde: bool = False,
13+
use_w_tilde: bool = True,
1414
use_positive_only_solver: Optional[bool] = None,
1515
positive_only_uses_p_initial: Optional[bool] = None,
1616
use_border_relocator: Optional[bool] = None,

autoarray/inversion/pixelization/mappers/delaunay.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def pix_sub_weights_split_cross(self) -> PixSubWeights:
168168

169169
splitted_weights = mapper_numba_util.pixel_weights_delaunay_from(
170170
source_plane_data_grid=self.source_plane_mesh_grid.split_cross,
171-
source_plane_mesh_grid=np.array(self.source_plane_mesh_grid),
171+
source_plane_mesh_grid=np.array(self.source_plane_mesh_grid.array),
172172
slim_index_for_sub_slim_index=self.source_plane_mesh_grid.split_cross,
173173
pix_indexes_for_sub_slim_index=splitted_mappings.astype("int"),
174174
)

autoarray/inversion/pixelization/mappers/voronoi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ def pix_sub_weights(self) -> PixSubWeights:
126126
"""
127127

128128
mappings, sizes, weights = mapper_numba_util.pix_size_weights_voronoi_nn_from(
129-
grid=self.source_plane_data_grid.over_sampled,
130-
mesh_grid=self.source_plane_mesh_grid,
129+
grid=np.array(self.source_plane_data_grid.over_sampled),
130+
mesh_grid=np.array(self.source_plane_mesh_grid.array),
131131
)
132132

133133
mappings = mappings.astype("int")

autoarray/operators/transformer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ def visibilities_from(self, image: Array2D) -> Visibilities:
383383

384384
return Visibilities(
385385
visibilities=self.forward(
386-
image.native[::-1, :]
386+
image.native.array[::-1, :]
387387
) # flip due to PyNUFFT internal flip
388388
)
389389

autoarray/plot/visuals/two_d.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from matplotlib import patches as ptch
2+
import numpy as np
23
from typing import List, Optional, Union
34

45
from autoarray.mask.mask_2d import Mask2D
@@ -91,6 +92,6 @@ def plot_via_plotter(self, plotter, grid_indexes=None):
9192
if self.indexes is not None and grid_indexes is not None:
9293

9394
plotter.index_scatter.scatter_grid_indexes(
94-
grid=grid_indexes,
95+
grid=np.array(grid_indexes),
9596
indexes=self.indexes,
9697
)

autoarray/plot/wrap/two_d/delaunay_drawer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ def draw_delaunay_pixels(
104104
colorbar_tickparams.set(cb=cb)
105105

106106
ax.tripcolor(
107-
source_pixelization_grid[:, 1],
108-
source_pixelization_grid[:, 0],
107+
source_pixelization_grid.array[:, 1],
108+
source_pixelization_grid.array[:, 0],
109109
simplices,
110110
facecolors=facecolors,
111111
edgecolors="None",

0 commit comments

Comments
 (0)