Skip to content

Commit

Permalink
Merge branch 'develop' into vsaltykovx/add_mmdetection_input_paramete…
Browse files Browse the repository at this point in the history 
…rs_validation
  • Loading branch information
@saltykox
saltykox committed Feb 21, 2022
2 parents 1cc4410 + 70bd630 commit 23207fd
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion tests/ote_cli/common.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ def nncf_export_testing(template, root):
assert compressed_bin_size < original_bin_size, f"{compressed_bin_size=}, {original_bin_size=}"


def nncf_eval_testing(template, root, ote_dir, args, threshold=0.001):
def nncf_eval_testing(template, root, ote_dir, args, threshold):
work_dir, template_work_dir, _ = get_some_vars(template, root)
command_line = ['ote',
'eval',
Expand Down
4 changes: 2 additions & 2 deletions tests/ote_cli/test_ote_cli_tools_anomaly_classification.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def test_ote_deploy_openvino(self, template):
@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
def test_ote_eval_deployment(self, template):
ote_eval_deployment_testing(template, root, ote_dir, args, threshold=0.00)
ote_eval_deployment_testing(template, root, ote_dir, args, threshold=0.0)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand Down Expand Up @@ -132,7 +132,7 @@ def test_nncf_eval(self, template):
if template.entrypoints.nncf is None:
pytest.skip("nncf entrypoint is none")

nncf_eval_testing(template, root, ote_dir, args)
nncf_eval_testing(template, root, ote_dir, args, threshold=0.1)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand Down
4 changes: 2 additions & 2 deletions tests/ote_cli/test_ote_cli_tools_classification.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def test_ote_deploy_openvino(self, template):
@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
def test_ote_eval_deployment(self, template):
ote_eval_deployment_testing(template, root, ote_dir, args, threshold=0.00)
ote_eval_deployment_testing(template, root, ote_dir, args, threshold=0.0)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand Down Expand Up @@ -144,7 +144,7 @@ def test_nncf_eval(self, template):
if template.entrypoints.nncf is None:
pytest.skip("nncf entrypoint is none")

nncf_eval_testing(template, root, ote_dir, args)
nncf_eval_testing(template, root, ote_dir, args, threshold=0.1)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand Down
6 changes: 3 additions & 3 deletions tests/ote_cli/test_ote_cli_tools_detection.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def test_ote_eval(self, template):
@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
def test_ote_eval_openvino(self, template):
ote_eval_openvino_testing(template, root, ote_dir, args, threshold=0.01)
ote_eval_openvino_testing(template, root, ote_dir, args, threshold=0.1)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand All @@ -112,7 +112,7 @@ def test_ote_deploy_openvino(self, template):
@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
def test_ote_eval_deployment(self, template):
ote_eval_deployment_testing(template, root, ote_dir, args, threshold=0.00)
ote_eval_deployment_testing(template, root, ote_dir, args, threshold=0.0)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand Down Expand Up @@ -146,7 +146,7 @@ def test_nncf_eval(self, template):
if template.entrypoints.nncf is None:
pytest.skip("nncf entrypoint is none")

nncf_eval_testing(template, root, ote_dir, args)
nncf_eval_testing(template, root, ote_dir, args, threshold=0.1)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand Down
4 changes: 2 additions & 2 deletions tests/ote_cli/test_ote_cli_tools_instance_segmentation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def test_ote_eval(self, template):
@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
def test_ote_eval_openvino(self, template):
ote_eval_openvino_testing(template, root, ote_dir, args, threshold=0.01)
ote_eval_openvino_testing(template, root, ote_dir, args, threshold=0.1)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand All @@ -105,7 +105,7 @@ def test_ote_deploy_openvino(self, template):
@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
def test_ote_eval_deployment(self, template):
ote_eval_deployment_testing(template, root, ote_dir, args, threshold=0.00)
ote_eval_deployment_testing(template, root, ote_dir, args, threshold=0.0)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand Down
4 changes: 2 additions & 2 deletions tests/ote_cli/test_ote_cli_tools_rotated_detection.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def test_ote_eval(self, template):
@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
def test_ote_eval_openvino(self, template):
ote_eval_openvino_testing(template, root, ote_dir, args, threshold=0.01)
ote_eval_openvino_testing(template, root, ote_dir, args, threshold=0.1)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand All @@ -105,7 +105,7 @@ def test_ote_deploy_openvino(self, template):
@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
def test_ote_eval_deployment(self, template):
ote_eval_deployment_testing(template, root, ote_dir, args, threshold=0.01)
ote_eval_deployment_testing(template, root, ote_dir, args, threshold=0.0)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand Down
6 changes: 3 additions & 3 deletions tests/ote_cli/test_ote_cli_tools_segmentation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def test_ote_eval(self, template):
@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
def test_ote_eval_openvino(self, template):
ote_eval_openvino_testing(template, root, ote_dir, args, threshold=0.01)
ote_eval_openvino_testing(template, root, ote_dir, args, threshold=0.1)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand All @@ -111,7 +111,7 @@ def test_ote_deploy_openvino(self, template):
@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
def test_ote_eval_deployment(self, template):
ote_eval_deployment_testing(template, root, ote_dir, args, threshold=0.00)
ote_eval_deployment_testing(template, root, ote_dir, args, threshold=0.0)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand Down Expand Up @@ -141,7 +141,7 @@ def test_nncf_eval(self, template):
if template.entrypoints.nncf is None:
pytest.skip("nncf entrypoint is none")

nncf_eval_testing(template, root, ote_dir, args)
nncf_eval_testing(template, root, ote_dir, args, threshold=0.1)

@e2e_pytest_component
@pytest.mark.parametrize("template", templates, ids=templates_ids)
Expand Down

0 comments on commit 23207fd

Please sign in to comment.