diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 8f4569030f..a80bc1b735 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -41,6 +41,8 @@ jobs: pip install -e ".[tests]" --progress-bar off --upgrade - name: Test with pytest env: + KAGGLE_USERNAME: ${{ secrets.KAGGLE_USERNAME }} + KAGGLE_KEY: ${{ secrets.KAGGLE_KEY }} TEST_CUSTOM_OPS: false run: | pytest keras_cv/ --ignore keras_cv/models/legacy/ --durations 0 @@ -77,6 +79,8 @@ jobs: env: TEST_CUSTOM_OPS: false # TODO(ianstenbit): test custom ops, or figure out what our story is here KERAS_BACKEND: ${{ matrix.backend }} + KAGGLE_USERNAME: ${{ secrets.KAGGLE_USERNAME}} + KAGGLE_KEY: ${{ secrets.KAGGLE_KEY}} JAX_ENABLE_X64: true run: | pytest keras_cv/bounding_box \ diff --git a/keras_cv/models/backbones/csp_darknet/csp_darknet_backbone_presets.py b/keras_cv/models/backbones/csp_darknet/csp_darknet_backbone_presets.py index dbafd437d8..f6ec10296f 100644 --- a/keras_cv/models/backbones/csp_darknet/csp_darknet_backbone_presets.py +++ b/keras_cv/models/backbones/csp_darknet/csp_darknet_backbone_presets.py @@ -26,7 +26,7 @@ "official_name": "CSPDarkNet", "path": "csp_darknet", }, - "kaggle_handle": "gs://keras-cv-kaggle/csp_darknet_tiny", + "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_tiny/1", }, "csp_darknet_s": { "metadata": { @@ -39,7 +39,7 @@ "official_name": "CSPDarkNet", "path": "csp_darknet", }, - "kaggle_handle": "gs://keras-cv-kaggle/csp_darknet_s", + "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_s/1", }, "csp_darknet_m": { "metadata": { @@ -52,7 +52,7 @@ "official_name": "CSPDarkNet", "path": "csp_darknet", }, - "kaggle_handle": "gs://keras-cv-kaggle/csp_darknet_m", + "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_m/1", }, "csp_darknet_l": { "metadata": { @@ -65,7 +65,7 @@ "official_name": "CSPDarkNet", "path": "csp_darknet", }, - "kaggle_handle": "gs://keras-cv-kaggle/csp_darknet_l", + "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_l/1", }, "csp_darknet_xl": { "metadata": { @@ -78,7 +78,7 @@ "official_name": "CSPDarkNet", "path": "csp_darknet", }, - "kaggle_handle": "gs://keras-cv-kaggle/csp_darknet_xl", + "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_xl/1", }, } @@ -95,7 +95,7 @@ "official_name": "CSPDarkNet", "path": "csp_darknet", }, - "kaggle_handle": "gs://keras-cv-kaggle/csp_darknet_tiny_imagenet", + "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_tiny_imagenet/1", # noqa: E501 }, "csp_darknet_l_imagenet": { "metadata": { @@ -109,7 +109,7 @@ "official_name": "CSPDarkNet", "path": "csp_darknet", }, - "kaggle_handle": "gs://keras-cv-kaggle/csp_darknet_l_imagenet", + "kaggle_handle": "kaggle://keras/cspdarknet/csp_darknet_l_imagenet/1", }, } diff --git a/keras_cv/models/backbones/csp_darknet/csp_darknet_backbone_test.py b/keras_cv/models/backbones/csp_darknet/csp_darknet_backbone_test.py index 9dfe3289f4..3c9ee0ca4e 100644 --- a/keras_cv/models/backbones/csp_darknet/csp_darknet_backbone_test.py +++ b/keras_cv/models/backbones/csp_darknet/csp_darknet_backbone_test.py @@ -113,6 +113,9 @@ def test_saved_alias_model(self): ) def test_feature_pyramid_inputs(self): + import os + + print("HERE", os.environ["KAGGLE_USERNAME"]) model = CSPDarkNetLBackbone() backbone_model = get_feature_extractor( model, diff --git a/keras_cv/models/backbones/densenet/densenet_backbone_presets.py b/keras_cv/models/backbones/densenet/densenet_backbone_presets.py index c9ddfe3121..403dfbc199 100644 --- a/keras_cv/models/backbones/densenet/densenet_backbone_presets.py +++ b/keras_cv/models/backbones/densenet/densenet_backbone_presets.py @@ -18,19 +18,19 @@ "metadata": { "description": "DenseNet model with 121 layers.", }, - "kaggle_handle": "gs://keras-cv-kaggle/densenet121", + "kaggle_handle": "kaggle://keras/densenet/densenet121/1", }, "densenet169": { "metadata": { "description": "DenseNet model with 169 layers.", }, - "kaggle_handle": "gs://keras-cv-kaggle/densenet169", + "kaggle_handle": "kaggle://keras/densenet/densenet169/1", }, "densenet201": { "metadata": { "description": "DenseNet model with 201 layers.", }, - "kaggle_handle": "gs://keras-cv-kaggle/densenet201", + "kaggle_handle": "kaggle://keras/densenet/densenet201/1", }, } @@ -42,7 +42,7 @@ "classification task." ), }, - "kaggle_handle": "gs://keras-cv-kaggle/densenet121_imagenet", + "kaggle_handle": "kaggle://keras/densenet/densenet121_imagenet/1", }, "densenet169_imagenet": { "metadata": { @@ -51,7 +51,7 @@ "classification task." ), }, - "kaggle_handle": "gs://keras-cv-kaggle/densenet169_imagenet", + "kaggle_handle": "kaggle://keras/densenet/densenet169_imagenet/1", }, "densenet201_imagenet": { "metadata": { @@ -60,7 +60,7 @@ "classification task." ), }, - "kaggle_handle": "gs://keras-cv-kaggle/densenet201_imagenet", + "kaggle_handle": "kaggle://keras/densenet/densenet201_imagenet/1", }, } diff --git a/keras_cv/models/backbones/efficientnet_v2/efficientnet_v2_backbone_presets.py b/keras_cv/models/backbones/efficientnet_v2/efficientnet_v2_backbone_presets.py index b682b9881b..6cb49e1617 100644 --- a/keras_cv/models/backbones/efficientnet_v2/efficientnet_v2_backbone_presets.py +++ b/keras_cv/models/backbones/efficientnet_v2/efficientnet_v2_backbone_presets.py @@ -24,7 +24,7 @@ "official_name": "EfficientNetV2", "path": "efficientnetv2", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_s", + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_s/1", }, "efficientnetv2_m": { "metadata": { @@ -35,7 +35,7 @@ "official_name": "EfficientNetV2", "path": "efficientnetv2", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_m", + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_m/1", }, "efficientnetv2_l": { "metadata": { @@ -47,7 +47,7 @@ "official_name": "EfficientNetV2", "path": "efficientnetv2", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_l", + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_l/1", }, "efficientnetv2_b0": { "metadata": { @@ -60,7 +60,7 @@ "official_name": "EfficientNetV2", "path": "efficientnetv2", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_b0", + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b0/1", }, "efficientnetv2_b1": { "metadata": { @@ -73,7 +73,7 @@ "official_name": "EfficientNetV2", "path": "efficientnetv2", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_b1", + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b1/1", }, "efficientnetv2_b2": { "metadata": { @@ -86,7 +86,7 @@ "official_name": "EfficientNetV2", "path": "efficientnetv2", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_b2", + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b2/1", }, "efficientnetv2_b3": { "metadata": { @@ -99,7 +99,7 @@ "official_name": "EfficientNetV2", "path": "efficientnetv2", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_b3", + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b3/1", }, } @@ -117,7 +117,7 @@ "official_name": "EfficientNetV2", "path": "efficientnetv2", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_s_imagenet", + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_s_imagenet/1", # noqa: E501 }, "efficientnetv2_b0_imagenet": { "metadata": { @@ -134,7 +134,7 @@ "official_name": "EfficientNetV2", "path": "efficientnetv2", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_b0_imagenet", + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b0_imagenet/1", # noqa: E501 }, "efficientnetv2_b1_imagenet": { "metadata": { @@ -151,7 +151,7 @@ "official_name": "EfficientNetV2", "path": "efficientnetv2", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_b1_imagenet", + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b1_imagenet/1", # noqa: E501 }, "efficientnetv2_b2_imagenet": { "metadata": { @@ -168,7 +168,7 @@ "official_name": "EfficientNetV2", "path": "efficientnetv2", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_b2_imagenet", + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b2_imagenet/1", # noqa: E501 }, } diff --git a/keras_cv/models/backbones/mix_transformer/mix_transformer_backbone_presets.py b/keras_cv/models/backbones/mix_transformer/mix_transformer_backbone_presets.py index ce0f5f626a..569a6fe31f 100644 --- a/keras_cv/models/backbones/mix_transformer/mix_transformer_backbone_presets.py +++ b/keras_cv/models/backbones/mix_transformer/mix_transformer_backbone_presets.py @@ -23,7 +23,7 @@ "official_name": "MiT", "path": "mit", }, - "kaggle_handle": "gs://keras-cv-kaggle/mit_b0", + "kaggle_handle": "kaggle://keras/mit/mit_b0/1", }, "mit_b1": { "metadata": { @@ -34,7 +34,7 @@ "official_name": "MiT", "path": "mit", }, - "kaggle_handle": "gs://keras-cv-kaggle/mit_b1", + "kaggle_handle": "kaggle://keras/mit/mit_b1/1", }, "mit_b2": { "metadata": { @@ -45,7 +45,7 @@ "official_name": "MiT", "path": "mit", }, - "kaggle_handle": "gs://keras-cv-kaggle/mit_b2", + "kaggle_handle": "kaggle://keras/mit/mit_b2/1", }, "mit_b3": { "metadata": { @@ -56,7 +56,7 @@ "official_name": "MiT", "path": "mit", }, - "kaggle_handle": "gs://keras-cv-kaggle/mit_b3", + "kaggle_handle": "kaggle://keras/mit/mit_b3/1", }, "mit_b4": { "metadata": { @@ -67,7 +67,7 @@ "official_name": "MiT", "path": "mit", }, - "kaggle_handle": "gs://keras-cv-kaggle/mit_b4", + "kaggle_handle": "kaggle://keras/mit/mit_b4/1", }, "mit_b5": { "metadata": { @@ -78,7 +78,7 @@ "official_name": "MiT", "path": "mit", }, - "kaggle_handle": "gs://keras-cv-kaggle/mit_b5", + "kaggle_handle": "kaggle://keras/mit/mit_b5/1", }, } @@ -92,7 +92,7 @@ "official_name": "MiT", "path": "mit", }, - "kaggle_handle": "gs://keras-cv-kaggle/mit_b0_imagenet", + "kaggle_handle": "kaggle://keras/mit/mit_b0_imagenet/1", }, } diff --git a/keras_cv/models/backbones/mobilenet_v3/mobilenet_v3_backbone_presets.py b/keras_cv/models/backbones/mobilenet_v3/mobilenet_v3_backbone_presets.py index 774df051eb..2e4f07fd44 100644 --- a/keras_cv/models/backbones/mobilenet_v3/mobilenet_v3_backbone_presets.py +++ b/keras_cv/models/backbones/mobilenet_v3/mobilenet_v3_backbone_presets.py @@ -25,7 +25,7 @@ "official_name": "MobileNetV3", "path": "mobilenetv3", }, - "kaggle_handle": "gs://keras-cv-kaggle/mobilenet_v3_small", + "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_small/1", }, "mobilenet_v3_large": { "metadata": { @@ -38,7 +38,7 @@ "official_name": "MobileNetV3", "path": "mobilenetv3", }, - "kaggle_handle": "gs://keras-cv-kaggle/mobilenet_v3_large", + "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_large/1", }, } @@ -55,7 +55,7 @@ "official_name": "MobileNetV3", "path": "mobilenetv3", }, - "kaggle_handle": "gs://keras-cv-kaggle/mobilenet_v3_large_imagenet", + "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_large_imagenet/1", # noqa: E501 }, "mobilenet_v3_small_imagenet": { "metadata": { @@ -69,7 +69,7 @@ "official_name": "MobileNetV3", "path": "mobilenetv3", }, - "kaggle_handle": "gs://keras-cv-kaggle/mobilenet_v3_small_imagenet", + "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_small_imagenet/1", # noqa: E501 }, } diff --git a/keras_cv/models/backbones/resnet_v1/resnet_v1_backbone_presets.py b/keras_cv/models/backbones/resnet_v1/resnet_v1_backbone_presets.py index 3b33449ad6..b9fa6bca73 100644 --- a/keras_cv/models/backbones/resnet_v1/resnet_v1_backbone_presets.py +++ b/keras_cv/models/backbones/resnet_v1/resnet_v1_backbone_presets.py @@ -25,7 +25,7 @@ "official_name": "ResNetV1", "path": "resnet_v1", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet18", + "kaggle_handle": "kaggle://keras/resnetv1/resnet18/1", }, "resnet34": { "metadata": { @@ -38,7 +38,7 @@ "official_name": "ResNetV1", "path": "resnet_v1", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet34", + "kaggle_handle": "kaggle://keras/resnetv1/resnet34/1", }, "resnet50": { "metadata": { @@ -51,7 +51,7 @@ "official_name": "ResNetV1", "path": "resnet_v1", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet50", + "kaggle_handle": "kaggle://keras/resnetv1/resnet50/1", }, "resnet101": { "metadata": { @@ -64,7 +64,7 @@ "official_name": "ResNetV1", "path": "resnet_v1", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet101", + "kaggle_handle": "kaggle://keras/resnetv1/resnet101/1", }, "resnet152": { "metadata": { @@ -77,7 +77,7 @@ "official_name": "ResNetV1", "path": "resnet_v1", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet152", + "kaggle_handle": "kaggle://keras/resnetv1/resnet152/1", }, } @@ -94,7 +94,7 @@ "official_name": "ResNetV1", "path": "resnet_v1", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet50_imagenet", + "kaggle_handle": "kaggle://keras/resnetv1/resnet50_imagenet/1", }, } diff --git a/keras_cv/models/backbones/resnet_v2/resnet_v2_backbone_presets.py b/keras_cv/models/backbones/resnet_v2/resnet_v2_backbone_presets.py index cf8b2e0278..0e9edd0ca2 100644 --- a/keras_cv/models/backbones/resnet_v2/resnet_v2_backbone_presets.py +++ b/keras_cv/models/backbones/resnet_v2/resnet_v2_backbone_presets.py @@ -24,7 +24,7 @@ "official_name": "ResNetV2", "path": "resnet_v2", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet18_v2", + "kaggle_handle": "kaggle://keras/resnetv2/resnet18_v2/1", }, "resnet34_v2": { "metadata": { @@ -36,7 +36,7 @@ "official_name": "ResNetV2", "path": "resnet_v2", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet34_v2", + "kaggle_handle": "kaggle://keras/resnetv2/resnet34_v2/1", }, "resnet50_v2": { "metadata": { @@ -48,7 +48,7 @@ "official_name": "ResNetV2", "path": "resnet_v2", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet50_v2", + "kaggle_handle": "kaggle://keras/resnetv2/resnet50_v2/1", }, "resnet101_v2": { "metadata": { @@ -60,7 +60,7 @@ "official_name": "ResNetV2", "path": "resnet_v2", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet101_v2", + "kaggle_handle": "kaggle://keras/resnetv2/resnet101_v2/1", }, "resnet152_v2": { "metadata": { @@ -72,7 +72,7 @@ "official_name": "ResNetV2", "path": "resnet_v2", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet152_v2", + "kaggle_handle": "kaggle://keras/resnetv2/resnet152_v2/1", }, } @@ -88,7 +88,7 @@ "official_name": "ResNetV2", "path": "resnet_v2", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet50_v2_imagenet", + "kaggle_handle": "kaggle://keras/resnetv2/resnet50_v2_imagenet/1", }, } diff --git a/keras_cv/models/backbones/vit_det/vit_det_backbone_presets.py b/keras_cv/models/backbones/vit_det/vit_det_backbone_presets.py index 7668c360a3..6121df2813 100644 --- a/keras_cv/models/backbones/vit_det/vit_det_backbone_presets.py +++ b/keras_cv/models/backbones/vit_det/vit_det_backbone_presets.py @@ -26,7 +26,7 @@ "official_name": "VitDet", "path": "vit_det", }, - "kaggle_handle": "gs://keras-cv-kaggle/vitdet_base", + "kaggle_handle": "kaggle://keras/vitdet/vitdet_base/1", }, "vitdet_large": { "metadata": { @@ -40,7 +40,7 @@ "official_name": "VitDet", "path": "vit_det", }, - "kaggle_handle": "gs://keras-cv-kaggle/vitdet_large", + "kaggle_handle": "kaggle://keras/vitdet/vitdet_large/1", }, "vitdet_huge": { "metadata": { @@ -54,7 +54,7 @@ "official_name": "VitDet", "path": "vit_det", }, - "kaggle_handle": "gs://keras-cv-kaggle/vitdet_huge", + "kaggle_handle": "kaggle://keras/vitdet/vitdet_huge/1", }, } @@ -69,7 +69,7 @@ "official_name": "VitDet", "path": "vit_det", }, - "kaggle_handle": "gs://keras-cv-kaggle/vitdet_base_sa1b", + "kaggle_handle": "kaggle://keras/vitdet/vitdet_base_sa1b/1", }, "vitdet_large_sa1b": { "metadata": { @@ -80,7 +80,7 @@ "official_name": "VitDet", "path": "vit_det", }, - "kaggle_handle": "gs://keras-cv-kaggle/vitdet_large_sa1b", + "kaggle_handle": "kaggle://keras/vitdet/vitdet_large_sa1b/1", }, "vitdet_huge_sa1b": { "metadata": { @@ -91,7 +91,7 @@ "official_name": "VitDet", "path": "vit_det", }, - "kaggle_handle": "gs://keras-cv-kaggle/vitdet_huge_sa1b", + "kaggle_handle": "kaggle://keras/vitdet/vitdet_huge_sa1b/1", }, } diff --git a/keras_cv/models/classification/image_classifier_presets.py b/keras_cv/models/classification/image_classifier_presets.py index 56cb8287fe..8d9804ae4e 100644 --- a/keras_cv/models/classification/image_classifier_presets.py +++ b/keras_cv/models/classification/image_classifier_presets.py @@ -27,7 +27,7 @@ "official_name": "ImageClassifier", "path": "image_classifier", }, - "kaggle_handle": "gs://keras-cv-kaggle/resnet50_v2_imagenet_classifier", + "kaggle_handle": "kaggle://keras/resnetv2/resnet50_v2_imagenet_classifier/1", # noqa: E501 }, "efficientnetv2_s_imagenet_classifier": { "metadata": { @@ -44,7 +44,7 @@ "official_name": "ImageClassifier", "path": "image_classifier", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_s_imagenet_classifier", # noqa: E501 + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_s_imagenet_classifier/1", # noqa: E501 }, "efficientnetv2_b0_imagenet_classifier": { "metadata": { @@ -64,7 +64,7 @@ "official_name": "ImageClassifier", "path": "image_classifier", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_b0_imagenet_classifier", # noqa: E501 + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b0_imagenet_classifier/1", # noqa: E501 }, "efficientnetv2_b1_imagenet_classifier": { "metadata": { @@ -84,7 +84,7 @@ "official_name": "ImageClassifier", "path": "image_classifier", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_b1_imagenet_classifier", # noqa: E501 + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b1_imagenet_classifier/1", # noqa: E501 }, "efficientnetv2_b2_imagenet_classifier": { "metadata": { @@ -104,7 +104,7 @@ "official_name": "ImageClassifier", "path": "image_classifier", }, - "kaggle_handle": "gs://keras-cv-kaggle/efficientnetv2_b2_imagenet_classifier", # noqa: E501 + "kaggle_handle": "kaggle://keras/efficientnetv2/efficientnetv2_b2_imagenet_classifier/1", # noqa: E501 }, "mobilenet_v3_large_imagenet_classifier": { "metadata": { @@ -121,6 +121,6 @@ "official_name": "ImageClassifier", "path": "image_classifier", }, - "kaggle_handle": "gs://keras-cv-kaggle/mobilenet_v3_large_imagenet_classifier", # noqa: E501 + "kaggle_handle": "kaggle://keras/mobilenetv3/mobilenet_v3_large_imagenet_classifier/1", # noqa: E501 }, } diff --git a/keras_cv/models/object_detection/retinanet/retinanet_presets.py b/keras_cv/models/object_detection/retinanet/retinanet_presets.py index 39e52d17ce..3b0ccc03d0 100644 --- a/keras_cv/models/object_detection/retinanet/retinanet_presets.py +++ b/keras_cv/models/object_detection/retinanet/retinanet_presets.py @@ -26,6 +26,6 @@ "official_name": "RetinaNet", "path": "retinanet", }, - "kaggle_handle": "gs://keras-cv-kaggle/retinanet_resnet50_pascalvoc", + "kaggle_handle": "kaggle://keras/retinanet/retinanet_resnet50_pascalvoc/1", # noqa: E501 }, } diff --git a/keras_cv/models/object_detection/yolo_v8/yolo_v8_backbone_presets.py b/keras_cv/models/object_detection/yolo_v8/yolo_v8_backbone_presets.py index 73e8636168..9168498012 100644 --- a/keras_cv/models/object_detection/yolo_v8/yolo_v8_backbone_presets.py +++ b/keras_cv/models/object_detection/yolo_v8/yolo_v8_backbone_presets.py @@ -22,7 +22,7 @@ "official_name": "YOLOV8", "path": "yolo_v8", }, - "kaggle_handle": "gs://keras-cv-kaggle/yolo_v8_xs_backbone", + "kaggle_handle": "kaggle://keras/yolov8/yolo_v8_xs_backbone/1", }, "yolo_v8_s_backbone": { "metadata": { @@ -31,7 +31,7 @@ "official_name": "YOLOV8", "path": "yolo_v8", }, - "kaggle_handle": "gs://keras-cv-kaggle/yolo_v8_s_backbone", + "kaggle_handle": "kaggle://keras/yolov8/yolo_v8_s_backbone/1", }, "yolo_v8_m_backbone": { "metadata": { @@ -40,7 +40,7 @@ "official_name": "YOLOV8", "path": "yolo_v8", }, - "kaggle_handle": "gs://keras-cv-kaggle/yolo_v8_m_backbone", + "kaggle_handle": "kaggle://keras/yolov8/yolo_v8_m_backbone/1", }, "yolo_v8_l_backbone": { "metadata": { @@ -49,7 +49,7 @@ "official_name": "YOLOV8", "path": "yolo_v8", }, - "kaggle_handle": "gs://keras-cv-kaggle/yolo_v8_l_backbone", + "kaggle_handle": "kaggle://keras/yolov8/yolo_v8_l_backbone/1", }, "yolo_v8_xl_backbone": { "metadata": { @@ -58,7 +58,7 @@ "official_name": "YOLOV8", "path": "yolo_v8", }, - "kaggle_handle": "gs://keras-cv-kaggle/yolo_v8_xl_backbone", + "kaggle_handle": "kaggle://keras/yolov8/yolo_v8_xl_backbone/1", }, } @@ -72,7 +72,7 @@ "official_name": "YOLOV8", "path": "yolo_v8", }, - "kaggle_handle": "gs://keras-cv-kaggle/yolo_v8_xs_backbone_coco", + "kaggle_handle": "kaggle://keras/yolov8/yolo_v8_xs_backbone_coco/1", }, "yolo_v8_s_backbone_coco": { "metadata": { @@ -81,7 +81,7 @@ "official_name": "YOLOV8", "path": "yolo_v8", }, - "kaggle_handle": "gs://keras-cv-kaggle/yolo_v8_s_backbone_coco", + "kaggle_handle": "kaggle://keras/yolov8/yolo_v8_s_backbone_coco/1", }, "yolo_v8_m_backbone_coco": { "metadata": { @@ -90,7 +90,7 @@ "official_name": "YOLOV8", "path": "yolo_v8", }, - "kaggle_handle": "gs://keras-cv-kaggle/yolo_v8_m_backbone_coco", + "kaggle_handle": "kaggle://keras/yolov8/yolo_v8_m_backbone_coco/1", }, "yolo_v8_l_backbone_coco": { "metadata": { @@ -99,7 +99,7 @@ "official_name": "YOLOV8", "path": "yolo_v8", }, - "kaggle_handle": "gs://keras-cv-kaggle/yolo_v8_l_backbone_coco", + "kaggle_handle": "kaggle://keras/yolov8/yolo_v8_l_backbone_coco/1", }, "yolo_v8_xl_backbone_coco": { "metadata": { @@ -110,7 +110,7 @@ "official_name": "YOLOV8", "path": "yolo_v8", }, - "kaggle_handle": "gs://keras-cv-kaggle/yolo_v8_xl_backbone_coco", + "kaggle_handle": "kaggle://keras/yolov8/yolo_v8_xl_backbone_coco/1", }, } diff --git a/keras_cv/models/object_detection/yolo_v8/yolo_v8_detector_presets.py b/keras_cv/models/object_detection/yolo_v8/yolo_v8_detector_presets.py index 148fcbef68..80403b91e8 100644 --- a/keras_cv/models/object_detection/yolo_v8/yolo_v8_detector_presets.py +++ b/keras_cv/models/object_detection/yolo_v8/yolo_v8_detector_presets.py @@ -25,6 +25,6 @@ "official_name": "YOLOV8Detector", "path": "yolo_v8_detector", }, - "kaggle_handle": "gs://keras-cv-kaggle/yolo_v8_m_pascalvoc", + "kaggle_handle": "kaggle://keras/yolov8/yolo_v8_m_pascalvoc/1", }, } diff --git a/keras_cv/models/segmentation/deeplab_v3_plus/deeplab_v3_plus_presets.py b/keras_cv/models/segmentation/deeplab_v3_plus/deeplab_v3_plus_presets.py index 6991bc2c3f..7213e81378 100644 --- a/keras_cv/models/segmentation/deeplab_v3_plus/deeplab_v3_plus_presets.py +++ b/keras_cv/models/segmentation/deeplab_v3_plus/deeplab_v3_plus_presets.py @@ -29,6 +29,6 @@ "official_name": "DeepLabV3Plus", "path": "deeplab_v3_plus", }, - "kaggle_handle": "gs://keras-cv-kaggle/deeplab_v3_plus_resnet50_pascalvoc", # noqa: E501 + "kaggle_handle": "kaggle://keras/deeplabv3plus/deeplab_v3_plus_resnet50_pascalvoc/1", # noqa: E501 }, } diff --git a/keras_cv/models/segmentation/segformer/segformer_presets.py b/keras_cv/models/segmentation/segformer/segformer_presets.py index 15d2bac8fe..c65fd01908 100644 --- a/keras_cv/models/segmentation/segformer/segformer_presets.py +++ b/keras_cv/models/segmentation/segformer/segformer_presets.py @@ -25,7 +25,7 @@ "official_name": "SegFormerB0", "path": "segformer_b0", }, - "kaggle_handle": "gs://keras-cv-kaggle/segformer_b0", + "kaggle_handle": "kaggle://keras/segformer/segformer_b0/1", }, "segformer_b1": { "metadata": { @@ -34,7 +34,7 @@ "official_name": "SegFormerB1", "path": "segformer_b1", }, - "kaggle_handle": "gs://keras-cv-kaggle/segformer_b1", + "kaggle_handle": "kaggle://keras/segformer/segformer_b1/1", }, "segformer_b2": { "metadata": { @@ -43,7 +43,7 @@ "official_name": "SegFormerB2", "path": "segformer_b2", }, - "kaggle_handle": "gs://keras-cv-kaggle/segformer_b2", + "kaggle_handle": "kaggle://keras/segformer/segformer_b2/1", }, "segformer_b3": { "metadata": { @@ -52,7 +52,7 @@ "official_name": "SegFormerB3", "path": "segformer_b3", }, - "kaggle_handle": "gs://keras-cv-kaggle/segformer_b3", + "kaggle_handle": "kaggle://keras/segformer/segformer_b3/1", }, "segformer_b4": { "metadata": { @@ -61,7 +61,7 @@ "official_name": "SegFormerB4", "path": "segformer_b4", }, - "kaggle_handle": "gs://keras-cv-kaggle/segformer_b4", + "kaggle_handle": "kaggle://keras/segformer/segformer_b4/1", }, "segformer_b5": { "metadata": { @@ -70,7 +70,7 @@ "official_name": "SegFormerB5", "path": "segformer_b5", }, - "kaggle_handle": "gs://keras-cv-kaggle/segformer_b5", + "kaggle_handle": "kaggle://keras/segformer/segformer_b5/1", }, } @@ -84,7 +84,7 @@ "official_name": "SegFormerB0", "path": "segformer_b0", }, - "kaggle_handle": "gs://keras-cv-kaggle/segformer_b0_imagenet", + "kaggle_handle": "kaggle://keras/segformer/segformer_b0_imagenet/1", }, } diff --git a/keras_cv/models/segmentation/segment_anything/sam_presets.py b/keras_cv/models/segmentation/segment_anything/sam_presets.py index 607e0b2dcf..d3db8f6e7f 100644 --- a/keras_cv/models/segmentation/segment_anything/sam_presets.py +++ b/keras_cv/models/segmentation/segment_anything/sam_presets.py @@ -22,7 +22,7 @@ "official_name": "SAM", "path": "segment_anything", }, - "kaggle_handle": "gs://keras-cv-kaggle/sam_base_sa1b", + "kaggle_handle": "kaggle://keras/sam/sam_base_sa1b/1", }, "sam_large_sa1b": { "metadata": { @@ -31,7 +31,7 @@ "official_name": "SAM", "path": "segment_anything", }, - "kaggle_handle": "gs://keras-cv-kaggle/sam_large_sa1b", + "kaggle_handle": "kaggle://keras/sam/sam_large_sa1b/1", }, "sam_huge_sa1b": { "metadata": { @@ -40,6 +40,6 @@ "official_name": "SAM", "path": "segment_anything", }, - "kaggle_handle": "gs://keras-cv-kaggle/sam_huge_sa1b", + "kaggle_handle": "kaggle://keras/sam/sam_huge_sa1b/1", }, } diff --git a/keras_cv/models/task.py b/keras_cv/models/task.py index aa30651130..31e47813c4 100644 --- a/keras_cv/models/task.py +++ b/keras_cv/models/task.py @@ -127,12 +127,11 @@ def from_preset( ) return cls(backbone=backbone, **kwargs) - kwargs.update({"input_shape": input_shape}) - # Task case. return load_from_preset( preset, load_weights=load_weights, + input_shape=input_shape, config_overrides=kwargs, ) diff --git a/keras_cv/utils/preset_utils.py b/keras_cv/utils/preset_utils.py index 6b9424fb4f..b865ac1e9e 100644 --- a/keras_cv/utils/preset_utils.py +++ b/keras_cv/utils/preset_utils.py @@ -140,6 +140,7 @@ def save_to_preset( def load_from_preset( preset, load_weights=None, + input_shape=None, config_file="config.json", config_overrides={}, ): @@ -150,6 +151,8 @@ def load_from_preset( config = json.load(config_file) config["config"] = {**config["config"], **config_overrides} layer = keras.saving.deserialize_keras_object(config) + if input_shape is not None: + layer.build(input_shape) # Check load_weights flag does not violate preset config. if load_weights is True and config["weights"] is None: diff --git a/requirements-common.txt b/requirements-common.txt index 5741b63606..fc21cc5f96 100644 --- a/requirements-common.txt +++ b/requirements-common.txt @@ -2,6 +2,7 @@ absl-py regex pandas +kagglehub keras-core>=0.1.6 tensorflow-datasets pycocotools diff --git a/setup.py b/setup.py index 6ca3d37aa6..ffe7cbb4a8 100644 --- a/setup.py +++ b/setup.py @@ -55,6 +55,7 @@ def is_pure(self): "regex", "tensorflow-datasets", "keras-core", + "kagglehub", ], extras_require={ "tests": [