Merge branch 'main' into cristina/issue535

lanl · Jul 24, 2024 · 9d9706d · 9d9706d
2 parents 7138eed + 1ffcbcf
commit 9d9706d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/scico/__init__.py b/scico/__init__.py
@@ -37,6 +37,9 @@
 from . import numpy
 from ._autograd import cvjp, grad, jacrev, linear_adjoint, value_and_grad
 
+# See https://github.com/google/jax/issues/19444
+jax.config.update("jax_default_matmul_precision", "highest")
+
 __all__ = [
     "grad",
     "value_and_grad",

diff --git a/scico/test/linop/xray/test_astra.py b/scico/test/linop/xray/test_astra.py
@@ -11,7 +11,12 @@
 from scico.test.linop.xray.test_svmbir import make_im
 
 try:
-    from scico.linop.xray.astra import XRayTransform2D, XRayTransform3D, angle_to_vector
+    from scico.linop.xray.astra import (
+        XRayTransform2D,
+        XRayTransform3D,
+        _ensure_writeable,
+        angle_to_vector,
+    )
 except ModuleNotFoundError as e:
     if e.name == "astra":
         pytest.skip("astra not installed", allow_module_level=True)