Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OTE-TEST] hot-fix for MPA performance tests #1273

Merged
merged 7 commits into from
Sep 20, 2022
Merged

[OTE-TEST] hot-fix for MPA performance tests #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
149dd6a
check hot-fix
harimkang Sep 19, 2022
8fd1e3c
revert conftest
harimkang Sep 19, 2022
b7dee8d
conftest Import Error Fix
harimkang Sep 19, 2022
0800cc9
collection error
harimkang Sep 19, 2022
6192e1b
Validation Report Selection fix
harimkang Sep 19, 2022
f7b5a1d
Change Name TestClass for resolving file name too long issue
harimkang Sep 20, 2022
892ccc5
Fix Anomaly template root path
harimkang Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/anomaly/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def ote_templates_root_dir_fx():

logger = logging.getLogger(__name__)
root = osp.dirname(osp.dirname(osp.realpath(__file__)))
root = f"{root}/templates/"
root = f"{root}/configs/"
logger.debug(f"overloaded ote_templates_root_dir_fx: return {root}")
return root

Expand Down
2 changes: 1 addition & 1 deletion external/model-preparation-algorithm/ote_tests_pytest.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[pytest]
python_files = test_ote_*_api.py test_ote_*_training.py
python_files = test_ote_*.py
14 changes: 0 additions & 14 deletions external/model-preparation-algorithm/tests/config.py
View file
Open in desktop

This file was deleted.

21 changes: 13 additions & 8 deletions external/model-preparation-algorithm/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,23 @@

try:
import e2e.fixtures

from e2e.conftest_utils import * # noqa
from e2e.conftest_utils import pytest_addoption as _e2e_pytest_addoption # noqa
from e2e import config # noqa
from e2e.conftest_utils import * # noqa
from e2e.conftest_utils import pytest_addoption as _e2e_pytest_addoption # noqa
from e2e import config # noqa
from e2e.utils import get_plugins_from_packages

pytest_plugins = get_plugins_from_packages([e2e])
import os
from e2e import config as config_e2e

config_e2e.repository_name = os.environ.get(
"TT_REPOSITORY_NAME",
"ote/training_extensions/external/model-preparation-algorithm",
)
except ImportError:
_e2e_pytest_addoption = None
pass
import config

import pytest
from ote_sdk.test_suite.pytest_insertions import (
get_pytest_plugins_from_ote,
Expand All @@ -25,9 +32,7 @@

pytest_plugins = get_pytest_plugins_from_ote()

ote_conftest_insertion(
default_repository_name="ote/training_extensions/external/model-preparation-algorithm"
)
ote_conftest_insertion(default_repository_name="ote/training_extensions/external/model-preparation-algorithm")


@pytest.fixture
Expand Down
2 changes: 1 addition & 1 deletion external/model-preparation-algorithm/tests/test_ote_classification_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def default_test_parameters(self) -> Dict[str, Any]:
return deepcopy(DEFAULT_TEST_PARAMETERS)


class TestOTEReallifeClassificationClsIncr(OTETrainingTestInterface):
class TestOTEReallifeMPACls(OTETrainingTestInterface):
"""
The main class of running test in this file.
"""
Expand Down
2 changes: 1 addition & 1 deletion external/model-preparation-algorithm/tests/test_ote_detection_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def get_dummy_compressed_model(task):
return compressed_model


class TestOTEReallifeObjectDetectionClsIncr(OTETrainingTestInterface):
class TestOTEReallifeMPADet(OTETrainingTestInterface):
"""
The main class of running test in this file.
"""
Expand Down
2 changes: 1 addition & 1 deletion external/model-preparation-algorithm/tests/test_ote_segmentation_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def test_bunches(self) -> List[Dict[str, Any]]:
return deepcopy(test_bunches)


class TestOTEReallifeSegmentationClsIncr(OTETrainingTestInterface):
class TestOTEReallifeMPASeg(OTETrainingTestInterface):
"""
The main class of running test in this file.
"""
Expand Down