Move utils inside utils to avoid coflict

Author: garciadias

tests/apps/detection/networks/test_retinanet.py

@@ -20,7 +20,7 @@
 from monai.networks import eval_mode
 from monai.networks.nets import resnet10, resnet18, resnet34, resnet50, resnet101, resnet152, resnet200
 from monai.utils import ensure_tuple, optional_import
-from tests.utils import SkipIfBeforePyTorchVersion, skip_if_quick, test_onnx_save, test_script_save
+from tests.utils.utils import SkipIfBeforePyTorchVersion, skip_if_quick, test_onnx_save, test_script_save
 
 _, has_torchvision = optional_import("torchvision")
 

tests/apps/detection/networks/test_retinanet_detector.py

@@ -21,7 +21,7 @@
 from monai.apps.detection.utils.anchor_utils import AnchorGeneratorWithAnchorShape
 from monai.networks import eval_mode, train_mode
 from monai.utils import optional_import
-from tests.utils import SkipIfBeforePyTorchVersion, skip_if_quick, test_script_save
+from tests.utils.utils import SkipIfBeforePyTorchVersion, skip_if_quick, test_script_save
 
 _, has_torchvision = optional_import("torchvision")
 

tests/apps/detection/test_box_transform.py

@@ -36,7 +36,7 @@
 )
 from monai.data.meta_tensor import MetaTensor
 from monai.transforms import CastToTyped, Invertd
-from tests.utils import TEST_NDARRAYS, assert_allclose
+from tests.utils.utils import TEST_NDARRAYS, assert_allclose
 
 TESTS_3D = []
 boxes = [[0, 0, 0, 0, 0, 0], [0, 1, 0, 2, 3, 3], [0, 1, 1, 2, 3, 4]]

tests/apps/detection/utils/test_anchor_box.py

@@ -18,7 +18,7 @@
 
 from monai.apps.detection.utils.anchor_utils import AnchorGenerator, AnchorGeneratorWithAnchorShape
 from monai.utils import optional_import
-from tests.utils import SkipIfBeforePyTorchVersion, assert_allclose, test_script_save
+from tests.utils.utils import SkipIfBeforePyTorchVersion, assert_allclose, test_script_save
 
 _, has_torchvision = optional_import("torchvision")
 

tests/apps/detection/utils/test_atss_box_matcher.py

@@ -18,7 +18,7 @@
 
 from monai.apps.detection.utils.ATSS_matcher import ATSSMatcher
 from monai.data.box_utils import box_iou
-from tests.utils import assert_allclose
+from tests.utils.utils import assert_allclose
 
 TEST_CASES = [
     [

tests/apps/detection/utils/test_box_coder.py

@@ -17,7 +17,7 @@
 
 from monai.apps.detection.utils.box_coder import BoxCoder
 from monai.transforms import CastToType
-from tests.utils import assert_allclose
+from tests.utils.utils import assert_allclose
 
 
 class TestBoxTransform(unittest.TestCase):

tests/apps/detection/utils/test_detector_boxselector.py

@@ -17,7 +17,7 @@
 from parameterized import parameterized
 
 from monai.apps.detection.utils.box_selector import BoxSelector
-from tests.utils import assert_allclose
+from tests.utils.utils import assert_allclose
 
 device = "cuda" if torch.cuda.is_available() else "cpu"
 num_anchors = 7

tests/apps/detection/utils/test_detector_utils.py

@@ -19,7 +19,7 @@
 
 from monai.apps.detection.utils.detector_utils import preprocess_images
 from monai.utils import ensure_tuple
-from tests.utils import assert_allclose
+from tests.utils.utils import assert_allclose
 
 TEST_CASE_1 = [  # 3D, batch 3, 2 input channel
     {

tests/apps/detection/utils/test_hardnegsampler.py

@@ -17,7 +17,7 @@
 from parameterized import parameterized
 
 from monai.apps.detection.utils.hard_negative_sampler import HardNegativeSampler
-from tests.utils import assert_allclose
+from tests.utils.utils import assert_allclose
 
 TEST_CASE = [
     [[], [], [], [torch.tensor([]), torch.tensor([])], [torch.tensor([]), torch.tensor([])]],

tests/apps/generation/maisi/networks/test_autoencoderkl_maisi.py

@@ -19,7 +19,7 @@
 from monai.apps.generation.maisi.networks.autoencoderkl_maisi import AutoencoderKlMaisi
 from monai.networks import eval_mode
 from monai.utils import optional_import
-from tests.utils import SkipIfBeforePyTorchVersion
+from tests.utils.utils import SkipIfBeforePyTorchVersion
 
 tqdm, has_tqdm = optional_import("tqdm", name="tqdm")
 _, has_einops = optional_import("einops")