returnn 1.20241213.155203__tar.gz → 1.20241217.122516__tar.gz

{returnn-1.20241213.155203 → returnn-1.20241217.122516}/CHANGELOG.md

@@ -6,6 +6,10 @@ or any changes which could potentially break or change the behavior of existing
 This is intentionally kept short. For a full change log, just see the Git log.
 
 
+## 2024-12-13: Bump min Python version from 3.7 to 3.8 ([issue #1326](https://github.com/rwth-i6/returnn/issues/1326))
+
+This also drops support for TF 1.x.
+
 ## 2024-06-07: `VariableDataset`
 
 Custom subdataset per subepoch based on user-provided function.

{returnn-1.20241213.155203 → returnn-1.20241217.122516}/CONTRIBUTING.md

@@ -29,7 +29,7 @@ General rules when contributing to the code of RETURNN:
   and in general to use newer TF features (even maybe TF >=2),
   as long as your new feature (new layer or so) is just optional.
   For older TF support, `TFCompat.py` might be helpful. (See code for examples.)
-* We support Python >=3.7 ([discussion](https://github.com/rwth-i6/returnn/issues/487)).
+* We support Python >=3.8 ([discussion](https://github.com/rwth-i6/returnn/issues/1326)).
 
 About new features:
 

{returnn-1.20241213.155203/returnn.egg-info → returnn-1.20241217.122516}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: returnn
-Version: 1.20241213.155203
+Version: 1.20241217.122516
 Summary: The RWTH extensible training framework for universal recurrent neural networks
 Home-page: https://github.com/rwth-i6/returnn/
 Author: Albert Zeyer
@@ -100,3 +100,15 @@ Questions can also be asked on
 
 .. image:: https://github.com/rwth-i6/returnn/workflows/CI/badge.svg
     :target: https://github.com/rwth-i6/returnn/actions
+
+Dependencies
+============
+
+pip dependencies are listed in ``requirements.txt`` and ``requirements-dev``,
+although some parts of the code may require additional dependencies (e.g. ``librosa``, ``resampy``) on-demand.
+
+RETURNN supports Python >= 3.8. Bumps to the minimum Python version are listed in `CHANGELOG.md <https://github.com/rwth-i6/returnn/blob/master/CHANGELOG.md>`__.
+
+TensorFlow-based setups require TensorFlow >= 2.2.
+
+PyTorch-based setups require Torch >= 1.0.

{returnn-1.20241213.155203 → returnn-1.20241217.122516}/README.rst

@@ -72,3 +72,15 @@ Questions can also be asked on
 
 .. image:: https://github.com/rwth-i6/returnn/workflows/CI/badge.svg
     :target: https://github.com/rwth-i6/returnn/actions
+
+Dependencies
+============
+
+pip dependencies are listed in ``requirements.txt`` and ``requirements-dev``,
+although some parts of the code may require additional dependencies (e.g. ``librosa``, ``resampy``) on-demand.
+
+RETURNN supports Python >= 3.8. Bumps to the minimum Python version are listed in `CHANGELOG.md <https://github.com/rwth-i6/returnn/blob/master/CHANGELOG.md>`__.
+
+TensorFlow-based setups require TensorFlow >= 2.2.
+
+PyTorch-based setups require Torch >= 1.0.

returnn-1.20241217.122516/_setup_info_generated.py

@@ -0,0 +1,2 @@
+version = '1.20241217.122516'
+long_version = '1.20241217.122516+git.d51e906'

{returnn-1.20241213.155203 → returnn-1.20241217.122516}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 120
-target-version = ["py37"]  # https://github.com/rwth-i6/returnn/issues/487
+target-version = ["py38"]  # https://github.com/rwth-i6/returnn/issues/1326
 extend-exclude = '''
 /(
     # All Git submodules, see .gitmodules.

{returnn-1.20241213.155203 → returnn-1.20241217.122516/returnn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: returnn
-Version: 1.20241213.155203
+Version: 1.20241217.122516
 Summary: The RWTH extensible training framework for universal recurrent neural networks
 Home-page: https://github.com/rwth-i6/returnn/
 Author: Albert Zeyer
@@ -100,3 +100,15 @@ Questions can also be asked on
 
 .. image:: https://github.com/rwth-i6/returnn/workflows/CI/badge.svg
     :target: https://github.com/rwth-i6/returnn/actions
+
+Dependencies
+============
+
+pip dependencies are listed in ``requirements.txt`` and ``requirements-dev``,
+although some parts of the code may require additional dependencies (e.g. ``librosa``, ``resampy``) on-demand.
+
+RETURNN supports Python >= 3.8. Bumps to the minimum Python version are listed in `CHANGELOG.md <https://github.com/rwth-i6/returnn/blob/master/CHANGELOG.md>`__.
+
+TensorFlow-based setups require TensorFlow >= 2.2.
+
+PyTorch-based setups require Torch >= 1.0.

{returnn-1.20241213.155203 → returnn-1.20241217.122516}/tests/PyCharm-inspection-profile.xml

@@ -4,10 +4,9 @@
     <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ourVersions">
         <value>
-          <list size="3">
-            <item index="0" class="java.lang.String" itemvalue="3.7" />
-            <item index="1" class="java.lang.String" itemvalue="3.8" />
-            <item index="2" class="java.lang.String" itemvalue="3.9" />
+          <list size="2">
+            <item index="0" class="java.lang.String" itemvalue="3.8" />
+            <item index="1" class="java.lang.String" itemvalue="3.9" />
           </list>
         </value>
       </option>

{returnn-1.20241213.155203 → returnn-1.20241217.122516}/tests/PyCharm.idea/inspectionProfiles/Project_Default.xml

@@ -4,10 +4,9 @@
     <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ourVersions">
         <value>
-          <list size="3">
-            <item index="0" class="java.lang.String" itemvalue="3.7" />
-            <item index="1" class="java.lang.String" itemvalue="3.8" />
-            <item index="2" class="java.lang.String" itemvalue="3.9" />
+          <list size="2">
+            <item index="0" class="java.lang.String" itemvalue="3.8" />
+            <item index="1" class="java.lang.String" itemvalue="3.9" />
           </list>
         </value>
       </option>

{returnn-1.20241213.155203 → returnn-1.20241217.122516}/tests/rf_utils.py

@@ -5,15 +5,11 @@ RETURNN frontend (returnn.frontend) utils
 from __future__ import annotations
 from typing import Optional, Union, Any, Dict, Tuple
 import contextlib
+import os
 import re
 import numpy
 import numpy.testing
 
-try:
-    import tensorflow as tf
-except ImportError:
-    tf = globals().get("tf", None)  # type: ignore
-
 from returnn.config import Config, global_config_ctx
 from returnn.util.pprint import pprint
 import returnn.frontend as rf
@@ -22,6 +18,20 @@ from returnn.tensor.utils import tensor_dict_fill_random_numpy_
 import returnn.torch.frontend as rft
 from returnn.torch.data.tensor_utils import tensor_dict_numpy_to_torch_, tensor_dict_torch_to_numpy_
 
+# noinspection PyProtectedMember
+from returnn.frontend._random_journal import RandomJournal
+
+
+disable_tf = "RETURNN_DISABLE_TF" in os.environ and int(os.environ["RETURNN_DISABLE_TF"]) == 1
+
+if disable_tf:
+    tf = None
+else:
+    try:
+        import tensorflow as tf
+    except ImportError:
+        tf = globals().get("tf", None)  # type: ignore
+
 if tf:
     import returnn.tf.compat as tf_compat
     import returnn.tf.frontend_layers as rfl
@@ -29,9 +39,6 @@ if tf:
 else:
     tf_compat = rfl = TFNetwork = None
 
-# noinspection PyProtectedMember
-from returnn.frontend._random_journal import RandomJournal
-
 
 @contextlib.contextmanager
 def tf_scope():
@@ -65,7 +72,11 @@ def run_model(
 
     if not test_tensorflow:
         return out_pt
+    if disable_tf:
+        print("** TensorFlow disabled (RETURNN_DISABLE_TF)")
+        return out_pt
 
+    assert tf, "TensorFlow not available"
     print("** run with TensorFlow-net-dict backend")
     with rfl.ReturnnLayersBackend.random_journal_replay(random_journal):
         out_tf = _run_model_net_dict_tf(extern_data, get_model, forward_step)

{returnn-1.20241213.155203 → returnn-1.20241217.122516}/tests/test_Log.py

@@ -52,9 +52,12 @@ def filter_out(ls):
     i = 0
     while i < len(ls):
         s = ls[i]
-        if "tensorflow/core/" in s or "tensorflow/stream_executor/" in s:  # some TF warnings
+        if any(f"{l} tensorflow/" in s for l in "IWE"):  # some TF warnings
             i += 1
             continue
+        elif "SyntaxWarning" in s:
+            i += 2
+            continue
         # RuntimeWarning|FutureWarning are warnings and they include the code-line in the next output line
         if i + 1 < len(ls) and ls[i + 1].startswith("  "):
             if re.match(".*:\\d+: RuntimeWarning: numpy.*", s) or re.match(".*:\\d+: FutureWarning: .*", s):

{returnn-1.20241213.155203 → returnn-1.20241217.122516}/tests/test_rf_math.py

@@ -3,7 +3,13 @@ RETURNN frontend (returnn.frontend) tests
 """
 
 from __future__ import annotations
+
 import _setup_test_env  # noqa
+
+import sys
+import unittest
+
+from returnn.util import better_exchook
 import returnn.frontend as rf
 from returnn.tensor import Tensor, Dim, TensorDict, batch_dim
 from rf_utils import run_model
@@ -30,6 +36,39 @@ def test_neg():
     run_model(extern_data, lambda *, epoch, step: _Net(), _forward_step)
 
 
+def test_compare_bc():
+    beam_dim = Dim(3, name="beam")
+    in_dim = Dim(7, name="in")
+    extern_data = TensorDict({"idx": Tensor("idx", [batch_dim, beam_dim], dtype="int32", sparse_dim=in_dim)})
+
+    # noinspection PyShadowingNames,PyUnusedLocal
+    def _forward_step(*, model: rf.Module, extern_data: TensorDict):
+        idx = extern_data["idx"]
+        cond = rf.compare_bc(idx, "!=", rf.range_over_dim(in_dim))
+        cond.mark_as_default_output(shape=(batch_dim, beam_dim, in_dim))
+
+    run_model(extern_data, lambda *, epoch, step: rf.Module(), _forward_step)
+
+
+def test_logical_or():
+    beam_dim = Dim(3, name="beam")
+    in_dim = Dim(7, name="in")
+    extern_data = TensorDict(
+        {
+            "a": Tensor("a", [batch_dim, beam_dim], dtype="bool"),
+            "b": Tensor("b", [batch_dim, beam_dim, in_dim], dtype="bool"),
+        }
+    )
+
+    # noinspection PyShadowingNames,PyUnusedLocal
+    def _forward_step(*, model: rf.Module, extern_data: TensorDict):
+        a, b = extern_data["a"], extern_data["b"]
+        cond = a | b
+        cond.mark_as_default_output(shape=(batch_dim, beam_dim, in_dim))
+
+    run_model(extern_data, lambda *, epoch, step: rf.Module(), _forward_step)
+
+
 def test_squared_difference():
     time_dim = Dim(Tensor("time", [batch_dim], dtype="int32"))
     in_dim = Dim(7, name="in")
@@ -125,3 +164,26 @@ def test_cumsum():
         out.mark_as_default_output(shape=(batch_dim, time_dim))
 
     run_model(extern_data, lambda *, epoch, step: rf.Module(), _forward_step)
+
+
+if __name__ == "__main__":
+    better_exchook.install()
+    if len(sys.argv) <= 1:
+        for k, v in sorted(globals().items()):
+            if k.startswith("test_"):
+                print("-" * 40)
+                print("Executing: %s" % k)
+                try:
+                    v()
+                except unittest.SkipTest as exc:
+                    print("SkipTest:", exc)
+                print("-" * 40)
+        print("Finished all tests.")
+    else:
+        assert len(sys.argv) >= 2
+        for arg in sys.argv[1:]:
+            print("Executing: %s" % arg)
+            if arg in globals():
+                globals()[arg]()  # assume function and execute
+            else:
+                eval(arg)  # assume Python code and execute

returnn-1.20241213.155203/_setup_info_generated.py

@@ -1,2 +0,0 @@
-version = '1.20241213.155203'
-long_version = '1.20241213.155203+git.64d234b'