pygeoinf 1.1.9__py3-none-any.whl → 1.2.0__py3-none-any.whl

pygeoinf/linear_optimisation.py

@@ -51,7 +51,7 @@ class LinearLeastSquaresInversion(Inversion):
         if self.forward_problem.data_error_measure_set:
             self.assert_inverse_data_covariance()
 
-    def normal_operator(self, damping: float) -> "LinearOperator":
+    def normal_operator(self, damping: float) -> LinearOperator:
         """
         Returns the Tikhonov-regularized normal operator.
 
@@ -88,8 +88,8 @@ class LinearLeastSquaresInversion(Inversion):
         solver: "LinearSolver",
         /,
         *,
-        preconditioner: Optional["LinearOperator"] = None,
-    ) -> Union[Operator, "LinearOperator"]:
+        preconditioner: Optional[LinearOperator] = None,
+    ) -> Union[Operator, LinearOperator]:
         """
         Returns an operator that maps data to the least-squares solution.
 
@@ -121,7 +121,7 @@ class LinearLeastSquaresInversion(Inversion):
             )
 
             # This mapping is affine, not linear, if the error measure has a non-zero mean.
-            def mapping(data: "Vector") -> "Vector":
+            def mapping(data: Vector) -> Vector:
                 shifted_data = self.forward_problem.data_space.subtract(
                     data, self.forward_problem.data_error_measure.expectation
                 )
@@ -162,13 +162,13 @@ class LinearMinimumNormInversion(Inversion):
         solver: "LinearSolver",
         /,
         *,
-        preconditioner: Optional["LinearOperator"] = None,
+        preconditioner: Optional[LinearOperator] = None,
         significance_level: float = 0.95,
         minimum_damping: float = 0.0,
         maxiter: int = 100,
         rtol: float = 1.0e-6,
         atol: float = 0.0,
-    ) -> Union[Operator, "LinearOperator"]:
+    ) -> Union[Operator, LinearOperator]:
         """
         Returns an operator that maps data to the minimum-norm solution.
 
@@ -196,8 +196,8 @@ class LinearMinimumNormInversion(Inversion):
             lsq_inversion = LinearLeastSquaresInversion(self.forward_problem)
 
             def get_model_for_damping(
-                damping: float, data: "Vector", model0: Optional["Vector"] = None
-            ) -> tuple["Vector", float]:
+                damping: float, data: Vector, model0: Optional[Vector] = None
+            ) -> tuple[Vector, float]:
                 """Computes the LS model and its chi-squared for a given damping."""
                 op = lsq_inversion.least_squares_operator(
                     damping, solver, preconditioner=preconditioner
@@ -206,7 +206,7 @@ class LinearMinimumNormInversion(Inversion):
                 chi_squared = self.forward_problem.chi_squared(model, data)
                 return model, chi_squared
 
-            def mapping(data: "Vector") -> "Vector":
+            def mapping(data: Vector) -> Vector:
                 """The non-linear mapping from data to the minimum-norm model."""
                 model = self.model_space.zero
                 chi_squared = self.forward_problem.chi_squared(model, data)

pygeoinf/linear_solvers.py

@@ -48,6 +48,19 @@ class DirectLinearSolver(LinearSolver):
     factorization.
     """
 
+    def __init__(
+        self, /, *, galerkin: bool = False, parallel: bool = False, n_jobs: int = -1
+    ):
+        """
+        Args:
+            galerkin (bool): If True, the Galerkin matrix representation is used.
+            parallel (bool): If True, parallel computation is used.
+            n_jobs (int): Number of parallel jobs.
+        """
+        self._galerkin: bool = galerkin
+        self._parallel: bool = parallel
+        self._n_jobs: int = n_jobs
+
 
 class LUSolver(DirectLinearSolver):
     """
@@ -55,12 +68,16 @@ class LUSolver(DirectLinearSolver):
     dense matrix representation.
     """
 
-    def __init__(self, /, *, galerkin: bool = False) -> None:
+    def __init__(
+        self, /, *, galerkin: bool = False, parallel: bool = False, n_jobs: int = -1
+    ) -> None:
         """
         Args:
             galerkin (bool): If True, the Galerkin matrix representation is used.
+            parallel (bool): If True, parallel computation is used.
+            n_jobs (int): Number of parallel jobs.
         """
-        self._galerkin: bool = galerkin
+        super().__init__(galerkin=galerkin, parallel=parallel, n_jobs=n_jobs)
 
     def __call__(self, operator: LinearOperator) -> LinearOperator:
         """
@@ -74,7 +91,12 @@ class LUSolver(DirectLinearSolver):
         """
         assert operator.is_square
 
-        matrix = operator.matrix(dense=True, galerkin=self._galerkin)
+        matrix = operator.matrix(
+            dense=True,
+            galerkin=self._galerkin,
+            parallel=self._parallel,
+            n_jobs=self._n_jobs,
+        )
         factor = lu_factor(matrix, overwrite_a=True)
 
         def matvec(cy: np.ndarray) -> np.ndarray:
@@ -102,12 +124,16 @@ class CholeskySolver(DirectLinearSolver):
     representation is positive-definite.
     """
 
-    def __init__(self, /, *, galerkin: bool = False) -> None:
+    def __init__(
+        self, /, *, galerkin: bool = False, parallel: bool = False, n_jobs: int = -1
+    ) -> None:
         """
         Args:
             galerkin (bool): If True, the Galerkin matrix representation is used.
+            parallel (bool): If True, parallel computation is used.
+            n_jobs (int): Number of parallel jobs.
         """
-        self._galerkin: bool = galerkin
+        super().__init__(galerkin=galerkin, parallel=parallel, n_jobs=n_jobs)
 
     def __call__(self, operator: LinearOperator) -> LinearOperator:
         """
@@ -121,7 +147,12 @@ class CholeskySolver(DirectLinearSolver):
         """
         assert operator.is_automorphism
 
-        matrix = operator.matrix(dense=True, galerkin=self._galerkin)
+        matrix = operator.matrix(
+            dense=True,
+            galerkin=self._galerkin,
+            parallel=self._parallel,
+            n_jobs=self._n_jobs,
+        )
         factor = cho_factor(matrix, overwrite_a=False)
 
         def matvec(cy: np.ndarray) -> np.ndarray:

{pygeoinf-1.1.9.dist-info → pygeoinf-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pygeoinf
-Version: 1.1.9
+Version: 1.2.0
 Summary: A package for solving geophysical inference and inverse problems
 License: BSD-3-Clause
 Author: David Al-Attar and Dan Heathcote

{pygeoinf-1.1.9.dist-info → pygeoinf-1.2.0.dist-info}/RECORD

@@ -6,8 +6,8 @@ pygeoinf/hilbert_space.py,sha256=90aaUPUBCqsEuXroOwCmvbRFhi1vf6F9bS4pU3DCseI,233
 pygeoinf/inversion.py,sha256=p9k_iDVgJGLM1cGlT-0rgRwqdYVdsYC_euTXZk3kuOc,3199
 pygeoinf/linear_bayesian.py,sha256=aIOzTZbjJtdtwHKh5e01iS8iMiyr8XuwGx91udS3VK4,9624
 pygeoinf/linear_forms.py,sha256=Uizipi67i1Sd6m0TzsrJd99Xreo_6V8Db0gMy76fG6g,5953
-pygeoinf/linear_optimisation.py,sha256=7lklTRRBGkz8M9WsfvkDl-eoGkc4Ty7BOJq7LWkdxCg,11091
-pygeoinf/linear_solvers.py,sha256=zNYd7QNxzEMGp3sz1RWsyAT-Scv3yFv7FH0ZkK2OMZU,12270
+pygeoinf/linear_optimisation.py,sha256=zWUMQpuLlEXtA3yJ55sT8809THbU_oQlLUwjroAbZbU,11067
+pygeoinf/linear_solvers.py,sha256=USeUPa0zZ7gXk5OnvEw1LzCxCZoQIKhdwZZn-KNU7jA,13371
 pygeoinf/operators.py,sha256=_t_UqYBIk4rWdRe98hre39sPaoRRbNejOtcvabtf0x8,38010
 pygeoinf/parallel.py,sha256=E148IAKiXojWe6sq3iYtHl1XGAW8w6xaYbI7LOM9oKc,2269
 pygeoinf/random_matrix.py,sha256=Q9jgQVpMOy8jR3s057DzHeKrKLdvwRktF-n_oVZ0xbs,8231
@@ -15,7 +15,7 @@ pygeoinf/symmetric_space/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 pygeoinf/symmetric_space/circle.py,sha256=eUZPIDwg19RTCK3-bvbARg1g9RQcnV462MTlDaI-l5Y,17716
 pygeoinf/symmetric_space/sphere.py,sha256=yjmES34jWLi4-EhU_RDILYn1y7_YrvgrTyT2qL2mLVg,21534
 pygeoinf/symmetric_space/symmetric_space.py,sha256=lEAshbb55qL0iX84H423Pt35Af89Iy2pfB18JCPheX8,17970
-pygeoinf-1.1.9.dist-info/LICENSE,sha256=GrTQnKJemVi69FSbHprq60KN0OJGsOSR-joQoTq-oD8,1501
-pygeoinf-1.1.9.dist-info/METADATA,sha256=k1ymJcpBAr3TlSWhLaOun8fnO34ZQ0FSbMQGkE5DMuM,15363
-pygeoinf-1.1.9.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pygeoinf-1.1.9.dist-info/RECORD,,
+pygeoinf-1.2.0.dist-info/LICENSE,sha256=GrTQnKJemVi69FSbHprq60KN0OJGsOSR-joQoTq-oD8,1501
+pygeoinf-1.2.0.dist-info/METADATA,sha256=Q9Wo26AZXTTmUy7Fc8AVyhqDlEME7gDQ2udkImPATGo,15363
+pygeoinf-1.2.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pygeoinf-1.2.0.dist-info/RECORD,,