Skip to content

Commit 25ae058

Browse files
Jammy2211Jammy2211
authored andcommitted
blck
1 parent e0e2f28 commit 25ae058

File tree

3 files changed

+11
-21
lines changed

3 files changed

+11
-21
lines changed

autoarray/inversion/inversion/abstract.py

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from autoarray.structures.arrays.uniform_2d import Array2D
2020
from autoarray.structures.visibilities import Visibilities
2121

22-
from autoarray import exc
2322
from autoarray.util import misc_util
2423
from autoarray.inversion.inversion import inversion_util
2524

@@ -639,14 +638,9 @@ def log_det_curvature_reg_matrix_term(self) -> float:
639638
if not self.has(cls=AbstractRegularization):
640639
return 0.0
641640

642-
try:
643-
return 2.0 * np.sum(
644-
jnp.log(
645-
jnp.diag(jnp.linalg.cholesky(self.curvature_reg_matrix_reduced))
646-
)
647-
)
648-
except np.linalg.LinAlgError as e:
649-
raise exc.InversionException() from e
641+
return 2.0 * jnp.sum(
642+
jnp.log(jnp.diag(jnp.linalg.cholesky(self.curvature_reg_matrix_reduced)))
643+
)
650644

651645
@cached_property
652646
def log_det_regularization_matrix_term(self) -> float:
@@ -665,14 +659,9 @@ def log_det_regularization_matrix_term(self) -> float:
665659
if not self.has(cls=AbstractRegularization):
666660
return 0.0
667661

668-
try:
669-
return 2.0 * np.sum(
670-
jnp.log(
671-
jnp.diag(jnp.linalg.cholesky(self.regularization_matrix_reduced))
672-
)
673-
)
674-
except np.linalg.LinAlgError as e:
675-
raise exc.InversionException() from e
662+
return 2.0 * jnp.sum(
663+
jnp.log(jnp.diag(jnp.linalg.cholesky(self.regularization_matrix_reduced)))
664+
)
676665

677666
@property
678667
def reconstruction_noise_map_with_covariance(self) -> np.ndarray:

autoarray/inversion/pixelization/mappers/mapper_util.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
import numpy as np
55
from typing import Tuple
66

7-
from autoconf import conf
8-
9-
from autoarray import exc
10-
117

128
def forward_interp(xp, yp, x):
139
return jax.vmap(jnp.interp, in_axes=(1, 1, None, None, None))(x, xp, yp, 0, 1).T

test_autoarray/conftest.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,11 @@ def make_masked_imaging_7x7_no_blur():
156156
return fixtures.make_masked_imaging_7x7_no_blur()
157157

158158

159+
@pytest.fixture(name="masked_imaging_7x7_no_blur_sub_2")
160+
def make_masked_imaging_7x7_no_blur_sub_2():
161+
return fixtures.make_masked_imaging_7x7_no_blur_sub_2()
162+
163+
159164
@pytest.fixture(name="model_image_7x7")
160165
def make_model_image_7x7():
161166
return fixtures.make_model_image_7x7()

0 commit comments

Comments
 (0)