returnn 1.20230404.130855__tar.gz → 1.20230404.175609__tar.gz

{returnn-1.20230404.130855/returnn.egg-info → returnn-1.20230404.175609}/PKG-INFO

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

returnn-1.20230404.175609/_setup_info_generated.py

@@ -0,0 +1,2 @@
+version = '1.20230404.175609'
+long_version = '1.20230404.175609+git.e6dbb0e'

{returnn-1.20230404.130855 → returnn-1.20230404.175609}/returnn/frontend/_backend.py

@@ -592,6 +592,16 @@ global_backend = object.__new__(Backend)
 _dispatch_table = {}  # type: Dict[Type, Type[Backend]]
 
 
+def select_backend_tf():
+    """
+    Selects the RETURNN layers backend (based on TF).
+    """
+    import tensorflow as tf
+
+    backend = get_backend_by_raw_tensor_type(tf.Tensor)  # side-effect: register it
+    global_backend.__class__ = backend
+
+
 def select_backend_returnn_layers_tf():
     """
     Selects the RETURNN layers backend (based on TF).

{returnn-1.20230404.130855 → returnn-1.20230404.175609}/returnn/tf/engine.py

@@ -860,11 +860,11 @@ class Engine(EngineBase):
         """
         super(Engine, self).__init__(config=config)
         if not log.initialized:
-            log.init_by_config(config)
+            log.init_by_config(self.config)
         if not BehaviorVersion.is_set():
-            BehaviorVersion.set(config.int("behavior_version", None))
+            BehaviorVersion.set(self.config.int("behavior_version", None))
         if BackendEngine.selected_engine is None:
-            BackendEngine.select_engine(engine=BackendEngine.TensorFlow)
+            BackendEngine.select_engine(default_fallback_engine=BackendEngine.TensorFlow, config=self.config)
         assert BackendEngine.is_tensorflow_selected()
         self.orig_config = {}  # see _maybe_update_config
         self.custom_get_net_dict = None  # type: typing.Optional[typing.Callable]
@@ -882,8 +882,8 @@ class Engine(EngineBase):
         self._num_trained_epochs = 0  # type: int  # just a counter
         self._num_net_reinit = 0  # type: int
         self.use_dynamic_train_flag = False
-        self.use_search_flag = config.value("task", None) == "search"
-        self.use_eval_flag = config.value("task", None) != "forward"
+        self.use_search_flag = self.config.value("task", None) == "search"
+        self.use_eval_flag = self.config.value("task", None) != "forward"
         self._const_cache = {}  # type: typing.Dict[str,tf.Tensor]
         self.preload_from_files = None  # type: typing.Optional[typing.Dict[str,typing.Dict[str]]]
         self.max_seqs = None  # type: typing.Optional[int]

{returnn-1.20230404.130855 → returnn-1.20230404.175609}/returnn/util/basic.py

@@ -116,8 +116,9 @@ class BackendEngine:
     E.g. TensorFlow or PyTorch.
     """
 
-    TensorFlow = 1
-    Torch = 2  # PyTorch
+    TensorFlowNetDict = 1
+    TensorFlow = 2
+    Torch = 3  # PyTorch
     selected_engine = None  # type: typing.Optional[int]  # One of the possible engines.
 
     class CannotSelectEngine(Exception):
@@ -126,9 +127,10 @@ class BackendEngine:
         """
 
     @classmethod
-    def select_engine(cls, engine=None, config=None):
+    def select_engine(cls, *, engine=None, default_fallback_engine=None, config=None):
         """
         :param int engine: see the global class attribs for possible values
+        :param int|None default_fallback_engine: if engine is None and not defined in config, use this
         :param returnn.config.Config config:
         """
         assert cls.selected_engine is None, "already set"
@@ -139,20 +141,26 @@ class BackendEngine:
                 config = get_global_config()
             engine = None
             if config.bool("use_tensorflow", False):
-                engine = cls.TensorFlow
+                engine = cls.TensorFlowNetDict
             if config.value("backend", None):
                 backend = config.value("backend", None)
                 engine = {
+                    "tensorflow-net-dict": cls.TensorFlowNetDict,
                     "tensorflow": cls.TensorFlow,
                     "torch": cls.Torch,
                 }[backend]
             if engine is None:
-                engine = cls._get_default_engine()
+                if default_fallback_engine is not None:
+                    engine = default_fallback_engine
+                else:
+                    engine = cls._get_default_engine()
 
         # noinspection PyProtectedMember
         from returnn.frontend import _backend
 
         if engine == cls.TensorFlow:
+            _backend.select_backend_tf()
+        elif engine == cls.TensorFlowNetDict:
             # Note that we assume that the user wants the RETURNN layers frontend (TF-based)
             # and not the low-level TF frontend.
             # If we want to expose the low-level TF frontend to the user directly at some point,
@@ -163,19 +171,18 @@ class BackendEngine:
         cls.selected_engine = engine
 
     @classmethod
-    def _get_default_engine(cls):
+    def _get_default_engine(cls) -> int:
         """
         Select the backend engine. If both are installed Tensorflow is the default.
-        :rtype: int
         """
         if "tensorflow" in sys.modules:
-            return cls.TensorFlow
+            return cls.TensorFlowNetDict
         if "torch" in sys.modules:
             return cls.Torch
         try:
             import tensorflow
 
-            return cls.TensorFlow
+            return cls.TensorFlowNetDict
         except ImportError:
             pass
         try:
@@ -203,7 +210,7 @@ class BackendEngine:
         """
         :rtype: bool
         """
-        return cls.get_selected_engine() == cls.TensorFlow
+        return cls.get_selected_engine() in {cls.TensorFlowNetDict, cls.TensorFlow}
 
     @classmethod
     def is_torch_selected(cls):

{returnn-1.20230404.130855 → returnn-1.20230404.175609/returnn.egg-info}/PKG-INFO

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

returnn-1.20230404.130855/_setup_info_generated.py

@@ -1,2 +0,0 @@
-version = '1.20230404.130855'
-long_version = '1.20230404.130855+git.71608da'