fix(optim): move apply_updates in grad context

metaopt · May 22, 2024 · 5f9b918 · 5f9b918
1 parent 6c5304a
commit 5f9b918
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/torchopt/optim/func/base.py b/torchopt/optim/func/base.py
@@ -90,14 +90,13 @@ def step(
         with torch.enable_grad():
             # Step parameters only
             grads = torch.autograd.grad(loss, params, create_graph=True, allow_unused=True)
-
-        updates, self.optim_state = self.impl.update(
-            grads,
-            self.optim_state,
-            params=params,
-            inplace=inplace,
-        )
-        return apply_updates(params, updates, inplace=inplace)
+            updates, self.optim_state = self.impl.update(
+                grads,
+                self.optim_state,
+                params=params,
+                inplace=inplace,
+            )
+            return apply_updates(params, updates, inplace=inplace)
 
     def state_dict(self) -> OptState:
         """Extract the references of the optimizer states.

diff --git a/torchopt/optim/meta/base.py b/torchopt/optim/meta/base.py
@@ -78,10 +78,14 @@ def step(self, loss: torch.Tensor) -> None:  # pylint: disable=too-many-locals
             with torch.enable_grad():
                 # Step parameters only
                 grads = torch.autograd.grad(loss, flat_params, create_graph=True, allow_unused=True)
+                updates, new_state = self.impl.update(
+                    grads,
+                    state,
+                    params=flat_params,
+                    inplace=False,
+                )
+                flat_new_params = apply_updates(flat_params, updates, inplace=False)
 
-            updates, new_state = self.impl.update(grads, state, params=flat_params, inplace=False)
-
-            flat_new_params = apply_updates(flat_params, updates, inplace=False)
             new_params: ModuleTensorContainers = pytree.tree_unflatten(  # type: ignore[assignment]
                 container_treespec,
                 flat_new_params,