Resolve conflicts with main

Author: jessegrabowski

pytensor/link/numba/dispatch/basic.py

@@ -37,7 +37,7 @@
 from pytensor.tensor.blas import BatchedDot
 from pytensor.tensor.math import Dot
 from pytensor.tensor.shape import Reshape, Shape, Shape_i, SpecifyShape
-from pytensor.tensor.slinalg import Solve
+from pytensor.tensor.slinalg import Cholesky, Solve
 from pytensor.tensor.subtensor import (
     AdvancedIncSubtensor,
     AdvancedIncSubtensor1,
@@ -808,6 +808,7 @@ def softplus(x):
 
     return softplus
 
+
 @numba_funcify.register(Cholesky)
 def numba_funcify_Cholesky(op, node, **kwargs):
     lower = op.lower

pytensor/tensor/slinalg.py

@@ -50,11 +50,9 @@ class Cholesky(Op):
     __props__ = ("lower", "overwrite_a", "on_error")
     gufunc_signature = "(m,m)->(m,m)"
 
-    def __init__(self, *, lower=True, on_error="raise", overwrite_a=False):
-        self.lower = lower
-        self.overwrite_a = overwrite_a
-
-    def __init__(self, *, lower=True, check_finite=True, on_error="raise", overwrite_a=False):
+    def __init__(
+        self, *, lower=True, check_finite=True, on_error="raise", overwrite_a=False
+    ):
         self.lower = lower
         self.destructive = False
         self.check_finite = check_finite
@@ -154,11 +152,12 @@ def try_inplace_inputs(self, candidate_inputs: list[int]) -> "Op":
                 lower=self.lower, overwrite_a=True, on_error=self.on_error
             )
 
+
 def cholesky(x, lower=True, on_error="raise", check_finite=False):
     return Blockwise(
         Cholesky(lower=lower, on_error=on_error, check_finite=check_finite)
     )(x)
-  
+
 
 class SolveBase(Op):
     """Base class for `scipy.linalg` matrix equation solvers."""