diff --git a/otx/algorithms/classification/adapters/mmcls/configurer.py b/otx/algorithms/classification/adapters/mmcls/configurer.py index 599a309c690..df1984ac53e 100644 --- a/otx/algorithms/classification/adapters/mmcls/configurer.py +++ b/otx/algorithms/classification/adapters/mmcls/configurer.py @@ -426,7 +426,7 @@ def configure_samples_per_gpu( # drop the last batch if the last batch size is 1 # batch size of 1 is a runtime error for training batch normalization layer if subset in ("train", "unlabeled") and dataset_len % samples_per_gpu == 1: - dataloader_cfg.drop_last = True + dataloader_cfg["drop_last"] = True cfg.data[f"{subset}_dataloader"] = dataloader_cfg diff --git a/otx/algorithms/classification/adapters/mmcls/models/classifiers/semisl_classifier.py b/otx/algorithms/classification/adapters/mmcls/models/classifiers/semisl_classifier.py index 7da4b94ee21..bd83c6fb449 100644 --- a/otx/algorithms/classification/adapters/mmcls/models/classifiers/semisl_classifier.py +++ b/otx/algorithms/classification/adapters/mmcls/models/classifiers/semisl_classifier.py @@ -32,7 +32,7 @@ def forward_train(self, imgs, **kwargs): raise ValueError("'gt_label' does not exist in the labeled image") if "extra_0" not in kwargs: raise ValueError("'extra_0' does not exist in the dataset") - target = kwargs["gt_label"].squeeze() + target = kwargs["gt_label"].squeeze(dim=1) unlabeled_data = kwargs["extra_0"] x = {} x["labeled"] = self.extract_feat(imgs) diff --git a/otx/algorithms/classification/adapters/mmcls/utils/config_utils.py b/otx/algorithms/classification/adapters/mmcls/utils/config_utils.py index 99c946be6a9..7c311299f0d 100644 --- a/otx/algorithms/classification/adapters/mmcls/utils/config_utils.py +++ b/otx/algorithms/classification/adapters/mmcls/utils/config_utils.py @@ -55,7 +55,7 @@ def update_pipeline(cfg): # For stable hierarchical information indexing if subset == "train" and kwargs["type"] == "OTXHierarchicalClsDataset": - config.data[f"{subset}_dataloader"].drop_last = True + config.data[f"{subset}_dataloader"]["drop_last"] = True cfgs = get_dataset_configs(config, subset) for cfg in cfgs: diff --git a/otx/algorithms/detection/adapters/mmdet/configurer.py b/otx/algorithms/detection/adapters/mmdet/configurer.py index 5d3483c405c..54831bfac5c 100644 --- a/otx/algorithms/detection/adapters/mmdet/configurer.py +++ b/otx/algorithms/detection/adapters/mmdet/configurer.py @@ -588,7 +588,7 @@ def configure_samples_per_gpu( # drop the last batch if the last batch size is 1 # batch size of 1 is a runtime error for training batch normalization layer if subset in ("train", "unlabeled") and dataset_len % samples_per_gpu == 1: - dataloader_cfg.drop_last = True + dataloader_cfg["drop_last"] = True cfg.data[f"{subset}_dataloader"] = dataloader_cfg diff --git a/otx/algorithms/detection/adapters/mmdet/datasets/tiling.py b/otx/algorithms/detection/adapters/mmdet/datasets/tiling.py index 8921bf7daf8..0aa77e01102 100644 --- a/otx/algorithms/detection/adapters/mmdet/datasets/tiling.py +++ b/otx/algorithms/detection/adapters/mmdet/datasets/tiling.py @@ -74,7 +74,7 @@ def __init__( iou_threshold: float = 0.45, max_per_img: int = 1500, filter_empty_gt: bool = True, - nproc: int = 4, + nproc: int = 2, ): self.min_area_ratio = min_area_ratio self.filter_empty_gt = filter_empty_gt diff --git a/otx/algorithms/segmentation/adapters/mmseg/configurer.py b/otx/algorithms/segmentation/adapters/mmseg/configurer.py index 67348dcd22e..2a6388bad18 100644 --- a/otx/algorithms/segmentation/adapters/mmseg/configurer.py +++ b/otx/algorithms/segmentation/adapters/mmseg/configurer.py @@ -420,7 +420,7 @@ def configure_samples_per_gpu(self, cfg: Config, subset: str) -> None: # drop the last batch if the last batch size is 1 # batch size of 1 is a runtime error for training batch normalization layer if subset in ("train", "unlabeled") and dataset_len % samples_per_gpu == 1: - dataloader_cfg.drop_last = True + dataloader_cfg["drop_last"] = True cfg.data[f"{subset}_dataloader"] = dataloader_cfg diff --git a/otx/cli/utils/multi_gpu.py b/otx/cli/utils/multi_gpu.py index 46fa6783a49..0b06c007872 100644 --- a/otx/cli/utils/multi_gpu.py +++ b/otx/cli/utils/multi_gpu.py @@ -191,7 +191,7 @@ def setup_multi_gpu_train( def finalize(self): """Join all child processes.""" for p in self._processes: - if p.join(10) is None and p.exitcode is None: + if p.join(30) is None and p.exitcode is None: p.kill() @staticmethod diff --git a/tests/assets/classification_dataset/0/11.jpg b/tests/assets/classification_dataset/0/11.jpg new file mode 100644 index 00000000000..d381e4ece59 Binary files /dev/null and b/tests/assets/classification_dataset/0/11.jpg differ diff --git a/tests/assets/classification_dataset/0/14.jpg b/tests/assets/classification_dataset/0/14.jpg new file mode 100644 index 00000000000..b272c3dabf8 Binary files /dev/null and b/tests/assets/classification_dataset/0/14.jpg differ diff --git a/tests/assets/classification_dataset/0/16.jpg b/tests/assets/classification_dataset/0/16.jpg new file mode 100644 index 00000000000..3696014a7b5 Binary files /dev/null and b/tests/assets/classification_dataset/0/16.jpg differ diff --git a/tests/assets/classification_dataset/0/17.jpg b/tests/assets/classification_dataset/0/17.jpg new file mode 100644 index 00000000000..a83fd7d0e07 Binary files /dev/null and b/tests/assets/classification_dataset/0/17.jpg differ diff --git a/tests/assets/classification_dataset/0/18.jpg b/tests/assets/classification_dataset/0/18.jpg new file mode 100644 index 00000000000..76a1d16bd56 Binary files /dev/null and b/tests/assets/classification_dataset/0/18.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/2/images/00022.jpg b/tests/assets/classification_dataset/0/23.jpg similarity index 77% rename from tests/assets/cvat_dataset/action_classification/train/2/images/00022.jpg rename to tests/assets/classification_dataset/0/23.jpg index 222682d80bf..2244d1f8927 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/2/images/00022.jpg and b/tests/assets/classification_dataset/0/23.jpg differ diff --git a/tests/assets/classification_dataset/0/26.jpg b/tests/assets/classification_dataset/0/26.jpg new file mode 100644 index 00000000000..1ac24d776b4 Binary files /dev/null and b/tests/assets/classification_dataset/0/26.jpg differ diff --git a/tests/assets/classification_dataset/0/3.jpg b/tests/assets/classification_dataset/0/3.jpg new file mode 100644 index 00000000000..04f4a13b4d0 Binary files /dev/null and b/tests/assets/classification_dataset/0/3.jpg differ diff --git a/tests/assets/classification_dataset/0/30.jpg b/tests/assets/classification_dataset/0/30.jpg new file mode 100644 index 00000000000..81b0373220b Binary files /dev/null and b/tests/assets/classification_dataset/0/30.jpg differ diff --git a/tests/assets/classification_dataset/0/4.jpg b/tests/assets/classification_dataset/0/4.jpg new file mode 100644 index 00000000000..fab3ec5a61b Binary files /dev/null and b/tests/assets/classification_dataset/0/4.jpg differ diff --git a/tests/assets/classification_dataset/0/5.jpg b/tests/assets/classification_dataset/0/5.jpg new file mode 100644 index 00000000000..0689bda8e29 Binary files /dev/null and b/tests/assets/classification_dataset/0/5.jpg differ diff --git a/tests/assets/classification_dataset/0/6.jpg b/tests/assets/classification_dataset/0/6.jpg new file mode 100644 index 00000000000..ddd5b56408a Binary files /dev/null and b/tests/assets/classification_dataset/0/6.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/2/images/00023.jpg b/tests/assets/classification_dataset/0/7.jpg similarity index 79% rename from tests/assets/cvat_dataset/action_classification/train/2/images/00023.jpg rename to tests/assets/classification_dataset/0/7.jpg index 222682d80bf..f656609aac9 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/2/images/00023.jpg and b/tests/assets/classification_dataset/0/7.jpg differ diff --git a/tests/assets/classification_dataset/0/8.jpg b/tests/assets/classification_dataset/0/8.jpg new file mode 100644 index 00000000000..257140c8bab Binary files /dev/null and b/tests/assets/classification_dataset/0/8.jpg differ diff --git a/tests/assets/classification_dataset/1/0.jpg b/tests/assets/classification_dataset/1/0.jpg new file mode 100644 index 00000000000..f0fd22622f0 Binary files /dev/null and b/tests/assets/classification_dataset/1/0.jpg differ diff --git a/tests/assets/classification_dataset/1/1.jpg b/tests/assets/classification_dataset/1/1.jpg new file mode 100644 index 00000000000..7df9200ef65 Binary files /dev/null and b/tests/assets/classification_dataset/1/1.jpg differ diff --git a/tests/assets/classification_dataset/1/10.jpg b/tests/assets/classification_dataset/1/10.jpg new file mode 100644 index 00000000000..8c06ad5cdec Binary files /dev/null and b/tests/assets/classification_dataset/1/10.jpg differ diff --git a/tests/assets/classification_dataset/1/12.jpg b/tests/assets/classification_dataset/1/12.jpg new file mode 100644 index 00000000000..d7e48a0037c Binary files /dev/null and b/tests/assets/classification_dataset/1/12.jpg differ diff --git a/tests/assets/classification_dataset/1/15.jpg b/tests/assets/classification_dataset/1/15.jpg new file mode 100644 index 00000000000..02099ee9294 Binary files /dev/null and b/tests/assets/classification_dataset/1/15.jpg differ diff --git a/tests/assets/classification_dataset/1/19.jpg b/tests/assets/classification_dataset/1/19.jpg new file mode 100644 index 00000000000..c736d1da246 Binary files /dev/null and b/tests/assets/classification_dataset/1/19.jpg differ diff --git a/tests/assets/classification_dataset/1/2.jpg b/tests/assets/classification_dataset/1/2.jpg new file mode 100644 index 00000000000..6fe0e3c69d0 Binary files /dev/null and b/tests/assets/classification_dataset/1/2.jpg differ diff --git a/tests/assets/classification_dataset/1/21.jpg b/tests/assets/classification_dataset/1/21.jpg new file mode 100644 index 00000000000..a6782ba32f8 Binary files /dev/null and b/tests/assets/classification_dataset/1/21.jpg differ diff --git a/tests/assets/classification_dataset/1/27.jpg b/tests/assets/classification_dataset/1/27.jpg new file mode 100644 index 00000000000..9b997c560ea Binary files /dev/null and b/tests/assets/classification_dataset/1/27.jpg differ diff --git a/tests/assets/classification_dataset/1/28.jpg b/tests/assets/classification_dataset/1/28.jpg new file mode 100644 index 00000000000..951c69ae0b2 Binary files /dev/null and b/tests/assets/classification_dataset/1/28.jpg differ diff --git a/tests/assets/classification_dataset/1/29.jpg b/tests/assets/classification_dataset/1/29.jpg new file mode 100644 index 00000000000..3fc3b963e5e Binary files /dev/null and b/tests/assets/classification_dataset/1/29.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/11.jpg b/tests/assets/classification_dataset_class_incremental/0/11.jpg new file mode 100644 index 00000000000..d381e4ece59 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/11.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/14.jpg b/tests/assets/classification_dataset_class_incremental/0/14.jpg new file mode 100644 index 00000000000..b272c3dabf8 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/14.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/16.jpg b/tests/assets/classification_dataset_class_incremental/0/16.jpg new file mode 100644 index 00000000000..3696014a7b5 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/16.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/17.jpg b/tests/assets/classification_dataset_class_incremental/0/17.jpg new file mode 100644 index 00000000000..a83fd7d0e07 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/17.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/18.jpg b/tests/assets/classification_dataset_class_incremental/0/18.jpg new file mode 100644 index 00000000000..76a1d16bd56 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/18.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/23.jpg b/tests/assets/classification_dataset_class_incremental/0/23.jpg new file mode 100644 index 00000000000..2244d1f8927 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/23.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/26.jpg b/tests/assets/classification_dataset_class_incremental/0/26.jpg new file mode 100644 index 00000000000..1ac24d776b4 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/26.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/3.jpg b/tests/assets/classification_dataset_class_incremental/0/3.jpg new file mode 100644 index 00000000000..04f4a13b4d0 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/3.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/30.jpg b/tests/assets/classification_dataset_class_incremental/0/30.jpg new file mode 100644 index 00000000000..81b0373220b Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/30.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/4.jpg b/tests/assets/classification_dataset_class_incremental/0/4.jpg new file mode 100644 index 00000000000..fab3ec5a61b Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/4.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/5.jpg b/tests/assets/classification_dataset_class_incremental/0/5.jpg new file mode 100644 index 00000000000..0689bda8e29 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/5.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/6.jpg b/tests/assets/classification_dataset_class_incremental/0/6.jpg new file mode 100644 index 00000000000..ddd5b56408a Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/6.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/2/images/00020.jpg b/tests/assets/classification_dataset_class_incremental/0/7.jpg similarity index 79% rename from tests/assets/cvat_dataset/action_classification/train/2/images/00020.jpg rename to tests/assets/classification_dataset_class_incremental/0/7.jpg index 222682d80bf..f656609aac9 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/2/images/00020.jpg and b/tests/assets/classification_dataset_class_incremental/0/7.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/0/8.jpg b/tests/assets/classification_dataset_class_incremental/0/8.jpg new file mode 100644 index 00000000000..257140c8bab Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/0/8.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/1/0.jpg b/tests/assets/classification_dataset_class_incremental/1/0.jpg new file mode 100644 index 00000000000..f0fd22622f0 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/1/0.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/1/1.jpg b/tests/assets/classification_dataset_class_incremental/1/1.jpg new file mode 100644 index 00000000000..7df9200ef65 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/1/1.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/1/10.jpg b/tests/assets/classification_dataset_class_incremental/1/10.jpg new file mode 100644 index 00000000000..8c06ad5cdec Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/1/10.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/1/12.jpg b/tests/assets/classification_dataset_class_incremental/1/12.jpg new file mode 100644 index 00000000000..d7e48a0037c Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/1/12.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/1/15.jpg b/tests/assets/classification_dataset_class_incremental/1/15.jpg new file mode 100644 index 00000000000..02099ee9294 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/1/15.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/1/19.jpg b/tests/assets/classification_dataset_class_incremental/1/19.jpg new file mode 100644 index 00000000000..c736d1da246 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/1/19.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/1/2.jpg b/tests/assets/classification_dataset_class_incremental/1/2.jpg new file mode 100644 index 00000000000..6fe0e3c69d0 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/1/2.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/1/21.jpg b/tests/assets/classification_dataset_class_incremental/1/21.jpg new file mode 100644 index 00000000000..a6782ba32f8 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/1/21.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/1/27.jpg b/tests/assets/classification_dataset_class_incremental/1/27.jpg new file mode 100644 index 00000000000..9b997c560ea Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/1/27.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/1/28.jpg b/tests/assets/classification_dataset_class_incremental/1/28.jpg new file mode 100644 index 00000000000..951c69ae0b2 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/1/28.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/1/29.jpg b/tests/assets/classification_dataset_class_incremental/1/29.jpg new file mode 100644 index 00000000000..3fc3b963e5e Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/1/29.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/2/images/00021.jpg b/tests/assets/classification_dataset_class_incremental/2/13.jpg similarity index 78% rename from tests/assets/cvat_dataset/action_classification/train/2/images/00021.jpg rename to tests/assets/classification_dataset_class_incremental/2/13.jpg index 222682d80bf..7d7976b0073 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/2/images/00021.jpg and b/tests/assets/classification_dataset_class_incremental/2/13.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/2/20.jpg b/tests/assets/classification_dataset_class_incremental/2/20.jpg new file mode 100644 index 00000000000..aaa39013cd7 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/2/20.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/2/22.jpg b/tests/assets/classification_dataset_class_incremental/2/22.jpg new file mode 100644 index 00000000000..9390fc912b1 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/2/22.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/2/24.jpg b/tests/assets/classification_dataset_class_incremental/2/24.jpg new file mode 100644 index 00000000000..d6e3a633de2 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/2/24.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/2/25.jpg b/tests/assets/classification_dataset_class_incremental/2/25.jpg new file mode 100644 index 00000000000..a24c0aee01f Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/2/25.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/2/31.jpg b/tests/assets/classification_dataset_class_incremental/2/31.jpg new file mode 100644 index 00000000000..bb64d810600 Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/2/31.jpg differ diff --git a/tests/assets/classification_dataset_class_incremental/2/9.jpg b/tests/assets/classification_dataset_class_incremental/2/9.jpg new file mode 100644 index 00000000000..ac59b824f0d Binary files /dev/null and b/tests/assets/classification_dataset_class_incremental/2/9.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/0/annotations.xml b/tests/assets/cvat_dataset/action_classification/train/0/annotations.xml index 0cbe04dd942..173aacd67f3 100644 --- a/tests/assets/cvat_dataset/action_classification/train/0/annotations.xml +++ b/tests/assets/cvat_dataset/action_classification/train/0/annotations.xml @@ -23,39 +23,39 @@ - 256 - 192 + 24 + 24 - + - + - + - + - + - + - + - + - + - + diff --git a/tests/assets/cvat_dataset/action_classification/train/0/images/00020.jpg b/tests/assets/cvat_dataset/action_classification/train/0/images/00020.jpg index 222682d80bf..ca2f7df2c8c 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/0/images/00020.jpg and b/tests/assets/cvat_dataset/action_classification/train/0/images/00020.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/0/images/00021.jpg b/tests/assets/cvat_dataset/action_classification/train/0/images/00021.jpg index 222682d80bf..a983e07e46d 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/0/images/00021.jpg and b/tests/assets/cvat_dataset/action_classification/train/0/images/00021.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/0/images/00022.jpg b/tests/assets/cvat_dataset/action_classification/train/0/images/00022.jpg index 222682d80bf..8685452a165 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/0/images/00022.jpg and b/tests/assets/cvat_dataset/action_classification/train/0/images/00022.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/0/images/00023.jpg b/tests/assets/cvat_dataset/action_classification/train/0/images/00023.jpg index 222682d80bf..fa5fa2b6280 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/0/images/00023.jpg and b/tests/assets/cvat_dataset/action_classification/train/0/images/00023.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/0/images/00024.jpg b/tests/assets/cvat_dataset/action_classification/train/0/images/00024.jpg index 222682d80bf..e6da595f502 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/0/images/00024.jpg and b/tests/assets/cvat_dataset/action_classification/train/0/images/00024.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/0/images/00025.jpg b/tests/assets/cvat_dataset/action_classification/train/0/images/00025.jpg index 222682d80bf..3f709fd2a53 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/0/images/00025.jpg and b/tests/assets/cvat_dataset/action_classification/train/0/images/00025.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/0/images/00026.jpg b/tests/assets/cvat_dataset/action_classification/train/0/images/00026.jpg index 222682d80bf..2a8b09d4f39 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/0/images/00026.jpg and b/tests/assets/cvat_dataset/action_classification/train/0/images/00026.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/0/images/00027.jpg b/tests/assets/cvat_dataset/action_classification/train/0/images/00027.jpg index 222682d80bf..48da9d8fed3 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/0/images/00027.jpg and b/tests/assets/cvat_dataset/action_classification/train/0/images/00027.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/0/images/00028.jpg b/tests/assets/cvat_dataset/action_classification/train/0/images/00028.jpg index 222682d80bf..0f509735bc8 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/0/images/00028.jpg and b/tests/assets/cvat_dataset/action_classification/train/0/images/00028.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/0/images/00029.jpg b/tests/assets/cvat_dataset/action_classification/train/0/images/00029.jpg index 222682d80bf..3f75798fdf3 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/0/images/00029.jpg and b/tests/assets/cvat_dataset/action_classification/train/0/images/00029.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/1/annotations.xml b/tests/assets/cvat_dataset/action_classification/train/1/annotations.xml index 4a65f1cf7f5..71288527b47 100644 --- a/tests/assets/cvat_dataset/action_classification/train/1/annotations.xml +++ b/tests/assets/cvat_dataset/action_classification/train/1/annotations.xml @@ -3,8 +3,8 @@ 1.1 - 2 - v2 + 1 + v1 10 interpolation 2 @@ -23,39 +23,39 @@ - 256 - 192 + 24 + 24 - + - + - + - + - + - + - + - + - + - + diff --git a/tests/assets/cvat_dataset/action_classification/train/1/images/00020.jpg b/tests/assets/cvat_dataset/action_classification/train/1/images/00020.jpg index 222682d80bf..3f75798fdf3 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/1/images/00020.jpg and b/tests/assets/cvat_dataset/action_classification/train/1/images/00020.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/1/images/00021.jpg b/tests/assets/cvat_dataset/action_classification/train/1/images/00021.jpg index 222682d80bf..0f509735bc8 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/1/images/00021.jpg and b/tests/assets/cvat_dataset/action_classification/train/1/images/00021.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/1/images/00022.jpg b/tests/assets/cvat_dataset/action_classification/train/1/images/00022.jpg index 222682d80bf..48da9d8fed3 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/1/images/00022.jpg and b/tests/assets/cvat_dataset/action_classification/train/1/images/00022.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/1/images/00023.jpg b/tests/assets/cvat_dataset/action_classification/train/1/images/00023.jpg index 222682d80bf..2a8b09d4f39 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/1/images/00023.jpg and b/tests/assets/cvat_dataset/action_classification/train/1/images/00023.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/1/images/00024.jpg b/tests/assets/cvat_dataset/action_classification/train/1/images/00024.jpg index 222682d80bf..3f709fd2a53 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/1/images/00024.jpg and b/tests/assets/cvat_dataset/action_classification/train/1/images/00024.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/1/images/00025.jpg b/tests/assets/cvat_dataset/action_classification/train/1/images/00025.jpg index 222682d80bf..e6da595f502 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/1/images/00025.jpg and b/tests/assets/cvat_dataset/action_classification/train/1/images/00025.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/1/images/00026.jpg b/tests/assets/cvat_dataset/action_classification/train/1/images/00026.jpg index 222682d80bf..fa5fa2b6280 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/1/images/00026.jpg and b/tests/assets/cvat_dataset/action_classification/train/1/images/00026.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/1/images/00027.jpg b/tests/assets/cvat_dataset/action_classification/train/1/images/00027.jpg index 222682d80bf..8685452a165 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/1/images/00027.jpg and b/tests/assets/cvat_dataset/action_classification/train/1/images/00027.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/1/images/00028.jpg b/tests/assets/cvat_dataset/action_classification/train/1/images/00028.jpg index 222682d80bf..a983e07e46d 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/1/images/00028.jpg and b/tests/assets/cvat_dataset/action_classification/train/1/images/00028.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/1/images/00029.jpg b/tests/assets/cvat_dataset/action_classification/train/1/images/00029.jpg index 222682d80bf..ca2f7df2c8c 100644 Binary files a/tests/assets/cvat_dataset/action_classification/train/1/images/00029.jpg and b/tests/assets/cvat_dataset/action_classification/train/1/images/00029.jpg differ diff --git a/tests/assets/cvat_dataset/action_classification/train/2/annotations.xml b/tests/assets/cvat_dataset/action_classification/train/2/annotations.xml deleted file mode 100644 index 79ea160acf6..00000000000 --- a/tests/assets/cvat_dataset/action_classification/train/2/annotations.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 1.1 - - - 3 - v3 - 10 - interpolation - 2 - - - - 0 - 9 - 1 - True - - - - - - 256 - 192 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/assets/cvat_dataset/action_classification/train/2/images/00024.jpg b/tests/assets/cvat_dataset/action_classification/train/2/images/00024.jpg deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_classification/train/2/images/00024.jpg and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_classification/train/2/images/00025.jpg b/tests/assets/cvat_dataset/action_classification/train/2/images/00025.jpg deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_classification/train/2/images/00025.jpg and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_classification/train/2/images/00026.jpg b/tests/assets/cvat_dataset/action_classification/train/2/images/00026.jpg deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_classification/train/2/images/00026.jpg and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_classification/train/2/images/00027.jpg b/tests/assets/cvat_dataset/action_classification/train/2/images/00027.jpg deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_classification/train/2/images/00027.jpg and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_classification/train/2/images/00028.jpg b/tests/assets/cvat_dataset/action_classification/train/2/images/00028.jpg deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_classification/train/2/images/00028.jpg and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_classification/train/2/images/00029.jpg b/tests/assets/cvat_dataset/action_classification/train/2/images/00029.jpg deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_classification/train/2/images/00029.jpg and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train.pkl b/tests/assets/cvat_dataset/action_detection/train.pkl old mode 100755 new mode 100644 index 350727ae87a..86610a1a450 Binary files a/tests/assets/cvat_dataset/action_detection/train.pkl and b/tests/assets/cvat_dataset/action_detection/train.pkl differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/annotations.xml b/tests/assets/cvat_dataset/action_detection/train/0/annotations.xml index 17ea8516313..a8a9eedc026 100644 --- a/tests/assets/cvat_dataset/action_detection/train/0/annotations.xml +++ b/tests/assets/cvat_dataset/action_detection/train/0/annotations.xml @@ -21,45 +21,45 @@ - 256 - 192 + 24 + 24 - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000000.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000000.png new file mode 100644 index 00000000000..8eea7beb6e0 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000000.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000001.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000001.png new file mode 100644 index 00000000000..a548094f29f Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000001.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000002.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000002.png new file mode 100644 index 00000000000..ca2f05eec3c Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000002.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000003.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000003.png new file mode 100644 index 00000000000..a7c8136d128 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000003.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000004.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000004.png new file mode 100644 index 00000000000..7dacfb37dbf Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000004.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000005.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000005.png new file mode 100644 index 00000000000..870d0048597 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000005.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000006.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000006.png new file mode 100644 index 00000000000..0042daeda64 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000006.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000007.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000007.png new file mode 100644 index 00000000000..f6701191328 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000007.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000008.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000008.png new file mode 100644 index 00000000000..110d70e8ce6 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000008.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000009.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000009.png new file mode 100644 index 00000000000..678bb535cd5 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000009.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000020.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000020.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000020.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000021.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000021.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000021.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000022.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000022.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000022.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000023.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000023.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000023.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000024.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000024.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000024.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000025.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000025.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000025.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000026.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000026.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000026.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000027.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000027.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000027.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000028.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000028.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000028.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000029.png b/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000029.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/0/images/frame_000029.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/annotations.xml b/tests/assets/cvat_dataset/action_detection/train/1/annotations.xml index 96e67da84e1..9366aec70a6 100644 --- a/tests/assets/cvat_dataset/action_detection/train/1/annotations.xml +++ b/tests/assets/cvat_dataset/action_detection/train/1/annotations.xml @@ -21,45 +21,45 @@ - 256 - 192 + 24 + 24 - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000000.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000000.png new file mode 100644 index 00000000000..5fdaee44383 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000000.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000001.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000001.png new file mode 100644 index 00000000000..678bb535cd5 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000001.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000002.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000002.png new file mode 100644 index 00000000000..110d70e8ce6 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000002.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000003.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000003.png new file mode 100644 index 00000000000..f6701191328 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000003.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000004.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000004.png new file mode 100644 index 00000000000..0042daeda64 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000004.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000005.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000005.png new file mode 100644 index 00000000000..870d0048597 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000005.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000006.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000006.png new file mode 100644 index 00000000000..7dacfb37dbf Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000006.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000007.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000007.png new file mode 100644 index 00000000000..a7c8136d128 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000007.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000008.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000008.png new file mode 100644 index 00000000000..ca2f05eec3c Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000008.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000009.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000009.png new file mode 100644 index 00000000000..a548094f29f Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000009.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000020.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000020.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000020.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000021.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000021.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000021.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000022.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000022.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000022.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000023.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000023.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000023.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000024.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000024.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000024.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000025.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000025.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000025.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000026.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000026.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000026.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000027.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000027.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000027.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000028.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000028.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000028.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000029.png b/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000029.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/1/images/frame_000029.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/annotations.xml b/tests/assets/cvat_dataset/action_detection/train/2/annotations.xml index 93e66eaf38f..a40a71ca339 100644 --- a/tests/assets/cvat_dataset/action_detection/train/2/annotations.xml +++ b/tests/assets/cvat_dataset/action_detection/train/2/annotations.xml @@ -21,45 +21,45 @@ - 256 - 192 + 24 + 24 - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000000.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000000.png new file mode 100644 index 00000000000..610bcf0e187 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000000.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000001.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000001.png new file mode 100644 index 00000000000..b76ae6cbfcc Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000001.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000002.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000002.png new file mode 100644 index 00000000000..6f118d530b1 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000002.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000003.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000003.png new file mode 100644 index 00000000000..fc454a4d3dd Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000003.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000004.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000004.png new file mode 100644 index 00000000000..7dacfb37dbf Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000004.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000005.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000005.png new file mode 100644 index 00000000000..11bc7997f2e Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000005.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000006.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000006.png new file mode 100644 index 00000000000..bcbe6122709 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000006.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000007.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000007.png new file mode 100644 index 00000000000..7a334a1bf1d Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000007.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000008.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000008.png new file mode 100644 index 00000000000..071eb1f3f5d Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000008.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000009.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000009.png new file mode 100644 index 00000000000..84cf1625618 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000009.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000020.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000020.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000020.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000021.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000021.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000021.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000022.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000022.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000022.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000023.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000023.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000023.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000024.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000024.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000024.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000025.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000025.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000025.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000026.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000026.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000026.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000027.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000027.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000027.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000028.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000028.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000028.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000029.png b/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000029.png deleted file mode 100644 index 222682d80bf..00000000000 Binary files a/tests/assets/cvat_dataset/action_detection/train/2/images/frame_000029.png and /dev/null differ diff --git a/tests/assets/cvat_dataset/action_detection/train/3/annotations.xml b/tests/assets/cvat_dataset/action_detection/train/3/annotations.xml new file mode 100644 index 00000000000..5ee08eb1203 --- /dev/null +++ b/tests/assets/cvat_dataset/action_detection/train/3/annotations.xml @@ -0,0 +1,65 @@ + + + 1.1 + + + 0 + v0 + 10 + interpolation + 2 + + + + 0 + 9 + 1 + True + + + + + + + 24 + 24 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000000.png b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000000.png new file mode 100644 index 00000000000..7f7c8b16007 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000000.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000001.png b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000001.png new file mode 100644 index 00000000000..84cf1625618 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000001.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000002.png b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000002.png new file mode 100644 index 00000000000..071eb1f3f5d Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000002.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000003.png b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000003.png new file mode 100644 index 00000000000..7a334a1bf1d Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000003.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000004.png b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000004.png new file mode 100644 index 00000000000..bcbe6122709 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000004.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000005.png b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000005.png new file mode 100644 index 00000000000..11bc7997f2e Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000005.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000006.png b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000006.png new file mode 100644 index 00000000000..7dacfb37dbf Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000006.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000007.png b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000007.png new file mode 100644 index 00000000000..fc454a4d3dd Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000007.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000008.png b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000008.png new file mode 100644 index 00000000000..6f118d530b1 Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000008.png differ diff --git a/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000009.png b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000009.png new file mode 100644 index 00000000000..b76ae6cbfcc Binary files /dev/null and b/tests/assets/cvat_dataset/action_detection/train/3/images/frame_000009.png differ diff --git a/tests/assets/imagenet_dataset/label_0/label_0_1.jpg b/tests/assets/imagenet_dataset/label_0/label_0_1.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset/label_0/label_0_1.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset/label_0/label_0_2.jpg b/tests/assets/imagenet_dataset/label_0/label_0_2.jpg deleted file mode 100644 index ee889d22692..00000000000 Binary files a/tests/assets/imagenet_dataset/label_0/label_0_2.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset/label_0/label_0_3.jpg b/tests/assets/imagenet_dataset/label_0/label_0_3.jpg deleted file mode 100644 index ee889d22692..00000000000 Binary files a/tests/assets/imagenet_dataset/label_0/label_0_3.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset/label_1/label_1_1.jpg b/tests/assets/imagenet_dataset/label_1/label_1_1.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset/label_1/label_1_1.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset/label_1/label_1_2.jpg b/tests/assets/imagenet_dataset/label_1/label_1_2.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset/label_1/label_1_2.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset/label_1/label_1_3.jpg b/tests/assets/imagenet_dataset/label_1/label_1_3.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset/label_1/label_1_3.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset_class_incremental/label_0/label_0_1.jpg b/tests/assets/imagenet_dataset_class_incremental/label_0/label_0_1.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset_class_incremental/label_0/label_0_1.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset_class_incremental/label_0/label_0_2.jpg b/tests/assets/imagenet_dataset_class_incremental/label_0/label_0_2.jpg deleted file mode 100644 index ee889d22692..00000000000 Binary files a/tests/assets/imagenet_dataset_class_incremental/label_0/label_0_2.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset_class_incremental/label_0/label_0_3.jpg b/tests/assets/imagenet_dataset_class_incremental/label_0/label_0_3.jpg deleted file mode 100644 index ee889d22692..00000000000 Binary files a/tests/assets/imagenet_dataset_class_incremental/label_0/label_0_3.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset_class_incremental/label_0/label_0_4.jpg b/tests/assets/imagenet_dataset_class_incremental/label_0/label_0_4.jpg deleted file mode 100644 index ee889d22692..00000000000 Binary files a/tests/assets/imagenet_dataset_class_incremental/label_0/label_0_4.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset_class_incremental/label_1/label_1_1.jpg b/tests/assets/imagenet_dataset_class_incremental/label_1/label_1_1.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset_class_incremental/label_1/label_1_1.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset_class_incremental/label_1/label_1_2.jpg b/tests/assets/imagenet_dataset_class_incremental/label_1/label_1_2.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset_class_incremental/label_1/label_1_2.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset_class_incremental/label_1/label_1_3.jpg b/tests/assets/imagenet_dataset_class_incremental/label_1/label_1_3.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset_class_incremental/label_1/label_1_3.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset_class_incremental/label_1/label_1_4.jpg b/tests/assets/imagenet_dataset_class_incremental/label_1/label_1_4.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset_class_incremental/label_1/label_1_4.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset_class_incremental/label_2/label_2_1.jpg b/tests/assets/imagenet_dataset_class_incremental/label_2/label_2_1.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset_class_incremental/label_2/label_2_1.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset_class_incremental/label_2/label_2_2.jpg b/tests/assets/imagenet_dataset_class_incremental/label_2/label_2_2.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset_class_incremental/label_2/label_2_2.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset_class_incremental/label_2/label_2_3.jpg b/tests/assets/imagenet_dataset_class_incremental/label_2/label_2_3.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset_class_incremental/label_2/label_2_3.jpg and /dev/null differ diff --git a/tests/assets/imagenet_dataset_class_incremental/label_2/label_2_4.jpg b/tests/assets/imagenet_dataset_class_incremental/label_2/label_2_4.jpg deleted file mode 100644 index 9d28e0c15e0..00000000000 Binary files a/tests/assets/imagenet_dataset_class_incremental/label_2/label_2_4.jpg and /dev/null differ diff --git a/tests/e2e/cli/action/test_action_classification.py b/tests/e2e/cli/action/test_action_classification.py index 45ff92ed7fc..c2f76146b08 100644 --- a/tests/e2e/cli/action/test_action_classification.py +++ b/tests/e2e/cli/action/test_action_classification.py @@ -68,7 +68,7 @@ def test_otx_export(self, template, tmp_dir_path): @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_otx_eval_openvino(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "action_cls" - otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.2) + otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.05) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") diff --git a/tests/e2e/cli/action/test_action_detection.py b/tests/e2e/cli/action/test_action_detection.py index 1e670f91f33..e26a5378fba 100644 --- a/tests/e2e/cli/action/test_action_detection.py +++ b/tests/e2e/cli/action/test_action_detection.py @@ -70,7 +70,7 @@ def test_otx_export(self, template, tmp_dir_path): @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_otx_eval_openvino(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "action_det" - otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.2) + otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.05) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") diff --git a/tests/e2e/cli/anomaly/test_anomaly_classification.py b/tests/e2e/cli/anomaly/test_anomaly_classification.py index 0dffeeb2d30..80d771b6b84 100644 --- a/tests/e2e/cli/anomaly/test_anomaly_classification.py +++ b/tests/e2e/cli/anomaly/test_anomaly_classification.py @@ -93,7 +93,7 @@ def test_otx_deploy_openvino(self, template, tmp_dir_path): @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_otx_eval_deployment(self, template, tmp_dir_path): - otx_eval_deployment_testing(template, tmp_dir_path, otx_dir, args, threshold=0.01) + otx_eval_deployment_testing(template, tmp_dir_path, otx_dir, args, threshold=0.0) @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) @@ -130,7 +130,7 @@ def test_nncf_eval(self, template, tmp_dir_path): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.0001) + nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.01) @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) diff --git a/tests/e2e/cli/anomaly/test_anomaly_detection.py b/tests/e2e/cli/anomaly/test_anomaly_detection.py index bfe444b1430..c4025a501cf 100644 --- a/tests/e2e/cli/anomaly/test_anomaly_detection.py +++ b/tests/e2e/cli/anomaly/test_anomaly_detection.py @@ -93,7 +93,7 @@ def test_otx_deploy_openvino(self, template, tmp_dir_path): @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_otx_eval_deployment(self, template, tmp_dir_path): - otx_eval_deployment_testing(template, tmp_dir_path, otx_dir, args, threshold=0.01) + otx_eval_deployment_testing(template, tmp_dir_path, otx_dir, args, threshold=0.0) @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) @@ -130,7 +130,7 @@ def test_nncf_eval(self, template, tmp_dir_path): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.0001) + nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.01) @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) diff --git a/tests/e2e/cli/anomaly/test_anomaly_segmentation.py b/tests/e2e/cli/anomaly/test_anomaly_segmentation.py index ca94765bbbe..a7a3e83d291 100644 --- a/tests/e2e/cli/anomaly/test_anomaly_segmentation.py +++ b/tests/e2e/cli/anomaly/test_anomaly_segmentation.py @@ -93,7 +93,7 @@ def test_otx_deploy_openvino(self, template, tmp_dir_path): @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_otx_eval_deployment(self, template, tmp_dir_path): - otx_eval_deployment_testing(template, tmp_dir_path, otx_dir, args, threshold=0.01) + otx_eval_deployment_testing(template, tmp_dir_path, otx_dir, args, threshold=0.0) @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) @@ -130,7 +130,7 @@ def test_nncf_eval(self, template, tmp_dir_path): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.0001) + nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.01) @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) diff --git a/tests/e2e/cli/classification/reference/Custom_Image_Classification_EfficientNet-V2-S/compressed_model.yml b/tests/e2e/cli/classification/reference/Custom_Image_Classification_EfficientNet-V2-S/compressed_model.yml index 9e0c559a076..dec74ca9e01 100644 --- a/tests/e2e/cli/classification/reference/Custom_Image_Classification_EfficientNet-V2-S/compressed_model.yml +++ b/tests/e2e/cli/classification/reference/Custom_Image_Classification_EfficientNet-V2-S/compressed_model.yml @@ -10,6 +10,6 @@ TestToolsMultilabelClassification: number_of_fakequantizers: 269 TestToolsHierarchicalClassification: pot: - number_of_fakequantizers: 216 + number_of_fakequantizers: 208 nncf: number_of_fakequantizers: 267 diff --git a/tests/e2e/cli/classification/reference/Custom_Image_Classification_EfficinetNet-B0/compressed_model.yml b/tests/e2e/cli/classification/reference/Custom_Image_Classification_EfficinetNet-B0/compressed_model.yml index 2ea456f8f38..2c7dd0d3770 100644 --- a/tests/e2e/cli/classification/reference/Custom_Image_Classification_EfficinetNet-B0/compressed_model.yml +++ b/tests/e2e/cli/classification/reference/Custom_Image_Classification_EfficinetNet-B0/compressed_model.yml @@ -10,6 +10,6 @@ TestToolsMultilabelClassification: number_of_fakequantizers: 126 TestToolsHierarchicalClassification: pot: - number_of_fakequantizers: 100 + number_of_fakequantizers: 92 nncf: number_of_fakequantizers: 124 diff --git a/tests/e2e/cli/classification/reference/Custom_Image_Classification_MobileNet-V3-large-1x/compressed_model.yml b/tests/e2e/cli/classification/reference/Custom_Image_Classification_MobileNet-V3-large-1x/compressed_model.yml index 757ec370d16..cacf4fd84a5 100644 --- a/tests/e2e/cli/classification/reference/Custom_Image_Classification_MobileNet-V3-large-1x/compressed_model.yml +++ b/tests/e2e/cli/classification/reference/Custom_Image_Classification_MobileNet-V3-large-1x/compressed_model.yml @@ -10,6 +10,6 @@ TestToolsMultilabelClassification: number_of_fakequantizers: 93 TestToolsHierarchicalClassification: pot: - number_of_fakequantizers: 102 + number_of_fakequantizers: 135 nncf: number_of_fakequantizers: 91 diff --git a/tests/e2e/cli/classification/test_classification.py b/tests/e2e/cli/classification/test_classification.py index 1dc15794fdf..f331dac3895 100644 --- a/tests/e2e/cli/classification/test_classification.py +++ b/tests/e2e/cli/classification/test_classification.py @@ -39,10 +39,10 @@ # Pre-train w/ 'label_0', 'label_1' classes args0 = { - "--train-data-roots": "tests/assets/imagenet_dataset", - "--val-data-roots": "tests/assets/imagenet_dataset", - "--test-data-roots": "tests/assets/imagenet_dataset", - "--input": "tests/assets/imagenet_dataset/label_0", + "--train-data-roots": "tests/assets/classification_dataset", + "--val-data-roots": "tests/assets/classification_dataset", + "--test-data-roots": "tests/assets/classification_dataset", + "--input": "tests/assets/classification_dataset/0", "train_params": [ "params", "--learning_parameters.num_iters", @@ -54,10 +54,10 @@ # Pre-train w/ 'label_0', 'label_1', 'label_2' classes args = { - "--train-data-roots": "tests/assets/imagenet_dataset_class_incremental", - "--val-data-roots": "tests/assets/imagenet_dataset_class_incremental", - "--test-data-roots": "tests/assets/imagenet_dataset_class_incremental", - "--input": "tests/assets/imagenet_dataset/label_0", + "--train-data-roots": "tests/assets/classification_dataset_class_incremental", + "--val-data-roots": "tests/assets/classification_dataset_class_incremental", + "--test-data-roots": "tests/assets/classification_dataset_class_incremental", + "--input": "tests/assets/classification_dataset/0", "train_params": [ "params", "--learning_parameters.num_iters", @@ -172,7 +172,7 @@ def test_otx_explain_openvino(self, template, tmp_dir_path): @pytest.mark.parametrize("half_precision", [True, False]) def test_otx_eval_openvino(self, template, tmp_dir_path, half_precision): tmp_dir_path = tmp_dir_path / "multi_class_cls" - otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.0, half_precision=half_precision) + otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.05, half_precision=half_precision) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -254,7 +254,7 @@ def test_nncf_eval(self, template, tmp_dir_path): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.001) + nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.01) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -412,7 +412,7 @@ def test_otx_explain(self, template, tmp_dir_path): @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_otx_eval_openvino(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "multi_label_cls" - otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args_m, threshold=0.0) + otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args_m, threshold=0.05) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -497,7 +497,7 @@ def test_nncf_eval(self, template, tmp_dir_path): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, tmp_dir_path, otx_dir, args_m, threshold=0.001) + nncf_eval_testing(template, tmp_dir_path, otx_dir, args_m, threshold=0.01) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -608,7 +608,7 @@ def test_otx_explain(self, template, tmp_dir_path): @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_otx_eval_openvino(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "h_label_cls" - otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args_h, threshold=0.02) + otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args_h, threshold=0.05) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -683,7 +683,7 @@ def test_nncf_eval(self, template, tmp_dir_path): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, tmp_dir_path, otx_dir, args_h, threshold=0.001) + nncf_eval_testing(template, tmp_dir_path, otx_dir, args_h, threshold=0.01) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -739,7 +739,7 @@ def test_otx_multi_gpu_train(self, template, tmp_dir_path): # Warmstart using data w/ 'intel', 'openvino', 'opencv' classes args_selfsl = { - "--train-data-roots": "tests/assets/imagenet_dataset", + "--train-data-roots": "tests/assets/classification_dataset", "train_params": [ "params", "--learning_parameters.num_iters", diff --git a/tests/e2e/cli/detection/test_detection.py b/tests/e2e/cli/detection/test_detection.py index 82669d19427..e3d7102aa62 100644 --- a/tests/e2e/cli/detection/test_detection.py +++ b/tests/e2e/cli/detection/test_detection.py @@ -40,13 +40,13 @@ pot_validate_fq_testing, ) -# Pre-train w/ 'person' class ##TODO: Currently, it is closed to sample test. need to change other sample +# Pre-train w/ 'person' class args0 = { "--train-data-roots": "tests/assets/car_tree_bug", "--val-data-roots": "tests/assets/car_tree_bug", "--test-data-roots": "tests/assets/car_tree_bug", "--input": "tests/assets/car_tree_bug/images/train", - "train_params": ["params", "--learning_parameters.num_iters", "10", "--learning_parameters.batch_size", "4"], + "train_params": ["params", "--learning_parameters.num_iters", "20", "--learning_parameters.batch_size", "4"], } # Class-Incremental learning w/ 'vehicle', 'person', 'non-vehicle' classes @@ -152,7 +152,7 @@ def test_otx_eval(self, template, tmp_dir_path): @pytest.mark.parametrize("half_precision", [True, False]) def test_otx_eval_openvino(self, template, tmp_dir_path, half_precision): tmp_dir_path = tmp_dir_path / "detection" - otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.2, half_precision=half_precision) + otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.05, half_precision=half_precision) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -276,7 +276,7 @@ def test_nncf_eval(self, template, tmp_dir_path): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.001) + nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.01) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") diff --git a/tests/e2e/cli/detection/test_tiling_detection.py b/tests/e2e/cli/detection/test_tiling_detection.py index b0084b669c3..51287f00fc0 100644 --- a/tests/e2e/cli/detection/test_tiling_detection.py +++ b/tests/e2e/cli/detection/test_tiling_detection.py @@ -127,7 +127,7 @@ def test_otx_eval_openvino(self, template, tmp_dir_path, half_precision): if template.name in ["SSD", "ATSS"]: pytest.skip(reason="[CVS-108291] Tiling ATSS, SSD show performance drop") tmp_dir_path = tmp_dir_path / "tiling_det" - otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.2, half_precision=half_precision) + otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.05, half_precision=half_precision) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -229,7 +229,7 @@ def test_nncf_eval(self, template, tmp_dir_path): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.001) + nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.01) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") diff --git a/tests/e2e/cli/instance_segmentation/reference/Custom_Counting_Instance_Segmentation_MaskRCNN_ResNet50/compressed_model.yml b/tests/e2e/cli/instance_segmentation/reference/Custom_Counting_Instance_Segmentation_MaskRCNN_ResNet50/compressed_model.yml index 7d25949404a..9296a5af859 100644 --- a/tests/e2e/cli/instance_segmentation/reference/Custom_Counting_Instance_Segmentation_MaskRCNN_ResNet50/compressed_model.yml +++ b/tests/e2e/cli/instance_segmentation/reference/Custom_Counting_Instance_Segmentation_MaskRCNN_ResNet50/compressed_model.yml @@ -2,7 +2,7 @@ TestToolsMPAInstanceSegmentation: pot: number_of_fakequantizers: 76 nncf: - number_of_fakequantizers: 92 + number_of_fakequantizers: 97 TestToolsTilingInstanceSegmentation: pot: number_of_fakequantizers: 76 diff --git a/tests/e2e/cli/instance_segmentation/test_instance_segmentation.py b/tests/e2e/cli/instance_segmentation/test_instance_segmentation.py index aa2d0ca03f3..0c43092e08a 100644 --- a/tests/e2e/cli/instance_segmentation/test_instance_segmentation.py +++ b/tests/e2e/cli/instance_segmentation/test_instance_segmentation.py @@ -132,7 +132,7 @@ def test_otx_eval(self, template, tmp_dir_path): @pytest.mark.parametrize("half_precision", [True, False]) def test_otx_eval_openvino(self, template, tmp_dir_path, half_precision): tmp_dir_path = tmp_dir_path / "ins_seg" - otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.2, half_precision=half_precision) + otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.05, half_precision=half_precision) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -198,6 +198,7 @@ def test_otx_hpo(self, template, tmp_dir_path): @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @pytest.mark.parametrize("template", templates, ids=templates_ids) + @pytest.mark.skip(reason="CVS-98026") def test_nncf_optimize(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "ins_seg" if template.entrypoints.nncf is None: @@ -208,6 +209,7 @@ def test_nncf_optimize(self, template, tmp_dir_path): @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @pytest.mark.parametrize("template", templates, ids=templates_ids) + @pytest.mark.skip(reason="CVS-98026") def test_nncf_export(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "ins_seg" if template.entrypoints.nncf is None: @@ -218,27 +220,29 @@ def test_nncf_export(self, template, tmp_dir_path): @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @pytest.mark.parametrize("template", templates, ids=templates_ids) + @pytest.mark.skip(reason="CVS-98026") def test_nncf_validate_fq(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "ins_seg" if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_validate_fq_testing(template, tmp_dir_path, otx_dir, "detection", type(self).__name__) + nncf_validate_fq_testing(template, tmp_dir_path, otx_dir, "instance_segmentation", type(self).__name__) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @pytest.mark.parametrize("template", templates, ids=templates_ids) + @pytest.mark.skip(reason="CVS-98026") def test_nncf_eval(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "ins_seg" if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.001) + nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.01) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @pytest.mark.parametrize("template", templates, ids=templates_ids) - @pytest.mark.skip(reason="CVS-104657") + @pytest.mark.skip(reason="CVS-98026") def test_nncf_eval_openvino(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "ins_seg" if template.entrypoints.nncf is None: @@ -258,7 +262,7 @@ def test_pot_optimize(self, template, tmp_dir_path): @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_pot_validate_fq(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "ins_seg" - pot_validate_fq_testing(template, tmp_dir_path, otx_dir, "detection", type(self).__name__) + pot_validate_fq_testing(template, tmp_dir_path, otx_dir, "instance_segmentation", type(self).__name__) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") diff --git a/tests/e2e/cli/instance_segmentation/test_tiling_instseg.py b/tests/e2e/cli/instance_segmentation/test_tiling_instseg.py index 48b3204d9e8..04bdbb2087f 100644 --- a/tests/e2e/cli/instance_segmentation/test_tiling_instseg.py +++ b/tests/e2e/cli/instance_segmentation/test_tiling_instseg.py @@ -122,10 +122,11 @@ def test_otx_eval(self, template, tmp_dir_path): @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @pytest.mark.parametrize("template", templates, ids=templates_ids) + @pytest.mark.skip(reason="CVS-104657") @pytest.mark.parametrize("half_precision", [True, False]) def test_otx_eval_openvino(self, template, tmp_dir_path, half_precision): tmp_dir_path = tmp_dir_path / "tiling_ins_seg" - otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.2, half_precision=half_precision) + otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.05, half_precision=half_precision) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -137,6 +138,7 @@ def test_otx_explain(self, template, tmp_dir_path): @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @pytest.mark.parametrize("template", templates, ids=templates_ids) + @pytest.mark.skip(reason="CVS-104657") def test_otx_explain_openvino(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "tiling_ins_seg" otx_explain_openvino_testing(template, tmp_dir_path, otx_dir, args) @@ -151,6 +153,7 @@ def test_otx_demo(self, template, tmp_dir_path): @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @pytest.mark.parametrize("template", templates, ids=templates_ids) + @pytest.mark.skip(reason="CVS-104657") def test_otx_demo_openvino(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "tiling_ins_seg" otx_demo_openvino_testing(template, tmp_dir_path, otx_dir, args) @@ -158,6 +161,7 @@ def test_otx_demo_openvino(self, template, tmp_dir_path): @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @pytest.mark.parametrize("template", templates, ids=templates_ids) + @pytest.mark.skip(reason="CVS-104657") def test_otx_deploy_openvino(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "tiling_ins_seg" otx_deploy_openvino_testing(template, tmp_dir_path, otx_dir, args) @@ -165,6 +169,7 @@ def test_otx_deploy_openvino(self, template, tmp_dir_path): @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @pytest.mark.parametrize("template", templates, ids=templates_ids) + @pytest.mark.skip(reason="CVS-104657") def test_otx_eval_deployment(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "tiling_ins_seg" otx_eval_deployment_testing(template, tmp_dir_path, otx_dir, args, threshold=0.0) @@ -172,6 +177,7 @@ def test_otx_eval_deployment(self, template, tmp_dir_path): @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @pytest.mark.parametrize("template", templates, ids=templates_ids) + @pytest.mark.skip(reason="CVS-104657") def test_otx_demo_deployment(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "tiling_ins_seg" otx_demo_deployment_testing(template, tmp_dir_path, otx_dir, args) @@ -214,7 +220,7 @@ def test_nncf_validate_fq(self, template, tmp_dir_path): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_validate_fq_testing(template, tmp_dir_path, otx_dir, "detection", type(self).__name__) + nncf_validate_fq_testing(template, tmp_dir_path, otx_dir, "instance_segmentation", type(self).__name__) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -225,7 +231,7 @@ def test_nncf_eval(self, template, tmp_dir_path): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.001) + nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.01) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -250,7 +256,7 @@ def test_pot_optimize(self, template, tmp_dir_path): @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_pot_validate_fq(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "tiling_ins_seg" - pot_validate_fq_testing(template, tmp_dir_path, otx_dir, "detection", type(self).__name__) + pot_validate_fq_testing(template, tmp_dir_path, otx_dir, "instance_segmentation", type(self).__name__) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") diff --git a/tests/e2e/cli/semantic_segmentation/test_segmentation.py b/tests/e2e/cli/semantic_segmentation/test_segmentation.py index d735955d174..39c525319bc 100644 --- a/tests/e2e/cli/semantic_segmentation/test_segmentation.py +++ b/tests/e2e/cli/semantic_segmentation/test_segmentation.py @@ -131,7 +131,7 @@ def test_otx_eval(self, template, tmp_dir_path): @pytest.mark.parametrize("half_precision", [True, False]) def test_otx_eval_openvino(self, template, tmp_dir_path, half_precision): tmp_dir_path = tmp_dir_path / "segmentation" - otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.1, half_precision=half_precision) + otx_eval_openvino_testing(template, tmp_dir_path, otx_dir, args, threshold=0.05, half_precision=half_precision) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -203,7 +203,7 @@ def test_nncf_validate_fq(self, template, tmp_dir_path): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_validate_fq_testing(template, tmp_dir_path, otx_dir, "segmentation", type(self).__name__) + nncf_validate_fq_testing(template, tmp_dir_path, otx_dir, "semantic_segmentation", type(self).__name__) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -213,7 +213,7 @@ def test_nncf_eval(self, template, tmp_dir_path): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.001) + nncf_eval_testing(template, tmp_dir_path, otx_dir, args, threshold=0.01) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") @@ -243,7 +243,7 @@ def test_pot_validate_fq(self, template, tmp_dir_path): tmp_dir_path = tmp_dir_path / "segmentation" if template.model_template_id.startswith("ClassIncremental_Semantic_Segmentation_Lite-HRNet-"): pytest.skip("CVS-82482") - pot_validate_fq_testing(template, tmp_dir_path, otx_dir, "segmentation", type(self).__name__) + pot_validate_fq_testing(template, tmp_dir_path, otx_dir, "semantic_segmentation", type(self).__name__) @e2e_pytest_component @pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS") diff --git a/tests/e2e/cli/test_cli.py b/tests/e2e/cli/test_cli.py index 0bc00718321..52043a76110 100644 --- a/tests/e2e/cli/test_cli.py +++ b/tests/e2e/cli/test_cli.py @@ -40,21 +40,24 @@ def test_otx_backbone_build(self, tmp_dir_path, build_backbone_args): otx_build_backbone_testing(tmp_dir_path, build_backbone_args) -auto_config_args_with_autosplit = {"--train-data-roots": "tests/assets/imagenet_dataset"} +auto_config_args_with_autosplit = {"--train-data-roots": "tests/assets/classification_dataset"} auto_config_args_with_autosplit_task = { "--task": "classification", - "--train-data-roots": "tests/assets/imagenet_dataset", + "--train-data-roots": "tests/assets/classification_dataset", } auto_config_args_without_autosplit = { - "--train-data-roots": "tests/assets/imagenet_dataset", - "--val-data-roots": "tests/assets/imagenet_dataset_class_incremental", + "--train-data-roots": "tests/assets/classification_dataset", + "--val-data-roots": "tests/assets/classification_dataset_class_incremental", } build_auto_config_args = { - "classification": {"--train-data-roots": "tests/assets/imagenet_dataset"}, - "classification_with_task": {"--task": "classification", "--train-data-roots": "tests/assets/imagenet_dataset"}, + "classification": {"--train-data-roots": "tests/assets/classification_dataset"}, + "classification_with_task": { + "--task": "classification", + "--train-data-roots": "tests/assets/classification_dataset", + }, "detection": {"--train-data-roots": "tests/assets/car_tree_bug"}, "detection_with_task": {"--task": "detection", "--train-data-roots": "tests/assets/car_tree_bug"}, } @@ -70,10 +73,10 @@ def test_otx_build_with_autosplit(self, case, tmp_dir_path): train_auto_config_args = { - "classification": {"--train-data-roots": "tests/assets/imagenet_dataset"}, + "classification": {"--train-data-roots": "tests/assets/classification_dataset"}, "classification_with_template": { "template": "otx/algorithms/classification/configs/mobilenet_v3_large_1_cls_incr/template.yaml", - "--train-data-roots": "tests/assets/imagenet_dataset", + "--train-data-roots": "tests/assets/classification_dataset", }, "detection": {"--train-data-roots": "tests/assets/car_tree_bug"}, "detection_with_template": { diff --git a/tests/integration/cli/classification/test_classification.py b/tests/integration/cli/classification/test_classification.py index c39d77e2ced..d67ec49286e 100644 --- a/tests/integration/cli/classification/test_classification.py +++ b/tests/integration/cli/classification/test_classification.py @@ -34,10 +34,10 @@ # Pre-train w/ 'label_0', 'label_1', 'label_2' classes args = { - "--train-data-roots": "tests/assets/imagenet_dataset_class_incremental", - "--val-data-roots": "tests/assets/imagenet_dataset_class_incremental", - "--test-data-roots": "tests/assets/imagenet_dataset_class_incremental", - "--input": "tests/assets/imagenet_dataset/label_0", + "--train-data-roots": "tests/assets/classification_dataset", + "--val-data-roots": "tests/assets/classification_dataset", + "--test-data-roots": "tests/assets/classification_dataset", + "--input": "tests/assets/classification_dataset/0", "train_params": [ "params", "--learning_parameters.num_iters", @@ -49,7 +49,7 @@ # Warmstart using data w/ 'intel', 'openvino', 'opencv' classes args_selfsl = { - "--train-data-roots": "tests/assets/imagenet_dataset", + "--train-data-roots": "tests/assets/classification_dataset", "train_params": [ "params", "--learning_parameters.num_iters", diff --git a/tests/integration/cli/test_cli.py b/tests/integration/cli/test_cli.py index 00ab5dd9322..2431531e53a 100644 --- a/tests/integration/cli/test_cli.py +++ b/tests/integration/cli/test_cli.py @@ -77,8 +77,11 @@ def test_otx_build_rebuild(self, tmp_dir_path, case): build_auto_config_args = { - "classification": {"--train-data-roots": "tests/assets/imagenet_dataset"}, - "classification_with_task": {"--task": "classification", "--train-data-roots": "tests/assets/imagenet_dataset"}, + "classification": {"--train-data-roots": "tests/assets/classification_dataset"}, + "classification_with_task": { + "--task": "classification", + "--train-data-roots": "tests/assets/classification_dataset", + }, "detection": {"--train-data-roots": "tests/assets/car_tree_bug"}, "detection_with_task": {"--task": "detection", "--train-data-roots": "tests/assets/car_tree_bug"}, } @@ -94,10 +97,10 @@ def test_otx_build_with_autosplit(self, case, tmp_dir_path): train_auto_config_args = { - "classification": {"--train-data-roots": "tests/assets/imagenet_dataset"}, + "classification": {"--train-data-roots": "tests/assets/classification_dataset"}, "classification_with_template": { "template": "otx/algorithms/classification/configs/mobilenet_v3_large_1_cls_incr/template.yaml", - "--train-data-roots": "tests/assets/imagenet_dataset", + "--train-data-roots": "tests/assets/classification_dataset", }, "detection": {"--train-data-roots": "tests/assets/car_tree_bug"}, "detection_with_template": { diff --git a/tests/regression/action/test_action_classification.py b/tests/regression/action/test_action_classification.py index df0e06834f0..d686cfcfa2a 100644 --- a/tests/regression/action/test_action_classification.py +++ b/tests/regression/action/test_action_classification.py @@ -128,7 +128,7 @@ def test_otx_export_eval_openvino(self, template, tmp_dir_path): tmp_dir_path, otx_dir, action_cls_data_args, - threshold=0.02, + threshold=0.05, criteria=action_cls_regression_config["regression_criteria"]["export"], reg_threshold=0.10, result_dict=self.performance[template.name], diff --git a/tests/regression/anomaly/test_anomaly_classificaiton.py b/tests/regression/anomaly/test_anomaly_classificaiton.py index b40a77a6179..db1bce9d194 100644 --- a/tests/regression/anomaly/test_anomaly_classificaiton.py +++ b/tests/regression/anomaly/test_anomaly_classificaiton.py @@ -148,7 +148,7 @@ def test_otx_export_eval_openvino(self, template, tmp_dir_path, category): tmp_dir_path, otx_dir, category_data_args, - threshold=0.02, + threshold=0.05, criteria=anomaly_classification_regression_config["regression_criteria"]["export"][category], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -179,7 +179,7 @@ def test_otx_deploy_eval_deployment(self, template, tmp_dir_path, category): tmp_dir_path, otx_dir, category_data_args, - threshold=0.02, + threshold=0.0, criteria=anomaly_classification_regression_config["regression_criteria"]["deploy"][category], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -213,7 +213,7 @@ def test_nncf_optimize_eval(self, template, tmp_dir_path, category): tmp_dir_path, otx_dir, category_data_args, - threshold=0.001, + threshold=0.01, criteria=anomaly_classification_regression_config["regression_criteria"]["nncf"][category], reg_threshold=0.10, result_dict=self.performance[template.name], diff --git a/tests/regression/anomaly/test_anomaly_detection.py b/tests/regression/anomaly/test_anomaly_detection.py index 5de9f651b78..e65c91d3916 100644 --- a/tests/regression/anomaly/test_anomaly_detection.py +++ b/tests/regression/anomaly/test_anomaly_detection.py @@ -144,7 +144,7 @@ def test_otx_export_eval_openvino(self, template, tmp_dir_path, category): tmp_dir_path, otx_dir, category_data_args, - threshold=0.02, + threshold=0.05, criteria=anomaly_detection_regression_config["regression_criteria"]["export"][category], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -175,7 +175,7 @@ def test_otx_deploy_eval_deployment(self, template, tmp_dir_path, category): tmp_dir_path, otx_dir, category_data_args, - threshold=0.02, + threshold=0.0, criteria=anomaly_detection_regression_config["regression_criteria"]["deploy"][category], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -209,7 +209,7 @@ def test_nncf_optimize_eval(self, template, tmp_dir_path, category): tmp_dir_path, otx_dir, category_data_args, - threshold=0.001, + threshold=0.01, criteria=anomaly_detection_regression_config["regression_criteria"]["nncf"][category], reg_threshold=0.10, result_dict=self.performance[template.name], diff --git a/tests/regression/anomaly/test_anomaly_segmentation.py b/tests/regression/anomaly/test_anomaly_segmentation.py index ef715c9568a..c9476b77faa 100644 --- a/tests/regression/anomaly/test_anomaly_segmentation.py +++ b/tests/regression/anomaly/test_anomaly_segmentation.py @@ -146,7 +146,7 @@ def test_otx_export_eval_openvino(self, template, tmp_dir_path, category): tmp_dir_path, otx_dir, category_data_args, - threshold=0.02, + threshold=0.05, criteria=anomaly_segmentation_regression_config["regression_criteria"]["export"][category], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -177,7 +177,7 @@ def test_otx_deploy_eval_deployment(self, template, tmp_dir_path, category): tmp_dir_path, otx_dir, category_data_args, - threshold=0.02, + threshold=0.0, criteria=anomaly_segmentation_regression_config["regression_criteria"]["deploy"][category], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -211,7 +211,7 @@ def test_nncf_optimize_eval(self, template, tmp_dir_path, category): tmp_dir_path, otx_dir, category_data_args, - threshold=0.001, + threshold=0.01, criteria=anomaly_segmentation_regression_config["regression_criteria"]["nncf"][category], reg_threshold=0.10, result_dict=self.performance[template.name], diff --git a/tests/regression/classification/test_classification.py b/tests/regression/classification/test_classification.py index 18b11875f07..1c0e0ee9dca 100644 --- a/tests/regression/classification/test_classification.py +++ b/tests/regression/classification/test_classification.py @@ -323,7 +323,7 @@ def test_otx_export_eval_openvino(self, template, tmp_dir_path): tmp_dir_path, otx_dir, multi_class_data_args, - threshold=0.02, + threshold=0.05, criteria=multi_class_regression_config["regression_criteria"]["export"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -352,7 +352,7 @@ def test_otx_deploy_eval_deployment(self, template, tmp_dir_path): tmp_dir_path, otx_dir, multi_class_data_args, - threshold=0.02, + threshold=0.0, criteria=multi_class_regression_config["regression_criteria"]["deploy"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -384,7 +384,7 @@ def test_nncf_optimize_eval(self, template, tmp_dir_path): tmp_dir_path, otx_dir, multi_class_data_args, - threshold=0.001, + threshold=0.01, criteria=multi_class_regression_config["regression_criteria"]["nncf"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -563,7 +563,7 @@ def test_otx_export_eval_openvino(self, template, tmp_dir_path): tmp_dir_path, otx_dir, multi_label_data_args, - threshold=0.02, + threshold=0.05, criteria=multi_label_regression_config["regression_criteria"]["export"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -592,7 +592,7 @@ def test_otx_deploy_eval_deployment(self, template, tmp_dir_path): tmp_dir_path, otx_dir, multi_label_data_args, - threshold=0.02, + threshold=0.0, criteria=multi_label_regression_config["regression_criteria"]["deploy"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -624,7 +624,7 @@ def test_nncf_optimize_eval(self, template, tmp_dir_path): tmp_dir_path, otx_dir, multi_label_data_args, - threshold=0.001, + threshold=0.01, criteria=multi_label_regression_config["regression_criteria"]["nncf"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -744,7 +744,7 @@ def test_otx_export_eval_openvino(self, template, tmp_dir_path): tmp_dir_path, otx_dir, h_label_data_args, - threshold=0.02, + threshold=0.05, criteria=h_label_regression_config["regression_criteria"]["export"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -773,7 +773,7 @@ def test_otx_deploy_eval_deployment(self, template, tmp_dir_path): tmp_dir_path, otx_dir, h_label_data_args, - threshold=0.02, + threshold=0.0, criteria=h_label_regression_config["regression_criteria"]["deploy"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -805,7 +805,7 @@ def test_nncf_optimize_eval(self, template, tmp_dir_path): tmp_dir_path, otx_dir, h_label_data_args, - threshold=0.001, + threshold=0.01, criteria=h_label_regression_config["regression_criteria"]["nncf"], reg_threshold=0.10, result_dict=self.performance[template.name], diff --git a/tests/regression/detection/test_detection.py b/tests/regression/detection/test_detection.py index ad68bd6c572..de35016fd29 100644 --- a/tests/regression/detection/test_detection.py +++ b/tests/regression/detection/test_detection.py @@ -246,7 +246,7 @@ def test_otx_export_eval_openvino(self, template, tmp_dir_path): tmp_dir_path, otx_dir, detection_data_args, - threshold=0.02, + threshold=0.05, criteria=detection_regression_config["regression_criteria"]["export"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -275,7 +275,7 @@ def test_otx_deploy_eval_deployment(self, template, tmp_dir_path): tmp_dir_path, otx_dir, detection_data_args, - threshold=0.02, + threshold=0.0, criteria=detection_regression_config["regression_criteria"]["deploy"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -307,7 +307,7 @@ def test_nncf_optimize_eval(self, template, tmp_dir_path): tmp_dir_path, otx_dir, detection_data_args, - threshold=0.001, + threshold=0.01, criteria=detection_regression_config["regression_criteria"]["nncf"], reg_threshold=0.10, result_dict=self.performance[template.name], diff --git a/tests/regression/detection/test_tiling_detection.py b/tests/regression/detection/test_tiling_detection.py index de8b739d9c7..04bb571aa8b 100644 --- a/tests/regression/detection/test_tiling_detection.py +++ b/tests/regression/detection/test_tiling_detection.py @@ -135,7 +135,7 @@ def test_otx_export_eval_openvino(self, template, tmp_dir_path): tmp_dir_path, otx_dir, tiling_detection_data_args, - threshold=0.02, + threshold=0.05, criteria=tiling_detection_regression_config["regression_criteria"]["export"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -164,7 +164,7 @@ def test_otx_deploy_eval_deployment(self, template, tmp_dir_path): tmp_dir_path, otx_dir, tiling_detection_data_args, - threshold=0.02, + threshold=0.0, criteria=tiling_detection_regression_config["regression_criteria"]["deploy"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -197,7 +197,7 @@ def test_nncf_optimize_eval(self, template, tmp_dir_path): tmp_dir_path, otx_dir, tiling_detection_data_args, - threshold=0.001, + threshold=0.01, criteria=tiling_detection_regression_config["regression_criteria"]["nncf"], reg_threshold=0.10, result_dict=self.performance[template.name], diff --git a/tests/regression/instance_segmentation/test_instnace_segmentation.py b/tests/regression/instance_segmentation/test_instnace_segmentation.py index 1b94710ad38..917d05d6fb4 100644 --- a/tests/regression/instance_segmentation/test_instnace_segmentation.py +++ b/tests/regression/instance_segmentation/test_instnace_segmentation.py @@ -186,7 +186,7 @@ def test_otx_export_eval_openvino(self, template, tmp_dir_path): tmp_dir_path, otx_dir, inst_seg_data_args, - threshold=0.02, + threshold=0.05, criteria=inst_seg_regression_config["regression_criteria"]["export"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -215,7 +215,7 @@ def test_otx_deploy_eval_deployment(self, template, tmp_dir_path): tmp_dir_path, otx_dir, inst_seg_data_args, - threshold=0.02, + threshold=0.0, criteria=inst_seg_regression_config["regression_criteria"]["deploy"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -247,7 +247,7 @@ def test_nncf_optimize_eval(self, template, tmp_dir_path): tmp_dir_path, otx_dir, inst_seg_data_args, - threshold=0.001, + threshold=0.01, criteria=inst_seg_regression_config["regression_criteria"]["nncf"], reg_threshold=0.10, result_dict=self.performance[template.name], diff --git a/tests/regression/instance_segmentation/test_tiling_instnace_segmentation.py b/tests/regression/instance_segmentation/test_tiling_instnace_segmentation.py index 521b8c5375c..bc1a9bf5c7d 100644 --- a/tests/regression/instance_segmentation/test_tiling_instnace_segmentation.py +++ b/tests/regression/instance_segmentation/test_tiling_instnace_segmentation.py @@ -135,7 +135,7 @@ def test_otx_export_eval_openvino(self, template, tmp_dir_path): tmp_dir_path, otx_dir, tiling_inst_seg_data_args, - threshold=0.02, + threshold=0.05, criteria=tiling_inst_seg_regression_config["regression_criteria"]["export"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -164,7 +164,7 @@ def test_otx_deploy_eval_deployment(self, template, tmp_dir_path): tmp_dir_path, otx_dir, tiling_inst_seg_data_args, - threshold=0.02, + threshold=0.0, criteria=tiling_inst_seg_regression_config["regression_criteria"]["deploy"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -197,7 +197,7 @@ def test_nncf_optimize_eval(self, template, tmp_dir_path): tmp_dir_path, otx_dir, tiling_inst_seg_data_args, - threshold=0.001, + threshold=0.01, criteria=tiling_inst_seg_regression_config["regression_criteria"]["nncf"], reg_threshold=0.10, result_dict=self.performance[template.name], diff --git a/tests/regression/semantic_segmentation/test_segmentation.py b/tests/regression/semantic_segmentation/test_segmentation.py index abb21c90ef9..7f08d764869 100644 --- a/tests/regression/semantic_segmentation/test_segmentation.py +++ b/tests/regression/semantic_segmentation/test_segmentation.py @@ -314,7 +314,7 @@ def test_otx_export_eval_openvino(self, template, tmp_dir_path): tmp_dir_path, otx_dir, segmentation_data_args, - threshold=0.02, + threshold=0.05, criteria=segmentation_regression_config["regression_criteria"]["export"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -343,7 +343,7 @@ def test_otx_deploy_eval_deployment(self, template, tmp_dir_path): tmp_dir_path, otx_dir, segmentation_data_args, - threshold=0.02, + threshold=0.0, criteria=segmentation_regression_config["regression_criteria"]["deploy"], reg_threshold=0.10, result_dict=self.performance[template.name], @@ -375,7 +375,7 @@ def test_nncf_optimize_eval(self, template, tmp_dir_path): tmp_dir_path, otx_dir, segmentation_data_args, - threshold=0.001, + threshold=0.01, criteria=segmentation_regression_config["regression_criteria"]["nncf"], reg_threshold=0.10, result_dict=self.performance[template.name], diff --git a/tests/unit/algorithms/classification/test_helper.py b/tests/unit/algorithms/classification/test_helper.py index d64fd06e55c..aba7cd6022a 100644 --- a/tests/unit/algorithms/classification/test_helper.py +++ b/tests/unit/algorithms/classification/test_helper.py @@ -168,13 +168,13 @@ def setup_mpa_task_parameters(task_type, create_val=False, create_test=False): model_cfg.model.multilabel = False model_cfg.model.hierarchical = False data_cfg = MPAConfig.fromfile(DEFAULT_CLS_TEMPLATE_DIR / "data_pipeline.py") - data_cfg.data.train.data_dir = "tests/assets/imagenet_dataset" + data_cfg.data.train.data_dir = "tests/assets/classification_dataset" if create_val: - data_cfg.data.val.data_dir = "tests/assets/imagenet_dataset" + data_cfg.data.val.data_dir = "tests/assets/classification_dataset" else: data_cfg.data.val = None if create_test: - data_cfg.data.test.data_dir = "tests/assets/imagenet_dataset" + data_cfg.data.test.data_dir = "tests/assets/classification_dataset" else: data_cfg.data.test = None dummy_dataset = generate_cls_dataset(number_of_images=1) diff --git a/tests/unit/core/data/manager/test_dataset_manager.py b/tests/unit/core/data/manager/test_dataset_manager.py index 3b4ff0ca5ef..ab29c2d2771 100644 --- a/tests/unit/core/data/manager/test_dataset_manager.py +++ b/tests/unit/core/data/manager/test_dataset_manager.py @@ -19,7 +19,7 @@ AVAILABLE_TASKS = ["classification", "detection", "segmentation"] AVAILABLE_SUBSETS = ["train", "val"] AVAILABLE_DATA_ROOTS = [ - "tests/assets/imagenet_dataset", + "tests/assets/classification_dataset", "tests/assets/car_tree_bug", "tests/assets/cityscapes_dataset/dataset", "tests/assets/anomaly/hazelnut", @@ -27,7 +27,7 @@ ] DATA_ROOTS2FORMAT = { - "tests/assets/imagenet_dataset": "imagenet", + "tests/assets/classification_dataset": "imagenet", "tests/assets/car_tree_bug": "coco", "tests/assets/cityscapes_dataset/dataset": "cityscapes", } diff --git a/tests/unit/core/data/test_helpers.py b/tests/unit/core/data/test_helpers.py index 624d3ee7a9f..2d0c543f735 100644 --- a/tests/unit/core/data/test_helpers.py +++ b/tests/unit/core/data/test_helpers.py @@ -24,10 +24,10 @@ TASK_NAME_TO_DATA_ROOT = { "classification": { - "train": "tests/assets/imagenet_dataset", - "val": "tests/assets/imagenet_dataset", - "test": "tests/assets/imagenet_dataset", - "unlabeled": "tests/assets/imagenet_dataset", + "train": "tests/assets/classification_dataset", + "val": "tests/assets/classification_dataset", + "test": "tests/assets/classification_dataset", + "unlabeled": "tests/assets/classification_dataset", }, "detection": { "train": "tests/assets/car_tree_bug",