finish wrapping tranquilo, fides and nag optimizers

optimagic-dev · Aug 21, 2024 · 7278a6d · 7278a6d
1 parent cce012c
commit 7278a6d
Show file tree

Hide file tree

Showing 5 changed files with 699 additions and 99 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -358,6 +358,8 @@ module = [
     "petsc4py",
     "tranquilo",
     "tranquilo.tranquilo",
+    "tranquilo.options",
+    "tranquilo.process_arguments",
     "dfols",
     "pybobyqa",
     "pygmo",

diff --git a/src/estimagic/batch_evaluators.py b/src/estimagic/batch_evaluators.py
@@ -0,0 +1 @@
+from optimagic.batch_evaluators import *  # noqa: F403
diff --git a/src/optimagic/optimizers/fides.py b/src/optimagic/optimizers/fides.py
@@ -27,7 +27,6 @@
     NonNegativeFloat,
     PositiveFloat,
     PositiveInt,
-    PyTree,
 )
 
 if IS_FIDES_INSTALLED:
@@ -116,8 +115,8 @@ def _solve_internal_problem(
 def fides_internal(
     fun_and_jac: Callable[[NDArray[np.float64]], NDArray[np.float64]],
     x: NDArray[np.float64],
-    lower_bounds: PyTree | None,
-    upper_bounds: PyTree | None,
+    lower_bounds: NDArray[np.float64] | None,
+    upper_bounds: NDArray[np.float64] | None,
     hessian_update_strategy: Literal[
         "bfgs",
         "bb",