Move classification unit tests to OTX tests (#1932)

* [CI] Updated daily workflow (#1904) Updated daily workflow - remove if statement to allow running on any branch by manually * [FIX] re-bugfix: ATSS head loss (#1907) re bugfix * Added security.md Added the security related notification. * Update security.md fix prettier issue * Move classification unit tests * Apply mocker in RandAugment TC --------- Co-authored-by: Yunchu Lee <yunchu.lee@intel.com> Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>
openvinotoolkit · Mar 23, 2023 · 28b9341 · 28b9341
1 parent d9ec6ad
commit 28b9341
Show file tree

Hide file tree

Showing 25 changed files with 17 additions and 23 deletions.
diff --git a/...models/classifiers/test_sam_classifier.py → ...models/classifiers/test_sam_classifier.py b/...models/classifiers/test_sam_classifier.py → ...models/classifiers/test_sam_classifier.py
diff --git a/...els/classifiers/test_semisl_classifier.py → ...els/classifiers/test_semisl_classifier.py b/...els/classifiers/test_semisl_classifier.py → ...els/classifiers/test_semisl_classifier.py
diff --git a/...classifiers/test_semisl_mlc_classifier.py → ...classifiers/test_semisl_mlc_classifier.py b/...classifiers/test_semisl_mlc_classifier.py → ...classifiers/test_semisl_mlc_classifier.py
diff --git a/...els/classifiers/test_supcon_classifier.py → ...els/classifiers/test_supcon_classifier.py b/...els/classifiers/test_supcon_classifier.py → ...els/classifiers/test_supcon_classifier.py
diff --git a/...mpa/modules/heads/test_custom_cls_head.py → ...mcls/models/heads/test_custom_cls_head.py b/...mpa/modules/heads/test_custom_cls_head.py → ...mcls/models/heads/test_custom_cls_head.py
diff --git a/...eads/test_custom_hierarchical_cls_head.py → ...eads/test_custom_hierarchical_cls_head.py b/...eads/test_custom_hierarchical_cls_head.py → ...eads/test_custom_hierarchical_cls_head.py
diff --git a/.../heads/test_custom_multilabel_cls_head.py → .../heads/test_custom_multilabel_cls_head.py b/.../heads/test_custom_multilabel_cls_head.py → .../heads/test_custom_multilabel_cls_head.py
diff --git a/...a/modules/heads/test_multilabel_semisl.py → ...ls/models/heads/test_multilabel_semisl.py b/...a/modules/heads/test_multilabel_semisl.py → ...ls/models/heads/test_multilabel_semisl.py
diff --git a/...mpa/modules/heads/test_semisl_cls_head.py → ...mcls/models/heads/test_semisl_cls_head.py b/...mpa/modules/heads/test_semisl_cls_head.py → ...mcls/models/heads/test_semisl_cls_head.py
diff --git a/tests/unit/algorithms/classification/adapters/mmcls/models/losses/__init__.py b/tests/unit/algorithms/classification/adapters/mmcls/models/losses/__init__.py
@@ -0,0 +1,4 @@
+"""Test for otx.algorithms.classification.adapters.mmcls.models.losses."""
+# Copyright (C) 2023 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
diff --git a/...ules/losses/test_asymmetric_multilabel.py → ...dels/losses/test_asymmetric_multilabel.py b/...ules/losses/test_asymmetric_multilabel.py → ...dels/losses/test_asymmetric_multilabel.py
diff --git a/.../mpa/modules/losses/test_cross_entropy.py → ...mmcls/models/losses/test_cross_entropy.py b/.../mpa/modules/losses/test_cross_entropy.py → ...mmcls/models/losses/test_cross_entropy.py
diff --git a/tests/unit/mpa/modules/models/__init__.py → ...tion/adapters/mmcls/optimizer/__init__.py b/tests/unit/mpa/modules/models/__init__.py → ...tion/adapters/mmcls/optimizer/__init__.py
@@ -1,4 +1,4 @@
-"""Test for otx.mpa.modules.models"""
-
+"""Test for otx.algorithms.classification.adapters.mmcls.optimizer"""
 # Copyright (C) 2023 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
+#
diff --git a/...s/unit/mpa/modules/optimizer/test_lars.py → ...ion/adapters/mmcls/optimizer/test_lars.py b/...s/unit/mpa/modules/optimizer/test_lars.py → ...ion/adapters/mmcls/optimizer/test_lars.py
diff --git a/...pa/modules/models/classifiers/__init__.py → ...ommon/adapters/mmcv/pipelines/__init__.py b/...pa/modules/models/classifiers/__init__.py → ...ommon/adapters/mmcv/pipelines/__init__.py
@@ -1,4 +1,4 @@
-"""Test for otx.mpa.modules.models.classifiers"""
-
+"""Test for otx.algorithms.common.adapters.mmcv.pipelines"""
 # Copyright (C) 2023 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
+#
diff --git a/tests/unit/algorithms/common/adapters/mmcv/pipelines/transforms/__init__.py b/tests/unit/algorithms/common/adapters/mmcv/pipelines/transforms/__init__.py
@@ -0,0 +1,4 @@
+"""Test for otx.algorithms.common.adapters.mmcv.pipelines.transforms"""
+# Copyright (C) 2023 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
diff --git a/...ets/pipelines/transforms/test_augments.py → ...mcv/pipelines/transforms/test_augments.py b/...ets/pipelines/transforms/test_augments.py → ...mcv/pipelines/transforms/test_augments.py
diff --git a/...asets/pipelines/transforms/test_augmix.py → .../mmcv/pipelines/transforms/test_augmix.py b/...asets/pipelines/transforms/test_augmix.py → .../mmcv/pipelines/transforms/test_augmix.py
diff --git a/...pelines/transforms/test_ote_transforms.py → ...pelines/transforms/test_otx_transforms.py b/...pelines/transforms/test_ote_transforms.py → ...pelines/transforms/test_otx_transforms.py
@@ -1,4 +1,4 @@
-"""Unit Tests for the MPA Dataset Pipelines OTE Transforms."""
+"""Unit Tests for the OTX Dataset Pipelines OTX Transforms."""
 
 # Copyright (C) 2022 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0

diff --git a/...pelines/transforms/test_random_augment.py → ...pelines/transforms/test_random_augment.py b/...pelines/transforms/test_random_augment.py → ...pelines/transforms/test_random_augment.py
@@ -44,8 +44,9 @@ def test_cutoutabs_transform(sample_pil_image: Image.Image) -> None:
 
 
 class TestOTXRandAugment:
-    def test_with_default_arguments(self, sample_np_image: np.ndarray) -> None:
+    def test_with_default_arguments(self, mocker, sample_np_image: np.ndarray) -> None:
         """Test case with default arguments."""
+        mocker.patch("random.random", return_value=0.1)  # RandAugment is applied only when random.random() < 0.5
         transform = OTXRandAugment(num_aug=2, magnitude=5, cutout_value=16)
         data = {"img": sample_np_image}
         results = transform(data)
@@ -54,8 +55,9 @@ def test_with_default_arguments(self, sample_np_image: np.ndarray) -> None:
         assert any(item.startswith("rand_mc_") for item in results.keys())
         assert "CutoutAbs" in results
 
-    def test_with_img_fields_argument(self, sample_np_image: np.ndarray) -> None:
+    def test_with_img_fields_argument(self, mocker, sample_np_image: np.ndarray) -> None:
         """Test case with img_fields argument."""
+        mocker.patch("random.random", return_value=0.1)  # RandAugment is applied only when random.random() < 0.5
         transform = OTXRandAugment(num_aug=2, magnitude=5, cutout_value=16)
         data = {
             "img1": sample_np_image,

diff --git a/...ines/transforms/test_twocrop_transform.py → ...ines/transforms/test_twocrop_transform.py b/...ines/transforms/test_twocrop_transform.py → ...ines/transforms/test_twocrop_transform.py
diff --git a/tests/unit/mpa/modules/datasets/pipelines/__init__.py b/tests/unit/mpa/modules/datasets/pipelines/__init__.py
diff --git a/tests/unit/mpa/modules/datasets/pipelines/transforms/__init__.py b/tests/unit/mpa/modules/datasets/pipelines/transforms/__init__.py
diff --git a/tests/unit/mpa/modules/heads/__init__.py b/tests/unit/mpa/modules/heads/__init__.py
diff --git a/tests/unit/mpa/modules/optimizer/__init__.py b/tests/unit/mpa/modules/optimizer/__init__.py