From b26b6dd9c9362fb1354793b6dc894b64c2eca010 Mon Sep 17 00:00:00 2001 From: Jaeguk Hyun Date: Tue, 23 May 2023 05:01:40 +0900 Subject: [PATCH 1/2] Fix iseg e2e (#2173) --- .../e2e/cli/instance_segmentation/test_instance_segmentation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/cli/instance_segmentation/test_instance_segmentation.py b/tests/e2e/cli/instance_segmentation/test_instance_segmentation.py index 64899c60e50..c29531fc88b 100644 --- a/tests/e2e/cli/instance_segmentation/test_instance_segmentation.py +++ b/tests/e2e/cli/instance_segmentation/test_instance_segmentation.py @@ -51,7 +51,7 @@ "--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", "4", "--learning_parameters.batch_size", "2"], + "train_params": ["params", "--learning_parameters.num_iters", "5", "--learning_parameters.batch_size", "2"], } # Training params for resume, num_iters*2 From 25b87760c59ecda9bc63a66a958a90186dcf5eab Mon Sep 17 00:00:00 2001 From: Jaeguk Hyun Date: Tue, 23 May 2023 17:59:32 +0900 Subject: [PATCH 2/2] Fix det e2e (#2176) * Fix det e2e * Fix mypy --- .../configs/detection/cspdarknet_yolox/data_pipeline.py | 2 +- otx/api/configuration/helper/convert.py | 3 ++- tests/e2e/cli/detection/test_detection.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/otx/algorithms/detection/configs/detection/cspdarknet_yolox/data_pipeline.py b/otx/algorithms/detection/configs/detection/cspdarknet_yolox/data_pipeline.py index 83358159eb7..710def36738 100644 --- a/otx/algorithms/detection/configs/detection/cspdarknet_yolox/data_pipeline.py +++ b/otx/algorithms/detection/configs/detection/cspdarknet_yolox/data_pipeline.py @@ -48,7 +48,7 @@ img_scale=(416, 416), flip=False, transforms=[ - dict(type="Resize", keep_ratio=False), + dict(type="Resize", keep_ratio=True), dict(type="RandomFlip"), dict(type="Pad", size=(416, 416), pad_val=114.0), dict(type="Normalize", **__img_norm_cfg), diff --git a/otx/api/configuration/helper/convert.py b/otx/api/configuration/helper/convert.py index 1c8a84ed8eb..6febaaeddcc 100644 --- a/otx/api/configuration/helper/convert.py +++ b/otx/api/configuration/helper/convert.py @@ -8,7 +8,7 @@ from enum import Enum -from typing import Type, TypeVar +from typing import Any, Type, TypeVar import yaml from omegaconf import DictConfig, OmegaConf @@ -128,6 +128,7 @@ def convert( config_id = config_dict.get("id", None) config_dict["id"] = str(config_id) if config_id is not None else None + result: Any = None if target == str: result = yaml.dump(config_dict) elif target == dict: diff --git a/tests/e2e/cli/detection/test_detection.py b/tests/e2e/cli/detection/test_detection.py index 28e69c8a452..08392796ee6 100644 --- a/tests/e2e/cli/detection/test_detection.py +++ b/tests/e2e/cli/detection/test_detection.py @@ -46,7 +46,7 @@ "--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", "6", "--learning_parameters.batch_size", "4"], + "train_params": ["params", "--learning_parameters.num_iters", "15", "--learning_parameters.batch_size", "4"], } # Class-Incremental learning w/ 'vehicle', 'person', 'non-vehicle' classes