Merge branch 'keras-team:master' into master

keras-team · Jul 19, 2023 · a81609f · a81609f
2 parents a2117b4 + 2a645d3
commit a81609f
Show file tree

Hide file tree

Showing 58 changed files with 4,675 additions and 789 deletions.
diff --git a/examples/nlp/ipynb/sentence_embeddings_with_sbert.ipynb b/examples/nlp/ipynb/sentence_embeddings_with_sbert.ipynb
diff --git a/examples/nlp/md/sentence_embeddings_with_sbert.md b/examples/nlp/md/sentence_embeddings_with_sbert.md
diff --git a/examples/nlp/sentence_embeddings_with_sbert.py b/examples/nlp/sentence_embeddings_with_sbert.py
diff --git a/guides/customizing_what_happens_in_fit.py b/guides/customizing_what_happens_in_fit.py
@@ -45,7 +45,7 @@
 """
 
 import tensorflow as tf
-from tensorflow import keras
+import keras
 
 """
 ## A first simple example

diff --git a/guides/distributed_training.py b/guides/distributed_training.py
@@ -45,7 +45,7 @@
 """
 
 import tensorflow as tf
-from tensorflow import keras
+import keras
 
 """
 ## Single-host, multi-device synchronous training

diff --git a/guides/functional_api.py b/guides/functional_api.py
@@ -2,7 +2,7 @@
 Title: The Functional API
 Author: [fchollet](https://twitter.com/fchollet)
 Date created: 2019/03/01
-Last modified: 2020/04/12
+Last modified: 2020/07/10
 Description: Complete guide to the functional API.
 Accelerator: GPU
 """
@@ -12,8 +12,8 @@
 
 import numpy as np
 import tensorflow as tf
-from tensorflow import keras
-from tensorflow.keras import layers
+import keras
+from keras import layers
 
 """
 ## Introduction
@@ -607,6 +607,7 @@ def call(self, inputs):
 """
 
 
+@keras.saving.register_keras_serializable()
 class CustomDense(layers.Layer):
     def __init__(self, units=32):
         super().__init__()
@@ -635,7 +636,7 @@ def get_config(self):
 model = keras.Model(inputs, outputs)
 config = model.get_config()
 
-new_model = keras.Model.from_config(config, custom_objects={"CustomDense": CustomDense})
+new_model = keras.Model.from_config(config)
 
 """
 Optionally, implement the class method `from_config(cls, config)` which is used
@@ -776,6 +777,7 @@ def call(self, inputs):
 model = keras.Model(inputs, outputs)
 
 
+@keras.saving.register_keras_serializable()
 class CustomRNN(layers.Layer):
     def __init__(self):
         super().__init__()
@@ -830,6 +832,7 @@ def call(self, inputs):
 batch_size = 16
 
 
+@keras.saving.register_keras_serializable()
 class CustomRNN(layers.Layer):
     def __init__(self):
         super().__init__()

diff --git a/guides/intro_to_keras_for_engineers.py b/guides/intro_to_keras_for_engineers.py
@@ -13,7 +13,7 @@
 
 import numpy as np
 import tensorflow as tf
-from tensorflow import keras
+import keras
 
 """
 ## Introduction

diff --git a/guides/intro_to_keras_for_researchers.py b/guides/intro_to_keras_for_researchers.py
@@ -11,7 +11,7 @@
 """
 
 import tensorflow as tf
-from tensorflow import keras
+import keras
 
 """
 ## Introduction

diff --git a/guides/ipynb/customizing_what_happens_in_fit.ipynb b/guides/ipynb/customizing_what_happens_in_fit.ipynb
@@ -70,7 +70,7 @@
    "outputs": [],
    "source": [
     "import tensorflow as tf\n",
-    "from tensorflow import keras"
+    "import keras"
    ]
   },
   {

diff --git a/guides/ipynb/distributed_training.ipynb b/guides/ipynb/distributed_training.ipynb
@@ -70,7 +70,7 @@
    "outputs": [],
    "source": [
     "import tensorflow as tf\n",
-    "from tensorflow import keras"
+    "import keras"
    ]
   },
   {

diff --git a/guides/ipynb/functional_api.ipynb b/guides/ipynb/functional_api.ipynb
@@ -10,7 +10,7 @@
     "\n",
     "**Author:** [fchollet](https://twitter.com/fchollet)<br>\n",
     "**Date created:** 2019/03/01<br>\n",
-    "**Last modified:** 2020/04/12<br>\n",
+    "**Last modified:** 2020/07/10<br>\n",
     "**Description:** Complete guide to the functional API."
    ]
   },
@@ -33,8 +33,8 @@
    "source": [
     "import numpy as np\n",
     "import tensorflow as tf\n",
-    "from tensorflow import keras\n",
-    "from tensorflow.keras import layers"
+    "import keras\n",
+    "from keras import layers"
    ]
   },
   {
@@ -1064,6 +1064,7 @@
    "outputs": [],
    "source": [
     "\n",
+    "@keras.saving.register_keras_serializable()\n",
     "class CustomDense(layers.Layer):\n",
     "    def __init__(self, units=32):\n",
     "        super().__init__()\n",
@@ -1092,7 +1093,7 @@
     "model = keras.Model(inputs, outputs)\n",
     "config = model.get_config()\n",
     "\n",
-    "new_model = keras.Model.from_config(config, custom_objects={\"CustomDense\": CustomDense})"
+    "new_model = keras.Model.from_config(config)"
    ]
   },
   {
@@ -1256,6 +1257,7 @@
     "model = keras.Model(inputs, outputs)\n",
     "\n",
     "\n",
+    "@keras.saving.register_keras_serializable()\n",
     "class CustomRNN(layers.Layer):\n",
     "    def __init__(self):\n",
     "        super().__init__()\n",
@@ -1324,6 +1326,7 @@
     "batch_size = 16\n",
     "\n",
     "\n",
+    "@keras.saving.register_keras_serializable()\n",
     "class CustomRNN(layers.Layer):\n",
     "    def __init__(self):\n",
     "        super().__init__()\n",

diff --git a/guides/ipynb/intro_to_keras_for_engineers.ipynb b/guides/ipynb/intro_to_keras_for_engineers.ipynb
@@ -33,7 +33,7 @@
    "source": [
     "import numpy as np\n",
     "import tensorflow as tf\n",
-    "from tensorflow import keras"
+    "import keras"
    ]
   },
   {

diff --git a/guides/ipynb/intro_to_keras_for_researchers.ipynb b/guides/ipynb/intro_to_keras_for_researchers.ipynb
@@ -32,7 +32,7 @@
    "outputs": [],
    "source": [
     "import tensorflow as tf\n",
-    "from tensorflow import keras"
+    "import keras"
    ]
   },
   {