Merge back 2.3.0 to develop #4095
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…the files. (#4008) * added unit tests, fix linter for dataset * fixed linter in val * returned init back * added exporter test * added test for detection_3d model * fix pylint * fix integration tests * fixed perf tests
* Fix empty bbox error * Add unit test * precommit
* Update model name in rotated_detection recipes
* Add OV inference for 3d detection * Fix unit tests * Update changelog * Refactor dummy input * Fix torch deprecation warning * Update 3d det unit tests * Fix ruff * Fix flops counter call * Minor updates * Fix import
* added coco metric * fix linter * added ap_05 * fix perf test * small fix * fix some misc comments from previous PRs * reply comments
* added coco metric * fix linter * added ap_05 * fix perf test * small fix * fix some misc comments from previous PRs * move transforms from dataset. Metric not working * test metric. still 0 * transforms work. metric is expected. Delete kitty utils * remove unit test * fix unit tests * fix OV IR inference. reply comments * minor * fix linter * Update src/otx/core/data/transform_libs/torchvision.py Co-authored-by: Kim, Sungchul <sungchul.kim@intel.com> * Update src/otx/core/model/detection_3d.py Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com> * added more unit tests --------- Co-authored-by: Kim, Sungchul <sungchul.kim@intel.com> Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>
* update for releases 2.2.0rc0 * Fix Classification explain forward issue (#3867) Fix bug * Fix e2e code error (#3871) * 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 documentation about configurable input size (#3870) * add docs about configurable input size * update api usecase and fix bug * Fix zero-shot e2e (#3876) Fix * Fix DeiT for multi-label classification (#3881) Remove init_args * Fix Semi-SL for ViT accuracy drop (#3883) Remove init_args * Update docs for 2.2 (#3884) Update docs * Fix mean and scale for segmentation task (#3885) fix mean and scale * Update MAPI in 2.2 (#3889) * Bump MAPI * Update exportable code requirements * Improve Semi-SL for LiteHRNet (small-medium case) (#3891) * change drop pixels value * go safe, change only tested models * minor * Improve h-cls for eff models (#3893) * Update step size for eff v2 * Update effb0 recipe * Fix maskrcnn swin nncf acc drop (#3900) update maskrcnn swimt model type to transformer * Add keypoint detection recipe for single object cases (#3903) * add rtmpose_tiny for single obj * add rtmpose_tiny for single obj * modify test subset name * fix unit test * update recipe with reset * Improve acc drop of efficientnetv2 for h-label cls (#3907) * Add warmup_iters for effv2 * Update max_epochs * Fix pretrained weight cached dir for timm (#3909) * Fix pretrained_weight for timm * Fix unit-test * Fix keypoint detection single obj recipe (#3915) * add rtmpose_tiny for single obj * modify test subset name * fix unit test * property for pck * Fix cached dir for timm & hugging-face (#3914) * Fix cached dir * Pretrained weight download unit-test * Fix pre-commit * Fix wrong template id mapping for anomaly (#3916) * Update script to allow setting otx version using env. variable (#3913) * Fix Datamodule creation for OV in AutoConfigurator (#3920) Fix datamodule for ov * Update tpp file for 2.2.0 (#3921) * Fix names for ignored scope [HOT-FIX, 2.2.0] (#3924) fix names for ignored scope * Fix classification rt_info (#3922) * Restore output_raw_scores for classificaiton * Add uts * Fix linter * Update label info (#3925) add label info to init Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com> * Fix binary classification metric task (#3928) * Fix binary classification * Add unit-tests * Improve MaskRCNN SwinT NNCF (#3929) * ignore heads and disable smooth quant * add activations_range_estimator_params * update changelog * Fix get_item for Chained Tasks in Classification (#3931) * Fix Task Chain * Add multi-label case as well * Add multi-label case as well2 * Add H-label case * Correct Keyerror for h-label cls in label_groups for dm_label_categories using label's id/key (#3932) Modify label_groups for dm_label_categories with id/key of label * Remove datumaro attribute id from tiling, add subset names (#3933) * remove datumaro attribute id from tiling * add subset names * Fix soft predictions for Semantic Segmentation (#3934) fix soft preds * Update STFPM config (#3935) * Add missing pretrained weights when creating a docker image (#3938) * Fix pre-trained weight downloader * Remove if condition for pretrained wiehgt download * Change default option 'full' to 'base' in otx install (#3937) * Change option full to base for otx install * Fix wrong code * Fix issue * Fix docs * Fix auto adapt batch size in Converter (#3939) * Enable auto adapt batch size into converter * Fix wrong * Fix hpo converter (#3940) * save best hp after hpo * add test * Fix tiling XAI out of range (#3943) - Fix tile merge XAI out of range * enable model export (#3952) Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com> * Move templates from OTX1.X to OTX2.X (#3951) * add otx1.6 templates * added new models * delete entrypoints and nncf cfg * updated some hyperparams * fix for rtmdet_tiny * updated converter * Update classification templates * Update det, r-det, vpm * Update template.yaml * changed warmaup value in train.yaml --------- Co-authored-by: Kang, Harim <harim.kang@intel.com> Co-authored-by: Kim, Sungchul <sungchul.kim@intel.com> * Add missing tile recipes and various tile recipe changes (#3942) * add missing tile recipes * Fix tiling XAI out of range (#3943) - Fix tile merge XAI out of range * update xai tile merge * update rtdetr * update tile recipes * update rtdetr tile postprocess * update rtdetr recipes and tile recipes * update tile recipes * fix rtdetr unittest * update recipes * refactor tile unit test * address pr reviews * remove unnecessary files * update color channel * fix image channel passing * include tiling in cli integration test * remove transform_bbox --------- Co-authored-by: Vladislav Sovrasov <sovrasov.vlad@gmail.com> * Support ImageFromBytes (#3948) * add image_from_bytes Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com> * refactor code Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com> * allow empty anomalous masks Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com> --------- Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com> * Change categories mapping logic (#3946) * change pre-filtering logic * Update src/otx/core/data/pre_filtering.py Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com> --------- Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com> * Update for 2.2.0rc1 (#3956) * Include Geti arrow dataset subset names (#3962) * restrited number of output masks by tiling * add geti subset name * update num of max pred * Include full image with anno in case there's no tile in tile dataset (#3964) * include full image with anno incase there's no tile in dataset * update test * Add type checker in converter for callable functions (optimizer, scheduler) (#3968) Fix converter callable functions (optimizer, scheduler) * Update for 2.2.0rc2 (#3969) update for 2.2.0rc2 * Fix config converter for tiling (#3973) fix config converter for tiling * Update for 2.2.0rc3 (#3975) * Change sematic segmentation to consider bbox only annotations. (#3996) * segmentation consider bbox only annotations * add unit test * add unit test * update fixture * use name attribute * revert tox file * update for 2.2.0rc4 --------- Co-authored-by: Yunchu Lee <yunchu.lee@intel.com> * Relieve memory usage criteria on batch size 2 during adaptive_bs (#4009) * release memory usage cirteria on batch size 2 during adpative_bs * update unit test * update unit test * Remove background label from RT Info for segmentation task (#4011) * remove background from rt_info * provide another solution * fix unit test * Fix num_trials calculation on dataset length less than num_class (#4014) Fix balanced sampler * Fix out_features in HierarchicalCBAMClsHead (#4016) Fix out_features * Fix empty anno (#4010) * Refactor mask_target_single function to handle unsupported ground truth mask types and provide warnings for missing ground truth masks * Refactor bbox_overlaps function to handle unsupported ground truth mask types and provide warnings for missing ground truth masks * Refactor export script to export multiple directories * Refactor test_bbox_overlaps_2d to handle mismatched batch dimensions of bboxes * Refactor bbox_overlaps function error exception * update changelog --------- Co-authored-by: Harim Kang <harim.kang@intel.com> * Update for release 2.2.0rc5 (#4015) * Prevent using too low confidence thresholds in detection (#4018) Prevent writing too low confidence thresholds to MAPI configuration * Update for release 2.2.0rc6 (#4027) * Update pre-merge workflow (#4032) * Update HPO interface (#4035) * update hpo interface * update unit test * update CHANGELOG.md * Enable keypoint detection training through config conversion (#4034) enable keypoint det config converter * Update for release 2.2.0rc7 (#4036) update for release 2.2.0rc7 * Fix multilabel_accuracy of MixedHLabelAccuracy (#4042) * Fix metric for multi-label * Fix1 * Add CHANGELOG * Update for release 2.2.0rc8 (#4043) * Fix wrong indices setting in HLabelInfo (#4044) * Fix wrong indices setting in label_info * Add unit-test & update for releases * Add legacy template LiteHRNet_18 template (#4049) added legacy template * Model templates: rename model_status value 'DISCONTINUED' to 'OBSOLETE' (#4051) rename 'DISCONTINUED' to 'OBSOLETE' in model templates * Enable export of feature vectors for semantic segmentation task (#4055) * Upgrade MAPI in 2.2 (#4052) * Update MRCNN model export to include feature vector and saliency map (#4056) * Fix applying model's hparams when loading model from checkpoint (#4057) * Update anomaly transforms (#4059) * Update transforms Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com> * Update transforms Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com> * Update changelog Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com> * Update __init__.py --------- Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com> Co-authored-by: Emily Chun <emily.chun@intel.com> * Bump onnx to 1.17.0 to omit CVE-2024-5187 (#4063) * Fix incorrect all_groups order configuration in HLabelInfo (#4067) * Fix all_labels * Update CHAGELOG * label_groups change * fix conflicts --------- Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com> Co-authored-by: Yunchu Lee <yunchu.lee@intel.com> Co-authored-by: Harim Kang <harim.kang@intel.com> Co-authored-by: Emily Chun <emily.chun@intel.com> Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com> Co-authored-by: Kim, Sungchul <sungchul.kim@intel.com> Co-authored-by: Vladislav Sovrasov <sovrasov.vlad@gmail.com> Co-authored-by: Sooah Lee <sooah.lee@intel.com> Co-authored-by: Eugene Liu <eugene.liu@intel.com> Co-authored-by: Wonju Lee <wonju.lee@intel.com> Co-authored-by: Ashwin Vaidya <ashwin.vaidya@intel.com> Co-authored-by: Leonardo Lai <leonardo.lai@intel.com>
* Update template * Update CHANGELOG
kprokofi
requested review from
samet-akcay,
harimkang,
eugene123tw,
chuneuny-emily,
sovrasov,
sungchul2,
GalyaZalesskaya,
negvet,
goodsong81,
yunchu,
wonjuleee and
eunwoosh
as code owners
github-actions
bot
added
BUILD
DOC
sovrasov
reviewed
Nov 5, 2024
sovrasov
approved these changes
Nov 5, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #4095 +/- ##
===========================================
+ Coverage 77.11% 80.33% +3.21%
===========================================
Files 308 319 +11
Lines 30571 31622 +1051
===========================================
+ Hits 23576 25402 +1826
+ Misses 6995 6220 -775
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
eunwoosh
approved these changes
Nov 6, 2024
harimkang
approved these changes
Nov 6, 2024
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
How to test
Checklist
License
Feel free to contact the maintainers if that's a concern.