Add ConvNeXt models

keras/api/BUILD

@@ -21,6 +21,7 @@ exports_files(
 keras_packages = [
     "keras",
     "keras.activations",
+    "keras.applications.convnext",
     "keras.applications.densenet",
     "keras.applications.efficientnet",
     "keras.applications.efficientnet_v2",
@@ -181,7 +182,7 @@ gen_api_init_files(
         "//keras",
         "//:expect_tensorflow_installed",
     ],
-    packages = keras_packages,
+    packages=keras_packages,
 )
 
 gen_api_init_files(
@@ -195,5 +196,5 @@ gen_api_init_files(
         "//keras",
         "//:expect_tensorflow_installed",
     ],
-    packages = keras_packages,
+    packages=keras_packages,
 )

keras/api/api_init_files.bzl

@@ -12,6 +12,7 @@ KERAS_API_INIT_FILES = [
     "keras/__internal__/utils/__init__.py",
     "keras/activations/__init__.py",
     "keras/applications/__init__.py",
+    "keras/applications/convnext/__init__.py",
     "keras/applications/densenet/__init__.py",
     "keras/applications/efficientnet/__init__.py",
     "keras/applications/efficientnet_v2/__init__.py",
@@ -85,6 +86,7 @@ KERAS_API_INIT_FILES_V1 = [
     "keras/__internal__/legacy/rnn_cell/__init__.py",
     "keras/activations/__init__.py",
     "keras/applications/__init__.py",
+    "keras/applications/convnext/__init__.py",
     "keras/applications/densenet/__init__.py",
     "keras/applications/efficientnet/__init__.py",
     "keras/applications/efficientnet_v2/__init__.py",

keras/applications/BUILD

@@ -16,6 +16,7 @@ py_library(
     srcs = [
         "__init__.py",
         "densenet.py",
+        "convnext.py",
         "efficientnet.py",
         "efficientnet_v2.py",
         "imagenet_utils.py",
@@ -270,6 +271,24 @@ tf_py_test(
     ],
 )
 
+tf_py_test(
+    name = "applications_load_weight_test_convnext",
+    size = "large",
+    srcs = ["applications_load_weight_test.py"],
+    args = ["--module=convnext"],
+    main = "applications_load_weight_test.py",
+    tags = [
+        "no_oss",
+        "no_pip",
+    ],
+    deps = [
+        ":applications",
+        "//:expect_absl_installed",
+        "//:expect_tensorflow_installed",
+        "//keras/preprocessing",
+    ],
+)
+
 tf_py_test(
     name = "applications_load_weight_test_densenet",
     size = "large",

keras/applications/__init__.py

@@ -15,6 +15,12 @@
 """Keras Applications are premade architectures with pre-trained weights."""
 # pylint: disable=g-bad-import-order
 
+from keras.applications.convnext import ConvNeXtTiny
+from keras.applications.convnext import ConvNeXtSmall
+from keras.applications.convnext import ConvNeXtBase
+from keras.applications.convnext import ConvNeXtLarge
+from keras.applications.convnext import ConvNeXtXLarge
+
 from keras.applications.densenet import DenseNet121
 from keras.applications.densenet import DenseNet169
 from keras.applications.densenet import DenseNet201

keras/applications/applications_load_weight_test.py

@@ -20,6 +20,7 @@
 from absl.testing import parameterized
 import numpy as np
 
+from keras.applications import convnext
 from keras.applications import densenet
 from keras.applications import efficientnet
 from keras.applications import efficientnet_v2
@@ -55,6 +56,10 @@
     'mobilenet_v2': (mobilenet_v2, [mobilenet_v2.MobileNetV2]),
     'mobilenet_v3_small': (mobilenet_v3, [mobilenet_v3.MobileNetV3Small]),
     'mobilenet_v3_large': (mobilenet_v3, [mobilenet_v3.MobileNetV3Large]),
+    'convnext': 
+        (convnext, 
+        [convnext.ConvNeXtTiny, convnext.ConvNeXtSmall, convnext.ConvNeXtBase,
+        convnext.ConvNeXtLarge, convnext.ConvNeXtXLarge]),
     'densenet':
         (densenet,
          [densenet.DenseNet121, densenet.DenseNet169, densenet.DenseNet201]),

keras/applications/applications_test.py

@@ -16,6 +16,7 @@
 
 from absl.testing import parameterized
 from keras import backend
+from keras.applications import convnext
 from keras.applications import densenet
 from keras.applications import efficientnet
 from keras.applications import efficientnet_v2
@@ -32,6 +33,7 @@
 from keras.applications import vgg16
 from keras.applications import vgg19
 from keras.applications import xception
+from keras import utils
 import tensorflow.compat.v2 as tf
 
 MODEL_LIST_NO_NASNET = [(resnet.ResNet50, 2048), (resnet.ResNet101, 2048),
@@ -45,6 +47,11 @@
                         (mobilenet_v2.MobileNetV2, 1280),
                         (mobilenet_v3.MobileNetV3Small, 576),
                         (mobilenet_v3.MobileNetV3Large, 960),
+                        (convnext.ConvNeXtTiny, 768),
+                        (convnext.ConvNeXtSmall, 768),
+                        (convnext.ConvNeXtBase, 1024),
+                        (convnext.ConvNeXtLarge, 1536),
+                        (convnext.ConvNeXtXLarge, 2048),
                         (densenet.DenseNet121, 1024),
                         (densenet.DenseNet169, 1664),
                         (densenet.DenseNet201, 1920),
@@ -124,7 +131,12 @@ def test_application_base(self, app, _):
     model = app(weights=None)
     # Can be serialized and deserialized
     config = model.get_config()
-    reconstructed_model = model.__class__.from_config(config)
+    if "ConvNeXt" in app.__name__:
+      custom_objects = {"LayerScale": convnext.LayerScale}
+      with utils.custom_object_scope(custom_objects):
+        reconstructed_model = model.__class__.from_config(config)
+    else:
+      reconstructed_model = model.__class__.from_config(config)
     self.assertEqual(len(model.weights), len(reconstructed_model.weights))
     backend.clear_session()