returnn 1.20230719.100821__tar.gz → 1.20230719.115042__tar.gz

{returnn-1.20230719.100821/returnn.egg-info → returnn-1.20230719.115042}/PKG-INFO

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

returnn-1.20230719.115042/_setup_info_generated.py

@@ -0,0 +1,2 @@
+version = '1.20230719.115042'
+long_version = '1.20230719.115042+git.0354abd'

{returnn-1.20230719.100821 → returnn-1.20230719.115042}/demos/demo-rf.config

@@ -53,7 +53,7 @@ class Model(rf.Module):
         return x  # logits
 
 
-def get_model(**_kwargs):
+def get_model(*, epoch, step, **_kwargs):
     return Model()
 
 

{returnn-1.20230719.100821 → returnn-1.20230719.115042}/demos/demo-torch.config

@@ -54,7 +54,7 @@ class Model(torch.nn.Module):
         return x  # logits
 
 
-def get_model(**_kwargs):
+def get_model(*, epoch, step, **_kwargs):
     return Model()
 
 

{returnn-1.20230719.100821 → returnn-1.20230719.115042}/returnn/tensor/_dim_extra.py

@@ -441,10 +441,10 @@ class _DimMixin:
         :param bool allow_none:
         """
         assert self.can_be_used_as_dim()
-        if self.batch == batch and self.control_flow_ctx == ctx and self.dyn_size_ext:
+        if self.batch == batch and self._can_use_in_ctx(ctx) and self.dyn_size_ext:
             self._validate_in_current_graph()
             self._maybe_update()
-            if self.batch == batch and self.control_flow_ctx == ctx and self.dyn_size_ext:  # check again
+            if self.batch == batch and self._can_use_in_ctx(ctx) and self.dyn_size_ext:  # check again
                 return self
         if self.is_batch_dim():
             # We ignore the ctx for the batch dim currently.

{returnn-1.20230719.100821 → returnn-1.20230719.115042/returnn.egg-info}/PKG-INFO

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

{returnn-1.20230719.100821 → returnn-1.20230719.115042}/tools/torch_export_to_onnx.py

@@ -10,6 +10,7 @@ import torch
 from typing import Callable, Optional, Dict
 import argparse
 import os
+from random import random
 
 import _setup_returnn_env  # noqa
 from returnn.config import Config
@@ -156,6 +157,8 @@ def main():
     parser.add_argument("out_onnx_filename", type=str, help="Filename of the final ONNX model.")
     parser.add_argument("--verbosity", default=4, type=int, help="5 for all seqs (default: 4)")
     parser.add_argument("--device", type=str, default="cpu", help="'cpu' (default) or 'gpu'.")
+    parser.add_argument("--epoch", type=int, default=1, help="for get_model, default 1")
+    parser.add_argument("--step", type=int, default=0, help="for get_model, default 0")
     args = parser.parse_args()
 
     init(config_filename=args.config, checkpoint=args.checkpoint, log_verbosity=args.verbosity, device=args.device)
@@ -171,7 +174,8 @@ def main():
 
     get_model_func = config.typed_value("get_model")
     assert get_model_func, "get_model() isn't specified in the config passed as a parameter."
-    model = get_model_func()
+    sentinel_kw = {"__fwd_compatible_random_arg_%i" % int(random() * 100): None}
+    model = get_model_func(epoch=args.epoch, step=args.step, **sentinel_kw)
     loaded_checkpoint = torch.load(args.checkpoint)
 
     is_rf_module = isinstance(model, rf.Module)

returnn-1.20230719.100821/_setup_info_generated.py

@@ -1,2 +0,0 @@
-version = '1.20230719.100821'
-long_version = '1.20230719.100821+git.9f1e99e'