Follow-up for #1854. Fix migration guide update. Bump tf-keras to 2.18.0 (#1985)

fkouteib · web-flow · commit e87df245c832 · 2024-11-02T17:51:57.000-07:00
diff --git a/guides/ipynb/migrating_to_keras_3.ipynb b/guides/ipynb/migrating_to_keras_3.ipynb
@@ -530,8 +530,7 @@
     "    loss=\"categorical_crossentropy\",\n",
     "    metrics=[\"categorical_crossentropy\", \"categorical_crossentropy\"],\n",
     ")\n",
-    "multi_output_model.evaluate(x_test, y_test)\n",
-    ""
+    "multi_output_model.evaluate(x_test, y_test)\n"
    ]
   },
   {
@@ -700,8 +699,7 @@
     "        \"baz\": keras.Input(shape=(1,), name=\"bar\"),\n",
     "    },\n",
     "}\n",
-    "layer(inputs)\n",
-    ""
+    "layer(inputs)\n"
    ]
   },
   {
@@ -940,7 +938,9 @@
     "| `tf.scatter_nd_update`                             | `keras.ops.scatter_update`                                        |\n",
     "| `tf.tensor_scatter_nd_update`                      | `keras.ops.slice_update`                                          |\n",
     "| `tf.signal.fft2d`                                  | `keras.ops.fft2`                                                  |\n",
-    "| `tf.signal.inverse_stft`                           | `keras.ops.istft`                                                 |"
+    "| `tf.signal.inverse_stft`                           | `keras.ops.istft`                                                 |\n",
+    "| `tf.image.crop_to_bounding_box`                    | `keras.ops.image.crop_images`                                     |\n",
+    "| `tf.image.pad_to_bounding_box`                     | `keras.ops.image.pad_images`                                      |"
    ]
   },
   {
@@ -973,8 +973,7 @@
     "class MyModel(keras.Model):\n",
     "    def compute_loss(self, x=None, y=None, y_pred=None, sample_weight=None):\n",
     "        loss = keras.ops.sum(keras.losses.mean_squared_error(y, y_pred, sample_weight))\n",
-    "        return loss\n",
-    ""
+    "        return loss\n"
    ]
   },
   {
@@ -1018,8 +1017,7 @@
     "        pass  # See guide: keras.io/guides/custom_train_step_in_tensorflow/\n",
     "\n",
     "    def _torch_train_step(self, data):\n",
-    "        pass  # See guide: keras.io/guides/custom_train_step_in_torch/\n",
-    ""
+    "        pass  # See guide: keras.io/guides/custom_train_step_in_torch/\n"
    ]
   },
   {
@@ -1102,8 +1100,7 @@
    "source": [
     "seed_generator = keras.random.SeedGenerator(1337)\n",
     "print(keras.random.normal(shape=(), seed=seed_generator))\n",
-    "print(keras.random.normal(shape=(), seed=seed_generator))\n",
-    ""
+    "print(keras.random.normal(shape=(), seed=seed_generator))\n"
    ]
   },
   {
@@ -1134,8 +1131,7 @@
     "        noise = keras.random.uniform(\n",
     "            minval=0, maxval=self.noise_rate, seed=self.seed_generator\n",
     "        )\n",
-    "        return inputs + noise\n",
-    ""
+    "        return inputs + noise\n"
    ]
   },
   {
@@ -1178,4 +1174,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 0
-}
+}
diff --git a/guides/md/migrating_to_keras_3.md b/guides/md/migrating_to_keras_3.md
@@ -38,7 +38,7 @@ and click "Restart runtime" in Colab, and your code will run on the JAX or PyTor
 !pip install -q keras-nightly
 ```
 
-    
+
 ```python
 import os
 
@@ -178,7 +178,7 @@ INFO:tensorflow:Assets written to: saved_model/assets
 Saved artifact at 'saved_model'. The following endpoints are available:
 ```
 </div>
-    
+
 <div class="k-default-codeblock">
 ```
 * Endpoint 'serve'
@@ -815,6 +815,8 @@ are usually named the same in both frameworks (e.g. `reshape`, `matmul`, `cast`,
 | `tf.tensor_scatter_nd_update`                      | `keras.ops.slice_update`                                          |
 | `tf.signal.fft2d`                                  | `keras.ops.fft2`                                                  |
 | `tf.signal.inverse_stft`                           | `keras.ops.istft`                                                 |
+| `tf.image.crop_to_bounding_box`                    | `keras.ops.image.crop_images`                                     |
+| `tf.image.pad_to_bounding_box`                     | `keras.ops.image.pad_images`                                      |
 
 ### Custom `train_step()` methods
 
diff --git a/guides/migrating_to_keras_3.py b/guides/migrating_to_keras_3.py
@@ -715,8 +715,8 @@ def call(self, inputs):
 | `tf.tensor_scatter_nd_update`                      | `keras.ops.slice_update`                                          |
 | `tf.signal.fft2d`                                  | `keras.ops.fft2`                                                  |
 | `tf.signal.inverse_stft`                           | `keras.ops.istft`                                                 |
-| 'tf.image.crop_to_bounding_box'                    | `keras.ops.image.crop_images`                                     |
-| 'tf.image.pad_to_bounding_box'                     | `keras.ops.image.pad_images`                                      |
+| `tf.image.crop_to_bounding_box`                    | `keras.ops.image.crop_images`                                     |
+| `tf.image.pad_to_bounding_box`                     | `keras.ops.image.pad_images`                                      |
 
 """
 
diff --git a/scripts/autogen.py b/scripts/autogen.py
@@ -54,7 +54,7 @@
     "keras_cv": f"{KERAS_TEAM_GH}/keras-cv/tree/v0.9.0/",
     "keras_nlp": f"{KERAS_TEAM_GH}/keras-nlp/tree/v0.15.1/",
     "keras_hub": f"{KERAS_TEAM_GH}/keras-hub/tree/v0.17.0/",
-    "tf_keras": f"{KERAS_TEAM_GH}/tf-keras/tree/v2.17.0/",
+    "tf_keras": f"{KERAS_TEAM_GH}/tf-keras/tree/v2.18.0/",
 }
 USE_MULTIPROCESSING = False
 

Original file line number	Diff line number	Diff line change
`@@ -530,8 +530,7 @@`
`530`	`530`	`" loss=\"categorical_crossentropy\",\n",`
`531`	`531`	`" metrics=[\"categorical_crossentropy\", \"categorical_crossentropy\"],\n",`
`532`	`532`	`")\n",`
`533`		`- "multi_output_model.evaluate(x_test, y_test)\n",`
`534`		`- ""`
	`533`	`+ "multi_output_model.evaluate(x_test, y_test)\n"`
`535`	`534`	`]`
`536`	`535`	`},`
`537`	`536`	`{`
`@@ -700,8 +699,7 @@`
`700`	`699`	`" \"baz\": keras.Input(shape=(1,), name=\"bar\"),\n",`
`701`	`700`	`" },\n",`
`702`	`701`	`"}\n",`
`703`		`- "layer(inputs)\n",`
`704`		`- ""`
	`702`	`+ "layer(inputs)\n"`
`705`	`703`	`]`
`706`	`704`	`},`
`707`	`705`	`{`
`@@ -940,7 +938,9 @@`
`940`	`938`	"\| `tf.scatter_nd_update` \| `keras.ops.scatter_update` \|\n",
`941`	`939`	"\| `tf.tensor_scatter_nd_update` \| `keras.ops.slice_update` \|\n",
`942`	`940`	"\| `tf.signal.fft2d` \| `keras.ops.fft2` \|\n",
`943`		- "\| `tf.signal.inverse_stft` \| `keras.ops.istft` \|"
	`941`	+ "\| `tf.signal.inverse_stft` \| `keras.ops.istft` \|\n",
	`942`	+ "\| `tf.image.crop_to_bounding_box` \| `keras.ops.image.crop_images` \|\n",
	`943`	+ "\| `tf.image.pad_to_bounding_box` \| `keras.ops.image.pad_images` \|"
`944`	`944`	`]`
`945`	`945`	`},`
`946`	`946`	`{`
`@@ -973,8 +973,7 @@`
`973`	`973`	`"class MyModel(keras.Model):\n",`
`974`	`974`	`" def compute_loss(self, x=None, y=None, y_pred=None, sample_weight=None):\n",`
`975`	`975`	`" loss = keras.ops.sum(keras.losses.mean_squared_error(y, y_pred, sample_weight))\n",`
`976`		`- " return loss\n",`
`977`		`- ""`
	`976`	`+ " return loss\n"`
`978`	`977`	`]`
`979`	`978`	`},`
`980`	`979`	`{`
`@@ -1018,8 +1017,7 @@`
`1018`	`1017`	`" pass # See guide: keras.io/guides/custom_train_step_in_tensorflow/\n",`
`1019`	`1018`	`"\n",`
`1020`	`1019`	`" def _torch_train_step(self, data):\n",`
`1021`		`- " pass # See guide: keras.io/guides/custom_train_step_in_torch/\n",`
`1022`		`- ""`
	`1020`	`+ " pass # See guide: keras.io/guides/custom_train_step_in_torch/\n"`
`1023`	`1021`	`]`
`1024`	`1022`	`},`
`1025`	`1023`	`{`
`@@ -1102,8 +1100,7 @@`
`1102`	`1100`	`"source": [`
`1103`	`1101`	`"seed_generator = keras.random.SeedGenerator(1337)\n",`
`1104`	`1102`	`"print(keras.random.normal(shape=(), seed=seed_generator))\n",`
`1105`		`- "print(keras.random.normal(shape=(), seed=seed_generator))\n",`
`1106`		`- ""`
	`1103`	`+ "print(keras.random.normal(shape=(), seed=seed_generator))\n"`
`1107`	`1104`	`]`
`1108`	`1105`	`},`
`1109`	`1106`	`{`
`@@ -1134,8 +1131,7 @@`
`1134`	`1131`	`" noise = keras.random.uniform(\n",`
`1135`	`1132`	`" minval=0, maxval=self.noise_rate, seed=self.seed_generator\n",`
`1136`	`1133`	`" )\n",`
`1137`		`- " return inputs + noise\n",`
`1138`		`- ""`
	`1134`	`+ " return inputs + noise\n"`
`1139`	`1135`	`]`
`1140`	`1136`	`},`
`1141`	`1137`	`{`
`@@ -1178,4 +1174,4 @@`
`1178`	`1174`	`},`
`1179`	`1175`	`"nbformat": 4,`
`1180`	`1176`	`"nbformat_minor": 0`
`1181`		`-}`
	`1177`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`"keras_cv": f"{KERAS_TEAM_GH}/keras-cv/tree/v0.9.0/",`
`55`	`55`	`"keras_nlp": f"{KERAS_TEAM_GH}/keras-nlp/tree/v0.15.1/",`
`56`	`56`	`"keras_hub": f"{KERAS_TEAM_GH}/keras-hub/tree/v0.17.0/",`
`57`		`- "tf_keras": f"{KERAS_TEAM_GH}/tf-keras/tree/v2.17.0/",`
	`57`	`+ "tf_keras": f"{KERAS_TEAM_GH}/tf-keras/tree/v2.18.0/",`
`58`	`58`	`}`
`59`	`59`	`USE_MULTIPROCESSING = False`
`60`	`60`