Documentation for TF2.4

Summary:
Documentation for TF2.4

TF2.4 Only

Fix T43245, T40858, T36134, T43241

Reviewers: #tensorflow, #framework_ip_review_-_any_oss_or_third-party_code_use_has_been_approved, georgep

Reviewed By: #tensorflow, #framework_ip_review_-_any_oss_or_third-party_code_use_has_been_approved, georgep

Subscribers: hakons, markf, jackh, alfiee, jamiep, grahamh

Maniphest Tasks: T43245, T43241, T40858, T36134

Differential Revision: https://phabricator.sourcevertex.net/D49535

Author: Mark Fowden

tensorflow/compiler/plugin/poplar/BUILD

@@ -4995,17 +4995,6 @@ tf_xla_py_test(
     ],
 )
 
-tf_xla_py_test(
-    name = "logging_example_1",
-    size = "large",
-    srcs = ["docs/logging_example_1.py"],
-    enabled_backends = ["poplar"],
-    deps = [
-        "//tensorflow:tensorflow_py",
-        "//tensorflow/python/ipu:ipu_lib",
-    ],
-)
-
 tf_xla_py_test(
     name = "perf_training_example",
     size = "large",
@@ -5425,6 +5414,149 @@ tf_xla_py_test(
     ],
 )
 
+tf_xla_py_test(
+    name = "targeting_tf2_example1",
+    size = "large",
+    srcs = ["docs/targeting_tf2_example1.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
+tf_xla_py_test(
+    name = "targeting_tf2_example2",
+    size = "large",
+    srcs = ["docs/targeting_tf2_example2.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
+tf_xla_py_test(
+    name = "targeting_tf2_example3",
+    size = "large",
+    srcs = ["docs/targeting_tf2_example3.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
+tf_xla_py_test(
+    name = "keras_tf2_example1",
+    size = "large",
+    srcs = ["docs/keras_tf2_example1.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
+tf_xla_py_test(
+    name = "keras_tf2_example2",
+    size = "large",
+    srcs = ["docs/keras_tf2_example2.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
+tf_xla_py_test(
+    name = "keras_tf2_example3",
+    size = "large",
+    srcs = ["docs/keras_tf2_example3.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
+tf_xla_py_test(
+    name = "keras_tf2_example4",
+    size = "large",
+    srcs = ["docs/keras_tf2_example4.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
+tf_xla_py_test(
+    name = "keras_tf2_example5",
+    size = "large",
+    srcs = ["docs/keras_tf2_example5.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
+tf_xla_py_test(
+    name = "keras_tf2_example6",
+    size = "large",
+    srcs = ["docs/keras_tf2_example6.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
+tf_xla_py_test(
+    name = "keras_tf2_example7",
+    size = "large",
+    srcs = ["docs/keras_tf2_example7.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
+tf_xla_py_test(
+    name = "keras_tf2_example8",
+    size = "large",
+    srcs = ["docs/keras_tf2_example8.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
+tf_xla_py_test(
+    name = "keras_tf2_example9",
+    size = "large",
+    srcs = ["docs/keras_tf2_example9.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
+tf_xla_py_test(
+    name = "keras_porting_example",
+    size = "large",
+    srcs = ["docs/keras_porting_example.py"],
+    enabled_backends = ["poplar"],
+    deps = [
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python/ipu:ipu_lib",
+    ],
+)
+
 tf_xla_py_test(
     name = "compile_cache_test",
     size = "large",
@@ -5697,10 +5829,22 @@ test_suite(
         "function_example2",
         "ipu_estimator_example",
         "ipu_pipeline_estimator_example",
-        "logging_example_1",
+        "keras_tf2_example1",
+        "keras_tf2_example2",
+        "keras_tf2_example3",
+        "keras_tf2_example4",
+        "keras_tf2_example5",
+        "keras_tf2_example6",
+        "keras_tf2_example7",
+        "keras_tf2_example8",
+        "keras_tf2_example9",
+        "keras_porting_example",
         "outfeed_example",
         "perf_training_example",
         "pre_compile_example_runner",
+        "targeting_tf2_example1",
+        "targeting_tf2_example2",
+        "targeting_tf2_example3",
         "tutorial_attributes_example",
         "tutorial_custom_codelet",
     ] + if_horovod(["distributed_training_horovod_example"]),

tensorflow/compiler/plugin/poplar/docs/api.rst

@@ -23,8 +23,14 @@ For example, this will not work:
   :members:
   :imported-members:
 
+.. note::
+
+  `tensorflow.python.ipu.ipu_strategy.IPUStrategy` is an alias of
+  :py:class:`tensorflow.python.ipu.ipu_strategy.IPUStrategyV1`.
+
 .. automodule:: tensorflow.python.ipu.ipu_strategy
   :members: IPUStrategyV1
+  :special-members: __init__
 
 .. Note: the headings of the following modules will be included
          as subsection headings. They need to be added before
@@ -137,20 +143,9 @@ Estimators
 Keras
 ^^^^^
 
-.. note::
-
-  `tensorflow.python.ipu.keras.SequentialPipelineModel` has been renamed to
-  :py:class:`tensorflow.python.ipu.keras.PipelineSequential` and will be removed
-  in a future version.
-
-.. automodule:: tensorflow.python.ipu.keras
-  :members: Model, Sequential, PipelineStage, PipelineModel, PipelineSequential
-  :imported-members: Model, Sequential, PipelineModel, PipelineStage, PipelineSequential
-  :special-members: __init__
-
-.. automodule:: tensorflow.python.ipu.keras.model
-  :members: IPUModel, IPUSequential
-  :special-members: __init__
+.. automodule:: tensorflow.python.ipu.keras.extensions
+  :members: FunctionalExtension, PipelineStage, FunctionalLayerPipelineStageAssignment, SequentialExtension, SequentialLayerPipelineStageAssignment
+  :imported-members: FunctionalExtension, PipelineStage, FunctionalLayerPipelineStageAssignment, SequentialExtension, SequentialLayerPipelineStageAssignment
 
 .. _keras-layers-api: