Skip to content

Commit b2ccb26

Browse files
committed
Refactor RetinaNet test cases to use dict_product for parameter combinations
Signed-off-by: R. Garcia-Dias <[email protected]>
1 parent 836cf6e commit b2ccb26

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

tests/apps/detection/networks/test_retinanet.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from monai.networks import eval_mode
2121
from monai.networks.nets import resnet10, resnet18, resnet34, resnet50, resnet101, resnet152, resnet200
2222
from monai.utils import ensure_tuple, optional_import
23-
from tests.test_utils import SkipIfBeforePyTorchVersion, skip_if_quick, test_onnx_save, test_script_save
23+
from tests.test_utils import SkipIfBeforePyTorchVersion, dict_product, skip_if_quick, test_onnx_save, test_script_save
2424

2525
_, has_torchvision = optional_import("torchvision")
2626

@@ -86,15 +86,23 @@
8686
(2, 1, 32, 64),
8787
]
8888

89+
# Create all test case combinations using dict_product
90+
CASE_LIST = [TEST_CASE_1, TEST_CASE_2, TEST_CASE_3, TEST_CASE_2_A, TEST_CASE_3_A]
91+
MODEL_LIST = [resnet10, resnet18, resnet34, resnet50, resnet101, resnet152, resnet200]
92+
8993
TEST_CASES = []
90-
for case in [TEST_CASE_1, TEST_CASE_2, TEST_CASE_3, TEST_CASE_2_A, TEST_CASE_3_A]:
91-
for model in [resnet10, resnet18, resnet34, resnet50, resnet101, resnet152, resnet200]:
92-
TEST_CASES.append([model, *case])
94+
for params in dict_product(
95+
model=MODEL_LIST,
96+
case=CASE_LIST,
97+
):
98+
TEST_CASES.append([params["model"], *params["case"]])
9399

94100
TEST_CASES_TS = []
95-
for case in [TEST_CASE_1]:
96-
for model in [resnet10, resnet18, resnet34, resnet50, resnet101, resnet152, resnet200]:
97-
TEST_CASES_TS.append([model, *case])
101+
for params in dict_product(
102+
model=MODEL_LIST,
103+
case=[TEST_CASE_1],
104+
):
105+
TEST_CASES_TS.append([params["model"], *params["case"]])
98106

99107

100108
@SkipIfBeforePyTorchVersion((1, 12))

0 commit comments

Comments
 (0)