From df3abe3abfff7b623e05e920e60994e7699a02ab Mon Sep 17 00:00:00 2001 From: Richard Date: Fri, 8 Nov 2024 16:35:43 +0000 Subject: [PATCH 1/2] use the new jax coordinate array triangles --- test_autolens/point/triangles/test_solver_jax.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test_autolens/point/triangles/test_solver_jax.py b/test_autolens/point/triangles/test_solver_jax.py index 1667a634f..ff01ae9a7 100644 --- a/test_autolens/point/triangles/test_solver_jax.py +++ b/test_autolens/point/triangles/test_solver_jax.py @@ -9,9 +9,11 @@ from autolens import PointSolver try: - from autoarray.structures.triangles.jax_array import ArrayTriangles + from autoarray.structures.triangles.coordinate_array import CoordinateArrayTriangles except ImportError: - from autoarray.structures.triangles.array import ArrayTriangles + from autoarray.structures.triangles.jax_coordinate_array import ( + CoordinateArrayTriangles, + ) from autolens.mock import NullTracer @@ -28,7 +30,7 @@ def solver(grid): return PointSolver.for_grid( grid=grid, pixel_scale_precision=0.01, - array_triangles_cls=ArrayTriangles, + array_triangles_cls=CoordinateArrayTriangles, ) @@ -72,7 +74,7 @@ def test_real_example(grid, tracer): solver = PointSolver.for_grid( grid=grid, pixel_scale_precision=0.001, - array_triangles_cls=ArrayTriangles, + array_triangles_cls=CoordinateArrayTriangles, ) result = solver.solve(tracer, (0.07, 0.07)) @@ -89,7 +91,7 @@ def _test_jax(grid): solver = PointSolver.for_grid( grid=grid, pixel_scale_precision=0.001, - array_triangles_cls=ArrayTriangles, + array_triangles_cls=CoordinateArrayTriangles, max_containing_size=size, ) From 4d031d6b28ef49c21249679ccf84b01af47ac6d4 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 11 Nov 2024 11:21:28 +0000 Subject: [PATCH 2/2] use jax coordinate array in more tests --- test_autolens/point/triangles/test_solver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_autolens/point/triangles/test_solver.py b/test_autolens/point/triangles/test_solver.py index e9e25716e..6a5334bbe 100644 --- a/test_autolens/point/triangles/test_solver.py +++ b/test_autolens/point/triangles/test_solver.py @@ -4,7 +4,7 @@ import autolens as al import autogalaxy as ag -from autoarray.structures.triangles.array import ArrayTriangles +from autoarray.structures.triangles.jax_coordinate_array import ArrayTriangles from autolens.mock import NullTracer from autolens.point.solver import PointSolver