Skip to content

Commit 8a82764

Browse files
kprokofiyunchuharimkangchuneuny-emilyeunwoosh
authored
Merge back 2.2.2 to develop (#4159)
* 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 <[email protected]> * Update test_cli.py * Update test_cli.py --------- Co-authored-by: Eunwoo Shin <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: Kim, Sungchul <[email protected]> * 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 <[email protected]> * Support ImageFromBytes (#3948) * add image_from_bytes Signed-off-by: Ashwin Vaidya <[email protected]> * refactor code Signed-off-by: Ashwin Vaidya <[email protected]> * allow empty anomalous masks Signed-off-by: Ashwin Vaidya <[email protected]> --------- Signed-off-by: Ashwin Vaidya <[email protected]> * Change categories mapping logic (#3946) * change pre-filtering logic * Update src/otx/core/data/pre_filtering.py Co-authored-by: Eunwoo Shin <[email protected]> --------- Co-authored-by: Eunwoo Shin <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * Update transforms Signed-off-by: Ashwin Vaidya <[email protected]> * Update changelog Signed-off-by: Ashwin Vaidya <[email protected]> * Update __init__.py --------- Signed-off-by: Ashwin Vaidya <[email protected]> Co-authored-by: Emily Chun <[email protected]> * 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 wrong model name in converter & template (#4082) * Fix wrong * Update CHAGELOG * RTMDet Inst Seg Explain Mode for 2.2 (#4083) * Explain mode for RTMDet Inst Seg * Update changelog * reformat changelog * Fix rtdetr recipes (#4079) * Fix recipes * Update CHANGELOG * Enable adaptive_bs with Efficientnet-V2-L model template (#4085) Enable adaptive_bs with Efficientnet-V2-L model * Add Keypoint Detection legacy template (#4094) added rtmpose_template * Revert the old workaround for detection confidence threshold (#4096) Revert the old workaround * OTX RC 2.2 version up (#4099) * Update changelog * OTX version up * Fix linter * Add dummy XAI to RTDETR (export mode) & disable strong aug (#4106) * Implement warning for unsupported explain mode in DETR model and update transform probabilities to zero in RTDETR recipes * update changelog * Update photometric distortion probability in RTDETR recipes * Fix task chain for Det -> Cls / Seg (#4105) * fix linter * return recipe back * added roi extraction for multi cllass classification datasett * fix linter * add same logic to semantic seg * added test for OTXDataset * add clip and raise an error when coordinates are invalid. * rewrite value error * Disable tiling classifier toggle in configurable parameters (#4107) * Disable tiling classifier toggle in configurable parameters * Update changelog * Update keypoint detection template (#4114) * added default template * update field * Minor update of the Changelog for the releases/2.2 branch (#4116) * minor update * minor * Version up for 2.2 release (#4120) Version up * Allow empty tile annotation (#4124) * Add warnings for empty annotations in OTXTileDetTestDataset and OTXTileInstSegTestDataset * Fix empty annotation handling in tiling * Fix tensor type compatibility in dynamic soft label assigner and RTMDet head (#4140) * Fix tensor type compatibility in dynamic soft label assigner and RTMDet head * Update CHANGELOG * Update Label Info handling (#4127) * Update h-cls info * Revert h-cls head to linear one * Cosmetic changes * Add arrow-specific labels management logic for cls * Update export logic * Update label info usage * Update unit tests * Fix linter * Fix unit tests * Fix linter * Consider multilabel scenario in h-cls * Update dataset docstring * Add unit tests * Don't preprocess h-cls dataset for arrow * Fimussing labels in multilabel training * Revert hcls head for effnet b0 * Update converter to pick up cls task * Fix early stopping in converter patching + fix lr warmup for all tasks (#4131) * fix converter and early stopping + fix warmup epochs * fix linter * fix linter2 * aligned default patience=10 for all tasks * fix linte * fix unit tests * revert epoch to steps back, change templates * fix cls templates * fix unit test * revert rotated det back. * change schedule for classification * fix linter * update changelog * Decouple DinoV2 for semantic segmentation (#4136) * dinov2 decoupled. Perf tests * added dino * remove dinov2 backbone * fix linter * remove unit test * fix integration tests * revert perf test back * Ensure target class indices are of type long in loss calculations (#4143) * Ensure target class indices are of type long in loss calculations * update changelog * Fix arrow format reader for multiclass ROI case (#4145) Fix arrow format reader for multiclass roi case * Update classification in converter (#4146) * Prepare 2.2.1 release (#4147) prepare 2.2.1 release * Update codeowners - releases/2.2.0 (#4155) * Update codeowners * newline * Support Ellipse Shape for InstSeg algo (#4152) * ellipse shape * Update changelog * update transform * update * Allow empty anno * Update todo * BC improvement (#4154) * Add OTX version to exported models * Forward data format to tiling dataset to fix arrow handling * Workaround missing label_ids * Version up * Update release notes * Update changelog * merge conflicts * resolve onflicts * update all_label_ids * fix the rest files * update tests * fix linter * fix unit test * fix unite tests 2 * Support Ellipse Shape for InstSeg algo (#4152) * ellipse shape * Update changelog * update transform * update * Allow empty anno * Update todo * fix linter * fix hungarian matcher * fix augmentations tests * fix dinov2 tiling --------- Signed-off-by: Ashwin Vaidya <[email protected]> Co-authored-by: Yunchu Lee <[email protected]> Co-authored-by: Harim Kang <[email protected]> Co-authored-by: Emily Chun <[email protected]> Co-authored-by: Eunwoo Shin <[email protected]> Co-authored-by: Kim, Sungchul <[email protected]> Co-authored-by: Vladislav Sovrasov <[email protected]> Co-authored-by: Sooah Lee <[email protected]> Co-authored-by: Eugene Liu <[email protected]> Co-authored-by: Wonju Lee <[email protected]> Co-authored-by: Ashwin Vaidya <[email protected]> Co-authored-by: Leonardo Lai <[email protected]>
1 parent 125ccfb commit 8a82764

File tree

130 files changed

+1052
-719
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+1052
-719
lines changed

CHANGELOG.md

Lines changed: 43 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ All notable changes to this project will be documented in this file.
1212
(<https://github.com/openvinotoolkit/training_extensions/pull/4066>)
1313
- Add GPU memory monitor hook
1414
(<https://github.com/openvinotoolkit/training_extensions/pull/4118>)
15+
- Add YOLOv9 model for Object Detection
16+
(<https://github.com/openvinotoolkit/training_extensions/pull/3917>, <https://github.com/openvinotoolkit/training_extensions/pull/4026>)
17+
- Add OV inference for keypoint detection
18+
(<https://github.com/openvinotoolkit/training_extensions/pull/3970>)
19+
- Add tiling for semantic segmentation
20+
(<https://github.com/openvinotoolkit/training_extensions/pull/3954>)
21+
- Add 3D Object Detection task with MonoDETR model
22+
(<https://github.com/openvinotoolkit/training_extensions/pull/3979>)
23+
- Add OpenVINO inference for 3D Object Detection task
24+
(<https://github.com/openvinotoolkit/training_extensions/pull/4017>)
1525

1626
### Enhancements
1727

@@ -29,29 +39,6 @@ All notable changes to this project will be documented in this file.
2939
(<https://github.com/openvinotoolkit/training_extensions/pull/4123>)
3040
- Improve FMetric computation
3141
(<https://github.com/openvinotoolkit/training_extensions/pull/4130>)
32-
33-
### Bug fixes
34-
35-
- Fix MaskDINO, MonoDETR recipes
36-
(<https://github.com/openvinotoolkit/training_extensions/pull/4080>)
37-
38-
## \[2.3.0\]
39-
40-
### New features
41-
42-
- Add YOLOv9 model for Object Detection
43-
(<https://github.com/openvinotoolkit/training_extensions/pull/3917>, <https://github.com/openvinotoolkit/training_extensions/pull/4026>)
44-
- Add OV inference for keypoint detection
45-
(<https://github.com/openvinotoolkit/training_extensions/pull/3970>)
46-
- Add tiling for semantic segmentation
47-
(<https://github.com/openvinotoolkit/training_extensions/pull/3954>)
48-
- Add 3D Object Detection task with MonoDETR model
49-
(<https://github.com/openvinotoolkit/training_extensions/pull/3979>)
50-
- Add OpenVINO inference for 3D Object Detection task
51-
(<https://github.com/openvinotoolkit/training_extensions/pull/4017>)
52-
53-
### Enhancements
54-
5542
- Upgrade OV, MAPI, and NNCF dependencies
5643
(<https://github.com/openvinotoolkit/training_extensions/pull/3967>)
5744
- Instance Segmentation Model refactoring
@@ -63,13 +50,44 @@ All notable changes to this project will be documented in this file.
6350

6451
### Bug fixes
6552

53+
- Fix MaskDINO, MonoDETR recipes
54+
(<https://github.com/openvinotoolkit/training_extensions/pull/4080>)
6655
- Fix a wrong HPO log
6756
(<https://github.com/openvinotoolkit/training_extensions/pull/3972>)
6857
- Update model name in rotated detection recipes
6958
(<https://github.com/openvinotoolkit/training_extensions/pull/4028>)
7059
- Fix SupCon flag
7160
(https://github.com/openvinotoolkit/training_extensions/pull/4076)
7261

62+
## \[2.2.2\]
63+
64+
### Bug fixes
65+
66+
- BC improvement
67+
(<https://github.com/openvinotoolkit/training_extensions/pull/4154>)
68+
69+
## \[2.2.1\]
70+
71+
### Bug fixes
72+
73+
- Fix empty annotation in tiling
74+
(<https://github.com/openvinotoolkit/training_extensions/pull/4124>)
75+
- Fix patching early stopping in tools/converter.py, update headers in templates, change training schedule for classification
76+
(<https://github.com/openvinotoolkit/training_extensions/pull/4131>)
77+
- Fix tensor type compatibility in dynamic soft label assigner and RTMDet head
78+
(<https://github.com/openvinotoolkit/training_extensions/pull/4140>)
79+
- Fix DETR target class indices are of type long in loss calculations
80+
(<https://github.com/openvinotoolkit/training_extensions/pull/4143>)
81+
- Fix arrow format reader for multiclass ROI case
82+
(<https://github.com/openvinotoolkit/training_extensions/pull/4145>)
83+
84+
### Enhancements
85+
86+
- Decouple DinoV2 for semantic segmentation task
87+
(<https://github.com/openvinotoolkit/training_extensions/pull/4136>)
88+
- Update Label Info handling
89+
(<https://github.com/openvinotoolkit/training_extensions/pull/4127>)
90+
7391
## \[2.2.0\]
7492

7593
### New features
@@ -194,6 +212,8 @@ All notable changes to this project will be documented in this file.
194212
(<https://github.com/openvinotoolkit/training_extensions/pull/4105>)
195213
- Disable tiling classifier toggle in configurable parameters
196214
(<https://github.com/openvinotoolkit/training_extensions/pull/4107>)
215+
- Fix Ellipse shapes for Instance Segmentation
216+
(<https://github.com/openvinotoolkit/training_extensions/pull/4152>)
197217

198218
## \[v2.1.0\]
199219

docs/source/guide/release_notes/index.rst

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,35 @@ Releases
44
.. toctree::
55
:maxdepth: 1
66

7+
v2.2.2 (2024.12)
8+
----------------
9+
10+
Enhancements
11+
^^^^^^^^^^^^
12+
13+
Bug fixes
14+
^^^^^^^^^
15+
16+
- BC improvement
17+
18+
v2.2.1 (2024.12)
19+
----------------
20+
21+
Enhancements
22+
^^^^^^^^^^^^
23+
24+
- Decouple DinoV2 for semantic segmentation task
25+
- Update Label Info handling
26+
27+
Bug fixes
28+
^^^^^^^^^
29+
30+
- Fix empty annotation in tiling
31+
- Fix patching early stopping in tools/converter.py, update headers in templates, change training schedule for classification
32+
- Fix tensor type compatibility in dynamic soft label assigner and RTMDet head
33+
- Fix DETR target class indices are of type long in loss calculations
34+
- Fix arrow format reader for multiclass ROI case
35+
736
v2.2.0 (2024.10)
837
----------------
938

@@ -22,6 +51,8 @@ New features
2251
- Add Semi-SL MeanTeacher algorithm for Semantic Segmentation
2352
- Update head and h-label format for hierarchical label classification
2453
- Support configurable input size
54+
- Revert the old workaround for detection confidence threshold
55+
- Add Keypoint Detection legacy template
2556

2657
Enhancements
2758
^^^^^^^^^^^^
@@ -40,21 +71,38 @@ Enhancements
4071
- Change sematic segmentation to consider bbox only annotations
4172
- Relieve memory usage criteria on batch size 2 during adaptive batch size
4273
- Remove background label from RT Info for segmentation task
74+
- Enable export of the feature vectors for semantic segmentation task
4375
- Prevent using too low confidence thresholds in detection
76+
- Update HPO interface
77+
- Bump onnx to 1.17.0 to omit CVE-2024-5187
4478

4579
Bug fixes
4680
^^^^^^^^^
4781

82+
- Update anomaly base transforms to use square resizing
4883
- Fix Combined Dataloader & unlabeled warmup loss in Semi-SL
4984
- Revert #3579 to fix issues with replacing coco_instance with a different format in some dataset
5085
- Add num_devices in Engine for multi-gpu training
5186
- Add missing tile recipes and various tile recipe changes
5287
- Change categories mapping logic
5388
- Fix config converter for tiling
89+
- Fix `BboxOverlaps2D` handling of empty ground-truth annotations in datasets.
5490
- Fix num_trials calculation on dataset length less than num_class
5591
- Fix out_features in HierarchicalCBAMClsHead
5692
- Fix multilabel_accuracy of MixedHLabelAccuracy
5793
- Fix wrong indices setting in HLabelInfo
94+
- Add legacy template LiteHRNet_18 template
95+
- Model templates: rename model_status value 'DISCONTINUED' to 'OBSOLETE'
96+
- Update MRCNN model export to include feature vector and saliency map
97+
- Upgrade MAPI in 2.2
98+
- Fix applying model's hparams when loading model from checkpoint
99+
- Fix incorrect all_groups order configuration in HLabelInfo
100+
- Fix RTDETR recipes
101+
- Fix wrong model name in converter & template
102+
- Fix RTMDet Inst Explain Mode
103+
- Fix RTDETR Explain Mode
104+
- Fix classification and semantic segmentation tasks, when ROI provided for images
105+
- Disable tiling classifier toggle in configurable parameters
58106

59107
v2.1.0 (2024.07)
60108
----------------

src/otx/algo/callbacks/adaptive_early_stopping.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def __init__(
2020
self,
2121
monitor: str,
2222
min_delta: float = 0.0,
23-
patience: int = 3,
23+
patience: int = 10,
2424
verbose: bool = False,
2525
mode: str = "min",
2626
strict: bool = True,

0 commit comments

Comments
 (0)