From 1d8284e2fb4db186052afc1a7ab75eb3310e0b95 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Wed, 6 Apr 2022 11:21:21 +0100 Subject: [PATCH 1/3] Add RetinaNet improved weights --- torchvision/models/detection/retinanet.py | 27 ++++++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/torchvision/models/detection/retinanet.py b/torchvision/models/detection/retinanet.py index 39b7edc8c13..c0a810c85f8 100644 --- a/torchvision/models/detection/retinanet.py +++ b/torchvision/models/detection/retinanet.py @@ -672,17 +672,22 @@ def forward(self, images, targets=None): return self.eager_outputs(losses, detections) +_COMMON_META = { + "task": "image_object_detection", + "architecture": "RetinaNet", + "publication_year": 2017, + "categories": _COCO_CATEGORIES, + "interpolation": InterpolationMode.BILINEAR, +} + + class RetinaNet_ResNet50_FPN_Weights(WeightsEnum): COCO_V1 = Weights( url="https://download.pytorch.org/models/retinanet_resnet50_fpn_coco-eeacb38b.pth", transforms=ObjectDetection, meta={ - "task": "image_object_detection", - "architecture": "RetinaNet", - "publication_year": 2017, + **_COMMON_META, "num_params": 34014999, - "categories": _COCO_CATEGORIES, - "interpolation": InterpolationMode.BILINEAR, "recipe": "https://github.com/pytorch/vision/tree/main/references/detection#retinanet", "map": 36.4, }, @@ -691,7 +696,17 @@ class RetinaNet_ResNet50_FPN_Weights(WeightsEnum): class RetinaNet_ResNet50_FPN_V2_Weights(WeightsEnum): - pass + COCO_V1 = Weights( + url="", + transforms=ObjectDetection, + meta={ + **_COMMON_META, + "num_params": 38198935, + "recipe": "", + "map": 41.5, + }, + ) + DEFAULT = COCO_V1 @handle_legacy_interface( From 38848c8bfd6509744488a11522c8fcaa5e91ff91 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Wed, 6 Apr 2022 12:09:43 +0100 Subject: [PATCH 2/3] Add weights. --- torchvision/models/detection/retinanet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/torchvision/models/detection/retinanet.py b/torchvision/models/detection/retinanet.py index c0a810c85f8..316646c06e4 100644 --- a/torchvision/models/detection/retinanet.py +++ b/torchvision/models/detection/retinanet.py @@ -697,12 +697,12 @@ class RetinaNet_ResNet50_FPN_Weights(WeightsEnum): class RetinaNet_ResNet50_FPN_V2_Weights(WeightsEnum): COCO_V1 = Weights( - url="", + url="https://download.pytorch.org/models/retinanet_resnet50_fpn_v2_coco-5905b1c5.pth", transforms=ObjectDetection, meta={ **_COMMON_META, "num_params": 38198935, - "recipe": "", + "recipe": "https://github.com/pytorch/vision/pull/5756", "map": 41.5, }, ) From 93c6b1eddd8a75fcc31b9df38c1aa301a59df011 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Wed, 6 Apr 2022 14:21:00 +0100 Subject: [PATCH 3/3] Change publication date. --- torchvision/models/detection/retinanet.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/torchvision/models/detection/retinanet.py b/torchvision/models/detection/retinanet.py index 316646c06e4..d277f130ad3 100644 --- a/torchvision/models/detection/retinanet.py +++ b/torchvision/models/detection/retinanet.py @@ -675,7 +675,6 @@ def forward(self, images, targets=None): _COMMON_META = { "task": "image_object_detection", "architecture": "RetinaNet", - "publication_year": 2017, "categories": _COCO_CATEGORIES, "interpolation": InterpolationMode.BILINEAR, } @@ -687,6 +686,7 @@ class RetinaNet_ResNet50_FPN_Weights(WeightsEnum): transforms=ObjectDetection, meta={ **_COMMON_META, + "publication_year": 2017, "num_params": 34014999, "recipe": "https://github.com/pytorch/vision/tree/main/references/detection#retinanet", "map": 36.4, @@ -701,6 +701,7 @@ class RetinaNet_ResNet50_FPN_V2_Weights(WeightsEnum): transforms=ObjectDetection, meta={ **_COMMON_META, + "publication_year": 2019, "num_params": 38198935, "recipe": "https://github.com/pytorch/vision/pull/5756", "map": 41.5,