returnn 1.20230504.154037__tar.gz → 1.20230504.233443__tar.gz

{returnn-1.20230504.154037/returnn.egg-info → returnn-1.20230504.233443}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: returnn
-Version: 1.20230504.154037
+Version: 1.20230504.233443
 Summary: The RWTH extensible training framework for universal recurrent neural networks
 Home-page: https://github.com/rwth-i6/returnn/
 Author: Albert Zeyer

returnn-1.20230504.233443/_setup_info_generated.py

@@ -0,0 +1,2 @@
+version = '1.20230504.233443'
+long_version = '1.20230504.233443+git.e9a9920'

{returnn-1.20230504.154037 → returnn-1.20230504.233443}/returnn/torch/updater.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 
 import torch
 import typing
-from typing import Set
+from typing import Any, Set, Dict
 
 from returnn.log import log
 from returnn.util.basic import RefIdEq
@@ -35,7 +35,8 @@ def _init_optimizer_classes_dict():
 
 def get_optimizer_class(class_name):
     """
-    :param str|function|type[torch.optim.Optimizer] class_name: Optimizer data, e.g. "adam", torch.optim.Adam...
+    :param str|()->torch.optim.Optimizer|type[torch.optim.Optimizer] class_name:
+        Optimizer data, e.g. "adam", torch.optim.Adam...
     :return: Optimizer class
     :rtype: type[torch.optim.Optimizer]
     """
@@ -156,7 +157,7 @@ class Updater(object):
         if isinstance(optimizer_opts, torch.optim.Optimizer):
             return optimizer_opts
         elif callable(optimizer_opts):
-            optimizer_opts = {"class": optimizer_opts}
+            optimizer_opts: Dict[str, Any] = {"class": optimizer_opts}
         else:
             if not isinstance(optimizer_opts, dict):
                 raise ValueError("'optimizer' must of type dict, callable or torch.optim.Optimizer instance.")
@@ -246,18 +247,22 @@ class Updater(object):
         # Tracker of visited parameters to only add each parameter once, in case two modules share common parameters.
         # We need the wrapper class RefIdEq because Parameters are compared by value and not by reference.
         visited_params: Set[RefIdEq[torch.nn.Parameter]] = set()
-        for mn, m in self.network.named_modules():
-            for pn, p in m.named_parameters():
-                if RefIdEq(p) in visited_params:
+        for module_name, module in self.network.named_modules():
+            module_name: str
+            module: torch.nn.Module
+            for param_name, param in module.named_parameters(recurse=False):
+                param_name: str
+                param: torch.nn.Parameter
+                if RefIdEq(param) in visited_params:
                     continue
-                visited_params.add(RefIdEq(p))
-                fpn = "%s.%s" % (mn, pn) if mn else pn  # Full param name
-                if pn.endswith("bias"):
-                    no_wd_params.add(fpn)
-                elif pn.endswith("weight") and isinstance(m, blacklist_wd_modules):
-                    no_wd_params.add(fpn)
+                visited_params.add(RefIdEq(param))
+                full_param_name = "%s.%s" % (module_name, param_name) if module_name else param_name
+                if param_name.endswith("bias"):
+                    no_wd_params.add(full_param_name)
+                elif param_name.endswith("weight") and isinstance(module, blacklist_wd_modules):
+                    no_wd_params.add(full_param_name)
                 else:
-                    wd_params.add(fpn)
+                    wd_params.add(full_param_name)
 
         param_dict = {pn: p for pn, p in self.network.named_parameters()}
         optim_groups = [

{returnn-1.20230504.154037 → returnn-1.20230504.233443/returnn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: returnn
-Version: 1.20230504.154037
+Version: 1.20230504.233443
 Summary: The RWTH extensible training framework for universal recurrent neural networks
 Home-page: https://github.com/rwth-i6/returnn/
 Author: Albert Zeyer

returnn-1.20230504.154037/_setup_info_generated.py

@@ -1,2 +0,0 @@
-version = '1.20230504.154037'
-long_version = '1.20230504.154037+git.e95d447'