torchzero 0.3.13__tar.gz → 0.3.15__tar.gz

{torchzero-0.3.13 → torchzero-0.3.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: torchzero
-Version: 0.3.13
+Version: 0.3.15
 Summary: Modular optimization library for PyTorch.
 Author-email: Ivan Nikishev <nkshv2@gmail.com>
 Project-URL: Homepage, https://github.com/inikishev/torchzero

{torchzero-0.3.13 → torchzero-0.3.15}/pyproject.toml

@@ -13,7 +13,7 @@ build-backend = "setuptools.build_meta"
 name = "torchzero"
 description = "Modular optimization library for PyTorch."
 
-version = "0.3.13"
+version = "0.3.15"
 dependencies = [
   "torch",
   "numpy",

{torchzero-0.3.13 → torchzero-0.3.15}/tests/test_opts.py

@@ -400,13 +400,6 @@ RandomizedFDM_4samples = Run(
     func='booth', steps=50, loss=1e-5, merge_invariant=True,
     sphere_steps=100, sphere_loss=400,
 )
-RandomizedFDM_4samples_lerp = Run(
-    func_opt=lambda p: tz.Modular(p, tz.m.RandomizedFDM(n_samples=4, beta=0.99, seed=0), tz.m.LR(0.1)),
-    sphere_opt=lambda p: tz.Modular(p, tz.m.RandomizedFDM(n_samples=4, beta=0.9, seed=0), tz.m.LR(0.001)),
-    needs_closure=True,
-    func='booth', steps=50, loss=1e-5, merge_invariant=True,
-    sphere_steps=100, sphere_loss=505,
-)
 RandomizedFDM_4samples_no_pre_generate = Run(
     func_opt=lambda p: tz.Modular(p, tz.m.RandomizedFDM(n_samples=4, pre_generate=False, seed=0), tz.m.LR(0.1)),
     sphere_opt=lambda p: tz.Modular(p, tz.m.RandomizedFDM(n_samples=4, pre_generate=False, seed=0), tz.m.LR(0.001)),
@@ -762,6 +755,7 @@ SR1 = Run(
     sphere_opt=lambda p: tz.Modular(p, tz.m.SR1(scale_first=True), tz.m.StrongWolfe(fallback=False)),
     needs_closure=True,
     func='rosen', steps=50, loss=1e-12, merge_invariant=True,
+    # this reaches 1e-13 on github so don't change to 0
     sphere_steps=10, sphere_loss=0,
 )
 SSVM = Run(
@@ -813,7 +807,7 @@ NewtonCG = Run(
     func_opt=lambda p: tz.Modular(p, tz.m.NewtonCG(), tz.m.StrongWolfe(fallback=True)),
     sphere_opt=lambda p: tz.Modular(p, tz.m.NewtonCG(), tz.m.StrongWolfe(fallback=True)),
     needs_closure=True,
-    func='rosen', steps=20, loss=1e-7, merge_invariant=True,
+    func='rosen', steps=20, loss=1e-10, merge_invariant=True,
     sphere_steps=2, sphere_loss=3e-4,
 )
 
@@ -879,8 +873,8 @@ SophiaH = Run(
 
 # -------------------------- higher_order ------------------------- #
 HigherOrderNewton = Run(
-    func_opt=lambda p: tz.Modular(p, tz.m.HigherOrderNewton(trust_method=None)),
-    sphere_opt=lambda p: tz.Modular(p, tz.m.HigherOrderNewton(2, trust_method=None)),
+    func_opt=lambda p: tz.Modular(p, tz.m.experimental.HigherOrderNewton(trust_method=None)),
+    sphere_opt=lambda p: tz.Modular(p, tz.m.experimental.HigherOrderNewton(2, trust_method=None)),
     needs_closure=True,
     func='rosen', steps=1, loss=2e-10, merge_invariant=True,
     sphere_steps=1, sphere_loss=1e-10,

torchzero-0.3.15/torchzero/core/__init__.py

@@ -0,0 +1,5 @@
+from .chain import Chain, maybe_chain
+from .modular import Modular
+from .module import Chainable, Module
+from .transform import Target, TensorwiseTransform, Transform, apply_transform
+from .var import Var

torchzero-0.3.15/torchzero/core/chain.py

@@ -0,0 +1,50 @@
+from collections.abc import Iterable
+
+from ..utils.python_tools import flatten
+from .module import Module, Chainable
+
+
+class Chain(Module):
+    """Chain of modules, mostly used internally"""
+    def __init__(self, *modules: Module | Iterable[Module]):
+        super().__init__()
+        flat_modules: list[Module] = flatten(modules)
+        for i, module in enumerate(flat_modules):
+            self.set_child(f'module_{i}', module)
+
+    def update(self, var):
+        # note here that `update` and `apply` shouldn't be used directly
+        # as it will update all modules, and then apply all modules
+        # it is used in specific cases like Chain as trust region hessian module
+        for i in range(len(self.children)):
+            self.children[f'module_{i}'].update(var)
+            if var.stop: break
+        return var
+
+    def apply(self, var):
+        for i in range(len(self.children)):
+            var = self.children[f'module_{i}'].apply(var)
+            if var.stop: break
+        return var
+
+    def step(self, var):
+        for i in range(len(self.children)):
+            var = self.children[f'module_{i}'].step(var)
+            if var.stop: break
+        return var
+
+    def __repr__(self):
+        s = self.__class__.__name__
+        if self.children:
+            if s == 'Chain': s = 'C' # to shorten it
+            s = f'{s}({", ".join(str(m) for m in self.children.values())})'
+        return s
+
+def maybe_chain(*modules: Chainable) -> Module:
+    """Returns a single module directly if only one is provided, otherwise wraps them in a :code:`Chain`."""
+    flat_modules: list[Module] = flatten(modules)
+    if len(flat_modules) == 1:
+        return flat_modules[0]
+    return Chain(*flat_modules)
+
+

torchzero-0.3.15/torchzero/core/functional.py

@@ -0,0 +1,37 @@
+from collections.abc import Sequence
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .module import Module
+    from .var import Var
+
+
+def step(var: "Var", modules: "Sequence[Module]",) -> "Var":
+    """steps with ``modules`` and returns modified ``var``, doesn't update parameters.
+
+    Args:
+        var (Var): Var object.
+        modules (Sequence[Module]): sequence of modules to step with.
+
+    Returns:
+        Var: modified Var
+    """
+    # n_modules = len(modules)
+    # if n_modules == 0: return var.clone(clone_update=False)
+    # last_module = modules[-1]
+    # last_lr = last_module.defaults.get('lr', None)
+
+    # step
+    for i, module in enumerate(modules):
+        if i!=0: var = var.clone(clone_update=False)
+
+        # last module, or next to last module before lr
+        # if (i == n_modules - 1) or ((i == n_modules - 2) and (last_lr is not None)):
+        #     if len(module.children) != 0 or is_nested: var.nested_is_last = True
+        #     else: var.is_last = True
+        #     if last_lr is not None: var.last_module_lrs = [last_module.settings[p]['lr'] for p in var.params]
+
+        var = module.step(var)
+        if var.stop: break
+
+    return var

torchzero-0.3.15/torchzero/core/modular.py

@@ -0,0 +1,237 @@
+
+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 TYPE_CHECKING, Any, Literal, cast, final, overload
+
+import torch
+
+from ..utils import (
+    Init,
+    ListLike,
+    Params,
+    _make_param_groups,
+    get_state_vals,
+    vec_to_tensors,
+)
+from ..utils.derivatives import flatten_jacobian, hvp, hvp_fd_central, hvp_fd_forward
+from ..utils.linalg.linear_operator import LinearOperator
+from ..utils.python_tools import flatten
+from .module import Chainable, Module
+from .var import Var
+from .functional import step
+
+class _EvalCounterClosure:
+    """keeps track of how many times closure has been evaluated, and sets closure return"""
+    __slots__ = ("modular", "closure")
+    def __init__(self, modular: "Modular", closure):
+        self.modular = modular
+        self.closure = closure
+
+    def __call__(self, *args, **kwargs):
+        if self.closure is None:
+            raise RuntimeError("One of the modules requires closure to be passed to the step method")
+
+        v = self.closure(*args, **kwargs)
+
+        # set closure return on 1st evaluation
+        if self.modular._closure_return is None:
+            self.modular._closure_return = v
+
+        self.modular.num_evaluations += 1
+        return v
+
+
+def unroll_modules(*modules: Chainable) -> list[Module]:
+    unrolled = []
+
+    for m in modules:
+        if isinstance(m, Module):
+            unrolled.append(m)
+            unrolled.extend(unroll_modules(list(m.children.values())))
+        else:
+            unrolled.extend(unroll_modules(*m))
+
+    return unrolled
+
+
+# have to inherit from Modular to support lr schedulers
+# although Accelerate doesn't work due to converting param_groups to a dict
+class Modular(torch.optim.Optimizer):
+    """Chains multiple modules into an optimizer.
+
+    Args:
+        params (Params | torch.nn.Module): An iterable of parameters to optimize
+            (typically `model.parameters()`), an iterable of parameter group dicts,
+            or a `torch.nn.Module` instance.
+        *modules (Module): A sequence of `Module` instances that define the
+            optimization algorithm steps.
+    """
+    # this is specifically for lr schedulers
+    param_groups: list[ChainMap[str, Any]] # pyright:ignore[reportIncompatibleVariableOverride]
+
+    def __init__(self, params: Params | torch.nn.Module, *modules: Module):
+        if len(modules) == 0: raise RuntimeError("Empty list of modules passed to `Modular`")
+        self.model: torch.nn.Module | None = None
+        """The model whose parameters are being optimized, if a model instance was passed to `__init__`."""
+        if isinstance(params, torch.nn.Module):
+            self.model = params
+            params = params.parameters()
+
+        self.modules = modules
+        """Top-level modules providedduring initialization."""
+
+        self.unrolled_modules = unroll_modules(self.modules)
+        """A flattened list of all modules including all children."""
+
+        param_groups = _make_param_groups(params, differentiable=False)
+        self._per_parameter_global_settings: dict[torch.Tensor, list[MutableMapping[str, Any]]] = {}
+        """Maps each parameter tensor to a list of per-module global settings.
+        Each element in the list is ChainDict's 2nd map of a module."""
+
+        # make sure there is no more than a single learning rate module
+        lr_modules = [m for m in self.unrolled_modules if 'lr' in m.defaults]
+        if len(lr_modules) > 1:
+            warnings.warn(f'multiple learning rate modules detected: {lr_modules}. This may lead to componding of learning rate multiplication with per-parameter learning rates and schedulers.')
+
+        # iterate over all per-parameter settings overrides and check if they are applied at most once
+        for group in param_groups:
+            for k in group:
+                if k in ('params', 'lr'): continue
+                modules_with_k = [m for m in self.unrolled_modules if k in m.defaults and k not in m._overridden_keys]
+                if len(modules_with_k) > 1:
+                    warnings.warn(f'`params` has a `{k}` key, and multiple modules have that key: {modules_with_k}. If you intended to only set `{k}` to one of them, use `module.set_param_groups(params)`')
+
+        # defaults for schedulers
+        defaults = {}
+        for m in self.unrolled_modules: defaults.update(m.defaults)
+        super().__init__(param_groups, defaults=defaults)
+
+        # note - this is what super().__init__(param_groups, defaults=defaults) does:
+
+        # self.defaults = defaults
+        # for param_group in param_groups:
+        #     self.add_param_group(param_group)
+
+        # add_param_group adds a ChainMap where defaults are lowest priority,
+        # and entries specifed in param_groups or scheduler are higher priority.
+        # pytorch schedulers do group["lr"] = new_lr, which sets higher priority key.
+        # in each module, settings passed to that module by calling set_param_groups are highest priority
+
+        self.current_step = 0
+        """global step counter for the optimizer."""
+
+        self.num_evaluations = 0
+        """number of times the objective has been evaluated (number of closure calls or number of steps if closure is None)."""
+
+        # reformulations will change the closure to return a different loss (e.g. a sqrt homotopy, gaussian homotopy)
+        # we want to return original loss so this attribute is used
+        self._closure_return = None
+        """on each step, first time a closure is evaluated, this attribute is set to the returned value. `step` method returns this."""
+
+        self.attrs = {}
+        """custom attributes that can be set by modules, for example EMA of weights or best so far"""
+
+        self.should_terminate = False
+        """is set to True by termination criteria modules."""
+
+    def add_param_group(self, param_group: dict[str, Any]):
+        proc_param_group = _make_param_groups([param_group], differentiable=False)[0]
+        self.param_groups.append(ChainMap(proc_param_group, self.defaults))
+        # setting param_group[key] = value sets it to first map (the `proc_param_group`).
+        # therefore lr schedulers override defaults, but not settings passed to individual modules
+        # by `set_param_groups` .
+
+        for p in proc_param_group['params']:
+            # updates global per-parameter setting overrides (medium priority)
+            self._per_parameter_global_settings[p] = [m.settings[p].maps[1] for m in self.unrolled_modules]
+
+    def state_dict(self):
+        all_params = [p for g in self.param_groups for p in g['params']]
+        id_to_idx = {id(p): i for i,p in enumerate(all_params)}
+
+        groups = []
+        for g in self.param_groups:
+            g = g.copy()
+            g['params'] = [id_to_idx[id(p)] for p in g['params']]
+            groups.append(g)
+
+        state_dict = {
+            "idx_to_id": {v:k for k,v in id_to_idx.items()},
+            "params": all_params,
+            "groups": groups,
+            "defaults": self.defaults,
+            "modules": {i: m.state_dict() for i, m in enumerate(self.unrolled_modules)}
+        }
+        return state_dict
+
+    def load_state_dict(self, state_dict: dict):
+        self.defaults.clear()
+        self.defaults.update(state_dict['defaults'])
+
+        idx_to_param = dict(enumerate(state_dict['params']))
+        groups = []
+        for g in state_dict['groups']:
+            g = g.copy()
+            g['params'] = [idx_to_param[p] for p in g['params']]
+            groups.append(g)
+
+        self.param_groups.clear()
+        for group in groups:
+            self.add_param_group(group)
+
+        id_to_tensor = {state_dict['idx_to_id'][i]: p for i,p in enumerate(state_dict['params'])}
+        for m, sd in zip(self.unrolled_modules, state_dict['modules'].values()):
+            m._load_state_dict(sd, id_to_tensor)
+
+
+    def step(self, closure=None, loss=None, **kwargs): # pyright: ignore[reportIncompatibleMethodOverride]
+        # clear closure return from previous step
+        self._closure_return = None
+
+        # propagate global per-parameter setting overrides
+        for g in self.param_groups:
+            settings = dict(g.maps[0]) # ignore defaults
+            params = settings.pop('params')
+            if not settings: continue
+
+            for p in params:
+                if not p.requires_grad: continue
+                for map in self._per_parameter_global_settings[p]: map.update(settings)
+
+        # create var
+        params = [p for g in self.param_groups for p in g['params'] if p.requires_grad]
+        var = Var(params=params, closure=_EvalCounterClosure(self, closure), model=self.model, current_step=self.current_step, modular=self, loss=loss, storage=kwargs)
+
+        # if closure is None, assume backward has been called and gather grads
+        if closure is None:
+            var.grad = [p.grad if p.grad is not None else torch.zeros_like(p) for p in params]
+            self.num_evaluations += 1
+
+        if len(self.modules) == 0: raise RuntimeError("There are no modules in this `Modular` optimizer")
+
+        # step
+        var = step(var, self.modules)
+
+        # apply update
+        if not var.skip_update:
+            with torch.no_grad():
+                torch._foreach_sub_(params, var.get_update())
+
+        # update attributes
+        self.attrs.update(var.attrs)
+        if var.should_terminate is not None: self.should_terminate = var.should_terminate
+
+        # hooks
+        for hook in var.post_step_hooks:
+            hook(self, var)
+
+        self.current_step += 1
+        #return var.loss if var.loss is not None else var.loss_approx
+        return self._closure_return
+
+    def __repr__(self):
+        return f'Modular({", ".join(str(m) for m in self.modules)})'
+