Merge pull request #21 from ihmeuw-msca/bugfix/dx_direction

revert step size to previous version

Author: kels271828

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "msca"
-version = "0.3.4"
+version = "0.3.5"
 description = "Mathematical sciences and computational algorithms"
 readme = "README.md"
 requires-python = ">=3.11,<3.13"

src/msca/optim/solver/ntcgsolver.py

@@ -126,7 +126,7 @@ def minimize(
             precon_builder = precon_builder_map[precon_builder](
                 **(precon_builder_options or {})
             )
-        cg_options = cg_options or {"rtol": 1e-2}
+        cg_options = cg_options or {}
 
         def get_cg_maxiter(niter: int) -> int | None:
             if cg_maxiter_init is None and cg_maxiter is None:
@@ -172,16 +172,9 @@ def cg_iter_counter(xk, cg_info):
                 cg_options["M"] = precon_builder(x_pair, g_pair)
             cg_options["maxiter"] = get_cg_maxiter(niter)
             dx = cg(hess, -g, **cg_options)[0]
-            try:
-                # get step size
-                step = line_search(
-                    gradient=self.grad, x=x, dx=-dx, **line_search_options
-                )
-            except RuntimeError:
-                dx = -g
-                step = line_search(
-                    gradient=self.grad, x=x, dx=-dx, **line_search_options
-                )
+
+            # get step size
+            step = line_search(self.grad, x, dx, **line_search_options)
             x = x + step * dx
 
             # update f and gnorm