Skip to content

Conversation

sovrasov
Copy link
Member

@sovrasov sovrasov commented Sep 13, 2024

Summary

  • OVModel
  • fix torch functionality (export & benchmark)
  • minor fix in metric computation
  • CLI&Unit tests

Results on coco_keypoint_single_obj/medium:

Model PCK accuracy
RTMPose-tiny-single 0.7216
RTMPose-tiny-single OV 0.7216
RTMPose-tiny-single OV INT8 0.7208

yunchu and others added 30 commits August 20, 2024 09:16
* Update test_cli.py

* Update tests/e2e/cli/test_cli.py

Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>

* Update test_cli.py

* Update test_cli.py

---------

Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>
)

* add docs about configurable input size

* update api usecase and fix bug
* Bump MAPI

* Update exportable code requirements
…#3891)

* change drop pixels value

* go safe, change only tested models

* minor
* Update step size for eff v2

* Update effb0 recipe
update maskrcnn swimt model type to transformer
…form#3903)

* add rtmpose_tiny for single obj

* add rtmpose_tiny for single obj

* modify test subset name

* fix unit test

* update recipe with reset
* Fix pretrained_weight for timm

* Fix unit-test
* add rtmpose_tiny for single obj

* modify test subset name

* fix unit test

* property for pck
* Fix cached dir

* Pretrained weight download unit-test

* Fix pre-commit
* Restore output_raw_scores for classificaiton

* Add uts

* Fix linter
add label info to init

Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com>
* Fix binary classification

* Add unit-tests
* ignore heads and disable smooth quant

* add activations_range_estimator_params

* update changelog
…3931)

* Fix Task Chain

* Add multi-label case as well

* Add multi-label case as well2

* Add H-label case
…ies using label's id/key (open-edge-platform#3932)

Modify label_groups for dm_label_categories with id/key of label
…-platform#3933)

* remove datumaro attribute id from tiling

* add subset names
@sovrasov sovrasov added this to the 2.2.0 milestone Sep 13, 2024
@github-actions github-actions bot added DEPENDENCY Any changes in any dependencies (new dep or its version) should be produced via Change Request on PM TEST Any changes in tests BUILD OTX 2.0 labels Sep 13, 2024
kprokofi
kprokofi previously approved these changes Sep 13, 2024
Copy link

codecov bot commented Sep 13, 2024

Codecov Report

Attention: Patch coverage is 20.00000% with 28 lines in your changes missing coverage. Please review.

Please upload report for BASE (releases/2.2.0@b1ec8e7). Learn more about missing BASE report.

Files with missing lines Patch % Lines
src/otx/core/metrics/pck.py 0.00% 13 Missing ⚠️
src/otx/core/model/keypoint_detection.py 36.84% 12 Missing ⚠️
src/otx/algo/keypoint_detection/rtmpose.py 0.00% 3 Missing ⚠️
Additional details and impacted files
@@                Coverage Diff                @@
##             releases/2.2.0    #3957   +/-   ##
=================================================
  Coverage                  ?   80.79%           
=================================================
  Files                     ?      276           
  Lines                     ?    27302           
  Branches                  ?        0           
=================================================
  Hits                      ?    22059           
  Misses                    ?     5243           
  Partials                  ?        0           
Flag Coverage Δ
py311 80.79% <20.00%> (?)

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.

Copy link
Contributor

@eunwoosh eunwoosh left a comment

Choose a reason for hiding this comment

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

Thanks for your work. I left some comments. Please take a look.


kpts_visible_stacked = np.stack(kpts_visible)

normalize = np.tile(np.array([self.input_size[::-1]]), (pred_kpts.shape[0], 1))
Copy link
Contributor

Choose a reason for hiding this comment

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

the reason why input size order is reversed is that norm_factor order is (w, h)? Referring docstring of the function, it should be (h, w). Which one is right?

Copy link
Member Author

@sovrasov sovrasov Sep 19, 2024

Choose a reason for hiding this comment

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

It's wh, since we use xy keypoints coordinates. The function is order-agnostic, we can use it for both xy and xy. The main point is that we need to pass aligned kps and normalization, which are in xy format for our case.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for explanation. Could you update norm_factor docstring at keypoint_pck_accuracy then?

@chuneuny-emily
Copy link
Contributor

chuneuny-emily commented Sep 20, 2024

@sovrasov - Could you please designate the target branch as the develop branch? OTX2.2.0 has already proven that KeyPoint detection supports train and export. OV IR inference validation will be available in the upcoming OTX2.3.0.

@sovrasov sovrasov changed the base branch from releases/2.2.0 to develop September 20, 2024 07:04
@sovrasov sovrasov modified the milestones: 2.2.0, 2.3.0 Sep 20, 2024
@sovrasov
Copy link
Member Author

@chuneuny-emily just in case, export of keypoint model in 2.2 can be launched, but it generates an incorrect model, so it can be used only as a mock.

@github-actions github-actions bot added the DOC Improvements or additions to documentation label Sep 20, 2024
@sovrasov sovrasov closed this Sep 20, 2024
@sovrasov sovrasov deleted the vs/kp_tmp branch September 20, 2024 16:06
@sovrasov sovrasov restored the vs/kp_tmp branch September 20, 2024 16:06
@sovrasov sovrasov deleted the vs/kp_tmp branch September 20, 2024 16:07
@sovrasov sovrasov restored the vs/kp_tmp branch September 20, 2024 16:07
@sovrasov sovrasov reopened this Sep 20, 2024
@sovrasov sovrasov closed this Sep 20, 2024
@sovrasov sovrasov deleted the vs/kp_tmp branch September 20, 2024 16:09
Add integration tests for keypoint detection task (open-edge-platform#3945)

* Fix export

* Add integrastion tests for keypoint detection

* Update export

* Add kp det to gh workflow

* Fix ruff

* Move std mean to class vars

Cleanup

Implement dummy input for kp

Update export inf test

Upgrade MAPI

Cleanup

Fix CLI tests

Cleanup

Fix kp OV model data config

Fix dummy input docstring

Co-authored-by: Prokofiev Kirill <kirill.prokofiev@intel.com>

Add unit tests for kp det model

Fix ruff

Update pck docs

Fix typos in tests

Add uts for PCK metric

Rename kaypoints det metric

Del extra transform in p ove model

Fix unit test naming

Fix cpu train/eval

Fix autocast deprecation warnings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

BUILD DEPENDENCY Any changes in any dependencies (new dep or its version) should be produced via Change Request on PM DOC Improvements or additions to documentation TEST Any changes in tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.