Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate SSD from mmdet to OTX #3279

Merged
merged 12 commits into from
Apr 11, 2024

Conversation

jaegukhyun
Copy link
Contributor

Summary

How to test

Checklist

  • I have added unit tests to cover my changes.​
  • I have added integration tests to cover my changes.​
  • I have added e2e tests for validation.
  • I have added the description of my changes into CHANGELOG in my target branch (e.g., CHANGELOG in develop).​
  • I have updated the documentation in my target branch accordingly (e.g., documentation in develop).
  • I have linked related issues.

License

  • I submit my code changes under the same Apache License that covers the project.
    Feel free to contact the maintainers if that's a concern.
  • I have updated the license header for each file (see an example below).
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

@github-actions github-actions bot added the TEST Any changes in tests label Apr 5, 2024
Copy link

codecov bot commented Apr 5, 2024

Codecov Report

Attention: Patch coverage is 25.57803% with 515 lines in your changes are missing coverage. Please review.

Project coverage is 77.37%. Comparing base (7df78c1) to head (079fd70).
Report is 15 commits behind head on develop.

❗ Current head 079fd70 differs from pull request most recent head 9d945bd. Consider uploading reports for the commit 9d945bd to get more accurate results

Files Patch % Lines
src/otx/algo/detection/heads/base_head.py 0.00% 135 Missing ⚠️
src/otx/algo/detection/heads/anchor_head.py 18.47% 128 Missing ⚠️
src/otx/algo/detection/heads/max_iou_assigner.py 22.01% 85 Missing ⚠️
src/otx/algo/detection/ssd.py 48.21% 58 Missing ⚠️
.../otx/algo/detection/heads/delta_xywh_bbox_coder.py 26.38% 53 Missing ⚠️
src/otx/algo/detection/heads/custom_ssd_head.py 52.63% 36 Missing ⚠️
src/otx/algo/detection/heads/iou2d_calculator.py 37.93% 18 Missing ⚠️
src/otx/core/model/detection.py 0.00% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3279      +/-   ##
===========================================
- Coverage    78.39%   77.37%   -1.02%     
===========================================
  Files          179      185       +6     
  Lines        15169    16042     +873     
===========================================
+ Hits         11891    12413     +522     
- Misses        3278     3629     +351     
Flag Coverage Δ
py310 77.37% <25.57%> (-1.02%) ⬇️
py311 77.37% <25.57%> (-1.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

src/otx/algo/detection/ssd.py Show resolved Hide resolved
src/otx/algo/detection/ssd.py Show resolved Hide resolved
src/otx/algo/detection/ssd.py Show resolved Hide resolved
Copy link
Contributor

@sungchul2 sungchul2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems we don't need to type for modules in the recipe if using specific modules, not popping it.

Copy link
Contributor

@eugene123tw eugene123tw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please confirm if you intend to separate these mmdetection modules in the upcoming PR?

from mmdet.models.losses import smooth_l1_loss
from mmdet.models.task_modules.assigners.assign_result import AssignResult
from mmdet.models.task_modules.samplers import PseudoSampler
from mmdet.models.utils import multi_apply
from mmdet.models.utils import filter_scores_and_topk, select_single_mlvl, unpack_gt_instances
from mmdet.models.dense_heads.base_dense_head import BaseDenseHead
from mmdet.models.task_modules.prior_generators import AnchorGenerator, anchor_inside_flags
from mmdet.models.task_modules.samplers import PseudoSampler
from mmdet.models.utils import images_to_levels, multi_apply, unmap
from mmcv.ops import batched_nms

@jaegukhyun
Copy link
Contributor Author

jaegukhyun commented Apr 9, 2024

Could you please confirm if you intend to separate these mmdetection modules in the upcoming PR?

from mmdet.models.losses import smooth_l1_loss
from mmdet.models.task_modules.assigners.assign_result import AssignResult
from mmdet.models.task_modules.samplers import PseudoSampler
from mmdet.models.utils import multi_apply
from mmdet.models.utils import filter_scores_and_topk, select_single_mlvl, unpack_gt_instances
from mmdet.models.dense_heads.base_dense_head import BaseDenseHead
from mmdet.models.task_modules.prior_generators import AnchorGenerator, anchor_inside_flags
from mmdet.models.task_modules.samplers import PseudoSampler
from mmdet.models.utils import images_to_levels, multi_apply, unmap
from mmcv.ops import batched_nms

Current PR scope is bringing model architecture things, and after this PR I'll bring ops and data structures.
So from above, PseudoSampler, BaseDenseHead, AnchorGenerator should be replaced by OTX things.
I added commits for that.
Please review them. Thanks!

@jaegukhyun jaegukhyun requested a review from vinnamkim April 11, 2024 02:24
@jaegukhyun jaegukhyun merged commit 102038b into openvinotoolkit:develop Apr 11, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
TEST Any changes in tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants