Support TensorFlow 2.7 (#902)

* Support TensorFlow 2.7

* Fix formatting

* Skip TensorFlow Lite test case with TensorFlow 2.7

Author: guillaumekln

.github/workflows/ci.yml

@@ -17,10 +17,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3.6
+      - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.8
 
       - name: Install dependencies
         run: |
@@ -44,15 +44,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tensorflow: [2.4, 2.5, 2.6]
+        tensorflow: [2.4, 2.5, 2.6, 2.7]
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3.6
+      - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.8
 
       - name: Install dependencies
         run: |
@@ -71,7 +71,7 @@ jobs:
           pytest --cov=opennmt --cov-report xml opennmt/tests
 
       - name: Upload coverage report
-        if: matrix.tensorflow == '2.6'
+        if: matrix.tensorflow == '2.7'
         uses: codecov/codecov-action@v2
 
 
@@ -82,10 +82,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3.6
+      - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.8
 
       - name: Install dependencies
         run: |
@@ -112,10 +112,10 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up Python 3.6
+      - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.8
 
       - name: Install dependencies
         run: |

README.md

@@ -97,7 +97,7 @@ OpenNMT-tf also implements most of the techniques commonly used to train and eva
 OpenNMT-tf requires:
 
 * Python 3.6 or above
-* TensorFlow 2.4, 2.5, or 2.6
+* TensorFlow 2.4, 2.5, 2.6, or 2.7
 
 We recommend installing it with `pip`:
 

docs/installation.md

@@ -5,7 +5,7 @@
 OpenNMT-tf requires:
 
 * Python 3.6 or above
-* TensorFlow 2.4, 2.5, or 2.6
+* TensorFlow 2.4, 2.5, 2.6, or 2.7
 
 For GPU support, please read the [TensorFlow documentation](https://www.tensorflow.org/install/gpu) for additional software and hardware requirements.
 

opennmt/data/dataset.py

@@ -254,7 +254,11 @@ def _transform(dataset):
 
         # Take all original batches and the number of extra batches required.
         dataset = dataset.enumerate()
-        dataset = dataset.apply(tf.data.experimental.take_while(_continue_iter))
+        # TODO: clean this API when TensorFlow requirement is updated to >=2.6.
+        if compat.tf_supports("data.Dataset.take_while"):
+            dataset = dataset.take_while(_continue_iter)
+        else:
+            dataset = dataset.apply(tf.data.experimental.take_while(_continue_iter))
         return dataset.map(_retrieve_element)  # Retrieve the element only.
 
     return _transform
@@ -588,7 +592,13 @@ def _make_weighted_dataset(datasets, weights):
             datasets = [dataset.shard(num_shards, shard_index) for dataset in datasets]
         weights = normalize_weights(datasets, weights=weights, sizes=dataset_size)
         datasets = [dataset.repeat() for dataset in datasets]
-        dataset = tf.data.experimental.sample_from_datasets(datasets, weights=weights)
+        # TODO: clean this API when TensorFlow requirement is updated to >=2.7.
+        if compat.tf_supports("data.Dataset.sample_from_datasets"):
+            dataset = tf.data.Dataset.sample_from_datasets(datasets, weights=weights)
+        else:
+            dataset = tf.data.experimental.sample_from_datasets(
+                datasets, weights=weights
+            )
         if shuffle_buffer_size is not None and shuffle_buffer_size != 0:
             if shuffle_buffer_size < 0:
                 raise ValueError(

opennmt/tests/tflite_test.py

@@ -118,6 +118,12 @@ def testTFLiteOutput(self, model, params):
         version.parse(tf.__version__) < version.parse("2.5.0"),
         reason="TensorFlow Lite exporting requires TensorFlow 2.5+",
     )
+    @pytest.mark.skipif(
+        version.parse("2.7.0")
+        <= version.parse(tf.__version__)
+        < version.parse("2.8.0"),
+        reason="Test case failing with TensorFlow 2.7",
+    )
     def testTFLiteInterpreter(self, model, params=None, quantization=None):
         if params is None:
             params = {}

opennmt/version.py

@@ -3,7 +3,7 @@
 __version__ = "2.22.0"
 
 INCLUSIVE_MIN_TF_VERSION = "2.4.0"
-EXCLUSIVE_MAX_TF_VERSION = "2.7.0"
+EXCLUSIVE_MAX_TF_VERSION = "2.8.0"
 
 
 def _check_tf_version():

setup.py

@@ -69,7 +69,7 @@ def get_project_version():
         "pyyaml>=5.3,<7",
         "rouge>=1.0,<2",
         "sacrebleu>=1.5.0,<2.1",
-        "tensorflow-addons>=0.14,<0.15",
+        "tensorflow-addons>=0.14,<0.16",
     ],
     extras_require={
         "tensorflow": [