Skip to content

Commit 6559c5a

Browse files
jaegukhyunjaegukhyun
committed
Revert e2e test changes
1 parent 32e0bf8 commit 6559c5a

File tree

1 file changed

+18
-24
lines changed

1 file changed

+18
-24
lines changed

‎tests/e2e/cli/detection/test_detection.py

+18-24
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,10 @@
9090
templates = Registry("otx/algorithms/detection").filter(task_type="DETECTION").templates
9191
templates_ids = [template.model_template_id for template in templates]
9292

93-
template_experimental = parse_model_template(
94-
"otx/algorithms/detection/configs/detection/resnet50_deformable-detr/template_experimental.yaml"
95-
)
96-
templates_w_experimental = templates + [template_experimental]
97-
templates_ids_w_experimental = templates_ids + [template_experimental.model_template_id]
98-
9993

10094
class TestToolsMPADetection:
10195
@e2e_pytest_component
102-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
96+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
10397
def test_otx_train(self, template, tmp_dir_path):
10498
tmp_dir_path = tmp_dir_path / "detection"
10599
otx_train_testing(template, tmp_dir_path, otx_dir, args0)
@@ -110,7 +104,7 @@ def test_otx_train(self, template, tmp_dir_path):
110104

111105
@e2e_pytest_component
112106
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
113-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
107+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
114108
def test_otx_resume(self, template, tmp_dir_path):
115109
tmp_dir_path = tmp_dir_path / "detection/test_resume"
116110
otx_resume_testing(template, tmp_dir_path, otx_dir, args)
@@ -124,29 +118,29 @@ def test_otx_resume(self, template, tmp_dir_path):
124118

125119
@e2e_pytest_component
126120
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
127-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
121+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
128122
@pytest.mark.parametrize("dump_features", [True, False])
129123
def test_otx_export(self, template, tmp_dir_path, dump_features):
130124
tmp_dir_path = tmp_dir_path / "detection"
131125
otx_export_testing(template, tmp_dir_path, dump_features)
132126

133127
@e2e_pytest_component
134128
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
135-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
129+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
136130
def test_otx_export_fp16(self, template, tmp_dir_path):
137131
tmp_dir_path = tmp_dir_path / "detection"
138132
otx_export_testing(template, tmp_dir_path, half_precision=True)
139133

140134
@e2e_pytest_component
141135
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
142-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
136+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
143137
def test_otx_eval(self, template, tmp_dir_path):
144138
tmp_dir_path = tmp_dir_path / "detection"
145139
otx_eval_testing(template, tmp_dir_path, otx_dir, args)
146140

147141
@e2e_pytest_component
148142
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
149-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
143+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
150144
@pytest.mark.parametrize("half_precision", [True, False])
151145
def test_otx_eval_openvino(self, template, tmp_dir_path, half_precision):
152146
tmp_dir_path = tmp_dir_path / "detection"
@@ -196,42 +190,42 @@ def test_otx_explain_process_saliency_maps_openvino(self, template, tmp_dir_path
196190

197191
@e2e_pytest_component
198192
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
199-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
193+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
200194
def test_otx_demo(self, template, tmp_dir_path):
201195
tmp_dir_path = tmp_dir_path / "detection"
202196
otx_demo_testing(template, tmp_dir_path, otx_dir, args)
203197

204198
@e2e_pytest_component
205199
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
206-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
200+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
207201
def test_otx_demo_openvino(self, template, tmp_dir_path):
208202
tmp_dir_path = tmp_dir_path / "detection"
209203
otx_demo_openvino_testing(template, tmp_dir_path, otx_dir, args)
210204

211205
@e2e_pytest_component
212206
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
213-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
207+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
214208
def test_otx_deploy_openvino(self, template, tmp_dir_path):
215209
tmp_dir_path = tmp_dir_path / "detection"
216210
otx_deploy_openvino_testing(template, tmp_dir_path, otx_dir, args)
217211

218212
@e2e_pytest_component
219213
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
220-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
214+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
221215
def test_otx_eval_deployment(self, template, tmp_dir_path):
222216
tmp_dir_path = tmp_dir_path / "detection"
223217
otx_eval_deployment_testing(template, tmp_dir_path, otx_dir, args, threshold=0.0)
224218

225219
@e2e_pytest_component
226220
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
227-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
221+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
228222
def test_otx_demo_deployment(self, template, tmp_dir_path):
229223
tmp_dir_path = tmp_dir_path / "detection"
230224
otx_demo_deployment_testing(template, tmp_dir_path, otx_dir, args)
231225

232226
@e2e_pytest_component
233227
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
234-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
228+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
235229
def test_otx_hpo(self, template, tmp_dir_path):
236230
tmp_dir_path = tmp_dir_path / "detection/test_hpo"
237231
otx_hpo_testing(template, tmp_dir_path, otx_dir, args)
@@ -288,7 +282,7 @@ def test_nncf_eval_openvino(self, template, tmp_dir_path):
288282

289283
@e2e_pytest_component
290284
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
291-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
285+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
292286
def test_pot_optimize(self, template, tmp_dir_path):
293287
tmp_dir_path = tmp_dir_path / "detection"
294288
pot_optimize_testing(template, tmp_dir_path, otx_dir, args)
@@ -302,15 +296,15 @@ def test_pot_validate_fq(self, template, tmp_dir_path):
302296

303297
@e2e_pytest_component
304298
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
305-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
299+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
306300
def test_pot_eval(self, template, tmp_dir_path):
307301
tmp_dir_path = tmp_dir_path / "detection"
308302
pot_eval_testing(template, tmp_dir_path, otx_dir, args)
309303

310304
@e2e_pytest_component
311305
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
312306
@pytest.mark.skipif(MULTI_GPU_UNAVAILABLE, reason="The number of gpu is insufficient")
313-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
307+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
314308
def test_otx_multi_gpu_train(self, template, tmp_dir_path):
315309
tmp_dir_path = tmp_dir_path / "detection/test_multi_gpu"
316310
args1 = copy.deepcopy(args)
@@ -320,22 +314,22 @@ def test_otx_multi_gpu_train(self, template, tmp_dir_path):
320314

321315
class TestToolsMPASemiSLDetection:
322316
@e2e_pytest_component
323-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
317+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
324318
def test_otx_train(self, template, tmp_dir_path):
325319
tmp_dir_path = tmp_dir_path / "detection/test_semisl"
326320
otx_train_testing(template, tmp_dir_path, otx_dir, args_semisl)
327321

328322
@e2e_pytest_component
329323
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
330-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
324+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
331325
def test_otx_eval(self, template, tmp_dir_path):
332326
tmp_dir_path = tmp_dir_path / "detection/test_semisl"
333327
otx_eval_testing(template, tmp_dir_path, otx_dir, args)
334328

335329
@e2e_pytest_component
336330
@pytest.mark.skipif(TT_STABILITY_TESTS, reason="This is TT_STABILITY_TESTS")
337331
@pytest.mark.skipif(MULTI_GPU_UNAVAILABLE, reason="The number of gpu is insufficient")
338-
@pytest.mark.parametrize("template", templates_w_experimental, ids=templates_ids_w_experimental)
332+
@pytest.mark.parametrize("template", templates, ids=templates_ids)
339333
def test_otx_multi_gpu_train_semisl(self, template, tmp_dir_path):
340334
tmp_dir_path = tmp_dir_path / "detection/test_multi_gpu_semisl"
341335
args_semisl_multigpu = copy.deepcopy(args_semisl)

0 commit comments

Comments
 (0)