torchzero 0.3.14__py3-none-any.whl → 0.3.15__py3-none-any.whl

torchzero/core/transform.py

@@ -5,7 +5,9 @@ from typing import Any, Literal, final
 import torch
 
 from ..utils import TensorList, set_storage_, vec_to_tensors
-from .module import Chain, Chainable, Module, Var
+from .chain import Chain
+from .module import Chainable, Module
+from .var import Var
 
 Target = Literal['grad', 'update', 'closure', 'params_direct', 'params_difference', 'update_difference']
 
@@ -86,7 +88,7 @@ class Transform(Module, ABC):
 
     @final
     @torch.no_grad
-    def transform_update(
+    def update_transform(
         self,
         tensors: list[torch.Tensor],
         params: list[torch.Tensor],
@@ -123,7 +125,7 @@ class Transform(Module, ABC):
 
     @final
     @torch.no_grad
-    def transform_apply(
+    def apply_transform(
         self,
         tensors: list[torch.Tensor],
         params: list[torch.Tensor],
@@ -190,7 +192,7 @@ class Transform(Module, ABC):
     ):
         """`params` will be used as keys and need to always point to same tensor objects.`"""
         states, settings = self._get_keyed_states_settings(params)
-        self.transform_update(tensors=tensors, params=params, grads=grads, loss=loss, states=states, settings=settings)
+        self.update_transform(tensors=tensors, params=params, grads=grads, loss=loss, states=states, settings=settings)
 
 
     @final
@@ -204,7 +206,7 @@ class Transform(Module, ABC):
     ):
         """`params` will be used as keys and need to always point to same tensor objects.`"""
         states, settings = self._get_keyed_states_settings(params)
-        return self.transform_apply(tensors=tensors, params=params, grads=grads, loss=loss, states=states, settings=settings)
+        return self.apply_transform(tensors=tensors, params=params, grads=grads, loss=loss, states=states, settings=settings)
 
 
     def pre_step(self, var: Var) -> None:

torchzero/core/var.py

@@ -0,0 +1,376 @@
+
+import warnings
+from abc import ABC, abstractmethod
+from collections import ChainMap, defaultdict
+from collections.abc import Callable, Iterable, MutableMapping, Sequence
+from operator import itemgetter
+from typing import Any, final, overload, Literal, cast, TYPE_CHECKING
+
+import torch
+
+from ..utils import (
+    Init,
+    ListLike,
+    Params,
+    _make_param_groups,
+    get_state_vals,
+    vec_to_tensors
+)
+from ..utils.derivatives import hvp, hvp_fd_central, hvp_fd_forward, flatten_jacobian
+from ..utils.python_tools import flatten
+from ..utils.linalg.linear_operator import LinearOperator
+
+if TYPE_CHECKING:
+    from .modular import Modular
+
+def _closure_backward(closure, params, retain_graph, create_graph):
+    with torch.enable_grad():
+        if not (retain_graph or create_graph):
+            return closure()
+
+        for p in params: p.grad = None
+        loss = closure(False)
+        grad = torch.autograd.grad(loss, params, retain_graph=retain_graph, create_graph=create_graph)
+        for p,g in zip(params,grad): p.grad = g
+        return loss
+
+# region Vars
+# ----------------------------------- var ----------------------------------- #
+class Var:
+    """
+    Holds parameters, gradient, update, objective function (closure) if supplied, loss, and some other info.
+    Modules take in a ``Var`` object, modify and it is passed to the next module.
+
+    """
+    def __init__(
+        self,
+        params: list[torch.Tensor],
+        closure: Callable | None,
+        model: torch.nn.Module | None,
+        current_step: int,
+        parent: "Var | None" = None,
+        modular: "Modular | None" = None,
+        loss: torch.Tensor | None = None,
+        storage: dict | None = None,
+    ):
+        self.params: list[torch.Tensor] = params
+        """List of all parameters with requires_grad = True."""
+
+        self.closure = closure
+        """A closure that reevaluates the model and returns the loss, None if it wasn't specified"""
+
+        self.model = model
+        """torch.nn.Module object of the model, None if it wasn't specified."""
+
+        self.current_step: int = current_step
+        """global current step, starts at 0. This may not correspond to module current step,
+        for example a module may step every 10 global steps."""
+
+        self.parent: "Var | None" = parent
+        """parent ``Var`` object. When ``self.get_grad()`` is called, it will also set ``parent.grad``.
+        Same with ``self.get_loss()``. This is useful when ``self.params`` are different from ``parent.params``,
+        e.g. when projecting."""
+
+        self.modular: "Modular | None" = modular
+        """Modular optimizer object that created this ``Var``."""
+
+        self.update: list[torch.Tensor] | None = None
+        """
+        current update. Update is assumed to be a transformed gradient, therefore it is subtracted.
+
+        If closure is None, this is initially set to cloned gradient. Otherwise this is set to None.
+
+        At the end ``var.get_update()`` is subtracted from parameters. Therefore if ``var.update`` is ``None``,
+        gradient will be used and calculated if needed.
+        """
+
+        self.grad: list[torch.Tensor] | None = None
+        """gradient with current parameters. If closure is not ``None``, this is set to ``None`` and can be calculated if needed."""
+
+        self.loss: torch.Tensor | Any | None = loss
+        """loss with current parameters."""
+
+        self.loss_approx: torch.Tensor | Any | None = None
+        """loss at a point near current point. This can be useful as some modules only calculate loss at perturbed points,
+        whereas some other modules require loss strictly at current point."""
+
+        self.post_step_hooks: list[Callable[[Modular, Var]]] = []
+        """list of functions to be called after optimizer step.
+
+        This attribute should always be modified in-place (using ``append`` or ``extend``).
+
+        The signature is:
+
+        ```python
+        def hook(optimizer: Modular, var: Vars): ...
+        ```
+        """
+
+        self.stop: bool = False
+        """if True, all following modules will be skipped.
+        If this module is a child, it only affects modules at the same level (in the same Chain)."""
+
+        self.skip_update: bool = False
+        """if True, the parameters will not be updated."""
+
+        # self.storage: dict = {}
+        # """Storage for any other data, such as hessian estimates, etc."""
+
+        self.attrs: dict = {}
+        """attributes, Modular.attrs is updated with this after each step. This attribute should always be modified in-place"""
+
+        if storage is None: storage = {}
+        self.storage: dict = storage
+        """additional kwargs passed to closure will end up in this dict. This attribute should always be modified in-place"""
+
+        self.should_terminate: bool | None = None
+        """termination criteria, Modular.should_terminate is set to this after each step if not None"""
+
+    def get_loss(self, backward: bool, retain_graph = None, create_graph: bool = False) -> torch.Tensor | float:
+        """Returns the loss at current parameters, computing it if it hasn't been computed already and assigning ``var.loss``.
+        Do not call this at perturbed parameters. Backward always sets grads to None before recomputing."""
+        if self.loss is None:
+
+            if self.closure is None: raise RuntimeError("closure is None")
+            if backward:
+                with torch.enable_grad():
+                    self.loss = self.loss_approx = _closure_backward(
+                        closure=self.closure, params=self.params, retain_graph=retain_graph, create_graph=create_graph
+                    )
+
+                # initializing to zeros_like is equivalent to using zero_grad with set_to_none = False.
+                # it is technically a more correct approach for when some parameters conditionally receive gradients
+                # and in this case it shouldn't be slower.
+
+                # next time closure() is called, it will set grad to None.
+                # zero_grad(set_to_none=False) shouldn't be used (I should add a warning)
+                self.grad = [p.grad if p.grad  is not None else torch.zeros_like(p) for p in self.params]
+            else:
+                self.loss = self.loss_approx = self.closure(False)
+
+        # if self.loss was not None, above branch wasn't executed because loss has already been evaluated, but without backward since self.grad is None.
+        # and now it is requested to be evaluated with backward.
+        if backward and self.grad is None:
+            warnings.warn('get_loss was called with backward=False, and then with backward=True so it had to be re-evaluated, so the closure was evaluated twice where it could have been evaluated once.')
+            if self.closure is None: raise RuntimeError("closure is None")
+
+            with torch.enable_grad():
+                self.loss = self.loss_approx = _closure_backward(
+                    closure=self.closure, params=self.params, retain_graph=retain_graph, create_graph=create_graph
+                )
+            self.grad = [p.grad if p.grad is not None else torch.zeros_like(p) for p in self.params]
+
+        # set parent grad
+        if self.parent is not None:
+            # the way projections/split work, they make a new closure which evaluates original
+            # closure and projects the gradient, and set it as their var.closure.
+            # then on `get_loss(backward=True)` it is called, so it also sets original parameters gradient.
+            # and we set it to parent var here.
+            if self.parent.loss is None: self.parent.loss = self.loss
+            if self.parent.grad is None and backward:
+                if all(p.grad is None for p in self.parent.params):
+                    warnings.warn("Parent grad is None after backward.")
+                self.parent.grad = [p.grad if p.grad is not None else torch.zeros_like(p) for p in self.parent.params]
+
+        return self.loss # type:ignore
+
+    def get_grad(self, retain_graph: bool | None = None, create_graph: bool = False) -> list[torch.Tensor]:
+        """Returns the gradient at initial parameters, computing it if it hasn't been computed already and assigning
+        ``var.grad`` and potentially ``var.loss``. Do not call this at perturbed parameters."""
+        if self.grad is None:
+            if self.closure is None: raise RuntimeError("closure is None")
+            self.get_loss(backward=True, retain_graph=retain_graph, create_graph=create_graph) # evaluate and set self.loss and self.grad
+
+        assert self.grad is not None
+        return self.grad
+
+    def get_update(self) -> list[torch.Tensor]:
+        """Returns the update. If update is None, it is initialized by cloning the gradients and assigning to ``var.update``.
+        Computing the gradients may assign ``var.grad`` and ``var.loss`` if they haven't been computed.
+        Do not call this at perturbed parameters."""
+        if self.update is None: self.update = [g.clone() for g in self.get_grad()]
+        return self.update
+
+    def clone(self, clone_update: bool, parent: "Var | None" = None):
+        """Creates a shallow copy of the Vars object, update can optionally be deep-copied (via ``torch.clone``).
+
+        Setting ``parent`` is only if clone's parameters are something different,
+        while clone's closure referes to the same objective but with a "view" on parameters.
+        """
+        copy = Var(params = self.params, closure=self.closure, model=self.model, current_step=self.current_step, parent=parent)
+
+        if clone_update and self.update is not None:
+            copy.update = [u.clone() for u in self.update]
+        else:
+            copy.update = self.update
+
+        copy.grad = self.grad
+        copy.loss = self.loss
+        copy.loss_approx = self.loss_approx
+        copy.closure = self.closure
+        copy.post_step_hooks = self.post_step_hooks
+        copy.stop = self.stop
+        copy.skip_update = self.skip_update
+
+        copy.modular = self.modular
+        copy.attrs = self.attrs
+        copy.storage = self.storage
+        copy.should_terminate = self.should_terminate
+
+        return copy
+
+    def update_attrs_from_clone_(self, var: "Var"):
+        """Updates attributes of this `Vars` instance from a cloned instance.
+        Typically called after a child module has processed a cloned `Vars`
+        object. This propagates any newly computed loss or gradient values
+        from the child's context back to the parent `Vars` if the parent
+        didn't have them computed already.
+
+        Also, as long as ``post_step_hooks`` and ``attrs`` are modified in-place,
+        if the child updates them, the update will affect the parent too.
+        """
+        if self.loss is None: self.loss = var.loss
+        if self.loss_approx is None: self.loss_approx = var.loss_approx
+        if self.grad is None: self.grad = var.grad
+
+        if var.should_terminate is not None: self.should_terminate = var.should_terminate
+
+    def zero_grad(self, set_to_none=True):
+        if set_to_none:
+            for p in self.params: p.grad = None
+        else:
+            grads = [p.grad for p in self.params if p.grad is not None]
+            if len(grads) != 0: torch._foreach_zero_(grads)
+
+
+    # ------------------------------ HELPER METHODS ------------------------------ #
+    @torch.no_grad
+    def hessian_vector_product(
+        self,
+        v: Sequence[torch.Tensor],
+        at_x0: bool,
+        rgrad: Sequence[torch.Tensor] | None,
+        hvp_method: Literal['autograd', 'forward', 'central'],
+        h: float,
+        normalize: bool,
+        retain_graph: bool,
+    ) -> tuple[list[torch.Tensor], Sequence[torch.Tensor] | None]:
+        """
+        Returns ``(Hvp, rgrad)``, where ``rgrad`` is gradient at current parameters,
+        possibly with ``create_graph=True``, or it may be None with ``hvp_method="central"``.
+        Gradient is set to vars automatically if ``at_x0``, you can always access it with ``vars.get_grad()``
+
+        Single sample example:
+
+        ```python
+        Hvp, _ = self.hessian_vector_product(v, at_x0=True, rgrad=None, ..., retain_graph=False)
+        ```
+
+        Multiple samples example:
+
+        ```python
+        D = None
+        rgrad = None
+        for i in range(n_samples):
+            v = [torch.randn_like(p) for p in params]
+            Hvp, rgrad = self.hessian_vector_product(v, at_x0=True, rgrad=rgrad, ..., retain_graph=i < n_samples-1)
+
+            if D is None: D = Hvp
+            else: torch._foreach_add_(D, Hvp)
+
+        if n_samples > 1: torch._foreach_div_(D, n_samples)
+        ```
+
+        Args:
+            v (Sequence[torch.Tensor]): vector in hessian-vector product
+            at_x0 (bool): whether this is being called at original or perturbed parameters.
+            var (Var): Var
+            rgrad (Sequence[torch.Tensor] | None): pass None initially, then pass what this returns.
+            hvp_method (str): hvp method.
+            h (float): finite difference step size
+            normalize (bool): whether to normalize v for finite difference
+            retain_grad (bool): retain grad
+        """
+        # get grad
+        if rgrad is None and hvp_method in ('autograd', 'forward'):
+            if at_x0: rgrad = self.get_grad(create_graph = hvp_method=='autograd')
+            else:
+                if self.closure is None: raise RuntimeError("Closure is required to calculate HVp")
+                with torch.enable_grad():
+                    loss = self.closure()
+                    rgrad = torch.autograd.grad(loss, self.params, create_graph = hvp_method=='autograd')
+
+        if hvp_method == 'autograd':
+            assert rgrad is not None
+            Hvp = hvp(self.params, rgrad, v, retain_graph=retain_graph)
+
+        elif hvp_method == 'forward':
+            assert rgrad is not None
+            loss, Hvp = hvp_fd_forward(self.closure, self.params, v, h=h, g_0=rgrad, normalize=normalize)
+
+        elif hvp_method == 'central':
+            loss, Hvp = hvp_fd_central(self.closure, self.params, v, h=h, normalize=normalize)
+
+        else:
+            raise ValueError(hvp_method)
+
+        return list(Hvp), rgrad
+
+    @torch.no_grad
+    def hessian_matrix_product(
+        self,
+        M: torch.Tensor,
+        at_x0: bool,
+        rgrad: Sequence[torch.Tensor] | None,
+        hvp_method: Literal["batched", 'autograd', 'forward', 'central'],
+        h: float,
+        normalize: bool,
+        retain_graph: bool,
+    ) -> tuple[torch.Tensor, Sequence[torch.Tensor] | None]:
+        """M is (n_dim, n_hvps), computes H @ M - (n_dim, n_hvps)."""
+
+        # get grad
+        if rgrad is None and hvp_method in ('autograd', 'forward', "batched"):
+            if at_x0: rgrad = self.get_grad(create_graph = hvp_method in ('autograd', "batched"))
+            else:
+                if self.closure is None: raise RuntimeError("Closure is required to calculate HVp")
+                with torch.enable_grad():
+                    loss = self.closure()
+                    create_graph = hvp_method in ('autograd', "batched")
+                    rgrad = torch.autograd.grad(loss, self.params, create_graph=create_graph)
+
+        if hvp_method == "batched":
+            assert rgrad is not None
+            with torch.enable_grad():
+                flat_inputs = torch.cat([g.ravel() for g in rgrad])
+                HM_list = torch.autograd.grad(flat_inputs, self.params, grad_outputs=M.T, is_grads_batched=True, retain_graph=retain_graph)
+                HM = flatten_jacobian(HM_list).T
+
+        elif hvp_method == 'autograd':
+            assert rgrad is not None
+            with torch.enable_grad():
+                flat_inputs = torch.cat([g.ravel() for g in rgrad])
+                HV_tensors = [torch.autograd.grad(
+                    flat_inputs, self.params, grad_outputs=col,
+                    retain_graph = retain_graph or (i < M.size(1) - 1)
+                ) for i,col in enumerate(M.unbind(1))]
+                HM_list = [torch.cat([t.ravel() for t in tensors]) for tensors in HV_tensors]
+                HM = torch.stack(HM_list, 1)
+
+        elif hvp_method == 'forward':
+            assert rgrad is not None
+            HV_tensors = [hvp_fd_forward(self.closure, self.params, vec_to_tensors(col, self.params), h=h, g_0=rgrad, normalize=normalize)[1] for col in M.unbind(1)]
+            HM_list = [torch.cat([t.ravel() for t in tensors]) for tensors in HV_tensors]
+            HM = flatten_jacobian(HM_list)
+
+        elif hvp_method == 'central':
+            HV_tensors = [hvp_fd_central(self.closure, self.params, vec_to_tensors(col, self.params), h=h, normalize=normalize)[1] for col in M.unbind(1)]
+            HM_list = [torch.cat([t.ravel() for t in tensors]) for tensors in HV_tensors]
+            HM = flatten_jacobian(HM_list)
+
+        else:
+            raise ValueError(hvp_method)
+
+        return HM, rgrad
+
+# endregion

torchzero/modules/__init__.py

@@ -2,7 +2,6 @@ from . import experimental
 from .clipping import *
 from .conjugate_gradient import *
 from .grad_approximation import *
-from .higher_order import *
 from .least_squares import *
 from .line_search import *
 from .misc import *

torchzero/modules/adaptive/adahessian.py

@@ -193,8 +193,8 @@ class AdaHessian(Module):
             for i in range(n_samples):
                 u = [_rademacher_like(p, generator=generator) for p in params]
 
-                Hvp, rgrad = self.Hvp(u, at_x0=True, var=var, rgrad=rgrad, hvp_method=hvp_method,
-                                     h=fd_h, normalize=True, retain_grad=i < n_samples-1)
+                Hvp, rgrad = var.hessian_vector_product(u, at_x0=True, rgrad=rgrad, hvp_method=hvp_method,
+                                     h=fd_h, normalize=True, retain_graph=i < n_samples-1)
                 Hvp = tuple(Hvp)
 
                 if D is None: D = Hvp

torchzero/modules/adaptive/esgd.py

@@ -144,8 +144,8 @@ class ESGD(Module):
             for j in range(n_samples):
                 u = [torch.randn(p.size(), generator=generator, device=p.device, dtype=p.dtype) for p in params]
 
-                Hvp, rgrad = self.Hvp(u, at_x0=True, var=var, rgrad=rgrad, hvp_method=hvp_method,
-                                     h=fd_h, normalize=True, retain_grad=j < n_samples-1)
+                Hvp, rgrad = var.hessian_vector_product(u, at_x0=True, rgrad=rgrad, hvp_method=hvp_method,
+                                     h=fd_h, normalize=True, retain_graph=j < n_samples-1)
 
                 if D is None: D = Hvp
                 else: torch._foreach_add_(D, Hvp)

torchzero/modules/adaptive/matrix_momentum.py

@@ -74,7 +74,7 @@ class MatrixMomentum(Module):
         if step > 0:
             s = p - p_prev
 
-            Hs, _ = self.Hvp(s, at_x0=True, var=var, rgrad=None, hvp_method=hvp_method, h=h, normalize=True, retain_grad=False)
+            Hs, _ = var.hessian_vector_product(s, at_x0=True, rgrad=None, hvp_method=hvp_method, h=h, normalize=True, retain_graph=False)
             Hs = [t.detach() for t in Hs]
 
             if 'hvp_tfm' in self.children:

torchzero/modules/adaptive/sophia_h.py

@@ -155,8 +155,8 @@ class SophiaH(Module):
             for i in range(n_samples):
                 u = [torch.randn(p.shape, device=p.device, dtype=p.dtype, generator=generator) for p in params]
 
-                Hvp, rgrad = self.Hvp(u, at_x0=True, var=var, rgrad=rgrad, hvp_method=hvp_method,
-                                     h=fd_h, normalize=True, retain_grad=i < n_samples-1)
+                Hvp, rgrad = var.hessian_vector_product(u, at_x0=True, rgrad=rgrad, hvp_method=hvp_method,
+                                     h=fd_h, normalize=True, retain_graph=i < n_samples-1)
                 Hvp = tuple(Hvp)
 
                 if h is None: h = Hvp

torchzero/modules/experimental/__init__.py

@@ -4,6 +4,7 @@ from .curveball import CurveBall
 # from dct import DCTProjection
 from .fft import FFTProjection
 from .gradmin import GradMin
+from .higher_order_newton import HigherOrderNewton
 from .l_infinity import InfinityNormTrustRegion
 from .momentum import (
     CoordinateMomentum,

torchzero/modules/experimental/newtonnewton.py

@@ -45,9 +45,9 @@ class NewtonNewton(Module):
         order: int = 3,
         search_negative: bool = False,
         vectorize: bool = True,
-        eigval_tfm: Callable[[torch.Tensor], torch.Tensor] | None = None,
+        eigval_fn: Callable[[torch.Tensor], torch.Tensor] | None = None,
     ):
-        defaults = dict(order=order, reg=reg, vectorize=vectorize, eigval_tfm=eigval_tfm, search_negative=search_negative)
+        defaults = dict(order=order, reg=reg, vectorize=vectorize, eigval_fn=eigval_fn, search_negative=search_negative)
         super().__init__(defaults)
 
     @torch.no_grad
@@ -61,7 +61,7 @@ class NewtonNewton(Module):
         vectorize = settings['vectorize']
         order = settings['order']
         search_negative = settings['search_negative']
-        eigval_tfm = settings['eigval_tfm']
+        eigval_fn = settings['eigval_fn']
 
         # ------------------------ calculate grad and hessian ------------------------ #
         Hs = []
@@ -82,8 +82,8 @@ class NewtonNewton(Module):
                     Hs.append(H)
 
                     x = None
-                    if search_negative or (is_last and eigval_tfm is not None):
-                        x = _eigh_solve(H, xp, eigval_tfm, search_negative=search_negative)
+                    if search_negative or (is_last and eigval_fn is not None):
+                        x = _eigh_solve(H, xp, eigval_fn, search_negative=search_negative)
                     if x is None: x = _cholesky_solve(H, xp)
                     if x is None: x = _lu_solve(H, xp)
                     if x is None: x = _least_squares_solve(H, xp)

torchzero/modules/experimental/spsa1.py

@@ -48,7 +48,7 @@ class SPSA1(GradApproximator):
             n_samples = self.defaults['n_samples']
             h = self.get_settings(var.params, 'h')
 
-            perturbations = [params.sample_like(distribution='rademacher', generator=generator) for _ in range(n_samples)]
+            perturbations = [params.rademacher_like(generator=generator) for _ in range(n_samples)]
             torch._foreach_mul_([p for l in perturbations for p in l], [v for vv in h for v in [vv]*n_samples])
 
             for param, prt in zip(params, zip(*perturbations)):
@@ -74,7 +74,7 @@ class SPSA1(GradApproximator):
             prt = perturbations[i]
 
             if prt[0] is None:
-                prt = params.sample_like('rademacher', generator=generator).mul_(h)
+                prt = params.rademacher_like(generator=generator).mul_(h)
 
             else: prt = TensorList(prt)
 

torchzero/modules/functional.py

@@ -253,3 +253,10 @@ def safe_clip(x: torch.Tensor, min=None):
 
     if x.abs() < min: return x.new_full(x.size(), min).copysign(x)
     return x
+
+
+def clip_by_finfo(x, finfo: torch.finfo):
+    """clips by (dtype.max / 2, dtype.min / 2)"""
+    if x > finfo.max / 2: return finfo.max / 2
+    if x < finfo.min / 2: return finfo.min / 2
+    return x

torchzero/modules/line_search/__init__.py

@@ -1,4 +1,4 @@
-from .adaptive import AdaptiveTracking
+from .adaptive import AdaptiveBisection
 from .backtracking import AdaptiveBacktracking, Backtracking
 from .line_search import LineSearchBase
 from .scipy import ScipyMinimizeScalar

torchzero/modules/line_search/_polyinterp.py

@@ -2,7 +2,7 @@ import numpy as np
 import torch
 
 from .line_search import LineSearchBase
-
+from ...utils import tofloat
 
 # polynomial interpolation
 # this code is from https://github.com/hjmshi/PyTorch-LBFGS/blob/master/functions/LBFGS.py
@@ -284,6 +284,8 @@ def polyinterp2(points, lb, ub, unbounded: bool = False):
             x_sol = _cubic_interp(p, lb, ub)
             if x_sol is not None and _within_bounds(x_sol, lb, ub): return x_sol
 
+    if lb is not None: lb = tofloat(lb)
+    if ub is not None: ub = tofloat(ub)
     x_sol = _poly_interp(points, lb, ub)
     if x_sol is not None and _within_bounds(x_sol, lb, ub): return x_sol
     return polyinterp2(points[1:], lb, ub)

torchzero/modules/line_search/adaptive.py

@@ -10,7 +10,7 @@ import torch
 from .line_search import LineSearchBase, TerminationCondition, termination_condition
 
 
-def adaptive_tracking(
+def adaptive_bisection(
     f,
     a_init,
     maxiter: int,
@@ -56,7 +56,7 @@ def adaptive_tracking(
     return 0, f_0, niter
 
 
-class AdaptiveTracking(LineSearchBase):
+class AdaptiveBisection(LineSearchBase):
     """A line search that evaluates previous step size, if value increased, backtracks until the value stops decreasing,
     otherwise forward-tracks until value stops decreasing.
 
@@ -98,7 +98,7 @@ class AdaptiveTracking(LineSearchBase):
         if a_init < torch.finfo(var.params[0].dtype).tiny * 2:
             a_init = torch.finfo(var.params[0].dtype).max / 2
 
-        step_size, f, niter = adaptive_tracking(
+        step_size, f, niter = adaptive_bisection(
             objective,
             a_init=a_init,
             maxiter=maxiter,

torchzero/modules/line_search/backtracking.py

@@ -136,7 +136,7 @@ class Backtracking(LineSearchBase):
         if adaptive:
             finfo = torch.finfo(var.params[0].dtype)
             if init_scale <= finfo.tiny * 2:
-                self.global_state["init_scale"] = finfo.max / 2
+                self.global_state["init_scale"] = init * 2
             else:
                 self.global_state['init_scale'] = init_scale * beta**maxiter
         return 0