From fe1dccae81c2d311f7e499f05879f8b563391928 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 21 Jun 2024 10:30:52 +0900 Subject: [PATCH] Update code feedbacks --- tests/conftest.py | 2 +- tests/perf/conftest.py | 7 +++++-- tests/perf/test_action.py | 5 ++--- tests/perf/test_anomaly.py | 13 ------------- tests/perf/test_classification.py | 5 ++--- tests/perf/test_detection.py | 5 ++--- tests/perf/test_instance_segmentation.py | 13 ------------- tests/perf/test_semantic_segmentation.py | 13 ------------- tests/perf/test_visual_prompting.py | 13 ------------- 9 files changed, 12 insertions(+), 64 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 0a9fa81800d..43edaa76a05 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -94,7 +94,7 @@ def pytest_addoption(parser: pytest.Parser): ) parser.addoption( "--deterministic", - action="store", + choices=["true", "false"], default=None, help="Turn on deterministic training (true/false).", ) diff --git a/tests/perf/conftest.py b/tests/perf/conftest.py index 57752e3f47c..9ca0c59cb89 100644 --- a/tests/perf/conftest.py +++ b/tests/perf/conftest.py @@ -173,9 +173,12 @@ def fxt_dry_run(request: pytest.FixtureRequest) -> str: @pytest.fixture(scope="session") -def fxt_deterministic(request: pytest.FixtureRequest) -> str: +def fxt_deterministic(request: pytest.FixtureRequest) -> bool: """Option to turn on deterministic training.""" - return request.config.getoption("--deterministic") + deterministic = request.config.getoption("--deterministic") + deterministic = False if deterministic is None else deterministic == "true" + log.info(f"{deterministic=}") + return deterministic @pytest.fixture(scope="session") diff --git a/tests/perf/test_action.py b/tests/perf/test_action.py index 26a75c4dd23..876df901f40 100644 --- a/tests/perf/test_action.py +++ b/tests/perf/test_action.py @@ -20,9 +20,8 @@ def fxt_deterministic(request: pytest.FixtureRequest) -> bool: """Override the deterministic setting for action classification task.""" deterministic = request.config.getoption("--deterministic") - deterministic = True if deterministic is None else deterministic.lower() == "true" - msg = f"deterministic={deterministic}" - log.info(msg) + deterministic = True if deterministic is None else deterministic == "true" + log.info(f"{deterministic=}") return deterministic diff --git a/tests/perf/test_anomaly.py b/tests/perf/test_anomaly.py index 0ae0fe02af1..72f18c35443 100644 --- a/tests/perf/test_anomaly.py +++ b/tests/perf/test_anomaly.py @@ -5,7 +5,6 @@ from __future__ import annotations -import logging from pathlib import Path from typing import ClassVar @@ -14,18 +13,6 @@ from .benchmark import Benchmark from .conftest import PerfTestBase -log = logging.getLogger(__name__) - - -@pytest.fixture(scope="session") -def fxt_deterministic(request: pytest.FixtureRequest) -> bool: - """Override the deterministic setting for anomaly tasks.""" - deterministic = request.config.getoption("--deterministic") - deterministic = False if deterministic is None else deterministic.lower() == "true" - msg = f"deterministic={deterministic}" - log.info(msg) - return deterministic - class TestPerfAnomalyClassification(PerfTestBase): """Benchmark anomaly classification.""" diff --git a/tests/perf/test_classification.py b/tests/perf/test_classification.py index 9fe300584b8..c4361fa2932 100644 --- a/tests/perf/test_classification.py +++ b/tests/perf/test_classification.py @@ -20,9 +20,8 @@ def fxt_deterministic(request: pytest.FixtureRequest) -> bool: """Override the deterministic setting for classification tasks.""" deterministic = request.config.getoption("--deterministic") - deterministic = True if deterministic is None else deterministic.lower() == "true" - msg = f"deterministic={deterministic}" - log.info(msg) + deterministic = True if deterministic is None else deterministic == "true" + log.info(f"{deterministic=}") return deterministic diff --git a/tests/perf/test_detection.py b/tests/perf/test_detection.py index 8e5bd6f6ce7..0cbeb8b3d02 100644 --- a/tests/perf/test_detection.py +++ b/tests/perf/test_detection.py @@ -20,9 +20,8 @@ def fxt_deterministic(request: pytest.FixtureRequest) -> bool: """Override the deterministic setting for detection task.""" deterministic = request.config.getoption("--deterministic") - deterministic = True if deterministic is None else deterministic.lower() == "true" - msg = f"deterministic={deterministic}" - log.info(msg) + deterministic = True if deterministic is None else deterministic == "true" + log.info(f"{deterministic=}") return deterministic diff --git a/tests/perf/test_instance_segmentation.py b/tests/perf/test_instance_segmentation.py index 97556ab58a8..2cc02744d0b 100644 --- a/tests/perf/test_instance_segmentation.py +++ b/tests/perf/test_instance_segmentation.py @@ -5,7 +5,6 @@ from __future__ import annotations -import logging from pathlib import Path import pytest @@ -13,18 +12,6 @@ from .benchmark import Benchmark from .conftest import PerfTestBase -log = logging.getLogger(__name__) - - -@pytest.fixture(scope="session") -def fxt_deterministic(request: pytest.FixtureRequest) -> bool: - """Override the deterministic setting for instance segmentation task.""" - deterministic = request.config.getoption("--deterministic") - deterministic = False if deterministic is None else deterministic.lower() == "true" - msg = f"deterministic={deterministic}" - log.info(msg) - return deterministic - class TestPerfInstanceSegmentation(PerfTestBase): """Benchmark instance segmentation.""" diff --git a/tests/perf/test_semantic_segmentation.py b/tests/perf/test_semantic_segmentation.py index d4f25625ae2..6a63dca124c 100644 --- a/tests/perf/test_semantic_segmentation.py +++ b/tests/perf/test_semantic_segmentation.py @@ -5,7 +5,6 @@ from __future__ import annotations -import logging from pathlib import Path import pytest @@ -13,18 +12,6 @@ from .benchmark import Benchmark from .conftest import PerfTestBase -log = logging.getLogger(__name__) - - -@pytest.fixture(scope="session") -def fxt_deterministic(request: pytest.FixtureRequest) -> bool: - """Override the deterministic setting for semantic segmentation task.""" - deterministic = request.config.getoption("--deterministic") - deterministic = False if deterministic is None else deterministic.lower() == "true" - msg = f"deterministic={deterministic}" - log.info(msg) - return deterministic - class TestPerfSemanticSegmentation(PerfTestBase): """Benchmark semantic segmentation.""" diff --git a/tests/perf/test_visual_prompting.py b/tests/perf/test_visual_prompting.py index d860f1f4293..0aae2d8c29b 100644 --- a/tests/perf/test_visual_prompting.py +++ b/tests/perf/test_visual_prompting.py @@ -5,7 +5,6 @@ from __future__ import annotations -import logging from pathlib import Path import pytest @@ -13,18 +12,6 @@ from .benchmark import Benchmark from .conftest import PerfTestBase -log = logging.getLogger(__name__) - - -@pytest.fixture(scope="session") -def fxt_deterministic(request: pytest.FixtureRequest) -> bool: - """Override the deterministic setting for visual prompting task.""" - deterministic = request.config.getoption("--deterministic") - deterministic = False if deterministic is None else deterministic.lower() == "true" - msg = f"deterministic={deterministic}" - log.info(msg) - return deterministic - class TestPerfVisualPrompting(PerfTestBase): """Benchmark visual prompting."""