diff --git a/tests/apps/detection/networks/test_retinanet.py b/tests/apps/detection/networks/test_retinanet.py index fe9afaa8d4..b8881fdf24 100644 --- a/tests/apps/detection/networks/test_retinanet.py +++ b/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.utils import SkipIfBeforePyTorchVersion, skip_if_quick, test_onnx_save, test_script_save +from tests.util import SkipIfBeforePyTorchVersion, skip_if_quick, test_onnx_save, test_script_save _, has_torchvision = optional_import("torchvision") diff --git a/tests/apps/detection/networks/test_retinanet_detector.py b/tests/apps/detection/networks/test_retinanet_detector.py index a6ad00aabb..377613ed3d 100644 --- a/tests/apps/detection/networks/test_retinanet_detector.py +++ b/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.utils import SkipIfBeforePyTorchVersion, skip_if_quick, test_script_save +from tests.util import SkipIfBeforePyTorchVersion, skip_if_quick, test_script_save _, has_torchvision = optional_import("torchvision") diff --git a/tests/apps/detection/test_box_transform.py b/tests/apps/detection/test_box_transform.py index 21a8ba2675..dea04f6027 100644 --- a/tests/apps/detection/test_box_transform.py +++ b/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.utils import TEST_NDARRAYS, assert_allclose +from tests.util 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]] diff --git a/tests/apps/detection/utils/test_anchor_box.py b/tests/apps/detection/utils/test_anchor_box.py index 9b9c43033c..4a7b0a0b7b 100644 --- a/tests/apps/detection/utils/test_anchor_box.py +++ b/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.utils import SkipIfBeforePyTorchVersion, assert_allclose, test_script_save +from tests.util import SkipIfBeforePyTorchVersion, assert_allclose, test_script_save _, has_torchvision = optional_import("torchvision") diff --git a/tests/apps/detection/utils/test_atss_box_matcher.py b/tests/apps/detection/utils/test_atss_box_matcher.py index 88ae5c8205..dc7e32d8ef 100644 --- a/tests/apps/detection/utils/test_atss_box_matcher.py +++ b/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.utils import assert_allclose +from tests.util import assert_allclose TEST_CASES = [ [ diff --git a/tests/apps/detection/utils/test_box_coder.py b/tests/apps/detection/utils/test_box_coder.py index 5173c9cf1e..ea2a52bdba 100644 --- a/tests/apps/detection/utils/test_box_coder.py +++ b/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.utils import assert_allclose +from tests.util import assert_allclose class TestBoxTransform(unittest.TestCase): diff --git a/tests/apps/detection/utils/test_detector_boxselector.py b/tests/apps/detection/utils/test_detector_boxselector.py index dd4002301b..ae1ef123aa 100644 --- a/tests/apps/detection/utils/test_detector_boxselector.py +++ b/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.utils import assert_allclose +from tests.util import assert_allclose device = "cuda" if torch.cuda.is_available() else "cpu" num_anchors = 7 diff --git a/tests/apps/detection/utils/test_detector_utils.py b/tests/apps/detection/utils/test_detector_utils.py index 419598539d..af1818846d 100644 --- a/tests/apps/detection/utils/test_detector_utils.py +++ b/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.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_1 = [ # 3D, batch 3, 2 input channel { diff --git a/tests/apps/detection/utils/test_hardnegsampler.py b/tests/apps/detection/utils/test_hardnegsampler.py index 9466e28c56..9077234fbc 100644 --- a/tests/apps/detection/utils/test_hardnegsampler.py +++ b/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.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE = [ [[], [], [], [torch.tensor([]), torch.tensor([])], [torch.tensor([]), torch.tensor([])]], diff --git a/tests/apps/generation/maisi/networks/test_autoencoderkl_maisi.py b/tests/apps/generation/maisi/networks/test_autoencoderkl_maisi.py index 9755f00726..d78c7e6d34 100644 --- a/tests/apps/generation/maisi/networks/test_autoencoderkl_maisi.py +++ b/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.utils import SkipIfBeforePyTorchVersion +from tests.util import SkipIfBeforePyTorchVersion tqdm, has_tqdm = optional_import("tqdm", name="tqdm") _, has_einops = optional_import("einops") diff --git a/tests/apps/generation/maisi/networks/test_controlnet_maisi.py b/tests/apps/generation/maisi/networks/test_controlnet_maisi.py index 66004890ed..d5282426a6 100644 --- a/tests/apps/generation/maisi/networks/test_controlnet_maisi.py +++ b/tests/apps/generation/maisi/networks/test_controlnet_maisi.py @@ -20,7 +20,7 @@ from monai.apps.generation.maisi.networks.controlnet_maisi import ControlNetMaisi from monai.networks import eval_mode from monai.utils import optional_import -from tests.utils.utils import SkipIfBeforePyTorchVersion +from tests.util import SkipIfBeforePyTorchVersion _, has_einops = optional_import("einops") diff --git a/tests/apps/pathology/handlers/test_from_engine_hovernet.py b/tests/apps/pathology/handlers/test_from_engine_hovernet.py index 8c075d06e5..98659c4974 100644 --- a/tests/apps/pathology/handlers/test_from_engine_hovernet.py +++ b/tests/apps/pathology/handlers/test_from_engine_hovernet.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.apps.pathology.handlers.utils import from_engine_hovernet -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_0 = [ [{"A": {"C": 1, "D": 2}, "B": {"C": 2, "D": 2}}, {"A": {"C": 3, "D": 2}, "B": {"C": 4, "D": 2}}], diff --git a/tests/apps/pathology/test_prepare_batch_hovernet.py b/tests/apps/pathology/test_prepare_batch_hovernet.py index 34e4a6b82c..2d5d103d6b 100644 --- a/tests/apps/pathology/test_prepare_batch_hovernet.py +++ b/tests/apps/pathology/test_prepare_batch_hovernet.py @@ -19,7 +19,7 @@ from monai.apps.pathology.engines import PrepareBatchHoVerNet from monai.engines import SupervisedEvaluator from monai.utils.enums import HoVerNetBranch -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_0 = [ {"extra_keys": ["extra_label1", "extra_label2"]}, diff --git a/tests/apps/pathology/transforms/post/test_generate_distance_map.py b/tests/apps/pathology/transforms/post/test_generate_distance_map.py index 45baa51b64..c812b5c2e1 100644 --- a/tests/apps/pathology/transforms/post/test_generate_distance_map.py +++ b/tests/apps/pathology/transforms/post/test_generate_distance_map.py @@ -18,7 +18,7 @@ from monai.apps.pathology.transforms.post.array import GenerateDistanceMap from monai.transforms.intensity.array import GaussianSmooth -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS EXCEPTION_TESTS = [] TESTS = [] diff --git a/tests/apps/pathology/transforms/post/test_generate_distance_mapd.py b/tests/apps/pathology/transforms/post/test_generate_distance_mapd.py index e33dd54c53..e549ce0295 100644 --- a/tests/apps/pathology/transforms/post/test_generate_distance_mapd.py +++ b/tests/apps/pathology/transforms/post/test_generate_distance_mapd.py @@ -18,7 +18,7 @@ from monai.apps.pathology.transforms.post.dictionary import GenerateDistanceMapd from monai.transforms.intensity.array import GaussianSmooth -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS EXCEPTION_TESTS = [] TESTS = [] diff --git a/tests/apps/pathology/transforms/post/test_generate_instance_border.py b/tests/apps/pathology/transforms/post/test_generate_instance_border.py index 8e61116e6b..10c6f414ab 100644 --- a/tests/apps/pathology/transforms/post/test_generate_instance_border.py +++ b/tests/apps/pathology/transforms/post/test_generate_instance_border.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.apps.pathology.transforms.post.array import GenerateInstanceBorder -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS EXCEPTION_TESTS = [] TESTS = [] diff --git a/tests/apps/pathology/transforms/post/test_generate_instance_borderd.py b/tests/apps/pathology/transforms/post/test_generate_instance_borderd.py index 77e56f459d..ebdf6e9be5 100644 --- a/tests/apps/pathology/transforms/post/test_generate_instance_borderd.py +++ b/tests/apps/pathology/transforms/post/test_generate_instance_borderd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.apps.pathology.transforms.post.dictionary import GenerateInstanceBorderd -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS EXCEPTION_TESTS = [] TESTS = [] diff --git a/tests/apps/pathology/transforms/post/test_generate_instance_centroid.py b/tests/apps/pathology/transforms/post/test_generate_instance_centroid.py index 9d4a3b5f41..545d2b9a62 100644 --- a/tests/apps/pathology/transforms/post/test_generate_instance_centroid.py +++ b/tests/apps/pathology/transforms/post/test_generate_instance_centroid.py @@ -19,7 +19,7 @@ from monai.apps.pathology.transforms.post.array import GenerateInstanceCentroid from monai.transforms import BoundingRect from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_skimage = optional_import("skimage", "0.19.3", min_version) diff --git a/tests/apps/pathology/transforms/post/test_generate_instance_centroidd.py b/tests/apps/pathology/transforms/post/test_generate_instance_centroidd.py index d36bbd5b0f..9b28d1bb9f 100644 --- a/tests/apps/pathology/transforms/post/test_generate_instance_centroidd.py +++ b/tests/apps/pathology/transforms/post/test_generate_instance_centroidd.py @@ -19,7 +19,7 @@ from monai.apps.pathology.transforms.post.dictionary import GenerateInstanceCentroidd from monai.transforms import BoundingRect from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_skimage = optional_import("skimage", "0.19.3", min_version) diff --git a/tests/apps/pathology/transforms/post/test_generate_instance_contour.py b/tests/apps/pathology/transforms/post/test_generate_instance_contour.py index 1bd3eac47b..53ff6f50c7 100644 --- a/tests/apps/pathology/transforms/post/test_generate_instance_contour.py +++ b/tests/apps/pathology/transforms/post/test_generate_instance_contour.py @@ -19,7 +19,7 @@ from monai.apps.pathology.transforms.post.array import GenerateInstanceContour from monai.transforms import BoundingRect from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_skimage = optional_import("skimage", "0.19.3", min_version) diff --git a/tests/apps/pathology/transforms/post/test_generate_instance_contourd.py b/tests/apps/pathology/transforms/post/test_generate_instance_contourd.py index 2729f246d6..410f1c086b 100644 --- a/tests/apps/pathology/transforms/post/test_generate_instance_contourd.py +++ b/tests/apps/pathology/transforms/post/test_generate_instance_contourd.py @@ -19,7 +19,7 @@ from monai.apps.pathology.transforms.post.dictionary import GenerateInstanceContourd from monai.transforms import BoundingRect from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_skimage = optional_import("skimage", "0.19.3", min_version) diff --git a/tests/apps/pathology/transforms/post/test_generate_instance_type.py b/tests/apps/pathology/transforms/post/test_generate_instance_type.py index 10eef42edb..15daffaa36 100644 --- a/tests/apps/pathology/transforms/post/test_generate_instance_type.py +++ b/tests/apps/pathology/transforms/post/test_generate_instance_type.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.apps.pathology.transforms.post.array import GenerateInstanceType -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose y, x = np.ogrid[0:30, 0:30] diff --git a/tests/apps/pathology/transforms/post/test_generate_instance_typed.py b/tests/apps/pathology/transforms/post/test_generate_instance_typed.py index 63288a9cf1..ec7f242e51 100644 --- a/tests/apps/pathology/transforms/post/test_generate_instance_typed.py +++ b/tests/apps/pathology/transforms/post/test_generate_instance_typed.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.apps.pathology.transforms.post.dictionary import GenerateInstanceTyped -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose y, x = np.ogrid[0:30, 0:30] diff --git a/tests/apps/pathology/transforms/post/test_generate_watershed_markers.py b/tests/apps/pathology/transforms/post/test_generate_watershed_markers.py index 552ccc9d62..72b7f2acce 100644 --- a/tests/apps/pathology/transforms/post/test_generate_watershed_markers.py +++ b/tests/apps/pathology/transforms/post/test_generate_watershed_markers.py @@ -18,7 +18,7 @@ from monai.apps.pathology.transforms.post.array import GenerateWatershedMarkers from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS _, has_skimage = optional_import("skimage", "0.19.3", min_version) _, has_scipy = optional_import("scipy", "1.8.1", min_version) diff --git a/tests/apps/pathology/transforms/post/test_generate_watershed_markersd.py b/tests/apps/pathology/transforms/post/test_generate_watershed_markersd.py index 5103c622f2..cbb02e8ebf 100644 --- a/tests/apps/pathology/transforms/post/test_generate_watershed_markersd.py +++ b/tests/apps/pathology/transforms/post/test_generate_watershed_markersd.py @@ -18,7 +18,7 @@ from monai.apps.pathology.transforms.post.dictionary import GenerateWatershedMarkersd from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS _, has_skimage = optional_import("skimage", "0.19.3", min_version) _, has_scipy = optional_import("scipy", "1.8.1", min_version) diff --git a/tests/apps/pathology/transforms/post/test_generate_watershed_mask.py b/tests/apps/pathology/transforms/post/test_generate_watershed_mask.py index 405f707431..76b8591b68 100644 --- a/tests/apps/pathology/transforms/post/test_generate_watershed_mask.py +++ b/tests/apps/pathology/transforms/post/test_generate_watershed_mask.py @@ -19,7 +19,7 @@ from monai.apps.pathology.transforms.post.array import GenerateWatershedMask from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS _, has_scipy = optional_import("scipy", "1.8.1", min_version) diff --git a/tests/apps/pathology/transforms/post/test_generate_watershed_maskd.py b/tests/apps/pathology/transforms/post/test_generate_watershed_maskd.py index ca15c5cd5a..6453c53655 100644 --- a/tests/apps/pathology/transforms/post/test_generate_watershed_maskd.py +++ b/tests/apps/pathology/transforms/post/test_generate_watershed_maskd.py @@ -19,7 +19,7 @@ from monai.apps.pathology.transforms.post.dictionary import GenerateWatershedMaskd from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS _, has_scipy = optional_import("scipy", "1.8.1", min_version) diff --git a/tests/apps/pathology/transforms/post/test_hovernet_instance_map_post_processing.py b/tests/apps/pathology/transforms/post/test_hovernet_instance_map_post_processing.py index 298b98e10b..1a05dcb8cd 100644 --- a/tests/apps/pathology/transforms/post/test_hovernet_instance_map_post_processing.py +++ b/tests/apps/pathology/transforms/post/test_hovernet_instance_map_post_processing.py @@ -19,7 +19,7 @@ from monai.apps.pathology.transforms.post.array import HoVerNetInstanceMapPostProcessing from monai.transforms import ComputeHoVerMaps, FillHoles, GaussianSmooth from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_scipy = optional_import("scipy", "1.8.1", min_version) _, has_skimage = optional_import("skimage", "0.19.3", min_version) diff --git a/tests/apps/pathology/transforms/post/test_hovernet_instance_map_post_processingd.py b/tests/apps/pathology/transforms/post/test_hovernet_instance_map_post_processingd.py index 44bdec463d..425f3dbfab 100644 --- a/tests/apps/pathology/transforms/post/test_hovernet_instance_map_post_processingd.py +++ b/tests/apps/pathology/transforms/post/test_hovernet_instance_map_post_processingd.py @@ -20,7 +20,7 @@ from monai.transforms import ComputeHoVerMaps, FillHoles, GaussianSmooth from monai.utils import min_version, optional_import from monai.utils.enums import HoVerNetBranch -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_scipy = optional_import("scipy", "1.8.1", min_version) _, has_skimage = optional_import("skimage", "0.19.3", min_version) diff --git a/tests/apps/pathology/transforms/post/test_hovernet_nuclear_type_post_processing.py b/tests/apps/pathology/transforms/post/test_hovernet_nuclear_type_post_processing.py index 7b37352222..adfc6ef6e9 100644 --- a/tests/apps/pathology/transforms/post/test_hovernet_nuclear_type_post_processing.py +++ b/tests/apps/pathology/transforms/post/test_hovernet_nuclear_type_post_processing.py @@ -22,7 +22,7 @@ ) from monai.transforms import ComputeHoVerMaps from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_scipy = optional_import("scipy", "1.8.1", min_version) _, has_skimage = optional_import("skimage", "0.19.3", min_version) diff --git a/tests/apps/pathology/transforms/post/test_watershed.py b/tests/apps/pathology/transforms/post/test_watershed.py index c89ce4910f..c2ccb494bd 100644 --- a/tests/apps/pathology/transforms/post/test_watershed.py +++ b/tests/apps/pathology/transforms/post/test_watershed.py @@ -24,7 +24,7 @@ Watershed, ) from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS _, has_skimage = optional_import("skimage", "0.19.3", min_version) _, has_scipy = optional_import("scipy", "1.8.1", min_version) diff --git a/tests/apps/pathology/transforms/post/test_watershedd.py b/tests/apps/pathology/transforms/post/test_watershedd.py index 791e4b714d..fc62ba11a0 100644 --- a/tests/apps/pathology/transforms/post/test_watershedd.py +++ b/tests/apps/pathology/transforms/post/test_watershedd.py @@ -25,7 +25,7 @@ ) from monai.transforms import Compose from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS _, has_skimage = optional_import("skimage", "0.19.3", min_version) _, has_scipy = optional_import("scipy", "1.8.1", min_version) diff --git a/tests/apps/reconstruction/networks/nets/test_recon_net_utils.py b/tests/apps/reconstruction/networks/nets/test_recon_net_utils.py index a39fb5b0c7..f70c2777e3 100644 --- a/tests/apps/reconstruction/networks/nets/test_recon_net_utils.py +++ b/tests/apps/reconstruction/networks/nets/test_recon_net_utils.py @@ -27,7 +27,7 @@ sensitivity_map_expand, sensitivity_map_reduce, ) -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose # no need for checking devices, these functions don't change device format # reshape test case diff --git a/tests/apps/reconstruction/test_complex_utils.py b/tests/apps/reconstruction/test_complex_utils.py index df437838fe..089e6eaa2d 100644 --- a/tests/apps/reconstruction/test_complex_utils.py +++ b/tests/apps/reconstruction/test_complex_utils.py @@ -18,7 +18,7 @@ from monai.apps.reconstruction.complex_utils import complex_abs, complex_conj, complex_mul, convert_to_tensor_complex from monai.utils.type_conversion import convert_data_type -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose # test case for convert_to_tensor_complex im_complex = [[1.0 + 1.0j, 1.0 + 1.0j], [1.0 + 1.0j, 1.0 + 1.0j]] diff --git a/tests/apps/reconstruction/test_fastmri_reader.py b/tests/apps/reconstruction/test_fastmri_reader.py index fbdd8b92ad..857c7b6a77 100644 --- a/tests/apps/reconstruction/test_fastmri_reader.py +++ b/tests/apps/reconstruction/test_fastmri_reader.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.apps.reconstruction.fastmri_reader import FastMRIReader -from tests.utils.utils import SkipIfNoModule, assert_allclose +from tests.util import SkipIfNoModule, assert_allclose TEST_CASE1 = [ { diff --git a/tests/apps/reconstruction/test_mri_utils.py b/tests/apps/reconstruction/test_mri_utils.py index 7fe579027c..ca7586cc87 100644 --- a/tests/apps/reconstruction/test_mri_utils.py +++ b/tests/apps/reconstruction/test_mri_utils.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.apps.reconstruction.mri_utils import root_sum_of_squares -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose # root_sum_of_squares im = [[3.0, 4.0], [3.0, 4.0]] diff --git a/tests/apps/reconstruction/transforms/test_reference_based_normalize_intensity.py b/tests/apps/reconstruction/transforms/test_reference_based_normalize_intensity.py index c5cc1bbbbc..b9c9595575 100644 --- a/tests/apps/reconstruction/transforms/test_reference_based_normalize_intensity.py +++ b/tests/apps/reconstruction/transforms/test_reference_based_normalize_intensity.py @@ -18,7 +18,7 @@ from monai.apps.reconstruction.transforms.dictionary import ReferenceBasedNormalizeIntensityd from monai.utils.type_conversion import convert_to_numpy -from tests.utils.utils import TEST_NDARRAYS_NO_META_TENSOR, assert_allclose +from tests.util import TEST_NDARRAYS_NO_META_TENSOR, assert_allclose # see test_normalize_intensityd for typical tests (like non-zero # normalization, device test, etc.) diff --git a/tests/apps/reconstruction/transforms/test_reference_based_spatial_cropd.py b/tests/apps/reconstruction/transforms/test_reference_based_spatial_cropd.py index 0845c7aef6..f3a1caa2b6 100644 --- a/tests/apps/reconstruction/transforms/test_reference_based_spatial_cropd.py +++ b/tests/apps/reconstruction/transforms/test_reference_based_spatial_cropd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.apps.reconstruction.transforms.dictionary import ReferenceBasedSpatialCropd -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS # see test_spatial_cropd for typical tests (like roi_start, # roi_slices, etc.) diff --git a/tests/apps/test_auto3dseg_bundlegen.py b/tests/apps/test_auto3dseg_bundlegen.py index b4d3c2bf62..9c0f658807 100644 --- a/tests/apps/test_auto3dseg_bundlegen.py +++ b/tests/apps/test_auto3dseg_bundlegen.py @@ -26,7 +26,7 @@ from monai.bundle.config_parser import ConfigParser from monai.data import create_test_image_3d from monai.utils import set_determinism -from tests.utils.utils import ( +from tests.util import ( SkipIfBeforePyTorchVersion, get_testing_algo_template_path, skip_if_downloading_fails, diff --git a/tests/apps/test_cross_validation.py b/tests/apps/test_cross_validation.py index 8d69cba4cb..ece572c261 100644 --- a/tests/apps/test_cross_validation.py +++ b/tests/apps/test_cross_validation.py @@ -17,7 +17,7 @@ from monai.apps import CrossValidation, DecathlonDataset from monai.data import MetaTensor from monai.transforms import Compose, EnsureChannelFirstd, LoadImaged, ScaleIntensityd -from tests.utils.utils import skip_if_downloading_fails, skip_if_quick +from tests.util import skip_if_downloading_fails, skip_if_quick class TestCrossValidation(unittest.TestCase): diff --git a/tests/apps/test_decathlondataset.py b/tests/apps/test_decathlondataset.py index 0ad3bc5320..1a2a5238db 100644 --- a/tests/apps/test_decathlondataset.py +++ b/tests/apps/test_decathlondataset.py @@ -19,7 +19,7 @@ from monai.apps import DecathlonDataset from monai.data import MetaTensor from monai.transforms import Compose, EnsureChannelFirstd, LoadImaged, ScaleIntensityd -from tests.utils.utils import skip_if_downloading_fails, skip_if_quick +from tests.util import skip_if_downloading_fails, skip_if_quick class TestDecathlonDataset(unittest.TestCase): diff --git a/tests/apps/test_download_and_extract.py b/tests/apps/test_download_and_extract.py index 21295c5f2b..9af6c37826 100644 --- a/tests/apps/test_download_and_extract.py +++ b/tests/apps/test_download_and_extract.py @@ -11,7 +11,6 @@ from __future__ import annotations -import os import tempfile import unittest from pathlib import Path @@ -27,7 +26,7 @@ class TestDownloadAndExtract(unittest.TestCase): @skip_if_quick def test_actions(self): - testing_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "testing_data") + testing_dir = Path(__file__).parents[1] / "testing_data" config_dict = testing_data_config("images", "mednist") url = config_dict["url"] filepath = Path(testing_dir) / "MedNIST.tar.gz" diff --git a/tests/apps/test_mednistdataset.py b/tests/apps/test_mednistdataset.py index 8c244ea095..ab471524a2 100644 --- a/tests/apps/test_mednistdataset.py +++ b/tests/apps/test_mednistdataset.py @@ -19,7 +19,7 @@ from monai.apps import MedNISTDataset from monai.data import MetaTensor from monai.transforms import Compose, EnsureChannelFirstd, LoadImaged, ScaleIntensityd -from tests.utils.utils import skip_if_downloading_fails, skip_if_quick +from tests.util import skip_if_downloading_fails, skip_if_quick MEDNIST_FULL_DATASET_LENGTH = 58954 @@ -27,7 +27,7 @@ class TestMedNISTDataset(unittest.TestCase): @skip_if_quick def test_values(self): - testing_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "testing_data") + testing_dir = Path(__file__).parents[1] / "testing_data" transform = Compose( [ LoadImaged(keys="image"), diff --git a/tests/apps/test_mmar_download.py b/tests/apps/test_mmar_download.py index 01ad456457..fe037a5101 100644 --- a/tests/apps/test_mmar_download.py +++ b/tests/apps/test_mmar_download.py @@ -25,7 +25,7 @@ from monai.apps.mmars import MODEL_DESC from monai.apps.mmars.mmars import _get_val from monai.utils import version_leq -from tests.utils.utils import skip_if_downloading_fails, skip_if_quick +from tests.util import skip_if_downloading_fails, skip_if_quick TEST_CASES = [["clara_pt_prostate_mri_segmentation"], ["clara_pt_covid19_ct_lesion_segmentation"]] TEST_EXTRACT_CASES = [ diff --git a/tests/apps/test_tciadataset.py b/tests/apps/test_tciadataset.py index 2d5ef26d22..5502751c1d 100644 --- a/tests/apps/test_tciadataset.py +++ b/tests/apps/test_tciadataset.py @@ -14,18 +14,19 @@ import os import shutil import unittest +from pathlib import Path from monai.apps import TciaDataset from monai.apps.tcia import DCM_FILENAME_REGEX, TCIA_LABEL_DICT from monai.data import MetaTensor from monai.transforms import Compose, EnsureChannelFirstd, LoadImaged, ScaleIntensityd -from tests.utils.utils import skip_if_downloading_fails, skip_if_quick +from tests.util import skip_if_downloading_fails, skip_if_quick class TestTciaDataset(unittest.TestCase): @skip_if_quick def test_values(self): - testing_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "testing_data") + testing_dir = Path(__file__).parents[1] / "testing_data" download_len = 1 val_frac = 1.0 collection = "QIN-PROSTATE-Repeatability" diff --git a/tests/apps/vista3d/test_point_based_window_inferer.py b/tests/apps/vista3d/test_point_based_window_inferer.py index f82708185a..65ec915c23 100644 --- a/tests/apps/vista3d/test_point_based_window_inferer.py +++ b/tests/apps/vista3d/test_point_based_window_inferer.py @@ -20,7 +20,7 @@ from monai.networks import eval_mode from monai.networks.nets.vista3d import vista3d132 from monai.utils import optional_import -from tests.utils.utils import SkipIfBeforePyTorchVersion, skip_if_quick +from tests.util import SkipIfBeforePyTorchVersion, skip_if_quick device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/bundle/test_bundle_ckpt_export.py b/tests/bundle/test_bundle_ckpt_export.py index 9a784abb97..f720c72325 100644 --- a/tests/bundle/test_bundle_ckpt_export.py +++ b/tests/bundle/test_bundle_ckpt_export.py @@ -22,7 +22,7 @@ from monai.bundle import ConfigParser from monai.data import load_net_with_metadata from monai.networks import save_state -from tests.utils.utils import command_line_tests, skip_if_windows +from tests.util import command_line_tests, skip_if_windows TEST_CASE_1 = ["", ""] TEST_CASE_2 = ["model", ""] diff --git a/tests/bundle/test_bundle_download.py b/tests/bundle/test_bundle_download.py index c6296bb5ed..701d6eb557 100644 --- a/tests/bundle/test_bundle_download.py +++ b/tests/bundle/test_bundle_download.py @@ -27,7 +27,7 @@ from monai.bundle import ConfigParser, create_workflow, load from monai.bundle.scripts import _examine_monai_version, _list_latest_versions, download from monai.utils import optional_import -from tests.utils.utils import ( +from tests.util import ( SkipIfBeforePyTorchVersion, assert_allclose, command_line_tests, diff --git a/tests/bundle/test_bundle_get_data.py b/tests/bundle/test_bundle_get_data.py index 1c22a472aa..3168454b3c 100644 --- a/tests/bundle/test_bundle_get_data.py +++ b/tests/bundle/test_bundle_get_data.py @@ -17,7 +17,7 @@ from monai.bundle import get_all_bundles_list, get_bundle_info, get_bundle_versions from monai.utils import optional_import -from tests.utils.utils import SkipIfNoModule, skip_if_downloading_fails, skip_if_quick, skip_if_windows +from tests.util import SkipIfNoModule, skip_if_downloading_fails, skip_if_quick, skip_if_windows requests, _ = optional_import("requests") diff --git a/tests/bundle/test_bundle_push_to_hf_hub.py b/tests/bundle/test_bundle_push_to_hf_hub.py index 3a6dff57df..270f8e0cd7 100644 --- a/tests/bundle/test_bundle_push_to_hf_hub.py +++ b/tests/bundle/test_bundle_push_to_hf_hub.py @@ -20,7 +20,7 @@ from monai.bundle import push_to_hf_hub from monai.utils import optional_import -from tests.utils.utils import skip_if_quick +from tests.util import skip_if_quick huggingface_hub, has_huggingface_hub = optional_import("huggingface_hub") diff --git a/tests/bundle/test_bundle_trt_export.py b/tests/bundle/test_bundle_trt_export.py index 10e49ccf01..19781a9c4f 100644 --- a/tests/bundle/test_bundle_trt_export.py +++ b/tests/bundle/test_bundle_trt_export.py @@ -23,7 +23,7 @@ from monai.data import load_net_with_metadata from monai.networks import save_state from monai.utils import optional_import -from tests.utils.utils import ( +from tests.util import ( SkipIfBeforeComputeCapabilityVersion, command_line_tests, skip_if_no_cuda, diff --git a/tests/bundle/test_bundle_utils.py b/tests/bundle/test_bundle_utils.py index 6fb049c987..1265156daa 100644 --- a/tests/bundle/test_bundle_utils.py +++ b/tests/bundle/test_bundle_utils.py @@ -22,7 +22,7 @@ from monai.bundle.utils import load_bundle_config from monai.networks.nets import UNet from monai.utils import pprint_edges -from tests.utils.utils import command_line_tests, skip_if_windows +from tests.util import command_line_tests, skip_if_windows metadata = """ { diff --git a/tests/bundle/test_bundle_verify_metadata.py b/tests/bundle/test_bundle_verify_metadata.py index d5319c5b1e..3ce39b3c23 100644 --- a/tests/bundle/test_bundle_verify_metadata.py +++ b/tests/bundle/test_bundle_verify_metadata.py @@ -20,7 +20,7 @@ from parameterized import parameterized from monai.bundle import ConfigParser, verify_metadata -from tests.utils.utils import command_line_tests, download_url_or_skip_test, skip_if_windows, testing_data_config +from tests.util import command_line_tests, download_url_or_skip_test, skip_if_windows, testing_data_config TESTS_DIR = Path(__file__).parents[1] SCHEMA_FILE = os.path.join(TESTS_DIR, "testing_data", "schema.json") diff --git a/tests/bundle/test_bundle_verify_net.py b/tests/bundle/test_bundle_verify_net.py index 595cb6892a..69887f613e 100644 --- a/tests/bundle/test_bundle_verify_net.py +++ b/tests/bundle/test_bundle_verify_net.py @@ -19,7 +19,7 @@ from parameterized import parameterized from monai.bundle import ConfigParser, verify_net_in_out -from tests.utils.utils import command_line_tests, skip_if_no_cuda, skip_if_windows +from tests.util import command_line_tests, skip_if_no_cuda, skip_if_windows TESTS_PATH = Path(__file__).parents[1].as_posix() diff --git a/tests/bundle/test_config_parser.py b/tests/bundle/test_config_parser.py index 5f62e59adb..0141769c86 100644 --- a/tests/bundle/test_config_parser.py +++ b/tests/bundle/test_config_parser.py @@ -26,7 +26,7 @@ from monai.data import DataLoader, Dataset from monai.transforms import Compose, LoadImaged, RandTorchVisiond from monai.utils import min_version, optional_import -from tests.utils.utils import TimedCall +from tests.util import TimedCall _, has_tv = optional_import("torchvision", "0.8.0", min_version) _, has_yaml = optional_import("yaml") diff --git a/tests/config/test_cv2_dist.py b/tests/config/test_cv2_dist.py index 355ff683ff..24f7682ae2 100644 --- a/tests/config/test_cv2_dist.py +++ b/tests/config/test_cv2_dist.py @@ -20,7 +20,7 @@ # FIXME: test for the workaround of https://github.com/Project-MONAI/MONAI/issues/5291 from monai.config.deviceconfig import print_config -from tests.utils.utils import skip_if_no_cuda +from tests.util import skip_if_no_cuda def main_worker(rank, ngpus_per_node, port): diff --git a/tests/croppers.py b/tests/croppers.py index c9e937c104..683d7f283f 100644 --- a/tests/croppers.py +++ b/tests/croppers.py @@ -20,7 +20,7 @@ from monai.transforms import Randomizable from monai.transforms.lazy.functional import apply_pending from monai.transforms.transform import MapTransform -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose class CropTest(unittest.TestCase): diff --git a/tests/data/meta_tensor/test_meta_tensor.py b/tests/data/meta_tensor/test_meta_tensor.py index e5d937b251..7ec372c887 100644 --- a/tests/data/meta_tensor/test_meta_tensor.py +++ b/tests/data/meta_tensor/test_meta_tensor.py @@ -34,7 +34,7 @@ from monai.transforms import BorderPadd, Compose, DivisiblePadd, FromMetaTensord, ToMetaTensord from monai.utils.enums import PostFix from monai.utils.module import pytorch_after -from tests.utils.utils import TEST_DEVICES, SkipIfBeforePyTorchVersion, assert_allclose, skip_if_no_cuda +from tests.util import TEST_DEVICES, SkipIfBeforePyTorchVersion, assert_allclose, skip_if_no_cuda DTYPES = [[torch.float32], [torch.float64], [torch.float16], [torch.int64], [torch.int32], [None]] TESTS = [] diff --git a/tests/data/meta_tensor/test_to_from_meta_tensord.py b/tests/data/meta_tensor/test_to_from_meta_tensord.py index 5714fa6a08..c21da201ce 100644 --- a/tests/data/meta_tensor/test_to_from_meta_tensord.py +++ b/tests/data/meta_tensor/test_to_from_meta_tensord.py @@ -24,7 +24,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import FromMetaTensord, ToMetaTensord from monai.utils.enums import PostFix -from tests.utils.utils import TEST_DEVICES, assert_allclose +from tests.util import TEST_DEVICES, assert_allclose DTYPES = [[torch.float32], [torch.float64], [torch.float16], [torch.int64], [torch.int32]] TESTS = [] diff --git a/tests/data/test_box_utils.py b/tests/data/test_box_utils.py index 2928d6d9f8..a39e099052 100644 --- a/tests/data/test_box_utils.py +++ b/tests/data/test_box_utils.py @@ -35,7 +35,7 @@ non_max_suppression, ) from monai.utils.type_conversion import convert_data_type -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/data/test_csv_iterable_dataset.py b/tests/data/test_csv_iterable_dataset.py index 8fe808d4f1..b6d011e924 100644 --- a/tests/data/test_csv_iterable_dataset.py +++ b/tests/data/test_csv_iterable_dataset.py @@ -21,7 +21,7 @@ from monai.data import CSVIterableDataset, DataLoader from monai.transforms import ToNumpyd -from tests.utils.utils import skip_if_windows +from tests.util import skip_if_windows @skip_if_windows diff --git a/tests/data/test_dataloader.py b/tests/data/test_dataloader.py index 43903b5583..c1ae44a1ee 100644 --- a/tests/data/test_dataloader.py +++ b/tests/data/test_dataloader.py @@ -21,7 +21,7 @@ from monai.data import CacheDataset, DataLoader, Dataset, ZipDataset from monai.transforms import Compose, DataStatsd, Randomizable, SimulateDelayd from monai.utils import convert_to_numpy, set_determinism -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_1 = [[{"image": np.asarray([1, 2, 3])}, {"image": np.asarray([4, 5])}]] diff --git a/tests/data/test_fft_utils.py b/tests/data/test_fft_utils.py index 591723f502..88648757e8 100644 --- a/tests/data/test_fft_utils.py +++ b/tests/data/test_fft_utils.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.data.fft_utils import fftn_centered, ifftn_centered -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose # im = [[[1.0, 1.0, 1.0], [1.0, 1.0, 1.0], [1.0, 1.0, 1.0]]] diff --git a/tests/data/test_gdsdataset.py b/tests/data/test_gdsdataset.py index 0b69449490..2801513d53 100644 --- a/tests/data/test_gdsdataset.py +++ b/tests/data/test_gdsdataset.py @@ -23,7 +23,7 @@ from monai.data import GDSDataset, json_hashing from monai.transforms import Compose, Flip, Identity, LoadImaged, SimulateDelayd, Transform from monai.utils import optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose, skip_if_no_cuda +from tests.util import TEST_NDARRAYS, assert_allclose, skip_if_no_cuda _, has_cp = optional_import("cupy") nib, has_nib = optional_import("nibabel") diff --git a/tests/data/test_grid_dataset.py b/tests/data/test_grid_dataset.py index 9568f571ad..89bb65d26c 100644 --- a/tests/data/test_grid_dataset.py +++ b/tests/data/test_grid_dataset.py @@ -20,7 +20,7 @@ from monai.data import DataLoader, GridPatchDataset, PatchIter, PatchIterd, iter_patch from monai.transforms import RandShiftIntensity, RandShiftIntensityd from monai.utils import set_determinism -from tests.utils.utils import TEST_NDARRAYS, assert_allclose, get_arange_img +from tests.util import TEST_NDARRAYS, assert_allclose, get_arange_img def identity_generator(x): diff --git a/tests/data/test_init_reader.py b/tests/data/test_init_reader.py index 8132a4d2c3..55db7c7da7 100644 --- a/tests/data/test_init_reader.py +++ b/tests/data/test_init_reader.py @@ -15,7 +15,7 @@ from monai.data import ITKReader, NibabelReader, NrrdReader, NumpyReader, PILReader, PydicomReader from monai.transforms import LoadImage, LoadImaged -from tests.utils.utils import SkipIfNoModule +from tests.util import SkipIfNoModule class TestInitLoadImage(unittest.TestCase): diff --git a/tests/data/test_itk_torch_bridge.py b/tests/data/test_itk_torch_bridge.py index baeddcc194..2591bf6730 100644 --- a/tests/data/test_itk_torch_bridge.py +++ b/tests/data/test_itk_torch_bridge.py @@ -15,6 +15,7 @@ import os import tempfile import unittest +from pathlib import Path import numpy as np import torch @@ -35,7 +36,7 @@ from monai.networks.blocks import Warp from monai.transforms import Affine from monai.utils import optional_import, set_determinism -from tests.utils.utils import assert_allclose, skip_if_downloading_fails, skip_if_quick, test_is_quick, testing_data_config +from tests.util import assert_allclose, skip_if_downloading_fails, skip_if_quick, test_is_quick, testing_data_config itk, has_itk = optional_import("itk") _, has_nib = optional_import("nibabel") @@ -51,7 +52,7 @@ class TestITKTorchAffineMatrixBridge(unittest.TestCase): def setUp(self): set_determinism(seed=0) - self.data_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "testing_data") + self.data_dir = Path(__file__).parents[1] / "testing_data" self.reader = ITKReader(pixel_type=itk.F) for file_name in RW_TESTS: diff --git a/tests/data/test_lmdbdataset.py b/tests/data/test_lmdbdataset.py index 32601613a8..ff18e119d5 100644 --- a/tests/data/test_lmdbdataset.py +++ b/tests/data/test_lmdbdataset.py @@ -21,7 +21,7 @@ from monai.data import LMDBDataset, json_hashing from monai.transforms import Compose, LoadImaged, SimulateDelayd, Transform -from tests.utils.utils import skip_if_windows +from tests.util import skip_if_windows TEST_CASE_1 = [ Compose( diff --git a/tests/data/test_lmdbdataset_dist.py b/tests/data/test_lmdbdataset_dist.py index c963b1dda2..4563122b1d 100644 --- a/tests/data/test_lmdbdataset_dist.py +++ b/tests/data/test_lmdbdataset_dist.py @@ -19,7 +19,7 @@ from monai.data import LMDBDataset, json_hashing from monai.transforms import Transform -from tests.utils.utils import DistCall, DistTestCase, skip_if_windows +from tests.util import DistCall, DistTestCase, skip_if_windows class _InplaceXform(Transform): diff --git a/tests/data/test_make_nifti.py b/tests/data/test_make_nifti.py index c7442cd696..3dbced8d9a 100644 --- a/tests/data/test_make_nifti.py +++ b/tests/data/test_make_nifti.py @@ -21,7 +21,7 @@ from monai.data.synthetic import create_test_image_2d from monai.utils import optional_import -from tests.utils.utils import make_nifti_image +from tests.util import make_nifti_image _, has_nib = optional_import("nibabel") diff --git a/tests/data/test_masked_patch_wsi_dataset.py b/tests/data/test_masked_patch_wsi_dataset.py index 53981aa7d3..1980406f8a 100644 --- a/tests/data/test_masked_patch_wsi_dataset.py +++ b/tests/data/test_masked_patch_wsi_dataset.py @@ -21,7 +21,7 @@ from monai.data import Dataset, MaskedPatchWSIDataset from monai.transforms import Lambdad from monai.utils import ProbMapKeys, WSIPatchKeys, optional_import, set_determinism -from tests.utils.utils import download_url_or_skip_test, testing_data_config +from tests.util import download_url_or_skip_test, testing_data_config set_determinism(0) diff --git a/tests/data/test_nifti_rw.py b/tests/data/test_nifti_rw.py index 10e196f3a6..026ae2ec24 100644 --- a/tests/data/test_nifti_rw.py +++ b/tests/data/test_nifti_rw.py @@ -21,7 +21,7 @@ from monai.data import NibabelWriter from monai.transforms import LoadImage, Orientation, Spacing -from tests.utils.utils import TEST_NDARRAYS, assert_allclose, make_nifti_image +from tests.util import TEST_NDARRAYS, assert_allclose, make_nifti_image TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/data/test_numpy_reader.py b/tests/data/test_numpy_reader.py index 51f1f1287a..2ea98ce524 100644 --- a/tests/data/test_numpy_reader.py +++ b/tests/data/test_numpy_reader.py @@ -20,7 +20,7 @@ from monai.data import DataLoader, Dataset, NumpyReader from monai.transforms import LoadImage, LoadImaged -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose class TestNumpyReader(unittest.TestCase): diff --git a/tests/data/test_patch_wsi_dataset.py b/tests/data/test_patch_wsi_dataset.py index 3ed8007c8b..7e47efd4e8 100644 --- a/tests/data/test_patch_wsi_dataset.py +++ b/tests/data/test_patch_wsi_dataset.py @@ -24,7 +24,7 @@ from monai.data.wsi_reader import CuCIMWSIReader, OpenSlideWSIReader from monai.utils import optional_import from monai.utils.enums import WSIPatchKeys -from tests.utils.utils import download_url_or_skip_test, testing_data_config +from tests.util import download_url_or_skip_test, testing_data_config cucim, has_cim = optional_import("cucim") has_cim = has_cim and hasattr(cucim, "CuImage") diff --git a/tests/data/test_persistentdataset_dist.py b/tests/data/test_persistentdataset_dist.py index 2a1288db64..c117686b55 100644 --- a/tests/data/test_persistentdataset_dist.py +++ b/tests/data/test_persistentdataset_dist.py @@ -21,7 +21,7 @@ from monai.data import PersistentDataset, json_hashing from monai.transforms import Transform -from tests.utils.utils import DistCall, DistTestCase +from tests.util import DistCall, DistTestCase class _InplaceXform(Transform): diff --git a/tests/data/test_sampler_dist.py b/tests/data/test_sampler_dist.py index 130cfc1b8e..8e569acaa3 100644 --- a/tests/data/test_sampler_dist.py +++ b/tests/data/test_sampler_dist.py @@ -20,7 +20,7 @@ from monai.data import CacheDataset, DataLoader, DistributedSampler from monai.transforms import ToTensor -from tests.utils.utils import DistCall, DistTestCase, assert_allclose +from tests.util import DistCall, DistTestCase, assert_allclose class DistributedSamplerTest(DistTestCase): diff --git a/tests/data/test_shuffle_buffer.py b/tests/data/test_shuffle_buffer.py index 1fd0c11db1..59badf7e36 100644 --- a/tests/data/test_shuffle_buffer.py +++ b/tests/data/test_shuffle_buffer.py @@ -18,7 +18,7 @@ from monai.data import DataLoader, ShuffleBuffer from monai.utils import convert_data_type -from tests.utils.utils import SkipIfBeforePyTorchVersion +from tests.util import SkipIfBeforePyTorchVersion @SkipIfBeforePyTorchVersion((1, 12)) diff --git a/tests/data/test_sliding_patch_wsi_dataset.py b/tests/data/test_sliding_patch_wsi_dataset.py index fa1ec720c7..86fb02c56b 100644 --- a/tests/data/test_sliding_patch_wsi_dataset.py +++ b/tests/data/test_sliding_patch_wsi_dataset.py @@ -22,7 +22,7 @@ from monai.data import SlidingPatchWSIDataset from monai.utils import WSIPatchKeys, optional_import, set_determinism -from tests.utils.utils import download_url_or_skip_test, testing_data_config +from tests.util import download_url_or_skip_test, testing_data_config set_determinism(0) diff --git a/tests/data/test_smartcachedataset.py b/tests/data/test_smartcachedataset.py index a490b28b3e..f67c98c35d 100644 --- a/tests/data/test_smartcachedataset.py +++ b/tests/data/test_smartcachedataset.py @@ -24,7 +24,7 @@ from monai.data import DataLoader, SmartCacheDataset from monai.transforms import Compose, Lambda, LoadImaged -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_1 = [0.1, 0, Compose([LoadImaged(keys=["image", "label", "extra"])])] diff --git a/tests/data/test_thread_buffer.py b/tests/data/test_thread_buffer.py index ad1e2b016e..4e2930291d 100644 --- a/tests/data/test_thread_buffer.py +++ b/tests/data/test_thread_buffer.py @@ -20,7 +20,7 @@ from monai.data import DataLoader, Dataset, ThreadBuffer, ThreadDataLoader from monai.transforms import Compose, SimulateDelayd from monai.utils import PerfContext, set_determinism -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose class TestDataLoader(unittest.TestCase): diff --git a/tests/data/test_threadcontainer.py b/tests/data/test_threadcontainer.py index 748dcb4eda..c7ec37d418 100644 --- a/tests/data/test_threadcontainer.py +++ b/tests/data/test_threadcontainer.py @@ -22,7 +22,7 @@ from monai.data import DataLoader from monai.utils import optional_import, set_determinism from monai.utils.enums import CommonKeys -from tests.utils.utils import SkipIfNoModule +from tests.util import SkipIfNoModule try: _, has_ignite = optional_import("ignite") diff --git a/tests/data/test_video_datasets.py b/tests/data/test_video_datasets.py index f4493dd2c2..f37c83176a 100644 --- a/tests/data/test_video_datasets.py +++ b/tests/data/test_video_datasets.py @@ -21,7 +21,7 @@ from monai.data.dataloader import DataLoader from monai.data.video_dataset import CameraDataset, VideoDataset, VideoFileDataset from monai.utils.module import optional_import -from tests.utils.utils import assert_allclose, download_url_or_skip_test, testing_data_config +from tests.util import assert_allclose, download_url_or_skip_test, testing_data_config cv2, has_cv2 = optional_import("cv2") diff --git a/tests/data/test_weighted_random_sampler_dist.py b/tests/data/test_weighted_random_sampler_dist.py index 55dfdd2591..321c9282df 100644 --- a/tests/data/test_weighted_random_sampler_dist.py +++ b/tests/data/test_weighted_random_sampler_dist.py @@ -18,7 +18,7 @@ import torch.distributed as dist from monai.data import DistributedWeightedRandomSampler -from tests.utils.utils import DistCall, DistTestCase, skip_if_darwin, skip_if_windows +from tests.util import DistCall, DistTestCase, skip_if_darwin, skip_if_windows @skip_if_windows diff --git a/tests/data/utils/test_decollate.py b/tests/data/utils/test_decollate.py index 1bb09fb942..acb6fbd5ce 100644 --- a/tests/data/utils/test_decollate.py +++ b/tests/data/utils/test_decollate.py @@ -40,7 +40,7 @@ from monai.transforms.spatial.dictionary import RandAffined, RandRotate90d from monai.utils import optional_import, set_determinism from monai.utils.enums import PostFix, TraceKeys -from tests.utils.utils import make_nifti_image +from tests.util import make_nifti_image _, has_nib = optional_import("nibabel") diff --git a/tests/data/utils/test_ori_ras_lps.py b/tests/data/utils/test_ori_ras_lps.py index 2ef9fd9db0..621ad1bf3f 100644 --- a/tests/data/utils/test_ori_ras_lps.py +++ b/tests/data/utils/test_ori_ras_lps.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.data.utils import orientation_ras_lps -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TEST_CASES_AFFINE = [] for p in TEST_NDARRAYS: diff --git a/tests/engines/test_ensemble_evaluator.py b/tests/engines/test_ensemble_evaluator.py index 6459612a07..de0a4947c1 100644 --- a/tests/engines/test_ensemble_evaluator.py +++ b/tests/engines/test_ensemble_evaluator.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.engines import EnsembleEvaluator -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_1 = [["pred_0", "pred_1", "pred_2", "pred_3", "pred_4"]] diff --git a/tests/engines/test_prepare_batch_default.py b/tests/engines/test_prepare_batch_default.py index f2efd10b6d..89491d4c0d 100644 --- a/tests/engines/test_prepare_batch_default.py +++ b/tests/engines/test_prepare_batch_default.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.engines import PrepareBatchDefault, SupervisedEvaluator -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose class TestNet(torch.nn.Module): diff --git a/tests/engines/test_prepare_batch_default_dist.py b/tests/engines/test_prepare_batch_default_dist.py index 81c00732a5..4f47546017 100644 --- a/tests/engines/test_prepare_batch_default_dist.py +++ b/tests/engines/test_prepare_batch_default_dist.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.engines import PrepareBatchDefault, SupervisedEvaluator -from tests.utils.utils import DistCall, DistTestCase, assert_allclose +from tests.util import DistCall, DistTestCase, assert_allclose TEST_CASE_1 = [ [ diff --git a/tests/engines/test_prepare_batch_extra_input.py b/tests/engines/test_prepare_batch_extra_input.py index 8061509c2a..2d73273c6e 100644 --- a/tests/engines/test_prepare_batch_extra_input.py +++ b/tests/engines/test_prepare_batch_extra_input.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.engines import PrepareBatchExtraInput, SupervisedEvaluator -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_0 = [ {"extra_keys": "extra1"}, diff --git a/tests/fl/client/monai_algo/test_fl_monai_algo.py b/tests/fl/client/monai_algo/test_fl_monai_algo.py index af9e05a93d..7515ba143c 100644 --- a/tests/fl/client/monai_algo/test_fl_monai_algo.py +++ b/tests/fl/client/monai_algo/test_fl_monai_algo.py @@ -27,7 +27,7 @@ from monai.fl.utils.constants import ExtraItems from monai.fl.utils.exchange_object import ExchangeObject from monai.utils import path_to_uri -from tests.utils.utils import SkipIfNoModule +from tests.util import SkipIfNoModule _root_dir = Path(__file__).resolve().parents[3] _data_dir = os.path.join(_root_dir, "testing_data") diff --git a/tests/fl/client/monai_algo/test_fl_monai_algo_dist.py b/tests/fl/client/monai_algo/test_fl_monai_algo_dist.py index a57b6e9f18..d0976de751 100644 --- a/tests/fl/client/monai_algo/test_fl_monai_algo_dist.py +++ b/tests/fl/client/monai_algo/test_fl_monai_algo_dist.py @@ -23,7 +23,7 @@ from monai.fl.utils.constants import ExtraItems from monai.fl.utils.exchange_object import ExchangeObject from monai.networks import get_state_dict -from tests.utils.utils import DistCall, DistTestCase, SkipIfBeforePyTorchVersion, SkipIfNoModule, skip_if_no_cuda +from tests.util import DistCall, DistTestCase, SkipIfBeforePyTorchVersion, SkipIfNoModule, skip_if_no_cuda TESTS_PATH = TESTS_PATH = Path(__file__).parents[3].as_posix() _root_dir = os.path.abspath(pathjoin(TESTS_PATH)) diff --git a/tests/fl/test_fl_monai_algo_stats.py b/tests/fl/test_fl_monai_algo_stats.py index 2f3b8efb41..cac493e812 100644 --- a/tests/fl/test_fl_monai_algo_stats.py +++ b/tests/fl/test_fl_monai_algo_stats.py @@ -21,7 +21,7 @@ from monai.fl.client import MonaiAlgoStats from monai.fl.utils.constants import ExtraItems, FlStatistics from monai.fl.utils.exchange_object import ExchangeObject -from tests.utils.utils import SkipIfNoModule +from tests.util import SkipIfNoModule _root_dir = Path(__file__).resolve().parents[1] _data_dir = os.path.join(_root_dir, "testing_data") diff --git a/tests/fl/utils/test_fl_exchange_object.py b/tests/fl/utils/test_fl_exchange_object.py index 0fddf6c917..03314f7f6e 100644 --- a/tests/fl/utils/test_fl_exchange_object.py +++ b/tests/fl/utils/test_fl_exchange_object.py @@ -19,7 +19,7 @@ from monai.fl.utils.constants import WeightType from monai.fl.utils.exchange_object import ExchangeObject from monai.utils.module import optional_import -from tests.utils.utils import SkipIfNoModule +from tests.util import SkipIfNoModule models, has_torchvision = optional_import("torchvision.models") diff --git a/tests/handlers/test_handler_checkpoint_loader.py b/tests/handlers/test_handler_checkpoint_loader.py index a0c65e5380..25106ef57b 100644 --- a/tests/handlers/test_handler_checkpoint_loader.py +++ b/tests/handlers/test_handler_checkpoint_loader.py @@ -19,7 +19,7 @@ from ignite.engine import Engine, Events from monai.handlers import CheckpointLoader, CheckpointSaver -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose class TestHandlerCheckpointLoader(unittest.TestCase): diff --git a/tests/handlers/test_handler_classification_saver_dist.py b/tests/handlers/test_handler_classification_saver_dist.py index df715e4199..0810d158d7 100644 --- a/tests/handlers/test_handler_classification_saver_dist.py +++ b/tests/handlers/test_handler_classification_saver_dist.py @@ -23,7 +23,7 @@ from monai.data import decollate_batch from monai.handlers import ClassificationSaver -from tests.utils.utils import DistCall, DistTestCase +from tests.util import DistCall, DistTestCase class DistributedHandlerClassificationSaver(DistTestCase): diff --git a/tests/handlers/test_handler_confusion_matrix.py b/tests/handlers/test_handler_confusion_matrix.py index a1c39d6ff4..8db81235a4 100644 --- a/tests/handlers/test_handler_confusion_matrix.py +++ b/tests/handlers/test_handler_confusion_matrix.py @@ -19,7 +19,7 @@ from parameterized import parameterized from monai.handlers import ConfusionMatrix -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_1 = [{"include_background": True, "save_details": False, "metric_name": "f1"}, 0.75] TEST_CASE_2 = [{"include_background": False, "save_details": False, "metric_name": "ppv"}, 1.0] diff --git a/tests/handlers/test_handler_confusion_matrix_dist.py b/tests/handlers/test_handler_confusion_matrix_dist.py index d9dd93d2c1..e438ec16ec 100644 --- a/tests/handlers/test_handler_confusion_matrix_dist.py +++ b/tests/handlers/test_handler_confusion_matrix_dist.py @@ -19,7 +19,7 @@ from ignite.engine import Engine from monai.handlers import ConfusionMatrix -from tests.utils.utils import DistCall, DistTestCase +from tests.util import DistCall, DistTestCase class DistributedConfusionMatrix(DistTestCase): diff --git a/tests/handlers/test_handler_decollate_batch.py b/tests/handlers/test_handler_decollate_batch.py index a57d8d4e68..f674c32765 100644 --- a/tests/handlers/test_handler_decollate_batch.py +++ b/tests/handlers/test_handler_decollate_batch.py @@ -18,7 +18,7 @@ from monai.engines import SupervisedEvaluator from monai.handlers import DecollateBatch, PostProcessing from monai.transforms import Activationsd, AsDiscreted, Compose, CopyItemsd -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose class TestHandlerDecollateBatch(unittest.TestCase): diff --git a/tests/handlers/test_handler_hausdorff_distance.py b/tests/handlers/test_handler_hausdorff_distance.py index afe8156d55..283523789f 100644 --- a/tests/handlers/test_handler_hausdorff_distance.py +++ b/tests/handlers/test_handler_hausdorff_distance.py @@ -18,7 +18,7 @@ from ignite.engine import Engine from monai.handlers import HausdorffDistance -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose def create_spherical_seg_3d( diff --git a/tests/handlers/test_handler_ignite_metric.py b/tests/handlers/test_handler_ignite_metric.py index 3867363090..e6b3e64cf9 100644 --- a/tests/handlers/test_handler_ignite_metric.py +++ b/tests/handlers/test_handler_ignite_metric.py @@ -19,7 +19,7 @@ from monai.handlers import IgniteMetricHandler, from_engine from monai.losses import DiceLoss from monai.metrics import LossMetric -from tests.utils.utils import SkipIfNoModule, assert_allclose, optional_import +from tests.util import SkipIfNoModule, assert_allclose, optional_import try: _, has_ignite = optional_import("ignite") diff --git a/tests/handlers/test_handler_mean_dice.py b/tests/handlers/test_handler_mean_dice.py index a2c69ba988..6db7022ed1 100644 --- a/tests/handlers/test_handler_mean_dice.py +++ b/tests/handlers/test_handler_mean_dice.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.handlers import MeanDice, from_engine -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_1 = [{"include_background": True, "output_transform": from_engine(["pred", "label"])}, 0.75, (4, 2)] TEST_CASE_2 = [{"include_background": False, "output_transform": from_engine(["pred", "label"])}, 0.66666, (4, 1)] diff --git a/tests/handlers/test_handler_mean_iou.py b/tests/handlers/test_handler_mean_iou.py index 8883b4af4f..0de0e15e02 100644 --- a/tests/handlers/test_handler_mean_iou.py +++ b/tests/handlers/test_handler_mean_iou.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.handlers import MeanIoUHandler, from_engine -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_1 = [{"include_background": True, "output_transform": from_engine(["pred", "label"])}, 0.75, (4, 2)] TEST_CASE_2 = [{"include_background": False, "output_transform": from_engine(["pred", "label"])}, 2 / 3, (4, 1)] diff --git a/tests/handlers/test_handler_metrics_reloaded.py b/tests/handlers/test_handler_metrics_reloaded.py index 2c77941063..86ef52ca85 100644 --- a/tests/handlers/test_handler_metrics_reloaded.py +++ b/tests/handlers/test_handler_metrics_reloaded.py @@ -19,7 +19,7 @@ from monai.handlers import MetricsReloadedBinaryHandler, MetricsReloadedCategoricalHandler, from_engine from monai.utils import optional_import -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose _, has_metrics = optional_import("MetricsReloaded") diff --git a/tests/handlers/test_handler_metrics_saver_dist.py b/tests/handlers/test_handler_metrics_saver_dist.py index 625bb105a4..478d350b49 100644 --- a/tests/handlers/test_handler_metrics_saver_dist.py +++ b/tests/handlers/test_handler_metrics_saver_dist.py @@ -23,7 +23,7 @@ from monai.handlers import MetricsSaver from monai.utils import evenly_divisible_all_gather from monai.utils.enums import PostFix -from tests.utils.utils import DistCall, DistTestCase +from tests.util import DistCall, DistTestCase class DistributedMetricsSaver(DistTestCase): diff --git a/tests/handlers/test_handler_mlflow.py b/tests/handlers/test_handler_mlflow.py index c922faaf8c..3db22c313a 100644 --- a/tests/handlers/test_handler_mlflow.py +++ b/tests/handlers/test_handler_mlflow.py @@ -27,7 +27,7 @@ from monai.bundle import ConfigWorkflow, download from monai.handlers import MLFlowHandler from monai.utils import optional_import, path_to_uri -from tests.utils.utils import skip_if_downloading_fails, skip_if_quick +from tests.util import skip_if_downloading_fails, skip_if_quick _, has_dataset_tracking = optional_import("mlflow", "2.4.0") diff --git a/tests/handlers/test_handler_nvtx.py b/tests/handlers/test_handler_nvtx.py index e4fe9fe509..32836f40c9 100644 --- a/tests/handlers/test_handler_nvtx.py +++ b/tests/handlers/test_handler_nvtx.py @@ -21,7 +21,7 @@ from monai.handlers import StatsHandler, from_engine from monai.handlers.nvtx_handlers import MarkHandler, RangeHandler, RangePopHandler, RangePushHandler from monai.utils import optional_import -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose _, has_nvtx = optional_import("torch._C._nvtx", descriptor="NVTX is not installed. Are you sure you have a CUDA build?") diff --git a/tests/handlers/test_handler_panoptic_quality.py b/tests/handlers/test_handler_panoptic_quality.py index c1e0f8f23a..401057a11b 100644 --- a/tests/handlers/test_handler_panoptic_quality.py +++ b/tests/handlers/test_handler_panoptic_quality.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.handlers import PanopticQuality, from_engine -from tests.utils.utils import SkipIfNoModule, assert_allclose +from tests.util import SkipIfNoModule, assert_allclose sample_1_pred = torch.as_tensor( [[[0, 1, 1, 1], [0, 0, 5, 5], [2, 0, 3, 3], [2, 2, 2, 0]], [[0, 1, 1, 1], [0, 0, 0, 0], [2, 0, 3, 3], [4, 2, 2, 0]]] diff --git a/tests/handlers/test_handler_parameter_scheduler.py b/tests/handlers/test_handler_parameter_scheduler.py index e1be85ba95..7f2f933c2e 100644 --- a/tests/handlers/test_handler_parameter_scheduler.py +++ b/tests/handlers/test_handler_parameter_scheduler.py @@ -17,7 +17,7 @@ from torch.nn import Module from monai.handlers.parameter_scheduler import ParamSchedulerHandler -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose class ToyNet(Module): diff --git a/tests/handlers/test_handler_post_processing.py b/tests/handlers/test_handler_post_processing.py index 04128f81b1..13f9eb063b 100644 --- a/tests/handlers/test_handler_post_processing.py +++ b/tests/handlers/test_handler_post_processing.py @@ -19,7 +19,7 @@ from monai.engines import SupervisedEvaluator from monai.handlers import PostProcessing from monai.transforms import Activationsd, AsDiscreted, Compose, CopyItemsd -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose # test lambda function as `transform` TEST_CASE_1 = [{"transform": lambda x: dict(pred=x["pred"] + 1.0)}, False, torch.tensor([[[[1.9975], [1.9997]]]])] diff --git a/tests/handlers/test_handler_regression_metrics_dist.py b/tests/handlers/test_handler_regression_metrics_dist.py index 7d02bb4b7f..ca0f62c528 100644 --- a/tests/handlers/test_handler_regression_metrics_dist.py +++ b/tests/handlers/test_handler_regression_metrics_dist.py @@ -20,7 +20,7 @@ from monai.handlers import MeanAbsoluteError, MeanSquaredError, PeakSignalToNoiseRatio, RootMeanSquaredError from monai.utils import set_determinism -from tests.utils.utils import DistCall, DistTestCase +from tests.util import DistCall, DistTestCase # define a numpy flatten function that only preserves batch dimension diff --git a/tests/handlers/test_handler_rocauc_dist.py b/tests/handlers/test_handler_rocauc_dist.py index 02230e3082..d93402770e 100644 --- a/tests/handlers/test_handler_rocauc_dist.py +++ b/tests/handlers/test_handler_rocauc_dist.py @@ -19,7 +19,7 @@ from monai.handlers import ROCAUC from monai.transforms import Activations, AsDiscrete -from tests.utils.utils import DistCall, DistTestCase +from tests.util import DistCall, DistTestCase class DistributedROCAUC(DistTestCase): diff --git a/tests/handlers/test_handler_surface_distance.py b/tests/handlers/test_handler_surface_distance.py index 324efd0645..e7c54b45ee 100644 --- a/tests/handlers/test_handler_surface_distance.py +++ b/tests/handlers/test_handler_surface_distance.py @@ -18,7 +18,7 @@ from ignite.engine import Engine from monai.handlers import SurfaceDistance -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose def create_spherical_seg_3d( diff --git a/tests/handlers/test_handler_tb_image.py b/tests/handlers/test_handler_tb_image.py index 0e63008bb9..749d35c253 100644 --- a/tests/handlers/test_handler_tb_image.py +++ b/tests/handlers/test_handler_tb_image.py @@ -23,7 +23,7 @@ from monai.data import decollate_batch from monai.handlers import TensorBoardImageHandler from monai.utils import optional_import -from tests.utils.utils import SkipIfBeforePyTorchVersion +from tests.util import SkipIfBeforePyTorchVersion _, has_tb = optional_import("torch.utils.tensorboard", name="SummaryWriter") diff --git a/tests/handlers/test_trt_compile.py b/tests/handlers/test_trt_compile.py index 66552fb667..8245c1529b 100644 --- a/tests/handlers/test_trt_compile.py +++ b/tests/handlers/test_trt_compile.py @@ -21,7 +21,7 @@ from monai.networks import trt_compile from monai.networks.nets import cell_sam_wrapper, vista3d132 from monai.utils import min_version, optional_import -from tests.utils.utils import SkipIfBeforeComputeCapabilityVersion, skip_if_no_cuda, skip_if_quick, skip_if_windows +from tests.util import SkipIfBeforeComputeCapabilityVersion, skip_if_no_cuda, skip_if_quick, skip_if_windows trt, trt_imported = optional_import("tensorrt", "10.1.0", min_version) torch_tensorrt, torch_trt_imported = optional_import("torch_tensorrt") diff --git a/tests/hvd_evenly_divisible_all_gather.py b/tests/hvd_evenly_divisible_all_gather.py index 8129906702..0bf19902a0 100644 --- a/tests/hvd_evenly_divisible_all_gather.py +++ b/tests/hvd_evenly_divisible_all_gather.py @@ -15,7 +15,7 @@ from monai.utils import evenly_divisible_all_gather from monai.utils.module import optional_import -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose hvd, has_hvd = optional_import("horovod", name="torch") diff --git a/tests/inferers/test_avg_merger.py b/tests/inferers/test_avg_merger.py index bd6bda0966..a1bdd05f09 100644 --- a/tests/inferers/test_avg_merger.py +++ b/tests/inferers/test_avg_merger.py @@ -18,7 +18,7 @@ from torch.nn.functional import pad from monai.inferers import AvgMerger -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TENSOR_4x4 = torch.randint(low=0, high=255, size=(2, 3, 4, 4), dtype=torch.float32) TENSOR_4x4_WITH_NAN = TENSOR_4x4.clone() diff --git a/tests/inferers/test_patch_inferer.py b/tests/inferers/test_patch_inferer.py index 01a676171f..7a4d71f329 100644 --- a/tests/inferers/test_patch_inferer.py +++ b/tests/inferers/test_patch_inferer.py @@ -19,7 +19,7 @@ from monai.data.meta_tensor import MetaTensor from monai.inferers import AvgMerger, PatchInferer, SlidingWindowSplitter -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TENSOR_4x4 = torch.randint(low=0, high=255, size=(2, 3, 4, 4), dtype=torch.float32) TENSOR_2x2 = avg_pool2d(TENSOR_4x4, 2, 2) diff --git a/tests/inferers/test_sliding_window_inference.py b/tests/inferers/test_sliding_window_inference.py index 941eb94ca3..0ffdff8025 100644 --- a/tests/inferers/test_sliding_window_inference.py +++ b/tests/inferers/test_sliding_window_inference.py @@ -21,7 +21,7 @@ from monai.data.utils import list_data_collate from monai.inferers import SlidingWindowInferer, SlidingWindowInfererAdapt, sliding_window_inference from monai.utils import optional_import -from tests.utils.utils import TEST_TORCH_AND_META_TENSORS, skip_if_no_cuda, test_is_quick +from tests.util import TEST_TORCH_AND_META_TENSORS, skip_if_no_cuda, test_is_quick _, has_tqdm = optional_import("tqdm") diff --git a/tests/inferers/test_sliding_window_splitter.py b/tests/inferers/test_sliding_window_splitter.py index 3b0285d6ad..76b8eee6f6 100644 --- a/tests/inferers/test_sliding_window_splitter.py +++ b/tests/inferers/test_sliding_window_splitter.py @@ -18,7 +18,7 @@ from torch.nn.functional import pad from monai.inferers import SlidingWindowSplitter -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose # ---------------------------------------------------------------------------- # Tensor test cases diff --git a/tests/inferers/test_wsi_sliding_window_splitter.py b/tests/inferers/test_wsi_sliding_window_splitter.py index b707ae3cab..f6e23fd408 100644 --- a/tests/inferers/test_wsi_sliding_window_splitter.py +++ b/tests/inferers/test_wsi_sliding_window_splitter.py @@ -21,7 +21,7 @@ from monai.data import CuCIMWSIReader, ImageReader, OpenSlideWSIReader, WSIReader from monai.inferers import WSISlidingWindowSplitter -from tests.utils.utils import download_url_or_skip_test, optional_import, testing_data_config +from tests.util import download_url_or_skip_test, optional_import, testing_data_config cucim, has_cucim = optional_import("cucim") has_cucim = has_cucim and hasattr(cucim, "CuImage") diff --git a/tests/integration/test_auto3dseg_ensemble.py b/tests/integration/test_auto3dseg_ensemble.py index c424d1a849..5b415a76cf 100644 --- a/tests/integration/test_auto3dseg_ensemble.py +++ b/tests/integration/test_auto3dseg_ensemble.py @@ -32,7 +32,7 @@ from monai.transforms import SaveImage from monai.utils import check_parent_dir, optional_import, set_determinism from monai.utils.enums import AlgoKeys -from tests.utils.utils import ( +from tests.util import ( SkipIfBeforePyTorchVersion, get_testing_algo_template_path, skip_if_downloading_fails, diff --git a/tests/integration/test_auto3dseg_hpo.py b/tests/integration/test_auto3dseg_hpo.py index 1b5953d932..4cd881b536 100644 --- a/tests/integration/test_auto3dseg_hpo.py +++ b/tests/integration/test_auto3dseg_hpo.py @@ -25,7 +25,7 @@ from monai.data import create_test_image_3d from monai.utils import optional_import from monai.utils.enums import AlgoKeys -from tests.utils.utils import ( +from tests.util import ( SkipIfBeforePyTorchVersion, get_testing_algo_template_path, skip_if_downloading_fails, diff --git a/tests/integration/test_hovernet_nuclear_type_post_processingd.py b/tests/integration/test_hovernet_nuclear_type_post_processingd.py index 00ecd7d41c..e3b4f13c7c 100644 --- a/tests/integration/test_hovernet_nuclear_type_post_processingd.py +++ b/tests/integration/test_hovernet_nuclear_type_post_processingd.py @@ -23,7 +23,7 @@ from monai.transforms import ComputeHoVerMaps from monai.utils import min_version, optional_import from monai.utils.enums import HoVerNetBranch -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_scipy = optional_import("scipy", "1.8.1", min_version) _, has_skimage = optional_import("skimage", "0.19.3", min_version) diff --git a/tests/integration/test_image_rw.py b/tests/integration/test_image_rw.py index cfa0cadf09..6e3522dedc 100644 --- a/tests/integration/test_image_rw.py +++ b/tests/integration/test_image_rw.py @@ -26,7 +26,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import LoadImage, SaveImage, moveaxis from monai.utils import MetaKeys, OptionalImportError, optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_itk = optional_import("itk", allow_namespace_pkg=True) diff --git a/tests/integration/test_integration_autorunner.py b/tests/integration/test_integration_autorunner.py index 29c1e1429d..6a27e14801 100644 --- a/tests/integration/test_integration_autorunner.py +++ b/tests/integration/test_integration_autorunner.py @@ -23,7 +23,7 @@ from monai.bundle.config_parser import ConfigParser from monai.data import create_test_image_3d from monai.utils import optional_import -from tests.utils.utils import ( +from tests.util import ( SkipIfBeforePyTorchVersion, get_testing_algo_template_path, skip_if_downloading_fails, diff --git a/tests/integration/test_integration_bundle_run.py b/tests/integration/test_integration_bundle_run.py index 8d3733f4d0..dd1644d7d0 100644 --- a/tests/integration/test_integration_bundle_run.py +++ b/tests/integration/test_integration_bundle_run.py @@ -30,7 +30,7 @@ from monai.bundle.utils import DEFAULT_HANDLERS_ID from monai.transforms import LoadImage from monai.utils import path_to_uri -from tests.utils.utils import command_line_tests +from tests.util import command_line_tests TESTS_PATH = Path(__file__).parents[1] TEST_CASE_1 = [os.path.join(TESTS_PATH, "testing_data", "inference.json"), (128, 128, 128)] diff --git a/tests/integration/test_integration_classification_2d.py b/tests/integration/test_integration_classification_2d.py index 141e2e562d..1ca5a26220 100644 --- a/tests/integration/test_integration_classification_2d.py +++ b/tests/integration/test_integration_classification_2d.py @@ -39,7 +39,7 @@ ) from monai.utils import set_determinism from tests.testing_data.integration_answers import test_integration_value -from tests.utils.utils import DistTestCase, TimedCall, skip_if_downloading_fails, skip_if_quick, testing_data_config +from tests.util import DistTestCase, TimedCall, skip_if_downloading_fails, skip_if_quick, testing_data_config TASK = "integration_classification_2d" diff --git a/tests/integration/test_integration_determinism.py b/tests/integration/test_integration_determinism.py index 02047a2179..ecd8b9870d 100644 --- a/tests/integration/test_integration_determinism.py +++ b/tests/integration/test_integration_determinism.py @@ -22,7 +22,7 @@ from monai.networks.nets import UNet from monai.transforms import Compose, EnsureChannelFirst, RandRotate90, RandSpatialCrop, ScaleIntensity from monai.utils import set_determinism -from tests.utils.utils import DistTestCase, TimedCall +from tests.util import DistTestCase, TimedCall def run_test(batch_size=64, train_steps=200, device="cuda:0"): diff --git a/tests/integration/test_integration_fast_train.py b/tests/integration/test_integration_fast_train.py index a03617e235..3b2134a352 100644 --- a/tests/integration/test_integration_fast_train.py +++ b/tests/integration/test_integration_fast_train.py @@ -52,7 +52,7 @@ ToDeviced, ) from monai.utils import set_determinism -from tests.utils.utils import DistTestCase, TimedCall, skip_if_no_cuda, skip_if_quick +from tests.util import DistTestCase, TimedCall, skip_if_no_cuda, skip_if_quick @skip_if_no_cuda diff --git a/tests/integration/test_integration_gpu_customization.py b/tests/integration/test_integration_gpu_customization.py index 1d572ef756..a94ff874e9 100644 --- a/tests/integration/test_integration_gpu_customization.py +++ b/tests/integration/test_integration_gpu_customization.py @@ -24,7 +24,7 @@ from monai.data import create_test_image_3d from monai.utils import optional_import from monai.utils.enums import AlgoKeys -from tests.utils.utils import ( +from tests.util import ( SkipIfBeforePyTorchVersion, get_testing_algo_template_path, skip_if_downloading_fails, diff --git a/tests/integration/test_integration_lazy_samples.py b/tests/integration/test_integration_lazy_samples.py index 33ba8744da..49b64bb587 100644 --- a/tests/integration/test_integration_lazy_samples.py +++ b/tests/integration/test_integration_lazy_samples.py @@ -26,7 +26,7 @@ from monai.data import create_test_image_3d, decollate_batch from monai.transforms.utils import has_status_keys from monai.utils import TraceStatusKeys, set_determinism -from tests.utils.utils import HAS_CUPY, DistTestCase, SkipIfBeforePyTorchVersion, skip_if_quick +from tests.util import HAS_CUPY, DistTestCase, SkipIfBeforePyTorchVersion, skip_if_quick def _no_op(x): diff --git a/tests/integration/test_integration_nnunetv2_runner.py b/tests/integration/test_integration_nnunetv2_runner.py index 23b6f740f6..3ca7ced1cc 100644 --- a/tests/integration/test_integration_nnunetv2_runner.py +++ b/tests/integration/test_integration_nnunetv2_runner.py @@ -22,7 +22,7 @@ from monai.bundle.config_parser import ConfigParser from monai.data import create_test_image_3d from monai.utils import optional_import -from tests.utils.utils import SkipIfBeforePyTorchVersion, skip_if_downloading_fails, skip_if_no_cuda, skip_if_quick +from tests.util import SkipIfBeforePyTorchVersion, skip_if_downloading_fails, skip_if_no_cuda, skip_if_quick _, has_tb = optional_import("torch.utils.tensorboard", name="SummaryWriter") _, has_nnunet = optional_import("nnunetv2") diff --git a/tests/integration/test_integration_segmentation_3d.py b/tests/integration/test_integration_segmentation_3d.py index dcabc1b163..395c11f92e 100644 --- a/tests/integration/test_integration_segmentation_3d.py +++ b/tests/integration/test_integration_segmentation_3d.py @@ -42,7 +42,7 @@ from monai.utils import optional_import, set_determinism from monai.visualize import plot_2d_or_3d_image from tests.testing_data.integration_answers import test_integration_value -from tests.utils.utils import DistTestCase, TimedCall, skip_if_quick +from tests.util import DistTestCase, TimedCall, skip_if_quick SummaryWriter, _ = optional_import("torch.utils.tensorboard", name="SummaryWriter") diff --git a/tests/integration/test_integration_sliding_window.py b/tests/integration/test_integration_sliding_window.py index 7b94ec68a4..9705e14665 100644 --- a/tests/integration/test_integration_sliding_window.py +++ b/tests/integration/test_integration_sliding_window.py @@ -27,7 +27,7 @@ from monai.networks.nets import UNet from monai.transforms import EnsureChannelFirst, SaveImage from monai.utils import pytorch_after, set_determinism -from tests.utils.utils import DistTestCase, TimedCall, make_nifti_image, skip_if_quick +from tests.util import DistTestCase, TimedCall, make_nifti_image, skip_if_quick def run_test(batch_size, img_name, seg_name, output_dir, device="cuda:0"): diff --git a/tests/integration/test_integration_stn.py b/tests/integration/test_integration_stn.py index af5708a614..59cdcdef15 100644 --- a/tests/integration/test_integration_stn.py +++ b/tests/integration/test_integration_stn.py @@ -22,7 +22,7 @@ from monai.data import create_test_image_2d from monai.networks.layers import AffineTransform from monai.utils import set_determinism -from tests.utils.utils import DistTestCase, TimedCall +from tests.util import DistTestCase, TimedCall class STNBenchmark(nn.Module): diff --git a/tests/integration/test_integration_unet_2d.py b/tests/integration/test_integration_unet_2d.py index a92f341933..c84e359c03 100644 --- a/tests/integration/test_integration_unet_2d.py +++ b/tests/integration/test_integration_unet_2d.py @@ -21,7 +21,7 @@ from monai.data import create_test_image_2d from monai.losses import DiceLoss from monai.networks.nets import BasicUNet, UNet -from tests.utils.utils import DistTestCase, TimedCall, skip_if_quick +from tests.util import DistTestCase, TimedCall, skip_if_quick def run_test(net_name="basicunet", batch_size=64, train_steps=100, device="cuda:0"): diff --git a/tests/integration/test_integration_workers.py b/tests/integration/test_integration_workers.py index c3351bb345..f284ff9261 100644 --- a/tests/integration/test_integration_workers.py +++ b/tests/integration/test_integration_workers.py @@ -18,7 +18,7 @@ from monai.data import DataLoader from monai.utils import set_determinism -from tests.utils.utils import DistTestCase, SkipIfBeforePyTorchVersion, TimedCall, skip_if_no_cuda, skip_if_quick +from tests.util import DistTestCase, SkipIfBeforePyTorchVersion, TimedCall, skip_if_no_cuda, skip_if_quick def run_loading_test(num_workers=50, device=None, pw=False): diff --git a/tests/integration/test_integration_workflows.py b/tests/integration/test_integration_workflows.py index e514ba20b9..a91a967d71 100644 --- a/tests/integration/test_integration_workflows.py +++ b/tests/integration/test_integration_workflows.py @@ -54,7 +54,7 @@ ) from monai.utils import optional_import, set_determinism from tests.testing_data.integration_answers import test_integration_value -from tests.utils.utils import DistTestCase, TimedCall, assert_allclose, pytorch_after, skip_if_quick +from tests.util import DistTestCase, TimedCall, assert_allclose, pytorch_after, skip_if_quick SummaryWriter, _ = optional_import("torch.utils.tensorboard", name="SummaryWriter") diff --git a/tests/integration/test_integration_workflows_adversarial.py b/tests/integration/test_integration_workflows_adversarial.py index c71778ad43..6cb2d8ed28 100644 --- a/tests/integration/test_integration_workflows_adversarial.py +++ b/tests/integration/test_integration_workflows_adversarial.py @@ -28,7 +28,7 @@ from monai.transforms import Compose, EnsureChannelFirstd, LoadImaged, RandFlipd, ScaleIntensityd from monai.utils import AdversarialKeys as Keys from monai.utils import CommonKeys, optional_import, set_determinism -from tests.utils.utils import DistTestCase, TimedCall, skip_if_quick +from tests.util import DistTestCase, TimedCall, skip_if_quick nib, has_nibabel = optional_import("nibabel") diff --git a/tests/integration/test_integration_workflows_gan.py b/tests/integration/test_integration_workflows_gan.py index 3e2dcd71a3..43b0368ef5 100644 --- a/tests/integration/test_integration_workflows_gan.py +++ b/tests/integration/test_integration_workflows_gan.py @@ -30,7 +30,7 @@ from monai.transforms import Compose, EnsureChannelFirstd, LoadImaged, RandFlipd, ScaleIntensityd from monai.utils import GanKeys as Keys from monai.utils import set_determinism -from tests.utils.utils import DistTestCase, TimedCall, skip_if_quick +from tests.util import DistTestCase, TimedCall, skip_if_quick def run_training_test(root_dir, device="cuda:0"): diff --git a/tests/integration/test_meta_affine.py b/tests/integration/test_meta_affine.py index 32ae5b8fba..0a372322db 100644 --- a/tests/integration/test_meta_affine.py +++ b/tests/integration/test_meta_affine.py @@ -35,7 +35,7 @@ Transform, ) from monai.utils import convert_data_type, optional_import -from tests.utils.utils import assert_allclose, download_url_or_skip_test, testing_data_config +from tests.util import assert_allclose, download_url_or_skip_test, testing_data_config itk, has_itk = optional_import("itk") TINY_DIFF = 1e-4 diff --git a/tests/integration/test_metatensor_integration.py b/tests/integration/test_metatensor_integration.py index 8f07fa12b2..5f942ebd71 100644 --- a/tests/integration/test_metatensor_integration.py +++ b/tests/integration/test_metatensor_integration.py @@ -26,7 +26,7 @@ from monai.data.utils import TraceKeys from monai.transforms import InvertD, SaveImageD, reset_ops_id from monai.utils import optional_import, set_determinism -from tests.utils.utils import assert_allclose, download_url_or_skip_test, testing_data_config +from tests.util import assert_allclose, download_url_or_skip_test, testing_data_config nib, has_nib = optional_import("nibabel") TINY_DIFF = 0.1 diff --git a/tests/integration/test_reg_loss_integration.py b/tests/integration/test_reg_loss_integration.py index 0fc0f9d89c..eb093b3f4c 100644 --- a/tests/integration/test_reg_loss_integration.py +++ b/tests/integration/test_reg_loss_integration.py @@ -19,7 +19,7 @@ from parameterized import parameterized from monai.losses import BendingEnergyLoss, GlobalMutualInformationLoss, LocalNormalizedCrossCorrelationLoss -from tests.utils.utils import SkipIfBeforePyTorchVersion +from tests.util import SkipIfBeforePyTorchVersion TEST_CASES = [ [BendingEnergyLoss, {}, ["pred"], 3], diff --git a/tests/integration/test_spatial_combine_transforms.py b/tests/integration/test_spatial_combine_transforms.py index a3d85de7c1..4636309564 100644 --- a/tests/integration/test_spatial_combine_transforms.py +++ b/tests/integration/test_spatial_combine_transforms.py @@ -24,7 +24,7 @@ from monai.transforms.transform import MapTransform from monai.utils import set_determinism from tests.lazy_transforms_utils import get_apply_param -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_2D = [ [ diff --git a/tests/integration/test_testtimeaugmentation.py b/tests/integration/test_testtimeaugmentation.py index 5e9ebefb39..9a65b29761 100644 --- a/tests/integration/test_testtimeaugmentation.py +++ b/tests/integration/test_testtimeaugmentation.py @@ -37,7 +37,7 @@ from monai.transforms.spatial.dictionary import RandFlipd from monai.utils import optional_import, set_determinism from monai.utils.enums import PostFix -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS if TYPE_CHECKING: import tqdm diff --git a/tests/integration/test_vista3d_utils.py b/tests/integration/test_vista3d_utils.py index b2c67b8963..5e3d2edb97 100644 --- a/tests/integration/test_vista3d_utils.py +++ b/tests/integration/test_vista3d_utils.py @@ -21,7 +21,7 @@ from monai.transforms.utils import convert_points_to_disc, keep_merge_components_with_points, sample_points_from_label from monai.utils import min_version from monai.utils.module import optional_import -from tests.utils.utils import skip_if_no_cuda, skip_if_quick +from tests.util import skip_if_no_cuda, skip_if_quick cp, has_cp = optional_import("cupy") cucim_skimage, has_cucim = optional_import("cucim.skimage") diff --git a/tests/lazy_transforms_utils.py b/tests/lazy_transforms_utils.py index f0a680510a..03fa531176 100644 --- a/tests/lazy_transforms_utils.py +++ b/tests/lazy_transforms_utils.py @@ -16,7 +16,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import InvertibleTransform, MapTransform, Randomizable from monai.transforms.lazy.functional import apply_pending -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose apply_transforms_kwargs = ("pending", "mode", "padding_mode", "dtype", "align_corners") diff --git a/tests/losses/image_dissimilarity/test_global_mutual_information_loss.py b/tests/losses/image_dissimilarity/test_global_mutual_information_loss.py index 77a43a5ee5..c3d4963094 100644 --- a/tests/losses/image_dissimilarity/test_global_mutual_information_loss.py +++ b/tests/losses/image_dissimilarity/test_global_mutual_information_loss.py @@ -20,7 +20,7 @@ from monai import transforms from monai.losses.image_dissimilarity import GlobalMutualInformationLoss -from tests.utils.utils import SkipIfBeforePyTorchVersion, download_url_or_skip_test, skip_if_quick, testing_data_config +from tests.util import SkipIfBeforePyTorchVersion, download_url_or_skip_test, skip_if_quick, testing_data_config device = "cuda:0" if torch.cuda.is_available() else "cpu" diff --git a/tests/losses/test_dice_focal_loss.py b/tests/losses/test_dice_focal_loss.py index 553aecd9dd..6e79bf551e 100644 --- a/tests/losses/test_dice_focal_loss.py +++ b/tests/losses/test_dice_focal_loss.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.losses import DiceFocalLoss, DiceLoss, FocalLoss -from tests.utils.utils import test_script_save +from tests.util import test_script_save class TestDiceFocalLoss(unittest.TestCase): diff --git a/tests/losses/test_dice_loss.py b/tests/losses/test_dice_loss.py index fc1a177838..a6a8b7d9f7 100644 --- a/tests/losses/test_dice_loss.py +++ b/tests/losses/test_dice_loss.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.losses import DiceLoss -from tests.utils.utils import test_script_save +from tests.util import test_script_save TEST_CASES = [ [ # shape: (1, 1, 2, 2), (1, 1, 2, 2) diff --git a/tests/losses/test_ds_loss.py b/tests/losses/test_ds_loss.py index 50995f2520..d48797ccd8 100644 --- a/tests/losses/test_ds_loss.py +++ b/tests/losses/test_ds_loss.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.losses import DeepSupervisionLoss, DiceCELoss, DiceFocalLoss, DiceLoss -from tests.utils.utils import SkipIfBeforePyTorchVersion, test_script_save +from tests.util import SkipIfBeforePyTorchVersion, test_script_save TEST_CASES_DICECE = [ [ diff --git a/tests/losses/test_focal_loss.py b/tests/losses/test_focal_loss.py index db404f4edc..b7a928f573 100644 --- a/tests/losses/test_focal_loss.py +++ b/tests/losses/test_focal_loss.py @@ -21,7 +21,7 @@ from monai.losses import FocalLoss from monai.networks import one_hot -from tests.utils.utils import test_script_save +from tests.util import test_script_save TEST_CASES = [] for device in ["cpu", "cuda"] if torch.cuda.is_available() else ["cpu"]: diff --git a/tests/losses/test_generalized_dice_focal_loss.py b/tests/losses/test_generalized_dice_focal_loss.py index 5cf78c2af9..e38ef01771 100644 --- a/tests/losses/test_generalized_dice_focal_loss.py +++ b/tests/losses/test_generalized_dice_focal_loss.py @@ -17,7 +17,7 @@ import torch from monai.losses import FocalLoss, GeneralizedDiceFocalLoss, GeneralizedDiceLoss -from tests.utils.utils import test_script_save +from tests.util import test_script_save class TestGeneralizedDiceFocalLoss(unittest.TestCase): diff --git a/tests/losses/test_generalized_dice_loss.py b/tests/losses/test_generalized_dice_loss.py index 6b5d31acd3..ce8fc4b47d 100644 --- a/tests/losses/test_generalized_dice_loss.py +++ b/tests/losses/test_generalized_dice_loss.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.losses import GeneralizedDiceLoss -from tests.utils.utils import test_script_save +from tests.util import test_script_save TEST_CASES = [ [ # shape: (1, 1, 2, 2), (1, 1, 2, 2) diff --git a/tests/losses/test_generalized_wasserstein_dice_loss.py b/tests/losses/test_generalized_wasserstein_dice_loss.py index 6627ea086f..7cf2da0b95 100644 --- a/tests/losses/test_generalized_wasserstein_dice_loss.py +++ b/tests/losses/test_generalized_wasserstein_dice_loss.py @@ -20,7 +20,7 @@ import torch.optim as optim from monai.losses import GeneralizedWassersteinDiceLoss -from tests.utils.utils import test_script_save +from tests.util import test_script_save class TestGeneralizedWassersteinDiceLoss(unittest.TestCase): diff --git a/tests/losses/test_masked_loss.py b/tests/losses/test_masked_loss.py index a20df309cd..3f8fcaffb0 100644 --- a/tests/losses/test_masked_loss.py +++ b/tests/losses/test_masked_loss.py @@ -19,7 +19,7 @@ from monai.losses.dice import DiceFocalLoss, DiceLoss from monai.losses.spatial_mask import MaskedLoss from monai.utils import set_determinism -from tests.utils.utils import test_script_save +from tests.util import test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/losses/test_multi_scale.py b/tests/losses/test_multi_scale.py index e1fed59673..b105678146 100644 --- a/tests/losses/test_multi_scale.py +++ b/tests/losses/test_multi_scale.py @@ -18,7 +18,7 @@ from monai.losses import DiceLoss from monai.losses.multi_scale import MultiScaleLoss -from tests.utils.utils import test_script_save +from tests.util import test_script_save dice_loss = DiceLoss(include_background=True, sigmoid=True, smooth_nr=1e-5, smooth_dr=1e-5) device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/losses/test_perceptual_loss.py b/tests/losses/test_perceptual_loss.py index a7f7de5f82..a89d8e4244 100644 --- a/tests/losses/test_perceptual_loss.py +++ b/tests/losses/test_perceptual_loss.py @@ -18,7 +18,7 @@ from monai.losses import PerceptualLoss from monai.utils import optional_import -from tests.utils.utils import SkipIfBeforePyTorchVersion, assert_allclose, skip_if_downloading_fails, skip_if_quick +from tests.util import SkipIfBeforePyTorchVersion, assert_allclose, skip_if_downloading_fails, skip_if_quick _, has_torchvision = optional_import("torchvision") TEST_CASES = [ diff --git a/tests/losses/test_spectral_loss.py b/tests/losses/test_spectral_loss.py index 971f102d79..74d9807177 100644 --- a/tests/losses/test_spectral_loss.py +++ b/tests/losses/test_spectral_loss.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.losses import JukeboxLoss -from tests.utils.utils import test_script_save +from tests.util import test_script_save TEST_CASES = [ [ diff --git a/tests/losses/test_tversky_loss.py b/tests/losses/test_tversky_loss.py index 4db2c9da07..bf6907dc28 100644 --- a/tests/losses/test_tversky_loss.py +++ b/tests/losses/test_tversky_loss.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.losses import TverskyLoss -from tests.utils.utils import test_script_save +from tests.util import test_script_save TEST_CASES = [ [ # shape: (1, 1, 2, 2), (1, 1, 2, 2) diff --git a/tests/metrics/test_compute_confusion_matrix.py b/tests/metrics/test_compute_confusion_matrix.py index 0300b4a6e5..06b872544d 100644 --- a/tests/metrics/test_compute_confusion_matrix.py +++ b/tests/metrics/test_compute_confusion_matrix.py @@ -24,7 +24,7 @@ do_metric_reduction, get_confusion_matrix, ) -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose _device = "cuda:0" if torch.cuda.is_available() else "cpu" # input data diff --git a/tests/metrics/test_compute_f_beta.py b/tests/metrics/test_compute_f_beta.py index 249dec2a84..d642b7230a 100644 --- a/tests/metrics/test_compute_f_beta.py +++ b/tests/metrics/test_compute_f_beta.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.metrics import FBetaScore -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose _device = "cuda:0" if torch.cuda.is_available() else "cpu" diff --git a/tests/metrics/test_compute_panoptic_quality.py b/tests/metrics/test_compute_panoptic_quality.py index 3b6e27f823..bb3843d7ac 100644 --- a/tests/metrics/test_compute_panoptic_quality.py +++ b/tests/metrics/test_compute_panoptic_quality.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.metrics import PanopticQualityMetric, compute_panoptic_quality -from tests.utils.utils import SkipIfNoModule +from tests.util import SkipIfNoModule _device = "cuda:0" if torch.cuda.is_available() else "cpu" diff --git a/tests/metrics/test_cumulative.py b/tests/metrics/test_cumulative.py index 20a8eca718..32411662d1 100644 --- a/tests/metrics/test_cumulative.py +++ b/tests/metrics/test_cumulative.py @@ -16,7 +16,7 @@ import torch from monai.metrics import Cumulative -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose class TestCumulative(unittest.TestCase): diff --git a/tests/metrics/test_cumulative_average_dist.py b/tests/metrics/test_cumulative_average_dist.py index 8cbbb4e28b..8c640c2e06 100644 --- a/tests/metrics/test_cumulative_average_dist.py +++ b/tests/metrics/test_cumulative_average_dist.py @@ -18,7 +18,7 @@ import torch.distributed as dist from monai.metrics import CumulativeAverage -from tests.utils.utils import DistCall, DistTestCase, SkipIfBeforePyTorchVersion +from tests.util import DistCall, DistTestCase, SkipIfBeforePyTorchVersion @SkipIfBeforePyTorchVersion((1, 8)) diff --git a/tests/metrics/test_surface_dice.py b/tests/metrics/test_surface_dice.py index 15e40c4e35..31bd9905c7 100644 --- a/tests/metrics/test_surface_dice.py +++ b/tests/metrics/test_surface_dice.py @@ -18,7 +18,7 @@ import torch.nn.functional as F from monai.metrics.surface_dice import SurfaceDiceMetric, compute_surface_dice -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose _device = "cuda:0" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/blocks/test_adn.py b/tests/networks/blocks/test_adn.py index 2a2e0cb477..87f0138db2 100644 --- a/tests/networks/blocks/test_adn.py +++ b/tests/networks/blocks/test_adn.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.networks.blocks import ADN -from tests.utils.utils import TorchImageTestCase2D, TorchImageTestCase3D +from tests.util import TorchImageTestCase2D, TorchImageTestCase3D TEST_CASES_2D = [ [{"act": None}], diff --git a/tests/networks/blocks/test_convolutions.py b/tests/networks/blocks/test_convolutions.py index 336dcdd19f..71727b5062 100644 --- a/tests/networks/blocks/test_convolutions.py +++ b/tests/networks/blocks/test_convolutions.py @@ -14,7 +14,7 @@ import unittest from monai.networks.blocks import Convolution, ResidualUnit -from tests.utils.utils import TorchImageTestCase2D, TorchImageTestCase3D +from tests.util import TorchImageTestCase2D, TorchImageTestCase3D class TestConvolution2D(TorchImageTestCase2D): diff --git a/tests/networks/blocks/test_crf_cpu.py b/tests/networks/blocks/test_crf_cpu.py index a95272a68a..9a1b638940 100644 --- a/tests/networks/blocks/test_crf_cpu.py +++ b/tests/networks/blocks/test_crf_cpu.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.networks.blocks import CRF -from tests.utils.utils import skip_if_no_cpp_extension +from tests.util import skip_if_no_cpp_extension TEST_CASES = [ [ diff --git a/tests/networks/blocks/test_crf_cuda.py b/tests/networks/blocks/test_crf_cuda.py index 020d5c921b..765b19978b 100644 --- a/tests/networks/blocks/test_crf_cuda.py +++ b/tests/networks/blocks/test_crf_cuda.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.networks.blocks import CRF -from tests.utils.utils import skip_if_no_cpp_extension, skip_if_no_cuda +from tests.util import skip_if_no_cpp_extension, skip_if_no_cuda TEST_CASES = [ [ diff --git a/tests/networks/blocks/test_crossattention.py b/tests/networks/blocks/test_crossattention.py index 46c3696955..dbaeaf2a4a 100644 --- a/tests/networks/blocks/test_crossattention.py +++ b/tests/networks/blocks/test_crossattention.py @@ -22,7 +22,7 @@ from monai.networks.blocks.crossattention import CrossAttentionBlock from monai.networks.layers.factories import RelPosEmbedding from monai.utils import optional_import -from tests.utils.utils import SkipIfBeforePyTorchVersion, assert_allclose +from tests.util import SkipIfBeforePyTorchVersion, assert_allclose einops, has_einops = optional_import("einops") diff --git a/tests/networks/blocks/test_denseblock.py b/tests/networks/blocks/test_denseblock.py index e2f4b0d859..03e2f9fcd9 100644 --- a/tests/networks/blocks/test_denseblock.py +++ b/tests/networks/blocks/test_denseblock.py @@ -16,7 +16,7 @@ import torch.nn as nn from monai.networks.blocks import ConvDenseBlock, DenseBlock -from tests.utils.utils import TorchImageTestCase2D, TorchImageTestCase3D +from tests.util import TorchImageTestCase2D, TorchImageTestCase3D class TestDenseBlock2D(TorchImageTestCase2D): diff --git a/tests/networks/blocks/test_dynunet_block.py b/tests/networks/blocks/test_dynunet_block.py index 4be046ab44..4c0bccca2c 100644 --- a/tests/networks/blocks/test_dynunet_block.py +++ b/tests/networks/blocks/test_dynunet_block.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.blocks.dynunet_block import UnetBasicBlock, UnetResBlock, UnetUpBlock, get_padding -from tests.utils.utils import test_script_save +from tests.util import test_script_save TEST_CASE_RES_BASIC_BLOCK = [] for spatial_dims in range(2, 4): diff --git a/tests/networks/blocks/test_fpn_block.py b/tests/networks/blocks/test_fpn_block.py index 77b13cae9a..cb2df709fe 100644 --- a/tests/networks/blocks/test_fpn_block.py +++ b/tests/networks/blocks/test_fpn_block.py @@ -21,7 +21,7 @@ from monai.networks.blocks.feature_pyramid_network import FeaturePyramidNetwork from monai.networks.nets.resnet import resnet50 from monai.utils import optional_import -from tests.utils.utils import SkipIfBeforePyTorchVersion, test_script_save +from tests.util import SkipIfBeforePyTorchVersion, test_script_save _, has_torchvision = optional_import("torchvision") diff --git a/tests/networks/blocks/test_patchembedding.py b/tests/networks/blocks/test_patchembedding.py index 31d550ac9e..c9b16291f9 100644 --- a/tests/networks/blocks/test_patchembedding.py +++ b/tests/networks/blocks/test_patchembedding.py @@ -21,7 +21,7 @@ from monai.networks import eval_mode from monai.networks.blocks.patchembedding import PatchEmbed, PatchEmbeddingBlock from monai.utils import optional_import -from tests.utils.utils import SkipIfBeforePyTorchVersion +from tests.util import SkipIfBeforePyTorchVersion einops, has_einops = optional_import("einops") diff --git a/tests/networks/blocks/test_se_block.py b/tests/networks/blocks/test_se_block.py index f172399abd..09612d0cf5 100644 --- a/tests/networks/blocks/test_se_block.py +++ b/tests/networks/blocks/test_se_block.py @@ -19,7 +19,7 @@ from monai.networks import eval_mode from monai.networks.blocks import SEBlock from monai.networks.layers.factories import Act, Norm -from tests.utils.utils import test_script_save +from tests.util import test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/blocks/test_se_blocks.py b/tests/networks/blocks/test_se_blocks.py index 80578d2215..59b11ba97a 100644 --- a/tests/networks/blocks/test_se_blocks.py +++ b/tests/networks/blocks/test_se_blocks.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.blocks import ChannelSELayer, ResidualSELayer -from tests.utils.utils import test_script_save +from tests.util import test_script_save TEST_CASES = [ # single channel 3D, batch 16 [{"spatial_dims": 2, "in_channels": 4, "r": 3}, (7, 4, 64, 48), (7, 4, 64, 48)], # 4-channel 2D, batch 7 diff --git a/tests/networks/blocks/test_selfattention.py b/tests/networks/blocks/test_selfattention.py index 13f12fb2bb..2faa3d4d27 100644 --- a/tests/networks/blocks/test_selfattention.py +++ b/tests/networks/blocks/test_selfattention.py @@ -22,7 +22,7 @@ from monai.networks.blocks.selfattention import SABlock from monai.networks.layers.factories import RelPosEmbedding from monai.utils import optional_import -from tests.utils.utils import SkipIfBeforePyTorchVersion, assert_allclose, test_script_save +from tests.util import SkipIfBeforePyTorchVersion, assert_allclose, test_script_save einops, has_einops = optional_import("einops") diff --git a/tests/networks/blocks/test_subpixel_upsample.py b/tests/networks/blocks/test_subpixel_upsample.py index 274b2d654b..8a160fc425 100644 --- a/tests/networks/blocks/test_subpixel_upsample.py +++ b/tests/networks/blocks/test_subpixel_upsample.py @@ -20,7 +20,7 @@ from monai.networks import eval_mode from monai.networks.blocks import SubpixelUpsample from monai.networks.layers.factories import Conv -from tests.utils.utils import SkipIfBeforePyTorchVersion, test_script_save +from tests.util import SkipIfBeforePyTorchVersion, test_script_save TEST_CASE_SUBPIXEL = [] for inch in range(1, 5): diff --git a/tests/networks/blocks/test_text_encoding.py b/tests/networks/blocks/test_text_encoding.py index e11276e22a..09fee17cdb 100644 --- a/tests/networks/blocks/test_text_encoding.py +++ b/tests/networks/blocks/test_text_encoding.py @@ -14,7 +14,7 @@ import unittest from monai.networks.blocks.text_embedding import TextEncoder -from tests.utils.utils import skip_if_downloading_fails +from tests.util import skip_if_downloading_fails class TestTextEncoder(unittest.TestCase): diff --git a/tests/networks/blocks/test_unetr_block.py b/tests/networks/blocks/test_unetr_block.py index a227ba9f4b..018fba73e5 100644 --- a/tests/networks/blocks/test_unetr_block.py +++ b/tests/networks/blocks/test_unetr_block.py @@ -19,7 +19,7 @@ from monai.networks import eval_mode from monai.networks.blocks.dynunet_block import get_padding from monai.networks.blocks.unetr_block import UnetrBasicBlock, UnetrPrUpBlock, UnetrUpBlock -from tests.utils.utils import test_script_save +from tests.util import test_script_save TEST_CASE_UNETR_BASIC_BLOCK = [] for spatial_dims in range(1, 4): diff --git a/tests/networks/blocks/warp/test_warp.py b/tests/networks/blocks/warp/test_warp.py index c299d729cb..c02d01c62a 100644 --- a/tests/networks/blocks/warp/test_warp.py +++ b/tests/networks/blocks/warp/test_warp.py @@ -23,7 +23,7 @@ from monai.networks.blocks.warp import Warp from monai.transforms import LoadImaged from monai.utils import GridSampleMode, GridSamplePadMode -from tests.utils.utils import ( +from tests.util import ( SkipIfBeforePyTorchVersion, SkipIfNoModule, download_url_or_skip_test, diff --git a/tests/networks/layers/filtering/test_bilateral_approx_cpu.py b/tests/networks/layers/filtering/test_bilateral_approx_cpu.py index 5f80a6f7b2..5432744bd0 100644 --- a/tests/networks/layers/filtering/test_bilateral_approx_cpu.py +++ b/tests/networks/layers/filtering/test_bilateral_approx_cpu.py @@ -19,7 +19,7 @@ from torch.autograd import gradcheck from monai.networks.layers.filtering import BilateralFilter -from tests.utils.utils import skip_if_no_cpp_extension +from tests.util import skip_if_no_cpp_extension TEST_CASES = [ [ diff --git a/tests/networks/layers/filtering/test_bilateral_approx_cuda.py b/tests/networks/layers/filtering/test_bilateral_approx_cuda.py index 9645ca63db..3c71350c86 100644 --- a/tests/networks/layers/filtering/test_bilateral_approx_cuda.py +++ b/tests/networks/layers/filtering/test_bilateral_approx_cuda.py @@ -19,7 +19,7 @@ from torch.autograd import gradcheck from monai.networks.layers.filtering import BilateralFilter -from tests.utils.utils import skip_if_no_cpp_extension, skip_if_no_cuda +from tests.util import skip_if_no_cpp_extension, skip_if_no_cuda TEST_CASES = [ [ diff --git a/tests/networks/layers/filtering/test_bilateral_precise.py b/tests/networks/layers/filtering/test_bilateral_precise.py index 04e38895c1..70f2228312 100644 --- a/tests/networks/layers/filtering/test_bilateral_precise.py +++ b/tests/networks/layers/filtering/test_bilateral_precise.py @@ -19,7 +19,7 @@ from torch.autograd import gradcheck from monai.networks.layers.filtering import BilateralFilter -from tests.utils.utils import skip_if_no_cpp_extension, skip_if_no_cuda, skip_if_quick +from tests.util import skip_if_no_cpp_extension, skip_if_no_cuda, skip_if_quick TEST_CASES = [ [ diff --git a/tests/networks/layers/filtering/test_phl_cpu.py b/tests/networks/layers/filtering/test_phl_cpu.py index 8dd627f122..219ac803ab 100644 --- a/tests/networks/layers/filtering/test_phl_cpu.py +++ b/tests/networks/layers/filtering/test_phl_cpu.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.networks.layers.filtering import PHLFilter -from tests.utils.utils import skip_if_no_cpp_extension +from tests.util import skip_if_no_cpp_extension TEST_CASES = [ [ diff --git a/tests/networks/layers/filtering/test_phl_cuda.py b/tests/networks/layers/filtering/test_phl_cuda.py index 840736abbf..6c604ca0aa 100644 --- a/tests/networks/layers/filtering/test_phl_cuda.py +++ b/tests/networks/layers/filtering/test_phl_cuda.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.networks.layers.filtering import PHLFilter -from tests.utils.utils import skip_if_no_cpp_extension, skip_if_no_cuda +from tests.util import skip_if_no_cpp_extension, skip_if_no_cuda TEST_CASES = [ [ diff --git a/tests/networks/layers/filtering/test_trainable_bilateral.py b/tests/networks/layers/filtering/test_trainable_bilateral.py index ffcc48162f..a031c4cfc0 100644 --- a/tests/networks/layers/filtering/test_trainable_bilateral.py +++ b/tests/networks/layers/filtering/test_trainable_bilateral.py @@ -19,7 +19,7 @@ from torch.autograd import gradcheck from monai.networks.layers.filtering import TrainableBilateralFilterFunction -from tests.utils.utils import skip_if_no_cpp_extension, skip_if_no_cuda +from tests.util import skip_if_no_cpp_extension, skip_if_no_cuda TEST_CASES = [ [ diff --git a/tests/networks/layers/filtering/test_trainable_joint_bilateral.py b/tests/networks/layers/filtering/test_trainable_joint_bilateral.py index 3122b2cd33..d43cc490ce 100644 --- a/tests/networks/layers/filtering/test_trainable_joint_bilateral.py +++ b/tests/networks/layers/filtering/test_trainable_joint_bilateral.py @@ -19,7 +19,7 @@ from torch.autograd import gradcheck from monai.networks.layers.filtering import TrainableJointBilateralFilterFunction -from tests.utils.utils import skip_if_no_cpp_extension, skip_if_no_cuda, skip_if_quick +from tests.util import skip_if_no_cpp_extension, skip_if_no_cuda, skip_if_quick TEST_CASES = [ [ diff --git a/tests/networks/layers/test_affine_transform.py b/tests/networks/layers/test_affine_transform.py index 6e84245b62..6383b9ffef 100644 --- a/tests/networks/layers/test_affine_transform.py +++ b/tests/networks/layers/test_affine_transform.py @@ -19,7 +19,7 @@ from monai.networks import normalize_transform, to_norm_affine from monai.networks.layers import AffineTransform -from tests.utils.utils import is_tf32_env +from tests.util import is_tf32_env _rtol = 1e-4 if not is_tf32_env() else 5e-3 diff --git a/tests/networks/layers/test_gaussian_filter.py b/tests/networks/layers/test_gaussian_filter.py index 35515c0323..3bba6c4357 100644 --- a/tests/networks/layers/test_gaussian_filter.py +++ b/tests/networks/layers/test_gaussian_filter.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.networks.layers import GaussianFilter -from tests.utils.utils import SkipIfAtLeastPyTorchVersion, skip_if_quick +from tests.util import SkipIfAtLeastPyTorchVersion, skip_if_quick TEST_CASES = [[{"type": "erf", "gt": 2.0}], [{"type": "scalespace", "gt": 3.0}], [{"type": "sampled", "gt": 5.0}]] TEST_CASES_GPU = [[{"type": "erf", "gt": 0.8, "device": "cuda"}], [{"type": "sampled", "gt": 5.0, "device": "cuda"}]] diff --git a/tests/networks/layers/test_gmm.py b/tests/networks/layers/test_gmm.py index 8ec8fbdc87..234819976e 100644 --- a/tests/networks/layers/test_gmm.py +++ b/tests/networks/layers/test_gmm.py @@ -22,7 +22,7 @@ from monai._extensions import load_module from monai.networks.layers import GaussianMixtureModel -from tests.utils.utils import skip_if_darwin, skip_if_no_cuda, skip_if_quick, skip_if_windows +from tests.util import skip_if_darwin, skip_if_no_cuda, skip_if_quick, skip_if_windows TEST_CASES = [ [ diff --git a/tests/networks/layers/test_grid_pull.py b/tests/networks/layers/test_grid_pull.py index 751074395c..ac6a8e6527 100644 --- a/tests/networks/layers/test_grid_pull.py +++ b/tests/networks/layers/test_grid_pull.py @@ -21,7 +21,7 @@ from monai.networks.utils import meshgrid_ij from monai.utils import optional_import from tests.testing_data.cpp_resample_answers import Expected_1D_GP_bwd, Expected_1D_GP_fwd -from tests.utils.utils import skip_if_no_cpp_extension +from tests.util import skip_if_no_cpp_extension BType, has_b_type = optional_import("monai._C", name="BoundType") PType, has_p_type = optional_import("monai._C", name="InterpolationType") diff --git a/tests/networks/layers/test_hilbert_transform.py b/tests/networks/layers/test_hilbert_transform.py index 64ed4bd3fa..ceccafccce 100644 --- a/tests/networks/layers/test_hilbert_transform.py +++ b/tests/networks/layers/test_hilbert_transform.py @@ -19,7 +19,7 @@ from monai.networks.layers import HilbertTransform from monai.utils import OptionalImportError -from tests.utils.utils import SkipIfModule, SkipIfNoModule +from tests.util import SkipIfModule, SkipIfNoModule def create_expected_numpy_output(input_datum, **kwargs): diff --git a/tests/networks/layers/test_lltm.py b/tests/networks/layers/test_lltm.py index ec89582d7f..c77aa8c6d1 100644 --- a/tests/networks/layers/test_lltm.py +++ b/tests/networks/layers/test_lltm.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.networks.layers import LLTM -from tests.utils.utils import SkipIfNoModule, assert_allclose, is_tf32_env +from tests.util import SkipIfNoModule, assert_allclose, is_tf32_env _rtol = 0.001 if is_tf32_env() else 0.0001 diff --git a/tests/networks/layers/test_savitzky_golay_filter.py b/tests/networks/layers/test_savitzky_golay_filter.py index f1b90f461e..daa2d6e766 100644 --- a/tests/networks/layers/test_savitzky_golay_filter.py +++ b/tests/networks/layers/test_savitzky_golay_filter.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.networks.layers import SavitzkyGolayFilter -from tests.utils.utils import skip_if_no_cuda +from tests.util import skip_if_no_cuda # Zero-padding trivial tests diff --git a/tests/networks/nets/dints/test_dints_mixop.py b/tests/networks/nets/dints/test_dints_mixop.py index 8826c55b79..cec3ea6115 100644 --- a/tests/networks/nets/dints/test_dints_mixop.py +++ b/tests/networks/nets/dints/test_dints_mixop.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.networks.nets.dints import Cell, MixedOp -from tests.utils.utils import test_script_save +from tests.util import test_script_save TEST_CASES_3D = [ [ diff --git a/tests/networks/nets/regunet/test_localnet.py b/tests/networks/nets/regunet/test_localnet.py index 3663814b01..6698712669 100644 --- a/tests/networks/nets/regunet/test_localnet.py +++ b/tests/networks/nets/regunet/test_localnet.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets.regunet import LocalNet -from tests.utils.utils import test_script_save +from tests.util import test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/nets/regunet/test_regunet.py b/tests/networks/nets/regunet/test_regunet.py index efd58a7e79..af3ed0a68c 100644 --- a/tests/networks/nets/regunet/test_regunet.py +++ b/tests/networks/nets/regunet/test_regunet.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets.regunet import RegUNet -from tests.utils.utils import test_script_save +from tests.util import test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/nets/test_ahnet.py b/tests/networks/nets/test_ahnet.py index 01b228cfd3..bd466b8180 100644 --- a/tests/networks/nets/test_ahnet.py +++ b/tests/networks/nets/test_ahnet.py @@ -19,7 +19,7 @@ from monai.networks import eval_mode from monai.networks.blocks import FCN, MCFCN from monai.networks.nets import AHNet -from tests.utils.utils import skip_if_quick, test_pretrained_networks, test_script_save +from tests.util import skip_if_quick, test_pretrained_networks, test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/nets/test_attentionunet.py b/tests/networks/nets/test_attentionunet.py index 09e8092f73..16f9752320 100644 --- a/tests/networks/nets/test_attentionunet.py +++ b/tests/networks/nets/test_attentionunet.py @@ -17,7 +17,7 @@ import torch.nn as nn import monai.networks.nets.attentionunet as att -from tests.utils.utils import skip_if_no_cuda, skip_if_quick +from tests.util import skip_if_no_cuda, skip_if_quick def get_net_parameters(net: nn.Module) -> int: diff --git a/tests/networks/nets/test_autoencoder.py b/tests/networks/nets/test_autoencoder.py index b29fa8cab7..07529c7469 100644 --- a/tests/networks/nets/test_autoencoder.py +++ b/tests/networks/nets/test_autoencoder.py @@ -19,7 +19,7 @@ from monai.networks import eval_mode from monai.networks.layers import Act from monai.networks.nets import AutoEncoder -from tests.utils.utils import test_script_save +from tests.util import test_script_save device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu") diff --git a/tests/networks/nets/test_autoencoderkl.py b/tests/networks/nets/test_autoencoderkl.py index 5b117408de..8c232a49f9 100644 --- a/tests/networks/nets/test_autoencoderkl.py +++ b/tests/networks/nets/test_autoencoderkl.py @@ -23,7 +23,7 @@ from monai.networks import eval_mode from monai.networks.nets import AutoencoderKL from monai.utils import optional_import -from tests.utils.utils import SkipIfBeforePyTorchVersion, skip_if_downloading_fails, testing_data_config +from tests.util import SkipIfBeforePyTorchVersion, skip_if_downloading_fails, testing_data_config tqdm, has_tqdm = optional_import("tqdm", name="tqdm") _, has_einops = optional_import("einops") diff --git a/tests/networks/nets/test_basic_unet.py b/tests/networks/nets/test_basic_unet.py index f0cf40d1a3..56e4f3e9a4 100644 --- a/tests/networks/nets/test_basic_unet.py +++ b/tests/networks/nets/test_basic_unet.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets import BasicUNet -from tests.utils.utils import test_script_save +from tests.util import test_script_save CASES_1D = [] for mode in ["pixelshuffle", "nontrainable", "deconv", None]: diff --git a/tests/networks/nets/test_basic_unetplusplus.py b/tests/networks/nets/test_basic_unetplusplus.py index 650cbed00c..74cccca7e2 100644 --- a/tests/networks/nets/test_basic_unetplusplus.py +++ b/tests/networks/nets/test_basic_unetplusplus.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets import BasicUNetPlusPlus -from tests.utils.utils import test_script_save +from tests.util import test_script_save CASES_1D = [] for mode in ["pixelshuffle", "nontrainable", "deconv", None]: diff --git a/tests/networks/nets/test_bundle_init_bundle.py b/tests/networks/nets/test_bundle_init_bundle.py index dda8b31fbc..2cf1bb9b4c 100644 --- a/tests/networks/nets/test_bundle_init_bundle.py +++ b/tests/networks/nets/test_bundle_init_bundle.py @@ -18,7 +18,7 @@ import torch from monai.networks.nets import UNet -from tests.utils.utils import command_line_tests, skip_if_windows +from tests.util import command_line_tests, skip_if_windows @skip_if_windows diff --git a/tests/networks/nets/test_controlnet.py b/tests/networks/nets/test_controlnet.py index 16c51774d6..2cd6a1c428 100644 --- a/tests/networks/nets/test_controlnet.py +++ b/tests/networks/nets/test_controlnet.py @@ -23,7 +23,7 @@ from monai.networks import eval_mode from monai.networks.nets.controlnet import ControlNet from monai.utils import optional_import -from tests.utils.utils import skip_if_downloading_fails, testing_data_config +from tests.util import skip_if_downloading_fails, testing_data_config _, has_einops = optional_import("einops") UNCOND_CASES_2D = [ diff --git a/tests/networks/nets/test_daf3d.py b/tests/networks/nets/test_daf3d.py index e7d73b6889..e2b7c4d512 100644 --- a/tests/networks/nets/test_daf3d.py +++ b/tests/networks/nets/test_daf3d.py @@ -19,7 +19,7 @@ from monai.networks import eval_mode from monai.networks.nets import DAF3D from monai.utils import optional_import -from tests.utils.utils import test_script_save +from tests.util import test_script_save _, has_tv = optional_import("torchvision") diff --git a/tests/networks/nets/test_densenet.py b/tests/networks/nets/test_densenet.py index a4ccc22f16..3e731dd537 100644 --- a/tests/networks/nets/test_densenet.py +++ b/tests/networks/nets/test_densenet.py @@ -21,7 +21,7 @@ from monai.networks import eval_mode from monai.networks.nets import DenseNet121, Densenet169, DenseNet264, densenet201 from monai.utils import optional_import -from tests.utils.utils import skip_if_downloading_fails, skip_if_quick, test_script_save +from tests.util import skip_if_downloading_fails, skip_if_quick, test_script_save if TYPE_CHECKING: import torchvision diff --git a/tests/networks/nets/test_diffusion_model_unet.py b/tests/networks/nets/test_diffusion_model_unet.py index c795c71c2f..4bfa789e5c 100644 --- a/tests/networks/nets/test_diffusion_model_unet.py +++ b/tests/networks/nets/test_diffusion_model_unet.py @@ -23,7 +23,7 @@ from monai.networks import eval_mode from monai.networks.nets import DiffusionModelUNet from monai.utils import optional_import -from tests.utils.utils import skip_if_downloading_fails, testing_data_config +from tests.util import skip_if_downloading_fails, testing_data_config _, has_einops = optional_import("einops") diff --git a/tests/networks/nets/test_dints_network.py b/tests/networks/nets/test_dints_network.py index 89d473dd1c..f2bce951b3 100644 --- a/tests/networks/nets/test_dints_network.py +++ b/tests/networks/nets/test_dints_network.py @@ -19,7 +19,7 @@ from monai.networks.nets import DiNTS, TopologyInstance, TopologySearch from monai.networks.nets.dints import Cell -from tests.utils.utils import SkipIfBeforePyTorchVersion, skip_if_quick, test_script_save +from tests.util import SkipIfBeforePyTorchVersion, skip_if_quick, test_script_save TEST_CASES_3D = [ [ diff --git a/tests/networks/nets/test_discriminator.py b/tests/networks/nets/test_discriminator.py index 552829ace1..b3527a44ff 100644 --- a/tests/networks/nets/test_discriminator.py +++ b/tests/networks/nets/test_discriminator.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets import Discriminator -from tests.utils.utils import test_script_save +from tests.util import test_script_save TEST_CASE_0 = [ {"in_shape": (1, 64, 64), "channels": (2, 4, 8), "strides": (2, 2, 2), "num_res_units": 0}, diff --git a/tests/networks/nets/test_dynunet.py b/tests/networks/nets/test_dynunet.py index 1e9d5bb1e7..264ba858c3 100644 --- a/tests/networks/nets/test_dynunet.py +++ b/tests/networks/nets/test_dynunet.py @@ -22,7 +22,7 @@ from monai.networks import eval_mode from monai.networks.nets import DynUNet from monai.utils import optional_import -from tests.utils.utils import assert_allclose, skip_if_no_cuda, skip_if_windows, test_script_save +from tests.util import assert_allclose, skip_if_no_cuda, skip_if_windows, test_script_save InstanceNorm3dNVFuser, _ = optional_import("apex.normalization", name="InstanceNorm3dNVFuser") diff --git a/tests/networks/nets/test_efficientnet.py b/tests/networks/nets/test_efficientnet.py index de09fd6904..65892511cc 100644 --- a/tests/networks/nets/test_efficientnet.py +++ b/tests/networks/nets/test_efficientnet.py @@ -29,7 +29,7 @@ get_efficientnet_image_size, ) from monai.utils import optional_import -from tests.utils.utils import skip_if_downloading_fails, skip_if_quick, test_pretrained_networks, test_script_save +from tests.util import skip_if_downloading_fails, skip_if_quick, test_pretrained_networks, test_script_save TESTS_PATH = Path(__file__).parents[1] diff --git a/tests/networks/nets/test_flexible_unet.py b/tests/networks/nets/test_flexible_unet.py index 41a23d997e..82d43732f3 100644 --- a/tests/networks/nets/test_flexible_unet.py +++ b/tests/networks/nets/test_flexible_unet.py @@ -27,7 +27,7 @@ ResNetFeatures, ) from monai.utils import optional_import -from tests.utils.utils import SkipIfNoModule, skip_if_downloading_fails, skip_if_quick +from tests.util import SkipIfNoModule, skip_if_downloading_fails, skip_if_quick torchvision, has_torchvision = optional_import("torchvision") PIL, has_pil = optional_import("PIL") diff --git a/tests/networks/nets/test_generator.py b/tests/networks/nets/test_generator.py index 96078ebef4..f29bed3d21 100644 --- a/tests/networks/nets/test_generator.py +++ b/tests/networks/nets/test_generator.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets import Generator -from tests.utils.utils import test_script_save +from tests.util import test_script_save TEST_CASE_0 = [ {"latent_shape": (64,), "start_shape": (8, 8, 8), "channels": (8, 4, 1), "strides": (2, 2, 2), "num_res_units": 0}, diff --git a/tests/networks/nets/test_globalnet.py b/tests/networks/nets/test_globalnet.py index f72119b37d..0278835d49 100644 --- a/tests/networks/nets/test_globalnet.py +++ b/tests/networks/nets/test_globalnet.py @@ -21,7 +21,7 @@ from monai.networks.blocks import Warp from monai.networks.nets import GlobalNet from monai.networks.nets.regunet import AffineHead -from tests.utils.utils import assert_allclose, test_script_save +from tests.util import assert_allclose, test_script_save TEST_CASES_AFFINE_TRANSFORM = [ [ diff --git a/tests/networks/nets/test_highresnet.py b/tests/networks/nets/test_highresnet.py index 44accb25bd..fcec84375b 100644 --- a/tests/networks/nets/test_highresnet.py +++ b/tests/networks/nets/test_highresnet.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets import HighResNet -from tests.utils.utils import DistTestCase, TimedCall, test_script_save +from tests.util import DistTestCase, TimedCall, test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/nets/test_hovernet.py b/tests/networks/nets/test_hovernet.py index 19fb424840..dede36aae7 100644 --- a/tests/networks/nets/test_hovernet.py +++ b/tests/networks/nets/test_hovernet.py @@ -19,7 +19,7 @@ from monai.networks import eval_mode, train_mode from monai.networks.nets import HoVerNet from monai.networks.nets.hovernet import _DenseLayerDecoder -from tests.utils.utils import test_script_save +from tests.util import test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/nets/test_milmodel.py b/tests/networks/nets/test_milmodel.py index 20c435f8bd..151a31ad81 100644 --- a/tests/networks/nets/test_milmodel.py +++ b/tests/networks/nets/test_milmodel.py @@ -19,7 +19,7 @@ from monai.networks import eval_mode from monai.networks.nets import MILModel from monai.utils.module import optional_import -from tests.utils.utils import skip_if_downloading_fails, test_script_save +from tests.util import skip_if_downloading_fails, test_script_save models, _ = optional_import("torchvision.models") diff --git a/tests/networks/nets/test_net_adapter.py b/tests/networks/nets/test_net_adapter.py index 32f92ca98c..19d138b139 100644 --- a/tests/networks/nets/test_net_adapter.py +++ b/tests/networks/nets/test_net_adapter.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets import NetAdapter, resnet18 -from tests.utils.utils import test_script_save +from tests.util import test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/nets/test_network_consistency.py b/tests/networks/nets/test_network_consistency.py index b2983d2fdd..b13dfd2a13 100644 --- a/tests/networks/nets/test_network_consistency.py +++ b/tests/networks/nets/test_network_consistency.py @@ -24,7 +24,7 @@ import monai.networks.nets as nets from monai.utils import set_determinism from monai.utils.misc import MONAIEnvVars -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose extra_test_data_dir = MONAIEnvVars.extra_test_data() diff --git a/tests/networks/nets/test_patch_gan_dicriminator.py b/tests/networks/nets/test_patch_gan_dicriminator.py index 196a5edd80..10434fcbde 100644 --- a/tests/networks/nets/test_patch_gan_dicriminator.py +++ b/tests/networks/nets/test_patch_gan_dicriminator.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets import MultiScalePatchDiscriminator, PatchDiscriminator -from tests.utils.utils import test_script_save +from tests.util import test_script_save TEST_PATCHGAN = [ [ diff --git a/tests/networks/nets/test_quicknat.py b/tests/networks/nets/test_quicknat.py index a75f733fd0..26e6b4656b 100644 --- a/tests/networks/nets/test_quicknat.py +++ b/tests/networks/nets/test_quicknat.py @@ -19,7 +19,7 @@ from monai.networks import eval_mode from monai.networks.nets import Quicknat from monai.utils import optional_import -from tests.utils.utils import test_script_save +from tests.util import test_script_save _, has_se = optional_import("squeeze_and_excitation") diff --git a/tests/networks/nets/test_resnet.py b/tests/networks/nets/test_resnet.py index 21d512f32f..3ec63f1885 100644 --- a/tests/networks/nets/test_resnet.py +++ b/tests/networks/nets/test_resnet.py @@ -37,7 +37,7 @@ ) from monai.networks.nets.resnet import ResNetBlock from monai.utils import optional_import -from tests.utils.utils import ( +from tests.util import ( SkipIfNoModule, equal_state_dict, skip_if_downloading_fails, diff --git a/tests/networks/nets/test_segresnet.py b/tests/networks/nets/test_segresnet.py index e78a8a3ba5..dfffa69525 100644 --- a/tests/networks/nets/test_segresnet.py +++ b/tests/networks/nets/test_segresnet.py @@ -19,7 +19,7 @@ from monai.networks import eval_mode from monai.networks.nets import SegResNet, SegResNetVAE from monai.utils import UpsampleMode -from tests.utils.utils import test_script_save +from tests.util import test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/nets/test_segresnet_ds.py b/tests/networks/nets/test_segresnet_ds.py index ebd270aa5b..c8b9e5d99c 100644 --- a/tests/networks/nets/test_segresnet_ds.py +++ b/tests/networks/nets/test_segresnet_ds.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets import SegResNetDS, SegResNetDS2 -from tests.utils.utils import SkipIfBeforePyTorchVersion, test_script_save +from tests.util import SkipIfBeforePyTorchVersion, test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" TEST_CASE_SEGRESNET_DS = [] diff --git a/tests/networks/nets/test_senet.py b/tests/networks/nets/test_senet.py index 4dcdc237cc..57a15fdbe3 100644 --- a/tests/networks/nets/test_senet.py +++ b/tests/networks/nets/test_senet.py @@ -13,6 +13,7 @@ import os import unittest +from pathlib import Path from typing import TYPE_CHECKING from unittest import skipUnless @@ -23,7 +24,7 @@ from monai.networks import eval_mode from monai.networks.nets import SENet, SENet154, SEResNet50, SEResNet101, SEResNet152, SEResNext50, SEResNext101 from monai.utils import optional_import -from tests.utils.utils import test_is_quick, test_pretrained_networks, test_script_save, testing_data_config +from tests.util import test_is_quick, test_pretrained_networks, test_script_save, testing_data_config if TYPE_CHECKING: import pretrainedmodels @@ -86,7 +87,7 @@ def setUp(self): if "certificate" in str(rt_e): # [SSL: CERTIFICATE_VERIFY_FAILED] replace_url = True if replace_url: - testing_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "testing_data") + testing_dir = Path(__file__).parents[1] / "testing_data" testing_data_urls = { "senet154": { "url": testing_data_config("models", "senet154-c7b49a05", "url"), diff --git a/tests/networks/nets/test_swin_unetr.py b/tests/networks/nets/test_swin_unetr.py index b752f31eee..e86673b8f1 100644 --- a/tests/networks/nets/test_swin_unetr.py +++ b/tests/networks/nets/test_swin_unetr.py @@ -24,7 +24,7 @@ from monai.networks.nets.swin_unetr import PatchMerging, PatchMergingV2, SwinUNETR, filter_swinunetr from monai.networks.utils import copy_model_state from monai.utils import optional_import -from tests.utils.utils import ( +from tests.util import ( assert_allclose, pytorch_after, skip_if_downloading_fails, diff --git a/tests/networks/nets/test_torchvision_fc_model.py b/tests/networks/nets/test_torchvision_fc_model.py index 9f59b1be2f..b759b3cc88 100644 --- a/tests/networks/nets/test_torchvision_fc_model.py +++ b/tests/networks/nets/test_torchvision_fc_model.py @@ -21,7 +21,7 @@ from monai.networks.nets import TorchVisionFCModel, UNet from monai.networks.utils import look_up_named_module, set_named_module from monai.utils import min_version, optional_import -from tests.utils.utils import skip_if_downloading_fails +from tests.util import skip_if_downloading_fails Inception_V3_Weights, has_enum = optional_import("torchvision.models.inception", name="Inception_V3_Weights") diff --git a/tests/networks/nets/test_transchex.py b/tests/networks/nets/test_transchex.py index 989cfc3529..91a8e4bba6 100644 --- a/tests/networks/nets/test_transchex.py +++ b/tests/networks/nets/test_transchex.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets.transchex import Transchex -from tests.utils.utils import skip_if_quick +from tests.util import skip_if_quick TEST_CASE_TRANSCHEX = [] for drop_out in [0.4]: diff --git a/tests/networks/nets/test_transformer.py b/tests/networks/nets/test_transformer.py index 1b696a71c1..a557443019 100644 --- a/tests/networks/nets/test_transformer.py +++ b/tests/networks/nets/test_transformer.py @@ -24,7 +24,7 @@ from monai.networks import eval_mode from monai.networks.nets import DecoderOnlyTransformer from monai.utils import optional_import -from tests.utils.utils import skip_if_downloading_fails, testing_data_config +from tests.util import skip_if_downloading_fails, testing_data_config _, has_einops = optional_import("einops") TEST_CASES = [] diff --git a/tests/networks/nets/test_unet.py b/tests/networks/nets/test_unet.py index 316937e1ff..5248213648 100644 --- a/tests/networks/nets/test_unet.py +++ b/tests/networks/nets/test_unet.py @@ -19,7 +19,7 @@ from monai.networks import eval_mode from monai.networks.layers import Act, Norm from monai.networks.nets import UNet -from tests.utils.utils import test_script_save +from tests.util import test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/nets/test_unetr.py b/tests/networks/nets/test_unetr.py index f8cb55df06..75373f0271 100644 --- a/tests/networks/nets/test_unetr.py +++ b/tests/networks/nets/test_unetr.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets.unetr import UNETR -from tests.utils.utils import SkipIfBeforePyTorchVersion, skip_if_quick, test_script_save +from tests.util import SkipIfBeforePyTorchVersion, skip_if_quick, test_script_save TEST_CASE_UNETR = [] for dropout_rate in [0.4]: diff --git a/tests/networks/nets/test_varautoencoder.py b/tests/networks/nets/test_varautoencoder.py index 50337e27c5..d1346a5a92 100644 --- a/tests/networks/nets/test_varautoencoder.py +++ b/tests/networks/nets/test_varautoencoder.py @@ -19,7 +19,7 @@ from monai.networks import eval_mode from monai.networks.layers import Act from monai.networks.nets import VarAutoEncoder -from tests.utils.utils import test_script_save +from tests.util import test_script_save device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu") diff --git a/tests/networks/nets/test_vista3d.py b/tests/networks/nets/test_vista3d.py index b52810540a..b54ba1c92e 100644 --- a/tests/networks/nets/test_vista3d.py +++ b/tests/networks/nets/test_vista3d.py @@ -19,7 +19,7 @@ from monai.networks import eval_mode from monai.networks.nets import VISTA3D, SegResNetDS2 from monai.networks.nets.vista3d import ClassMappingClassify, PointMappingSAM -from tests.utils.utils import SkipIfBeforePyTorchVersion, skip_if_quick +from tests.util import SkipIfBeforePyTorchVersion, skip_if_quick device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/nets/test_vit.py b/tests/networks/nets/test_vit.py index 31d2a65769..f65f462fa6 100644 --- a/tests/networks/nets/test_vit.py +++ b/tests/networks/nets/test_vit.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets.vit import ViT -from tests.utils.utils import SkipIfBeforePyTorchVersion, skip_if_quick, test_script_save +from tests.util import SkipIfBeforePyTorchVersion, skip_if_quick, test_script_save TEST_CASE_Vit = [] for dropout_rate in [0.6]: diff --git a/tests/networks/nets/test_vitautoenc.py b/tests/networks/nets/test_vitautoenc.py index 0f545141d0..ecaac0490c 100644 --- a/tests/networks/nets/test_vitautoenc.py +++ b/tests/networks/nets/test_vitautoenc.py @@ -17,7 +17,7 @@ from monai.networks import eval_mode from monai.networks.nets.vitautoenc import ViTAutoEnc -from tests.utils.utils import skip_if_quick, skip_if_windows +from tests.util import skip_if_quick, skip_if_windows TEST_CASE_Vitautoenc = [] for in_channels in [1, 4]: diff --git a/tests/networks/nets/test_vnet.py b/tests/networks/nets/test_vnet.py index 58aee99359..7bb79fcb42 100644 --- a/tests/networks/nets/test_vnet.py +++ b/tests/networks/nets/test_vnet.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets import VNet -from tests.utils.utils import test_script_save +from tests.util import test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/nets/test_voxelmorph.py b/tests/networks/nets/test_voxelmorph.py index 0353358c0c..7b4483cdee 100644 --- a/tests/networks/nets/test_voxelmorph.py +++ b/tests/networks/nets/test_voxelmorph.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets import VoxelMorph, VoxelMorphUNet -from tests.utils.utils import test_script_save +from tests.util import test_script_save device = "cuda" if torch.cuda.is_available() else "cpu" diff --git a/tests/networks/nets/test_vqvae.py b/tests/networks/nets/test_vqvae.py index c733879467..1192a651be 100644 --- a/tests/networks/nets/test_vqvae.py +++ b/tests/networks/nets/test_vqvae.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets.vqvae import VQVAE -from tests.utils.utils import SkipIfBeforePyTorchVersion +from tests.util import SkipIfBeforePyTorchVersion TEST_CASES = [ [ diff --git a/tests/networks/schedulers/test_scheduler_ddim.py b/tests/networks/schedulers/test_scheduler_ddim.py index 4cd672afbc..80d693db18 100644 --- a/tests/networks/schedulers/test_scheduler_ddim.py +++ b/tests/networks/schedulers/test_scheduler_ddim.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.networks.schedulers import DDIMScheduler -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_2D_CASE = [] for beta_schedule in ["linear_beta", "scaled_linear_beta"]: diff --git a/tests/networks/schedulers/test_scheduler_ddpm.py b/tests/networks/schedulers/test_scheduler_ddpm.py index 42232e7fb4..46aca2c6ca 100644 --- a/tests/networks/schedulers/test_scheduler_ddpm.py +++ b/tests/networks/schedulers/test_scheduler_ddpm.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.networks.schedulers import DDPMScheduler -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_2D_CASE = [] for beta_schedule in ["linear_beta", "scaled_linear_beta"]: diff --git a/tests/networks/schedulers/test_scheduler_pndm.py b/tests/networks/schedulers/test_scheduler_pndm.py index a23f2c0709..fb2ecc56b2 100644 --- a/tests/networks/schedulers/test_scheduler_pndm.py +++ b/tests/networks/schedulers/test_scheduler_pndm.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.networks.schedulers import PNDMScheduler -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_2D_CASE = [] for beta_schedule in ["linear_beta", "scaled_linear_beta"]: diff --git a/tests/networks/test_bundle_onnx_export.py b/tests/networks/test_bundle_onnx_export.py index 855685c335..f3aa746cf5 100644 --- a/tests/networks/test_bundle_onnx_export.py +++ b/tests/networks/test_bundle_onnx_export.py @@ -20,7 +20,7 @@ from monai.bundle import ConfigParser from monai.networks import save_state -from tests.utils.utils import SkipIfBeforePyTorchVersion, SkipIfNoModule, command_line_tests, skip_if_windows +from tests.util import SkipIfBeforePyTorchVersion, SkipIfNoModule, command_line_tests, skip_if_windows TEST_CASE_1 = ["True"] TEST_CASE_2 = ["False"] diff --git a/tests/networks/test_convert_to_onnx.py b/tests/networks/test_convert_to_onnx.py index 7ff2c7abbc..b13b0f562b 100644 --- a/tests/networks/test_convert_to_onnx.py +++ b/tests/networks/test_convert_to_onnx.py @@ -21,7 +21,7 @@ from monai.networks import convert_to_onnx from monai.networks.nets import SegResNet, UNet from monai.utils.module import pytorch_after -from tests.utils.utils import SkipIfBeforePyTorchVersion, SkipIfNoModule, optional_import, skip_if_quick +from tests.util import SkipIfBeforePyTorchVersion, SkipIfNoModule, optional_import, skip_if_quick if torch.cuda.is_available(): TORCH_DEVICE_OPTIONS = ["cpu", "cuda"] diff --git a/tests/networks/test_convert_to_trt.py b/tests/networks/test_convert_to_trt.py index 55e12ea69c..903a488f84 100644 --- a/tests/networks/test_convert_to_trt.py +++ b/tests/networks/test_convert_to_trt.py @@ -20,7 +20,7 @@ from monai.networks import convert_to_trt from monai.networks.nets import UNet from monai.utils import optional_import -from tests.utils.utils import SkipIfBeforeComputeCapabilityVersion, skip_if_no_cuda, skip_if_quick, skip_if_windows +from tests.util import SkipIfBeforeComputeCapabilityVersion, skip_if_no_cuda, skip_if_quick, skip_if_windows _, has_torchtrt = optional_import( "torch_tensorrt", diff --git a/tests/networks/test_varnet.py b/tests/networks/test_varnet.py index fd7fe584f8..2215bc608c 100644 --- a/tests/networks/test_varnet.py +++ b/tests/networks/test_varnet.py @@ -20,7 +20,7 @@ from monai.apps.reconstruction.networks.nets.complex_unet import ComplexUnet from monai.apps.reconstruction.networks.nets.varnet import VariationalNetworkModel from monai.networks import eval_mode -from tests.utils.utils import SkipIfBeforePyTorchVersion, test_script_save +from tests.util import SkipIfBeforePyTorchVersion, test_script_save device = torch.device("cuda" if torch.cuda.is_available() else "cpu") coil_sens_model = CoilSensitivityModel(spatial_dims=2, features=[8, 16, 32, 64, 128, 8]) diff --git a/tests/networks/utils/test_replace_module.py b/tests/networks/utils/test_replace_module.py index 986ee272db..f562d1e1e5 100644 --- a/tests/networks/utils/test_replace_module.py +++ b/tests/networks/utils/test_replace_module.py @@ -18,7 +18,7 @@ from monai.networks.nets import DenseNet121 from monai.networks.utils import replace_modules, replace_modules_temp -from tests.utils.utils import TEST_DEVICES +from tests.util import TEST_DEVICES TESTS = [] for device in TEST_DEVICES: diff --git a/tests/ngc_bundle_download.py b/tests/ngc_bundle_download.py index d99a5ca85b..4913c3b256 100644 --- a/tests/ngc_bundle_download.py +++ b/tests/ngc_bundle_download.py @@ -24,7 +24,7 @@ from monai.bundle import download, load from monai.config import print_debug_info from monai.networks.utils import copy_model_state -from tests.utils.utils import assert_allclose, skip_if_downloading_fails, skip_if_quick, skip_if_windows +from tests.util import assert_allclose, skip_if_downloading_fails, skip_if_quick, skip_if_windows TEST_CASE_NGC_1 = [ "spleen_ct_segmentation", diff --git a/tests/optimizers/test_generate_param_groups.py b/tests/optimizers/test_generate_param_groups.py index 79329095ad..c25848ea9f 100644 --- a/tests/optimizers/test_generate_param_groups.py +++ b/tests/optimizers/test_generate_param_groups.py @@ -19,7 +19,7 @@ from monai.networks.nets import Unet from monai.optimizers import generate_param_groups from monai.utils import ensure_tuple -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_1 = [{"layer_matches": [lambda x: x.model[-1]], "match_types": "select", "lr_values": [1]}, (1, 100), [5, 21]] diff --git a/tests/optimizers/test_lr_finder.py b/tests/optimizers/test_lr_finder.py index 3672d0f5f3..e2660e888f 100644 --- a/tests/optimizers/test_lr_finder.py +++ b/tests/optimizers/test_lr_finder.py @@ -11,11 +11,11 @@ from __future__ import annotations -from pathlib import Path import pickle import random import sys import unittest +from pathlib import Path from typing import TYPE_CHECKING import torch @@ -27,7 +27,7 @@ from monai.transforms import Compose, EnsureChannelFirstd, LoadImaged, ScaleIntensityd, ToTensord from monai.utils import optional_import, set_determinism from monai.utils.misc import MONAIEnvVars -from tests.utils.utils import skip_if_downloading_fails +from tests.util import skip_if_downloading_fails if TYPE_CHECKING: import matplotlib.pyplot as plt @@ -53,12 +53,14 @@ def setUp(self): if not self.root_dir: self.root_dir = Path(__file__).parents[1] / "testing_data" - self.transforms = Compose([ - LoadImaged(keys="image"), - EnsureChannelFirstd(keys="image", channel_dim="no_channel"), - ScaleIntensityd(keys="image"), - ToTensord(keys="image"), - ]) + self.transforms = Compose( + [ + LoadImaged(keys="image"), + EnsureChannelFirstd(keys="image", channel_dim="no_channel"), + ScaleIntensityd(keys="image"), + ToTensord(keys="image"), + ] + ) def test_lr_finder(self): # 0.001 gives 54 examples @@ -74,7 +76,9 @@ def test_lr_finder(self): train_loader = DataLoader(train_ds, batch_size=300, shuffle=True, num_workers=2) num_classes = train_ds.get_num_classes() - model = DenseNet(spatial_dims=2, in_channels=1, out_channels=num_classes, init_features=2, growth_rate=2, block_config=(2,)) + model = DenseNet( + spatial_dims=2, in_channels=1, out_channels=num_classes, init_features=2, growth_rate=2, block_config=(2,) + ) loss_function = torch.nn.CrossEntropyLoss() learning_rate = 1e-5 optimizer = torch.optim.Adam(model.parameters(), learning_rate) diff --git a/tests/padders.py b/tests/padders.py index fdfd502688..13aed74635 100644 --- a/tests/padders.py +++ b/tests/padders.py @@ -21,7 +21,7 @@ from monai.transforms.lazy.functional import apply_pending from monai.transforms.transform import MapTransform from monai.utils.enums import NumpyPadMode, PytorchPadMode -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose MODES = [] # Test modes diff --git a/tests/test_auto3dseg.py b/tests/test_auto3dseg.py index 04e75b3fe0..c3ed9ba1e4 100644 --- a/tests/test_auto3dseg.py +++ b/tests/test_auto3dseg.py @@ -54,7 +54,7 @@ ToDeviced, ) from monai.utils.enums import DataStatsKeys -from tests.utils.utils import skip_if_no_cuda +from tests.util import skip_if_no_cuda device = "cpu" n_workers = 2 diff --git a/tests/test_call_dist.py b/tests/test_call_dist.py index add778bf8b..50b7696904 100644 --- a/tests/test_call_dist.py +++ b/tests/test_call_dist.py @@ -13,7 +13,7 @@ import unittest -from tests.utils.utils import DistCall, DistTestCase +from tests.util import DistCall, DistTestCase class DistributedCallTest(DistTestCase): diff --git a/tests/test_masked_autoencoder_vit.py b/tests/test_masked_autoencoder_vit.py index 3ad4188b8b..cee3b605f5 100644 --- a/tests/test_masked_autoencoder_vit.py +++ b/tests/test_masked_autoencoder_vit.py @@ -18,7 +18,7 @@ from monai.networks import eval_mode from monai.networks.nets.masked_autoencoder_vit import MaskedAutoEncoderViT -from tests.utils.utils import skip_if_quick +from tests.util import skip_if_quick TEST_CASE_MaskedAutoEncoderViT = [] for masking_ratio in [0.5]: diff --git a/tests/test_query_memory.py b/tests/test_query_memory.py index d563327887..bd58b0803f 100644 --- a/tests/test_query_memory.py +++ b/tests/test_query_memory.py @@ -13,7 +13,7 @@ import unittest -from tests.utils.utils import query_memory +from tests.util import query_memory class TestQueryMemory(unittest.TestCase): diff --git a/tests/test_rand_torchiod.py b/tests/test_rand_torchiod.py index 545c613442..d86bd1d8bf 100644 --- a/tests/test_rand_torchiod.py +++ b/tests/test_rand_torchiod.py @@ -20,7 +20,7 @@ from monai.transforms import RandTorchIOd from monai.utils import optional_import, set_determinism -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose _, has_torchio = optional_import("torchio") diff --git a/tests/test_set_visible_devices.py b/tests/test_set_visible_devices.py index 0dfa1ec354..48f124f7da 100644 --- a/tests/test_set_visible_devices.py +++ b/tests/test_set_visible_devices.py @@ -14,7 +14,7 @@ import os import unittest -from tests.utils.utils import SkipIfAtLeastPyTorchVersion, skip_if_no_cuda +from tests.util import SkipIfAtLeastPyTorchVersion, skip_if_no_cuda class TestVisibleDevices(unittest.TestCase): diff --git a/tests/test_timedcall_dist.py b/tests/test_timedcall_dist.py index 12d7d2a330..b5e0059b17 100644 --- a/tests/test_timedcall_dist.py +++ b/tests/test_timedcall_dist.py @@ -16,7 +16,7 @@ import time import unittest -from tests.utils.utils import TimedCall +from tests.util import TimedCall @TimedCall(seconds=20 if sys.platform == "linux" else 60, force_quit=False) diff --git a/tests/test_torchiod.py b/tests/test_torchiod.py index 4cbc2c01ac..d61421cae2 100644 --- a/tests/test_torchiod.py +++ b/tests/test_torchiod.py @@ -19,7 +19,7 @@ from monai.transforms import TorchIOd from monai.utils import optional_import -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose _, has_torchio = optional_import("torchio") diff --git a/tests/transforms/croppad/test_rand_weighted_crop.py b/tests/transforms/croppad/test_rand_weighted_crop.py index 53f4053242..f700291a10 100644 --- a/tests/transforms/croppad/test_rand_weighted_crop.py +++ b/tests/transforms/croppad/test_rand_weighted_crop.py @@ -20,7 +20,7 @@ from monai.transforms.croppad.array import RandWeightedCrop from monai.transforms.lazy.functional import apply_pending from tests.croppers import CropTest -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, NumpyImageTestCase3D, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, NumpyImageTestCase3D, assert_allclose def get_data(ndim): diff --git a/tests/transforms/croppad/test_rand_weighted_cropd.py b/tests/transforms/croppad/test_rand_weighted_cropd.py index 00c144acb6..6baf3b255f 100644 --- a/tests/transforms/croppad/test_rand_weighted_cropd.py +++ b/tests/transforms/croppad/test_rand_weighted_cropd.py @@ -19,7 +19,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms.croppad.dictionary import RandWeightedCropd from monai.transforms.lazy.functional import apply_pending -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, NumpyImageTestCase3D, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, NumpyImageTestCase3D, assert_allclose def get_data(ndim): diff --git a/tests/transforms/intensity/test_compute_ho_ver_maps.py b/tests/transforms/intensity/test_compute_ho_ver_maps.py index f43d53865f..6b243c9f49 100644 --- a/tests/transforms/intensity/test_compute_ho_ver_maps.py +++ b/tests/transforms/intensity/test_compute_ho_ver_maps.py @@ -19,7 +19,7 @@ from monai.transforms.intensity.array import ComputeHoVerMaps from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_skimage = optional_import("skimage", "0.19.0", min_version) diff --git a/tests/transforms/intensity/test_compute_ho_ver_maps_d.py b/tests/transforms/intensity/test_compute_ho_ver_maps_d.py index 453e8cf972..c4f6b122c6 100644 --- a/tests/transforms/intensity/test_compute_ho_ver_maps_d.py +++ b/tests/transforms/intensity/test_compute_ho_ver_maps_d.py @@ -19,7 +19,7 @@ from monai.transforms.intensity.dictionary import ComputeHoVerMapsd from monai.utils import min_version, optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_skimage = optional_import("skimage", "0.19.0", min_version) diff --git a/tests/transforms/intensity/test_foreground_mask.py b/tests/transforms/intensity/test_foreground_mask.py index 675fbe2e40..0a6806428e 100644 --- a/tests/transforms/intensity/test_foreground_mask.py +++ b/tests/transforms/intensity/test_foreground_mask.py @@ -18,7 +18,7 @@ from monai.transforms.intensity.array import ForegroundMask from monai.utils import min_version, optional_import, set_determinism -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose skimage, has_skimage = optional_import("skimage", "0.19.0", min_version) set_determinism(1234) diff --git a/tests/transforms/intensity/test_foreground_maskd.py b/tests/transforms/intensity/test_foreground_maskd.py index b3a93efd8e..12cc67e040 100644 --- a/tests/transforms/intensity/test_foreground_maskd.py +++ b/tests/transforms/intensity/test_foreground_maskd.py @@ -18,7 +18,7 @@ from monai.transforms.intensity.dictionary import ForegroundMaskd from monai.utils import min_version, optional_import, set_determinism -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose skimage, has_skimage = optional_import("skimage", "0.19.0", min_version) set_determinism(1234) diff --git a/tests/transforms/intensity/test_rand_histogram_shiftd.py b/tests/transforms/intensity/test_rand_histogram_shiftd.py index 360e9139a7..a831147a6e 100644 --- a/tests/transforms/intensity/test_rand_histogram_shiftd.py +++ b/tests/transforms/intensity/test_rand_histogram_shiftd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms.intensity.dictionary import RandHistogramShiftd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/intensity/test_scale_intensity_range_percentiles.py b/tests/transforms/intensity/test_scale_intensity_range_percentiles.py index 9a383b83a3..6b0a2c2d0d 100644 --- a/tests/transforms/intensity/test_scale_intensity_range_percentiles.py +++ b/tests/transforms/intensity/test_scale_intensity_range_percentiles.py @@ -17,7 +17,7 @@ import torch from monai.transforms.intensity.array import ScaleIntensityRangePercentiles -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestScaleIntensityRangePercentiles(NumpyImageTestCase2D): diff --git a/tests/transforms/intensity/test_scale_intensity_range_percentilesd.py b/tests/transforms/intensity/test_scale_intensity_range_percentilesd.py index 133eb7ea63..1447733dcd 100644 --- a/tests/transforms/intensity/test_scale_intensity_range_percentilesd.py +++ b/tests/transforms/intensity/test_scale_intensity_range_percentilesd.py @@ -16,7 +16,7 @@ import numpy as np from monai.transforms.intensity.dictionary import ScaleIntensityRangePercentilesd -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestScaleIntensityRangePercentilesd(NumpyImageTestCase2D): diff --git a/tests/transforms/inverse/test_inverse_array.py b/tests/transforms/inverse/test_inverse_array.py index 34fa4c6bb2..0709283cb8 100644 --- a/tests/transforms/inverse/test_inverse_array.py +++ b/tests/transforms/inverse/test_inverse_array.py @@ -20,7 +20,7 @@ from monai.transforms import Compose, EnsureChannelFirst, Flip, Orientation, Spacing from monai.transforms.inverse import InvertibleTransform from monai.utils import optional_import -from tests.utils.utils import TEST_DEVICES +from tests.util import TEST_DEVICES _, has_nib = optional_import("nibabel") diff --git a/tests/transforms/lazy/functional/test_apply.py b/tests/transforms/lazy/functional/test_apply.py index 164de96dff..1462698bc3 100644 --- a/tests/transforms/lazy/functional/test_apply.py +++ b/tests/transforms/lazy/functional/test_apply.py @@ -19,7 +19,7 @@ from monai.transforms.lazy.functional import apply_pending from monai.transforms.utils import create_rotate from monai.utils import LazyAttr, convert_to_tensor -from tests.utils.utils import get_arange_img +from tests.util import get_arange_img def single_2d_transform_cases(): diff --git a/tests/transforms/lazy/functional/test_resample.py b/tests/transforms/lazy/functional/test_resample.py index ad826aaeac..9ae7303fdb 100644 --- a/tests/transforms/lazy/functional/test_resample.py +++ b/tests/transforms/lazy/functional/test_resample.py @@ -18,7 +18,7 @@ from monai.transforms.lazy.functional import resample from monai.utils import convert_to_tensor -from tests.utils.utils import assert_allclose, get_arange_img +from tests.util import assert_allclose, get_arange_img def rotate_90_2d(): diff --git a/tests/transforms/post/test_label_filterd.py b/tests/transforms/post/test_label_filterd.py index 18fa2904ca..95ce8dd267 100644 --- a/tests/transforms/post/test_label_filterd.py +++ b/tests/transforms/post/test_label_filterd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms.post.dictionary import LabelFilterd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose grid_1 = torch.tensor([[[[1, 2, 3], [4, 5, 6], [7, 8, 9]]]]) diff --git a/tests/transforms/post/test_probnms.py b/tests/transforms/post/test_probnms.py index 5fb38ee45f..4cb1f472bc 100644 --- a/tests/transforms/post/test_probnms.py +++ b/tests/transforms/post/test_probnms.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms.post.array import ProbNMS -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/post/test_probnmsd.py b/tests/transforms/post/test_probnmsd.py index 2dcdcd11a7..19edd09057 100644 --- a/tests/transforms/post/test_probnmsd.py +++ b/tests/transforms/post/test_probnmsd.py @@ -19,7 +19,7 @@ from parameterized import parameterized from monai.transforms.post.dictionary import ProbNMSD -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TESTS: list[Any] = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/post/test_remove_small_objects.py b/tests/transforms/post/test_remove_small_objects.py index fbd9443345..8521d0a9f4 100644 --- a/tests/transforms/post/test_remove_small_objects.py +++ b/tests/transforms/post/test_remove_small_objects.py @@ -21,7 +21,7 @@ from monai.transforms.post.array import RemoveSmallObjects from monai.transforms.post.dictionary import RemoveSmallObjectsd from monai.utils import optional_import -from tests.utils.utils import TEST_NDARRAYS, SkipIfNoModule, assert_allclose +from tests.util import TEST_NDARRAYS, SkipIfNoModule, assert_allclose morphology, has_morphology = optional_import("skimage.morphology") diff --git a/tests/transforms/spatial/test_convert_box_points.py b/tests/transforms/spatial/test_convert_box_points.py index cb34bb0726..5570369192 100644 --- a/tests/transforms/spatial/test_convert_box_points.py +++ b/tests/transforms/spatial/test_convert_box_points.py @@ -18,7 +18,7 @@ from monai.data.box_utils import convert_box_to_standard_mode from monai.transforms.spatial.array import ConvertBoxToPoints, ConvertPointsToBoxes -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_POINTS_2D = [ [ diff --git a/tests/transforms/spatial/test_grid_patch.py b/tests/transforms/spatial/test_grid_patch.py index a20e1a6a09..a60f6aa073 100644 --- a/tests/transforms/spatial/test_grid_patch.py +++ b/tests/transforms/spatial/test_grid_patch.py @@ -19,7 +19,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms.spatial.array import GridPatch -from tests.utils.utils import TEST_NDARRAYS, SkipIfBeforePyTorchVersion, assert_allclose +from tests.util import TEST_NDARRAYS, SkipIfBeforePyTorchVersion, assert_allclose A = np.arange(16).repeat(3).reshape(4, 4, 3).transpose(2, 0, 1) A11 = A[:, :2, :2] diff --git a/tests/transforms/spatial/test_grid_patchd.py b/tests/transforms/spatial/test_grid_patchd.py index 13860607e6..c765f658b5 100644 --- a/tests/transforms/spatial/test_grid_patchd.py +++ b/tests/transforms/spatial/test_grid_patchd.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms.spatial.dictionary import GridPatchd -from tests.utils.utils import TEST_NDARRAYS, SkipIfBeforePyTorchVersion, assert_allclose +from tests.util import TEST_NDARRAYS, SkipIfBeforePyTorchVersion, assert_allclose A = np.arange(16).repeat(3).reshape(4, 4, 3).transpose(2, 0, 1) A11 = A[:, :2, :2] diff --git a/tests/transforms/spatial/test_rand_grid_patch.py b/tests/transforms/spatial/test_rand_grid_patch.py index baa7e19360..ae79b8639f 100644 --- a/tests/transforms/spatial/test_rand_grid_patch.py +++ b/tests/transforms/spatial/test_rand_grid_patch.py @@ -20,7 +20,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms.spatial.array import RandGridPatch from monai.utils import set_determinism -from tests.utils.utils import TEST_NDARRAYS, SkipIfBeforePyTorchVersion, assert_allclose +from tests.util import TEST_NDARRAYS, SkipIfBeforePyTorchVersion, assert_allclose A = np.arange(16).repeat(3).reshape(4, 4, 3).transpose(2, 0, 1) A11 = A[:, :2, :2] diff --git a/tests/transforms/spatial/test_rand_grid_patchd.py b/tests/transforms/spatial/test_rand_grid_patchd.py index 7928b0fb2c..a93f0e9e01 100644 --- a/tests/transforms/spatial/test_rand_grid_patchd.py +++ b/tests/transforms/spatial/test_rand_grid_patchd.py @@ -19,7 +19,7 @@ from monai.transforms.spatial.dictionary import RandGridPatchd from monai.utils import set_determinism -from tests.utils.utils import TEST_NDARRAYS, SkipIfBeforePyTorchVersion, assert_allclose +from tests.util import TEST_NDARRAYS, SkipIfBeforePyTorchVersion, assert_allclose A = np.arange(16).repeat(3).reshape(4, 4, 3).transpose(2, 0, 1) A11 = A[:, :2, :2] diff --git a/tests/transforms/spatial/test_spatial_resampled.py b/tests/transforms/spatial/test_spatial_resampled.py index 89a273bc2d..d81b163007 100644 --- a/tests/transforms/spatial/test_spatial_resampled.py +++ b/tests/transforms/spatial/test_spatial_resampled.py @@ -22,7 +22,7 @@ from monai.data.utils import to_affine_nd from monai.transforms.spatial.dictionary import SpatialResampled from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_DEVICES, assert_allclose +from tests.util import TEST_DEVICES, assert_allclose ON_AARCH64 = platform.machine() == "aarch64" if ON_AARCH64: diff --git a/tests/transforms/test_activations.py b/tests/transforms/test_activations.py index 6928485067..71628b437b 100644 --- a/tests/transforms/test_activations.py +++ b/tests/transforms/test_activations.py @@ -18,7 +18,7 @@ from monai.networks.layers.factories import Act from monai.transforms import Activations -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TEST_CASES = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_activationsd.py b/tests/transforms/test_activationsd.py index 5e8af644aa..2ea7ac100b 100644 --- a/tests/transforms/test_activationsd.py +++ b/tests/transforms/test_activationsd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import Activationsd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TEST_CASES = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_add_coordinate_channels.py b/tests/transforms/test_add_coordinate_channels.py index f40f25a2fd..ff9194915a 100644 --- a/tests/transforms/test_add_coordinate_channels.py +++ b/tests/transforms/test_add_coordinate_channels.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import AddCoordinateChannels -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS, TEST_CASES_ERROR_1, TEST_CASES_ERROR_2 = [], [], [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_add_coordinate_channelsd.py b/tests/transforms/test_add_coordinate_channelsd.py index 301a037172..5fda6d13c5 100644 --- a/tests/transforms/test_add_coordinate_channelsd.py +++ b/tests/transforms/test_add_coordinate_channelsd.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import AddCoordinateChannelsd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS, TEST_CASES_ERROR_1, TEST_CASES_ERROR_2 = [], [], [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_add_extreme_points_channel.py b/tests/transforms/test_add_extreme_points_channel.py index 2bb568ceba..00a02275f3 100644 --- a/tests/transforms/test_add_extreme_points_channel.py +++ b/tests/transforms/test_add_extreme_points_channel.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import AddExtremePointsChannel -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose IMG_CHANNEL = 3 TESTS = [] diff --git a/tests/transforms/test_add_extreme_points_channeld.py b/tests/transforms/test_add_extreme_points_channeld.py index 8b71a0e051..d7feba2c01 100644 --- a/tests/transforms/test_add_extreme_points_channeld.py +++ b/tests/transforms/test_add_extreme_points_channeld.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import AddExtremePointsChanneld -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose IMG_CHANNEL = 3 diff --git a/tests/transforms/test_adjust_contrast.py b/tests/transforms/test_adjust_contrast.py index edf7166a0f..eca15260af 100644 --- a/tests/transforms/test_adjust_contrast.py +++ b/tests/transforms/test_adjust_contrast.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import AdjustContrast -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose TESTS = [] for invert_image in (True, False): diff --git a/tests/transforms/test_adjust_contrastd.py b/tests/transforms/test_adjust_contrastd.py index 24f9a1c725..ad2329622f 100644 --- a/tests/transforms/test_adjust_contrastd.py +++ b/tests/transforms/test_adjust_contrastd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import AdjustContrastd -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose TESTS = [] for invert_image in (True, False): diff --git a/tests/transforms/test_affine.py b/tests/transforms/test_affine.py index 049d64b84a..22cc16c84f 100644 --- a/tests/transforms/test_affine.py +++ b/tests/transforms/test_affine.py @@ -23,7 +23,7 @@ from monai.transforms.lazy.functional import apply_pending from monai.utils import optional_import from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, assert_allclose, test_local_inversion TESTS = [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_affine_grid.py b/tests/transforms/test_affine_grid.py index 4f89411c91..ebde3a175a 100644 --- a/tests/transforms/test_affine_grid.py +++ b/tests/transforms/test_affine_grid.py @@ -19,7 +19,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import AffineGrid -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose, is_tf32_env +from tests.util import TEST_NDARRAYS_ALL, assert_allclose, is_tf32_env TESTS = [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_affined.py b/tests/transforms/test_affined.py index ef5db64f53..738cdf72e9 100644 --- a/tests/transforms/test_affined.py +++ b/tests/transforms/test_affined.py @@ -20,7 +20,7 @@ from monai.transforms import Affined from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, assert_allclose, test_local_inversion TESTS = [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_as_channel_last.py b/tests/transforms/test_as_channel_last.py index 93ee7481f0..fdd7d3ab6c 100644 --- a/tests/transforms/test_as_channel_last.py +++ b/tests/transforms/test_as_channel_last.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import AsChannelLast -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_as_channel_lastd.py b/tests/transforms/test_as_channel_lastd.py index 8b93019ecc..32edc12413 100644 --- a/tests/transforms/test_as_channel_lastd.py +++ b/tests/transforms/test_as_channel_lastd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import AsChannelLastd -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_as_discrete.py b/tests/transforms/test_as_discrete.py index 28d0d2166a..dc8ce48495 100644 --- a/tests/transforms/test_as_discrete.py +++ b/tests/transforms/test_as_discrete.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.transforms import AsDiscrete -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TEST_CASES = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_as_discreted.py b/tests/transforms/test_as_discreted.py index 5f8e553736..bad63cac08 100644 --- a/tests/transforms/test_as_discreted.py +++ b/tests/transforms/test_as_discreted.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.transforms import AsDiscreted -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TEST_CASES = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_bounding_rect.py b/tests/transforms/test_bounding_rect.py index ca7ec1637f..029bfca8f3 100644 --- a/tests/transforms/test_bounding_rect.py +++ b/tests/transforms/test_bounding_rect.py @@ -18,7 +18,7 @@ import monai from monai.transforms import BoundingRect -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TEST_CASE_1 = [(2, 3), [[0, 0], [1, 2]]] diff --git a/tests/transforms/test_bounding_rectd.py b/tests/transforms/test_bounding_rectd.py index a8c434ffc4..2ca20142a3 100644 --- a/tests/transforms/test_bounding_rectd.py +++ b/tests/transforms/test_bounding_rectd.py @@ -18,7 +18,7 @@ import monai from monai.transforms import BoundingRectD -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TEST_CASE_1 = [(2, 3), [[0, 0], [1, 2]]] diff --git a/tests/transforms/test_cast_to_type.py b/tests/transforms/test_cast_to_type.py index 4e5f1b97d6..f7d18660b4 100644 --- a/tests/transforms/test_cast_to_type.py +++ b/tests/transforms/test_cast_to_type.py @@ -20,7 +20,7 @@ from monai.transforms import CastToType from monai.utils import optional_import from monai.utils.type_conversion import get_equivalent_dtype -from tests.utils.utils import HAS_CUPY, TEST_NDARRAYS +from tests.util import HAS_CUPY, TEST_NDARRAYS cp, _ = optional_import("cupy") diff --git a/tests/transforms/test_cast_to_typed.py b/tests/transforms/test_cast_to_typed.py index 50e5b1daa6..318463a606 100644 --- a/tests/transforms/test_cast_to_typed.py +++ b/tests/transforms/test_cast_to_typed.py @@ -19,7 +19,7 @@ from monai.transforms import CastToTyped from monai.utils import optional_import -from tests.utils.utils import HAS_CUPY +from tests.util import HAS_CUPY cp, _ = optional_import("cupy") diff --git a/tests/transforms/test_classes_to_indices.py b/tests/transforms/test_classes_to_indices.py index 98ee951308..1d64c694ed 100644 --- a/tests/transforms/test_classes_to_indices.py +++ b/tests/transforms/test_classes_to_indices.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.transforms import ClassesToIndices -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS_CASES = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_classes_to_indicesd.py b/tests/transforms/test_classes_to_indicesd.py index 3db07e787e..0192f58456 100644 --- a/tests/transforms/test_classes_to_indicesd.py +++ b/tests/transforms/test_classes_to_indicesd.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.transforms import ClassesToIndicesd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS_CASES = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_clip_intensity_percentiles.py b/tests/transforms/test_clip_intensity_percentiles.py index 12f64069cf..f1d587a973 100644 --- a/tests/transforms/test_clip_intensity_percentiles.py +++ b/tests/transforms/test_clip_intensity_percentiles.py @@ -19,7 +19,7 @@ from monai.transforms.utils import soft_clip from monai.transforms.utils_pytorch_numpy_unification import clip, percentile from monai.utils.type_conversion import convert_to_tensor -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, NumpyImageTestCase3D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, NumpyImageTestCase3D, assert_allclose def test_hard_clip_func(im, lower, upper): diff --git a/tests/transforms/test_clip_intensity_percentilesd.py b/tests/transforms/test_clip_intensity_percentilesd.py index 793e5093dc..dbbe5e2254 100644 --- a/tests/transforms/test_clip_intensity_percentilesd.py +++ b/tests/transforms/test_clip_intensity_percentilesd.py @@ -19,7 +19,7 @@ from monai.transforms.utils_pytorch_numpy_unification import clip, percentile from monai.utils.type_conversion import convert_to_tensor from tests.transforms.test_clip_intensity_percentiles import test_hard_clip_func, test_soft_clip_func -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, NumpyImageTestCase3D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, NumpyImageTestCase3D, assert_allclose class TestClipIntensityPercentilesd2D(NumpyImageTestCase2D): diff --git a/tests/transforms/test_concat_itemsd.py b/tests/transforms/test_concat_itemsd.py index 49bfb8bb5e..f7aa0ab23a 100644 --- a/tests/transforms/test_concat_itemsd.py +++ b/tests/transforms/test_concat_itemsd.py @@ -18,7 +18,7 @@ from monai.data import MetaTensor from monai.transforms import ConcatItemsd -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose class TestConcatItemsd(unittest.TestCase): diff --git a/tests/transforms/test_convert_to_multi_channel.py b/tests/transforms/test_convert_to_multi_channel.py index 56aa60ce12..ea61f0a480 100644 --- a/tests/transforms/test_convert_to_multi_channel.py +++ b/tests/transforms/test_convert_to_multi_channel.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import ConvertToMultiChannelBasedOnBratsClasses -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_copy_itemsd.py b/tests/transforms/test_copy_itemsd.py index d379d030ad..9da8777f5b 100644 --- a/tests/transforms/test_copy_itemsd.py +++ b/tests/transforms/test_copy_itemsd.py @@ -20,7 +20,7 @@ from monai.networks import eval_mode from monai.transforms import CopyItemsd from monai.utils import ensure_tuple -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_1 = ["img", 1, "img_1"] diff --git a/tests/transforms/test_create_grid_and_affine.py b/tests/transforms/test_create_grid_and_affine.py index d74fdd9c63..2d1db7c38c 100644 --- a/tests/transforms/test_create_grid_and_affine.py +++ b/tests/transforms/test_create_grid_and_affine.py @@ -24,7 +24,7 @@ create_shear, create_translate, ) -from tests.utils.utils import assert_allclose, is_tf32_env +from tests.util import assert_allclose, is_tf32_env class TestCreateGrid(unittest.TestCase): diff --git a/tests/transforms/test_crop_foreground.py b/tests/transforms/test_crop_foreground.py index 0e61cc50c3..91fe16363e 100644 --- a/tests/transforms/test_crop_foreground.py +++ b/tests/transforms/test_crop_foreground.py @@ -20,7 +20,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import CropForeground from monai.transforms.lazy.functional import apply_pending -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TEST_COORDS, TESTS, TEST_LAZY_ERROR = [], [], [] diff --git a/tests/transforms/test_crop_foregroundd.py b/tests/transforms/test_crop_foregroundd.py index 1cc44054ed..c0b3b2b9af 100644 --- a/tests/transforms/test_crop_foregroundd.py +++ b/tests/transforms/test_crop_foregroundd.py @@ -19,7 +19,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import CropForegroundd from monai.transforms.lazy.functional import apply_pending -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TEST_POSITION, TESTS = [], [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_cucim_dict_transform.py b/tests/transforms/test_cucim_dict_transform.py index c82947544b..7b19d8fa9d 100644 --- a/tests/transforms/test_cucim_dict_transform.py +++ b/tests/transforms/test_cucim_dict_transform.py @@ -18,7 +18,7 @@ from monai.transforms import CuCIMd from monai.utils import optional_import, set_determinism -from tests.utils.utils import HAS_CUPY, skip_if_no_cuda +from tests.util import HAS_CUPY, skip_if_no_cuda _, has_cut = optional_import("cucim.core.operations.expose.transform") cp, _ = optional_import("cupy") diff --git a/tests/transforms/test_cucim_transform.py b/tests/transforms/test_cucim_transform.py index 8a35032c6a..0998a481d0 100644 --- a/tests/transforms/test_cucim_transform.py +++ b/tests/transforms/test_cucim_transform.py @@ -18,7 +18,7 @@ from monai.transforms import CuCIM from monai.utils import optional_import, set_determinism -from tests.utils.utils import HAS_CUPY, skip_if_no_cuda +from tests.util import HAS_CUPY, skip_if_no_cuda _, has_cut = optional_import("cucim.core.operations.expose.transform") cp, _ = optional_import("cupy") diff --git a/tests/transforms/test_detect_envelope.py b/tests/transforms/test_detect_envelope.py index 3067e68f9e..a0b44737e9 100644 --- a/tests/transforms/test_detect_envelope.py +++ b/tests/transforms/test_detect_envelope.py @@ -19,7 +19,7 @@ from monai.transforms import DetectEnvelope from monai.utils import OptionalImportError -from tests.utils.utils import TEST_NDARRAYS, SkipIfModule, SkipIfNoModule, assert_allclose +from tests.util import TEST_NDARRAYS, SkipIfModule, SkipIfNoModule, assert_allclose n_samples = 500 hann_windowed_sine = np.sin(2 * np.pi * 10 * np.linspace(0, 1, n_samples)) * np.hanning(n_samples) diff --git a/tests/transforms/test_distance_transform_edt.py b/tests/transforms/test_distance_transform_edt.py index 6714bb4b08..53d33df5e0 100644 --- a/tests/transforms/test_distance_transform_edt.py +++ b/tests/transforms/test_distance_transform_edt.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import DistanceTransformEDT, DistanceTransformEDTd -from tests.utils.utils import HAS_CUPY, assert_allclose, optional_import, skip_if_no_cuda +from tests.util import HAS_CUPY, assert_allclose, optional_import, skip_if_no_cuda momorphology, has_cucim = optional_import("cucim.core.operations.morphology") ndimage, has_ndimage = optional_import("scipy.ndimage") diff --git a/tests/transforms/test_ensure_type.py b/tests/transforms/test_ensure_type.py index 9616d331e2..a65b092bb0 100644 --- a/tests/transforms/test_ensure_type.py +++ b/tests/transforms/test_ensure_type.py @@ -18,7 +18,7 @@ from monai.data import MetaTensor from monai.transforms import EnsureType -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose class TestEnsureType(unittest.TestCase): diff --git a/tests/transforms/test_ensure_typed.py b/tests/transforms/test_ensure_typed.py index 9ac021c2fe..f3ea5dfd18 100644 --- a/tests/transforms/test_ensure_typed.py +++ b/tests/transforms/test_ensure_typed.py @@ -18,7 +18,7 @@ from monai.data import MetaTensor from monai.transforms import EnsureTyped -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose class TestEnsureTyped(unittest.TestCase): diff --git a/tests/transforms/test_fg_bg_to_indices.py b/tests/transforms/test_fg_bg_to_indices.py index 6d518a904d..a01d2960fc 100644 --- a/tests/transforms/test_fg_bg_to_indices.py +++ b/tests/transforms/test_fg_bg_to_indices.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.transforms import FgBgToIndices -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS_CASES = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_fg_bg_to_indicesd.py b/tests/transforms/test_fg_bg_to_indicesd.py index 9a2ac32cdd..7f5e327b23 100644 --- a/tests/transforms/test_fg_bg_to_indicesd.py +++ b/tests/transforms/test_fg_bg_to_indicesd.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.transforms import FgBgToIndicesd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TEST_CASES = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_fill_holes.py b/tests/transforms/test_fill_holes.py index f2aefba4fb..b038cb66dd 100644 --- a/tests/transforms/test_fill_holes.py +++ b/tests/transforms/test_fill_holes.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import FillHoles -from tests.utils.utils import TEST_NDARRAYS, assert_allclose, clone +from tests.util import TEST_NDARRAYS, assert_allclose, clone grid_1_raw = [[1, 1, 1], [1, 0, 1], [1, 1, 1]] diff --git a/tests/transforms/test_fill_holesd.py b/tests/transforms/test_fill_holesd.py index 542f03b2d1..e5ffbf1479 100644 --- a/tests/transforms/test_fill_holesd.py +++ b/tests/transforms/test_fill_holesd.py @@ -18,7 +18,7 @@ from monai.transforms import FillHolesd from monai.utils.enums import CommonKeys -from tests.utils.utils import TEST_NDARRAYS, assert_allclose, clone +from tests.util import TEST_NDARRAYS, assert_allclose, clone grid_1_raw = [[1, 1, 1], [1, 0, 1], [1, 1, 1]] diff --git a/tests/transforms/test_flip.py b/tests/transforms/test_flip.py index 20e849a03a..4ac0d18927 100644 --- a/tests/transforms/test_flip.py +++ b/tests/transforms/test_flip.py @@ -21,7 +21,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import Flip from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_DEVICES, TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion +from tests.util import TEST_DEVICES, TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion INVALID_CASES = [("wrong_axis", ["s", 1], TypeError), ("not_numbers", "s", TypeError)] diff --git a/tests/transforms/test_flipd.py b/tests/transforms/test_flipd.py index 255e248131..efdf85ee47 100644 --- a/tests/transforms/test_flipd.py +++ b/tests/transforms/test_flipd.py @@ -22,7 +22,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import Flipd from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_DEVICES, TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion +from tests.util import TEST_DEVICES, TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion INVALID_CASES = [("wrong_axis", ["s", 1], TypeError), ("not_numbers", "s", TypeError)] diff --git a/tests/transforms/test_fourier.py b/tests/transforms/test_fourier.py index 8f7408fe90..ba2484ec5e 100644 --- a/tests/transforms/test_fourier.py +++ b/tests/transforms/test_fourier.py @@ -20,7 +20,7 @@ from monai.data.synthetic import create_test_image_2d, create_test_image_3d from monai.transforms import Fourier from monai.utils.misc import set_determinism -from tests.utils.utils import SkipIfBeforePyTorchVersion, SkipIfNoModule +from tests.util import SkipIfBeforePyTorchVersion, SkipIfNoModule TEST_CASES = [((128, 64),), ((64, 48, 80),)] diff --git a/tests/transforms/test_gaussian_sharpen.py b/tests/transforms/test_gaussian_sharpen.py index 7d22c74f49..9d361e6d4e 100644 --- a/tests/transforms/test_gaussian_sharpen.py +++ b/tests/transforms/test_gaussian_sharpen.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.transforms import GaussianSharpen -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] diff --git a/tests/transforms/test_gaussian_sharpend.py b/tests/transforms/test_gaussian_sharpend.py index fa768d37e8..6b4f935a48 100644 --- a/tests/transforms/test_gaussian_sharpend.py +++ b/tests/transforms/test_gaussian_sharpend.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import GaussianSharpend -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_gaussian_smooth.py b/tests/transforms/test_gaussian_smooth.py index 6f66cf26d9..a8bdd04d8d 100644 --- a/tests/transforms/test_gaussian_smooth.py +++ b/tests/transforms/test_gaussian_smooth.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.transforms import GaussianSmooth -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] diff --git a/tests/transforms/test_gaussian_smoothd.py b/tests/transforms/test_gaussian_smoothd.py index de0563acfc..c7fc03d770 100644 --- a/tests/transforms/test_gaussian_smoothd.py +++ b/tests/transforms/test_gaussian_smoothd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import GaussianSmoothd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_generate_label_classes_crop_centers.py b/tests/transforms/test_generate_label_classes_crop_centers.py index 2ac7eca46c..5c96763ed6 100644 --- a/tests/transforms/test_generate_label_classes_crop_centers.py +++ b/tests/transforms/test_generate_label_classes_crop_centers.py @@ -18,7 +18,7 @@ from monai.transforms import generate_label_classes_crop_centers from monai.utils.misc import set_determinism -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TEST_CASE_1 = [ { diff --git a/tests/transforms/test_generate_pos_neg_label_crop_centers.py b/tests/transforms/test_generate_pos_neg_label_crop_centers.py index 802e92390f..1d39bf5dfd 100644 --- a/tests/transforms/test_generate_pos_neg_label_crop_centers.py +++ b/tests/transforms/test_generate_pos_neg_label_crop_centers.py @@ -18,7 +18,7 @@ from monai.transforms import generate_pos_neg_label_crop_centers from monai.utils.misc import set_determinism -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [ [ diff --git a/tests/transforms/test_generate_spatial_bounding_box.py b/tests/transforms/test_generate_spatial_bounding_box.py index 5fbd6d15b2..84ba28a3ff 100644 --- a/tests/transforms/test_generate_spatial_bounding_box.py +++ b/tests/transforms/test_generate_spatial_bounding_box.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import generate_spatial_bounding_box -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_get_extreme_points.py b/tests/transforms/test_get_extreme_points.py index cdb42838c9..c95f4433e0 100644 --- a/tests/transforms/test_get_extreme_points.py +++ b/tests/transforms/test_get_extreme_points.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import get_extreme_points -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_gibbs_noise.py b/tests/transforms/test_gibbs_noise.py index e36f45ed49..36a3849a30 100644 --- a/tests/transforms/test_gibbs_noise.py +++ b/tests/transforms/test_gibbs_noise.py @@ -21,7 +21,7 @@ from monai.transforms import GibbsNoise from monai.utils.misc import set_determinism from monai.utils.module import optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_torch_fft = optional_import("torch.fft", name="fftshift") diff --git a/tests/transforms/test_gibbs_noised.py b/tests/transforms/test_gibbs_noised.py index 387c1e3e58..f359123533 100644 --- a/tests/transforms/test_gibbs_noised.py +++ b/tests/transforms/test_gibbs_noised.py @@ -21,7 +21,7 @@ from monai.transforms import GibbsNoised from monai.utils.misc import set_determinism from monai.utils.module import optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_torch_fft = optional_import("torch.fft", name="fftshift") diff --git a/tests/transforms/test_grid_distortion.py b/tests/transforms/test_grid_distortion.py index 5f3995928f..f7bce61892 100644 --- a/tests/transforms/test_grid_distortion.py +++ b/tests/transforms/test_grid_distortion.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import GridDistortion -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TESTS = [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_grid_distortiond.py b/tests/transforms/test_grid_distortiond.py index f064cd03b7..a53d1c7770 100644 --- a/tests/transforms/test_grid_distortiond.py +++ b/tests/transforms/test_grid_distortiond.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import GridDistortiond -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TESTS = [] num_cells = (2, 2) diff --git a/tests/transforms/test_grid_split.py b/tests/transforms/test_grid_split.py index 674979f283..28261e6d5a 100644 --- a/tests/transforms/test_grid_split.py +++ b/tests/transforms/test_grid_split.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import GridSplit -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose A11 = torch.randn(3, 2, 2) A12 = torch.randn(3, 2, 2) diff --git a/tests/transforms/test_grid_splitd.py b/tests/transforms/test_grid_splitd.py index d0d19d319f..7d68c8686b 100644 --- a/tests/transforms/test_grid_splitd.py +++ b/tests/transforms/test_grid_splitd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import GridSplitd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose A11 = torch.randn(3, 2, 2) A12 = torch.randn(3, 2, 2) diff --git a/tests/transforms/test_histogram_normalize.py b/tests/transforms/test_histogram_normalize.py index 91a156c8be..d379ba9a81 100644 --- a/tests/transforms/test_histogram_normalize.py +++ b/tests/transforms/test_histogram_normalize.py @@ -18,7 +18,7 @@ from monai.transforms import HistogramNormalize from monai.utils import get_equivalent_dtype -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_histogram_normalized.py b/tests/transforms/test_histogram_normalized.py index 88588dfc1b..19bc2fee41 100644 --- a/tests/transforms/test_histogram_normalized.py +++ b/tests/transforms/test_histogram_normalized.py @@ -18,7 +18,7 @@ from monai.transforms import HistogramNormalized from monai.utils import get_equivalent_dtype -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_intensity_stats.py b/tests/transforms/test_intensity_stats.py index c5a9be7224..066c7ccc81 100644 --- a/tests/transforms/test_intensity_stats.py +++ b/tests/transforms/test_intensity_stats.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import IntensityStats -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_inverse.py b/tests/transforms/test_inverse.py index 84e8373011..379a40126b 100644 --- a/tests/transforms/test_inverse.py +++ b/tests/transforms/test_inverse.py @@ -69,7 +69,7 @@ reset_ops_id, ) from monai.utils import first, get_seed, optional_import, set_determinism -from tests.utils.utils import make_nifti_image, make_rand_affine +from tests.util import make_nifti_image, make_rand_affine if TYPE_CHECKING: has_nib = True diff --git a/tests/transforms/test_inverse_collation.py b/tests/transforms/test_inverse_collation.py index 5c7b032ec4..cd0a9a50c4 100644 --- a/tests/transforms/test_inverse_collation.py +++ b/tests/transforms/test_inverse_collation.py @@ -43,7 +43,7 @@ Rotated, ) from monai.utils import optional_import, set_determinism -from tests.utils.utils import make_nifti_image +from tests.util import make_nifti_image if TYPE_CHECKING: has_nib = True diff --git a/tests/transforms/test_invert.py b/tests/transforms/test_invert.py index fe9d717455..21f494c838 100644 --- a/tests/transforms/test_invert.py +++ b/tests/transforms/test_invert.py @@ -37,7 +37,7 @@ Spacing, ) from monai.utils import set_determinism -from tests.utils.utils import assert_allclose, make_nifti_image +from tests.util import assert_allclose, make_nifti_image class TestInvert(unittest.TestCase): diff --git a/tests/transforms/test_invertd.py b/tests/transforms/test_invertd.py index effc47f436..183e432e40 100644 --- a/tests/transforms/test_invertd.py +++ b/tests/transforms/test_invertd.py @@ -37,7 +37,7 @@ Spacingd, ) from monai.utils import set_determinism -from tests.utils.utils import assert_allclose, make_nifti_image +from tests.util import assert_allclose, make_nifti_image KEYS = ["image", "label"] diff --git a/tests/transforms/test_k_space_spike_noise.py b/tests/transforms/test_k_space_spike_noise.py index eaa9d4c501..653e1b8bd3 100644 --- a/tests/transforms/test_k_space_spike_noise.py +++ b/tests/transforms/test_k_space_spike_noise.py @@ -22,7 +22,7 @@ from monai.data.synthetic import create_test_image_2d, create_test_image_3d from monai.transforms import KSpaceSpikeNoise from monai.utils.misc import set_determinism -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TESTS = [] for shape in ((128, 64), (64, 48, 80)): diff --git a/tests/transforms/test_k_space_spike_noised.py b/tests/transforms/test_k_space_spike_noised.py index 55e8dd9155..61403f85a7 100644 --- a/tests/transforms/test_k_space_spike_noised.py +++ b/tests/transforms/test_k_space_spike_noised.py @@ -22,7 +22,7 @@ from monai.data.synthetic import create_test_image_2d, create_test_image_3d from monai.transforms import KSpaceSpikeNoised from monai.utils.misc import set_determinism -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for shape in ((128, 64), (64, 48, 80)): diff --git a/tests/transforms/test_keep_largest_connected_component.py b/tests/transforms/test_keep_largest_connected_component.py index 6ebb62432c..1a8d2775ca 100644 --- a/tests/transforms/test_keep_largest_connected_component.py +++ b/tests/transforms/test_keep_largest_connected_component.py @@ -21,7 +21,7 @@ from monai.transforms import KeepLargestConnectedComponent from monai.transforms.utils_pytorch_numpy_unification import moveaxis from monai.utils.type_conversion import convert_to_dst_type -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose def to_onehot(x): diff --git a/tests/transforms/test_keep_largest_connected_componentd.py b/tests/transforms/test_keep_largest_connected_componentd.py index fca0d77ab3..bd9b2a2016 100644 --- a/tests/transforms/test_keep_largest_connected_componentd.py +++ b/tests/transforms/test_keep_largest_connected_componentd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import KeepLargestConnectedComponentd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose grid_1 = [[[0, 0, 1, 0, 0], [0, 2, 1, 1, 1], [1, 2, 1, 0, 0], [1, 2, 0, 1, 0], [2, 2, 0, 0, 2]]] grid_2 = [[[0, 0, 0, 0, 1], [0, 0, 1, 1, 1], [1, 0, 1, 1, 2], [1, 0, 1, 2, 2], [0, 0, 0, 0, 1]]] diff --git a/tests/transforms/test_label_filter.py b/tests/transforms/test_label_filter.py index 8fe9e9b980..6e64d27105 100644 --- a/tests/transforms/test_label_filter.py +++ b/tests/transforms/test_label_filter.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import LabelFilter -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose grid_1 = torch.tensor([[[[1, 2, 3], [4, 5, 6], [7, 8, 9]]]]) diff --git a/tests/transforms/test_label_to_contour.py b/tests/transforms/test_label_to_contour.py index f9f852bf1f..d485315ab7 100644 --- a/tests/transforms/test_label_to_contour.py +++ b/tests/transforms/test_label_to_contour.py @@ -17,7 +17,7 @@ import torch from monai.transforms import LabelToContour -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose expected_output_for_cube = [ [ diff --git a/tests/transforms/test_label_to_contourd.py b/tests/transforms/test_label_to_contourd.py index 7747bb4130..9799950bad 100644 --- a/tests/transforms/test_label_to_contourd.py +++ b/tests/transforms/test_label_to_contourd.py @@ -17,7 +17,7 @@ import torch from monai.transforms import LabelToContourd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose expected_output_for_cube = [ [ diff --git a/tests/transforms/test_label_to_mask.py b/tests/transforms/test_label_to_mask.py index 341a6afe91..3d8a1272ba 100644 --- a/tests/transforms/test_label_to_mask.py +++ b/tests/transforms/test_label_to_mask.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import LabelToMask -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_label_to_maskd.py b/tests/transforms/test_label_to_maskd.py index e3867d4524..e93b8ff77d 100644 --- a/tests/transforms/test_label_to_maskd.py +++ b/tests/transforms/test_label_to_maskd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import LabelToMaskd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_load_imaged.py b/tests/transforms/test_load_imaged.py index 15f9ebf207..e851b10484 100644 --- a/tests/transforms/test_load_imaged.py +++ b/tests/transforms/test_load_imaged.py @@ -28,7 +28,7 @@ from monai.transforms import Compose, EnsureChannelFirstD, FromMetaTensord, LoadImaged, SaveImageD from monai.transforms.meta_utility.dictionary import ToMetaTensord from monai.utils import optional_import -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose itk, has_itk = optional_import("itk", allow_namespace_pkg=True) diff --git a/tests/transforms/test_map_and_generate_sampling_centers.py b/tests/transforms/test_map_and_generate_sampling_centers.py index a56d6c4e70..607dd3bf7e 100644 --- a/tests/transforms/test_map_and_generate_sampling_centers.py +++ b/tests/transforms/test_map_and_generate_sampling_centers.py @@ -19,7 +19,7 @@ from monai.transforms import map_and_generate_sampling_centers from monai.utils.misc import set_determinism -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TEST_CASE_1 = [ # test Argmax data diff --git a/tests/transforms/test_map_binary_to_indices.py b/tests/transforms/test_map_binary_to_indices.py index 807df7d2cd..1222cdc65a 100644 --- a/tests/transforms/test_map_binary_to_indices.py +++ b/tests/transforms/test_map_binary_to_indices.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import map_binary_to_indices -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_map_classes_to_indices.py b/tests/transforms/test_map_classes_to_indices.py index 1a7663f0ac..4c9c0443e7 100644 --- a/tests/transforms/test_map_classes_to_indices.py +++ b/tests/transforms/test_map_classes_to_indices.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import map_classes_to_indices -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_map_label_value.py b/tests/transforms/test_map_label_value.py index 3362668be7..970874777b 100644 --- a/tests/transforms/test_map_label_value.py +++ b/tests/transforms/test_map_label_value.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import MapLabelValue -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_map_label_valued.py b/tests/transforms/test_map_label_valued.py index a646d18a55..1758a23499 100644 --- a/tests/transforms/test_map_label_valued.py +++ b/tests/transforms/test_map_label_valued.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import MapLabelValued -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_1 = [ {"keys": "seg", "orig_labels": [3, 2, 1], "target_labels": [0, 1, 2]}, diff --git a/tests/transforms/test_mask_intensity.py b/tests/transforms/test_mask_intensity.py index 3ef505c442..27ea435562 100644 --- a/tests/transforms/test_mask_intensity.py +++ b/tests/transforms/test_mask_intensity.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import MaskIntensity -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TEST_CASE_1 = [ {"mask_data": np.array([[[0, 0, 0], [0, 1, 0], [0, 0, 0]]])}, diff --git a/tests/transforms/test_mean_ensemble.py b/tests/transforms/test_mean_ensemble.py index 6787299f95..fb62eb74df 100644 --- a/tests/transforms/test_mean_ensemble.py +++ b/tests/transforms/test_mean_ensemble.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import MeanEnsemble -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_mean_ensembled.py b/tests/transforms/test_mean_ensembled.py index 4c4c18a01a..a469aa7e1d 100644 --- a/tests/transforms/test_mean_ensembled.py +++ b/tests/transforms/test_mean_ensembled.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import MeanEnsembled -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_median_smooth.py b/tests/transforms/test_median_smooth.py index ff17e78515..896f83e008 100644 --- a/tests/transforms/test_median_smooth.py +++ b/tests/transforms/test_median_smooth.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.transforms import MedianSmooth -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] diff --git a/tests/transforms/test_median_smoothd.py b/tests/transforms/test_median_smoothd.py index 1585d43f54..8c02288af2 100644 --- a/tests/transforms/test_median_smoothd.py +++ b/tests/transforms/test_median_smoothd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import MedianSmoothd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS[0:1]: diff --git a/tests/transforms/test_morphological_ops.py b/tests/transforms/test_morphological_ops.py index 9b8993c8b9..534097219d 100644 --- a/tests/transforms/test_morphological_ops.py +++ b/tests/transforms/test_morphological_ops.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms.utils_morphological_ops import dilate, erode, get_morphological_filter_result_t -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS_SHAPE = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_normalize_intensity.py b/tests/transforms/test_normalize_intensity.py index 17ceb075d7..fa901d817d 100644 --- a/tests/transforms/test_normalize_intensity.py +++ b/tests/transforms/test_normalize_intensity.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import NormalizeIntensity -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_normalize_intensityd.py b/tests/transforms/test_normalize_intensityd.py index d2a805fc0c..07da8470f0 100644 --- a/tests/transforms/test_normalize_intensityd.py +++ b/tests/transforms/test_normalize_intensityd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import NormalizeIntensityd -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_nvtx_decorator.py b/tests/transforms/test_nvtx_decorator.py index 00c60de398..93cac47f88 100644 --- a/tests/transforms/test_nvtx_decorator.py +++ b/tests/transforms/test_nvtx_decorator.py @@ -35,7 +35,7 @@ ToTensord, ) from monai.utils import Range, optional_import -from tests.utils.utils import HAS_CUPY +from tests.util import HAS_CUPY _, has_nvtx = optional_import("torch._C._nvtx", descriptor="NVTX is not installed. Are you sure you have a CUDA build?") _, has_tvt = optional_import("torchvision.transforms") diff --git a/tests/transforms/test_orientation.py b/tests/transforms/test_orientation.py index 2e6f39379c..b00192c13f 100644 --- a/tests/transforms/test_orientation.py +++ b/tests/transforms/test_orientation.py @@ -22,7 +22,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import Orientation, create_rotate, create_translate from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_DEVICES, assert_allclose +from tests.util import TEST_DEVICES, assert_allclose TESTS = [] for device in TEST_DEVICES: diff --git a/tests/transforms/test_orientationd.py b/tests/transforms/test_orientationd.py index 66540fc80a..878e5dbbff 100644 --- a/tests/transforms/test_orientationd.py +++ b/tests/transforms/test_orientationd.py @@ -22,7 +22,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import Orientationd from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_DEVICES +from tests.util import TEST_DEVICES TESTS = [] for device in TEST_DEVICES: diff --git a/tests/transforms/test_rand_adjust_contrast.py b/tests/transforms/test_rand_adjust_contrast.py index e361394508..7b6a0c3386 100644 --- a/tests/transforms/test_rand_adjust_contrast.py +++ b/tests/transforms/test_rand_adjust_contrast.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandAdjustContrast -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose TEST_CASE_1 = [(0.5, 4.5)] diff --git a/tests/transforms/test_rand_adjust_contrastd.py b/tests/transforms/test_rand_adjust_contrastd.py index 9d50160b0a..4f1d06d9e8 100644 --- a/tests/transforms/test_rand_adjust_contrastd.py +++ b/tests/transforms/test_rand_adjust_contrastd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandAdjustContrastd -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose TEST_CASE_1 = [(0.5, 4.5)] diff --git a/tests/transforms/test_rand_affine.py b/tests/transforms/test_rand_affine.py index 864ca6909e..2fd93b848f 100644 --- a/tests/transforms/test_rand_affine.py +++ b/tests/transforms/test_rand_affine.py @@ -20,7 +20,7 @@ from monai.transforms import RandAffine from monai.utils.type_conversion import convert_data_type from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose, is_tf32_env +from tests.util import TEST_NDARRAYS_ALL, assert_allclose, is_tf32_env _rtol = 1e-3 if is_tf32_env() else 1e-4 diff --git a/tests/transforms/test_rand_affine_grid.py b/tests/transforms/test_rand_affine_grid.py index d4596ff46d..63d495870a 100644 --- a/tests/transforms/test_rand_affine_grid.py +++ b/tests/transforms/test_rand_affine_grid.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import RandAffineGrid -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose, is_tf32_env +from tests.util import TEST_NDARRAYS_ALL, assert_allclose, is_tf32_env _rtol = 1e-1 if is_tf32_env() else 1e-4 diff --git a/tests/transforms/test_rand_affined.py b/tests/transforms/test_rand_affined.py index 1ac70592b8..1b4470a8c5 100644 --- a/tests/transforms/test_rand_affined.py +++ b/tests/transforms/test_rand_affined.py @@ -22,7 +22,7 @@ from monai.transforms import RandAffined from monai.utils import GridSampleMode, ensure_tuple_rep from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import assert_allclose, is_tf32_env +from tests.util import assert_allclose, is_tf32_env _rtol = 1e-3 if is_tf32_env() else 1e-4 diff --git a/tests/transforms/test_rand_axis_flip.py b/tests/transforms/test_rand_axis_flip.py index 73ddc85ead..ec170cdff9 100644 --- a/tests/transforms/test_rand_axis_flip.py +++ b/tests/transforms/test_rand_axis_flip.py @@ -19,7 +19,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import RandAxisFlip from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion class TestRandAxisFlip(NumpyImageTestCase2D): diff --git a/tests/transforms/test_rand_axis_flipd.py b/tests/transforms/test_rand_axis_flipd.py index 9de8817cda..d8c67f7fb0 100644 --- a/tests/transforms/test_rand_axis_flipd.py +++ b/tests/transforms/test_rand_axis_flipd.py @@ -19,7 +19,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import RandAxisFlipd from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase3D, assert_allclose, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase3D, assert_allclose, test_local_inversion class TestRandAxisFlip(NumpyImageTestCase3D): diff --git a/tests/transforms/test_rand_bias_field.py b/tests/transforms/test_rand_bias_field.py index fb7fbe5b5e..590d249e55 100644 --- a/tests/transforms/test_rand_bias_field.py +++ b/tests/transforms/test_rand_bias_field.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import RandBiasField -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TEST_CASES_2D = [{"prob": 1.0}, (3, 32, 32)] TEST_CASES_3D = [{"prob": 1.0}, (3, 32, 32, 32)] diff --git a/tests/transforms/test_rand_coarse_dropout.py b/tests/transforms/test_rand_coarse_dropout.py index c5fbb32dac..910fae71b1 100644 --- a/tests/transforms/test_rand_coarse_dropout.py +++ b/tests/transforms/test_rand_coarse_dropout.py @@ -19,7 +19,7 @@ from monai.transforms import RandCoarseDropout from monai.utils import fall_back_tuple -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TEST_CASE_0 = [ {"holes": 2, "spatial_size": [2, 2, 2], "fill_value": 5, "prob": 1.0}, diff --git a/tests/transforms/test_rand_crop_by_label_classes.py b/tests/transforms/test_rand_crop_by_label_classes.py index 2564bf2aab..003df55d8a 100644 --- a/tests/transforms/test_rand_crop_by_label_classes.py +++ b/tests/transforms/test_rand_crop_by_label_classes.py @@ -19,7 +19,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import ClassesToIndices, RandCropByLabelClasses from monai.transforms.lazy.functional import apply_pending -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TESTS_INDICES, TESTS_SHAPE = [], [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_rand_crop_by_label_classesd.py b/tests/transforms/test_rand_crop_by_label_classesd.py index 8340596c1d..9e08ae56c0 100644 --- a/tests/transforms/test_rand_crop_by_label_classesd.py +++ b/tests/transforms/test_rand_crop_by_label_classesd.py @@ -19,7 +19,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import ClassesToIndicesd, RandCropByLabelClassesd from monai.transforms.lazy.functional import apply_pending -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TESTS = [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_rand_crop_by_pos_neg_label.py b/tests/transforms/test_rand_crop_by_pos_neg_label.py index cfef3dd517..e31041c759 100644 --- a/tests/transforms/test_rand_crop_by_pos_neg_label.py +++ b/tests/transforms/test_rand_crop_by_pos_neg_label.py @@ -20,7 +20,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import RandCropByPosNegLabel from monai.transforms.lazy.functional import apply_pending -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TESTS = [ [ diff --git a/tests/transforms/test_rand_crop_by_pos_neg_labeld.py b/tests/transforms/test_rand_crop_by_pos_neg_labeld.py index a38655294f..7d52c2de11 100644 --- a/tests/transforms/test_rand_crop_by_pos_neg_labeld.py +++ b/tests/transforms/test_rand_crop_by_pos_neg_labeld.py @@ -20,7 +20,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import RandCropByPosNegLabeld from monai.transforms.lazy.functional import apply_pending -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TESTS = [ [ diff --git a/tests/transforms/test_rand_cucim_dict_transform.py b/tests/transforms/test_rand_cucim_dict_transform.py index f3e28b56b8..3c6f4a70a4 100644 --- a/tests/transforms/test_rand_cucim_dict_transform.py +++ b/tests/transforms/test_rand_cucim_dict_transform.py @@ -18,7 +18,7 @@ from monai.transforms import RandCuCIMd from monai.utils import optional_import, set_determinism -from tests.utils.utils import HAS_CUPY, skip_if_no_cuda +from tests.util import HAS_CUPY, skip_if_no_cuda _, has_cut = optional_import("cucim.core.operations.expose.transform") cp, _ = optional_import("cupy") diff --git a/tests/transforms/test_rand_cucim_transform.py b/tests/transforms/test_rand_cucim_transform.py index ac2763c1da..1de41507d0 100644 --- a/tests/transforms/test_rand_cucim_transform.py +++ b/tests/transforms/test_rand_cucim_transform.py @@ -18,7 +18,7 @@ from monai.transforms import RandCuCIM from monai.utils import optional_import, set_determinism -from tests.utils.utils import HAS_CUPY, skip_if_no_cuda +from tests.util import HAS_CUPY, skip_if_no_cuda _, has_cut = optional_import("cucim.core.operations.expose.transform") cp, _ = optional_import("cupy") diff --git a/tests/transforms/test_rand_deform_grid.py b/tests/transforms/test_rand_deform_grid.py index d0d29c226e..8e98988b8a 100644 --- a/tests/transforms/test_rand_deform_grid.py +++ b/tests/transforms/test_rand_deform_grid.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandDeformGrid -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASES = [ [ diff --git a/tests/transforms/test_rand_elastic_2d.py b/tests/transforms/test_rand_elastic_2d.py index b93687e982..0ad9ec29b7 100644 --- a/tests/transforms/test_rand_elastic_2d.py +++ b/tests/transforms/test_rand_elastic_2d.py @@ -19,7 +19,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import Rand2DElastic -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose, is_tf32_env +from tests.util import TEST_NDARRAYS_ALL, assert_allclose, is_tf32_env _rtol = 5e-3 if is_tf32_env() else 1e-4 diff --git a/tests/transforms/test_rand_elastic_3d.py b/tests/transforms/test_rand_elastic_3d.py index 70a71b1826..eeafb7d3ee 100644 --- a/tests/transforms/test_rand_elastic_3d.py +++ b/tests/transforms/test_rand_elastic_3d.py @@ -19,7 +19,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import Rand3DElastic -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TESTS = [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_rand_elasticd_2d.py b/tests/transforms/test_rand_elasticd_2d.py index 0d9bc46415..210b55d3d1 100644 --- a/tests/transforms/test_rand_elasticd_2d.py +++ b/tests/transforms/test_rand_elasticd_2d.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import Rand2DElasticd -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose, is_tf32_env +from tests.util import TEST_NDARRAYS_ALL, assert_allclose, is_tf32_env _rtol = 5e-3 if is_tf32_env() else 1e-4 diff --git a/tests/transforms/test_rand_elasticd_3d.py b/tests/transforms/test_rand_elasticd_3d.py index cea7246c50..7c132bd550 100644 --- a/tests/transforms/test_rand_elasticd_3d.py +++ b/tests/transforms/test_rand_elasticd_3d.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import Rand3DElasticd -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TESTS = [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_rand_flip.py b/tests/transforms/test_rand_flip.py index e0c26349c4..23e741682e 100644 --- a/tests/transforms/test_rand_flip.py +++ b/tests/transforms/test_rand_flip.py @@ -20,7 +20,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import RandFlip from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion INVALID_CASES = [("wrong_axis", ["s", 1], TypeError), ("not_numbers", "s", TypeError)] diff --git a/tests/transforms/test_rand_flipd.py b/tests/transforms/test_rand_flipd.py index 42986fb9b4..666cdb6a97 100644 --- a/tests/transforms/test_rand_flipd.py +++ b/tests/transforms/test_rand_flipd.py @@ -20,7 +20,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import RandFlipd from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion VALID_CASES = [("no_axis", None), ("one_axis", 1), ("many_axis", [0, 1])] diff --git a/tests/transforms/test_rand_gaussian_noise.py b/tests/transforms/test_rand_gaussian_noise.py index 8281294308..3494dd717e 100644 --- a/tests/transforms/test_rand_gaussian_noise.py +++ b/tests/transforms/test_rand_gaussian_noise.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import RandGaussianNoise -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_rand_gaussian_noised.py b/tests/transforms/test_rand_gaussian_noised.py index 2aa2e73dd0..8c6a434416 100644 --- a/tests/transforms/test_rand_gaussian_noised.py +++ b/tests/transforms/test_rand_gaussian_noised.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import RandGaussianNoised -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_rand_gaussian_sharpen.py b/tests/transforms/test_rand_gaussian_sharpen.py index cbf08dec81..0f2f0a3157 100644 --- a/tests/transforms/test_rand_gaussian_sharpen.py +++ b/tests/transforms/test_rand_gaussian_sharpen.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.transforms import RandGaussianSharpen -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] diff --git a/tests/transforms/test_rand_gaussian_sharpend.py b/tests/transforms/test_rand_gaussian_sharpend.py index 74a84cac7f..caa408af23 100644 --- a/tests/transforms/test_rand_gaussian_sharpend.py +++ b/tests/transforms/test_rand_gaussian_sharpend.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandGaussianSharpend -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_rand_gaussian_smooth.py b/tests/transforms/test_rand_gaussian_smooth.py index 3ce5e19ea8..d7c4ac50b1 100644 --- a/tests/transforms/test_rand_gaussian_smooth.py +++ b/tests/transforms/test_rand_gaussian_smooth.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandGaussianSmooth -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_rand_gaussian_smoothd.py b/tests/transforms/test_rand_gaussian_smoothd.py index 8daa853e9b..9b42a4d323 100644 --- a/tests/transforms/test_rand_gaussian_smoothd.py +++ b/tests/transforms/test_rand_gaussian_smoothd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandGaussianSmoothd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_rand_gibbs_noise.py b/tests/transforms/test_rand_gibbs_noise.py index c036d40eb3..fff183633b 100644 --- a/tests/transforms/test_rand_gibbs_noise.py +++ b/tests/transforms/test_rand_gibbs_noise.py @@ -21,7 +21,7 @@ from monai.transforms import RandGibbsNoise from monai.utils.misc import set_determinism from monai.utils.module import optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_torch_fft = optional_import("torch.fft", name="fftshift") diff --git a/tests/transforms/test_rand_gibbs_noised.py b/tests/transforms/test_rand_gibbs_noised.py index 50bf9faae1..feee16266b 100644 --- a/tests/transforms/test_rand_gibbs_noised.py +++ b/tests/transforms/test_rand_gibbs_noised.py @@ -21,7 +21,7 @@ from monai.transforms import RandGibbsNoised from monai.utils.misc import set_determinism from monai.utils.module import optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose _, has_torch_fft = optional_import("torch.fft", name="fftshift") diff --git a/tests/transforms/test_rand_grid_distortion.py b/tests/transforms/test_rand_grid_distortion.py index 6412afb284..c2f4e8cc06 100644 --- a/tests/transforms/test_rand_grid_distortion.py +++ b/tests/transforms/test_rand_grid_distortion.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandGridDistortion -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TESTS = [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_rand_grid_distortiond.py b/tests/transforms/test_rand_grid_distortiond.py index 75f70d5fea..162c191db7 100644 --- a/tests/transforms/test_rand_grid_distortiond.py +++ b/tests/transforms/test_rand_grid_distortiond.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandGridDistortiond -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TESTS = [] num_cells = 2 diff --git a/tests/transforms/test_rand_histogram_shift.py b/tests/transforms/test_rand_histogram_shift.py index e2a113a269..b6098e1eb4 100644 --- a/tests/transforms/test_rand_histogram_shift.py +++ b/tests/transforms/test_rand_histogram_shift.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import RandHistogramShift -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_rand_k_space_spike_noise.py b/tests/transforms/test_rand_k_space_spike_noise.py index 8fbae69e18..bb04ddb0e2 100644 --- a/tests/transforms/test_rand_k_space_spike_noise.py +++ b/tests/transforms/test_rand_k_space_spike_noise.py @@ -19,7 +19,7 @@ from monai.data.synthetic import create_test_image_2d, create_test_image_3d from monai.transforms import KSpaceSpikeNoise, RandKSpaceSpikeNoise from monai.utils.misc import set_determinism -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for shape in ((128, 64), (64, 48, 80)): diff --git a/tests/transforms/test_rand_k_space_spike_noised.py b/tests/transforms/test_rand_k_space_spike_noised.py index 72ca029f7f..27b5fd58ce 100644 --- a/tests/transforms/test_rand_k_space_spike_noised.py +++ b/tests/transforms/test_rand_k_space_spike_noised.py @@ -19,7 +19,7 @@ from monai.data.synthetic import create_test_image_2d, create_test_image_3d from monai.transforms import RandKSpaceSpikeNoised from monai.utils.misc import set_determinism -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for shape in ((128, 64), (64, 48, 80)): diff --git a/tests/transforms/test_rand_rician_noise.py b/tests/transforms/test_rand_rician_noise.py index 4cbad3818f..cce27621a6 100644 --- a/tests/transforms/test_rand_rician_noise.py +++ b/tests/transforms/test_rand_rician_noise.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import RandRicianNoise -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_rand_rician_noised.py b/tests/transforms/test_rand_rician_noised.py index 9731b898fb..5bc4be060b 100644 --- a/tests/transforms/test_rand_rician_noised.py +++ b/tests/transforms/test_rand_rician_noised.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import RandRicianNoised -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_rand_rotate.py b/tests/transforms/test_rand_rotate.py index 490ab99500..99ea60dde4 100644 --- a/tests/transforms/test_rand_rotate.py +++ b/tests/transforms/test_rand_rotate.py @@ -22,7 +22,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import RandRotate from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import ( +from tests.util import ( TEST_NDARRAYS_ALL, NumpyImageTestCase2D, NumpyImageTestCase3D, diff --git a/tests/transforms/test_rand_rotate90.py b/tests/transforms/test_rand_rotate90.py index f68b0cbbb9..997e9450bc 100644 --- a/tests/transforms/test_rand_rotate90.py +++ b/tests/transforms/test_rand_rotate90.py @@ -19,7 +19,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import RandRotate90 from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion class TestRandRotate90(NumpyImageTestCase2D): diff --git a/tests/transforms/test_rand_rotate90d.py b/tests/transforms/test_rand_rotate90d.py index 4f67406b0e..baf626a4a7 100644 --- a/tests/transforms/test_rand_rotate90d.py +++ b/tests/transforms/test_rand_rotate90d.py @@ -19,7 +19,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import RandRotate90d from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion class TestRandRotate90d(NumpyImageTestCase2D): diff --git a/tests/transforms/test_rand_rotated.py b/tests/transforms/test_rand_rotated.py index 584661c53d..bc9c7cbb95 100644 --- a/tests/transforms/test_rand_rotated.py +++ b/tests/transforms/test_rand_rotated.py @@ -22,7 +22,7 @@ from monai.transforms import RandRotated from monai.utils import GridSampleMode, GridSamplePadMode from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, NumpyImageTestCase3D, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, NumpyImageTestCase3D, test_local_inversion TEST_CASES_2D: list[tuple] = [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_rand_scale_crop.py b/tests/transforms/test_rand_scale_crop.py index 68274c188b..b37550207f 100644 --- a/tests/transforms/test_rand_scale_crop.py +++ b/tests/transforms/test_rand_scale_crop.py @@ -18,7 +18,7 @@ from monai.transforms import RandScaleCrop from tests.croppers import CropTest -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TEST_SHAPES = [ [{"roi_scale": [1.0, 1.0, -1.0], "random_center": True}, (3, 3, 3, 4), (3, 3, 3, 4)], diff --git a/tests/transforms/test_rand_scale_cropd.py b/tests/transforms/test_rand_scale_cropd.py index 6eb23f2787..3bef4bc9a1 100644 --- a/tests/transforms/test_rand_scale_cropd.py +++ b/tests/transforms/test_rand_scale_cropd.py @@ -18,7 +18,7 @@ from monai.transforms import RandScaleCropd from tests.croppers import CropTest -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TEST_SHAPES = [ [{"keys": "img", "roi_scale": [1.0, 1.0, -1.0], "random_center": True}, (3, 3, 3, 4), (3, 3, 3, 4)], diff --git a/tests/transforms/test_rand_scale_intensity.py b/tests/transforms/test_rand_scale_intensity.py index 267afd1a4d..0a5dc7079f 100644 --- a/tests/transforms/test_rand_scale_intensity.py +++ b/tests/transforms/test_rand_scale_intensity.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandScaleIntensity -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestRandScaleIntensity(NumpyImageTestCase2D): diff --git a/tests/transforms/test_rand_scale_intensity_fixed_mean.py b/tests/transforms/test_rand_scale_intensity_fixed_mean.py index 1967e3d466..1e72c4efae 100644 --- a/tests/transforms/test_rand_scale_intensity_fixed_mean.py +++ b/tests/transforms/test_rand_scale_intensity_fixed_mean.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandScaleIntensityFixedMean -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestRandScaleIntensity(NumpyImageTestCase2D): diff --git a/tests/transforms/test_rand_scale_intensity_fixed_meand.py b/tests/transforms/test_rand_scale_intensity_fixed_meand.py index 1217b54063..6a45ba4eed 100644 --- a/tests/transforms/test_rand_scale_intensity_fixed_meand.py +++ b/tests/transforms/test_rand_scale_intensity_fixed_meand.py @@ -16,7 +16,7 @@ import numpy as np from monai.transforms import RandScaleIntensityFixedMeand -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestRandScaleIntensityFixedMeand(NumpyImageTestCase2D): diff --git a/tests/transforms/test_rand_scale_intensityd.py b/tests/transforms/test_rand_scale_intensityd.py index b89698540f..1d13b0b2f2 100644 --- a/tests/transforms/test_rand_scale_intensityd.py +++ b/tests/transforms/test_rand_scale_intensityd.py @@ -16,7 +16,7 @@ import numpy as np from monai.transforms import RandScaleIntensityd -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestRandScaleIntensityd(NumpyImageTestCase2D): diff --git a/tests/transforms/test_rand_shift_intensity.py b/tests/transforms/test_rand_shift_intensity.py index 1850cc7c51..b9200ca380 100644 --- a/tests/transforms/test_rand_shift_intensity.py +++ b/tests/transforms/test_rand_shift_intensity.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandShiftIntensity -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestRandShiftIntensity(NumpyImageTestCase2D): diff --git a/tests/transforms/test_rand_shift_intensityd.py b/tests/transforms/test_rand_shift_intensityd.py index 348181304b..33e8580e6e 100644 --- a/tests/transforms/test_rand_shift_intensityd.py +++ b/tests/transforms/test_rand_shift_intensityd.py @@ -17,7 +17,7 @@ from monai.transforms import IntensityStatsd, RandShiftIntensityd from monai.utils.enums import PostFix -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestRandShiftIntensityd(NumpyImageTestCase2D): diff --git a/tests/transforms/test_rand_simulate_low_resolution.py b/tests/transforms/test_rand_simulate_low_resolution.py index 71f0c01705..3945971403 100644 --- a/tests/transforms/test_rand_simulate_low_resolution.py +++ b/tests/transforms/test_rand_simulate_low_resolution.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandSimulateLowResolution -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_rand_simulate_low_resolutiond.py b/tests/transforms/test_rand_simulate_low_resolutiond.py index 4ca1b015bf..5394f47e40 100644 --- a/tests/transforms/test_rand_simulate_low_resolutiond.py +++ b/tests/transforms/test_rand_simulate_low_resolutiond.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RandSimulateLowResolutiond -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_rand_spatial_crop.py b/tests/transforms/test_rand_spatial_crop.py index ba244c0fc7..22dacabc9f 100644 --- a/tests/transforms/test_rand_spatial_crop.py +++ b/tests/transforms/test_rand_spatial_crop.py @@ -20,7 +20,7 @@ from monai.transforms import RandScaleCrop, RandSpatialCrop from monai.transforms.lazy.functional import apply_pending from tests.croppers import CropTest -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TEST_SHAPES = [ [{"roi_size": [3, 3, -1], "random_center": True}, (3, 3, 3, 4), (3, 3, 3, 4)], diff --git a/tests/transforms/test_rand_spatial_crop_samples.py b/tests/transforms/test_rand_spatial_crop_samples.py index 31bc481cce..5c2cc84989 100644 --- a/tests/transforms/test_rand_spatial_crop_samples.py +++ b/tests/transforms/test_rand_spatial_crop_samples.py @@ -20,7 +20,7 @@ from monai.transforms import RandSpatialCropSamples from monai.transforms.lazy.functional import apply_pending from tests.croppers import CropTest -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TEST_CASE_1 = [ {"roi_size": [3, 3, 3], "num_samples": 4, "random_center": True, "random_size": False}, diff --git a/tests/transforms/test_rand_spatial_crop_samplesd.py b/tests/transforms/test_rand_spatial_crop_samplesd.py index af0e8020ba..31a239841a 100644 --- a/tests/transforms/test_rand_spatial_crop_samplesd.py +++ b/tests/transforms/test_rand_spatial_crop_samplesd.py @@ -19,7 +19,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import Compose, DivisiblePadd, RandSpatialCropSamplesd from monai.transforms.lazy.functional import apply_pending -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TEST_CASE_1 = [ {"keys": ["img", "seg"], "num_samples": 4, "roi_size": [2, 2, 2], "random_center": True, "random_size": True}, diff --git a/tests/transforms/test_rand_spatial_cropd.py b/tests/transforms/test_rand_spatial_cropd.py index 57eaf7b218..f73c3cd903 100644 --- a/tests/transforms/test_rand_spatial_cropd.py +++ b/tests/transforms/test_rand_spatial_cropd.py @@ -20,7 +20,7 @@ from monai.transforms import RandScaleCropd, RandSpatialCropd from monai.transforms.lazy.functional import apply_pending from tests.croppers import CropTest -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TEST_SHAPES = [ [{"keys": "img", "roi_size": [3, 3, -1], "random_center": True}, (3, 3, 3, 5), (3, 3, 3, 5)], diff --git a/tests/transforms/test_rand_std_shift_intensity.py b/tests/transforms/test_rand_std_shift_intensity.py index 6780f79d87..6aa33bf6bc 100644 --- a/tests/transforms/test_rand_std_shift_intensity.py +++ b/tests/transforms/test_rand_std_shift_intensity.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import RandStdShiftIntensity -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestRandStdShiftIntensity(NumpyImageTestCase2D): diff --git a/tests/transforms/test_rand_std_shift_intensityd.py b/tests/transforms/test_rand_std_shift_intensityd.py index 5822dfe4b6..44c3f3d069 100644 --- a/tests/transforms/test_rand_std_shift_intensityd.py +++ b/tests/transforms/test_rand_std_shift_intensityd.py @@ -16,7 +16,7 @@ import numpy as np from monai.transforms import RandStdShiftIntensityd -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestRandStdShiftIntensityd(NumpyImageTestCase2D): diff --git a/tests/transforms/test_rand_zoom.py b/tests/transforms/test_rand_zoom.py index f3fae3adf4..ce12299694 100644 --- a/tests/transforms/test_rand_zoom.py +++ b/tests/transforms/test_rand_zoom.py @@ -22,7 +22,7 @@ from monai.transforms import RandZoom from monai.utils import InterpolateMode from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion VALID_CASES = [ (0.8, 1.2, "nearest", False), diff --git a/tests/transforms/test_rand_zoomd.py b/tests/transforms/test_rand_zoomd.py index c54de27afc..1a7f571173 100644 --- a/tests/transforms/test_rand_zoomd.py +++ b/tests/transforms/test_rand_zoomd.py @@ -21,7 +21,7 @@ from monai.config import USE_COMPILED from monai.transforms import RandZoomd from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion VALID_CASES = [ (0.8, 1.2, "nearest", None, False), diff --git a/tests/transforms/test_randidentity.py b/tests/transforms/test_randidentity.py index daf09c5dda..b22fc05f07 100644 --- a/tests/transforms/test_randidentity.py +++ b/tests/transforms/test_randidentity.py @@ -15,7 +15,7 @@ import monai.transforms as mt from monai.data import CacheDataset -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class T(mt.Transform): diff --git a/tests/transforms/test_randtorchvisiond.py b/tests/transforms/test_randtorchvisiond.py index 136e607b11..ae8d504909 100644 --- a/tests/transforms/test_randtorchvisiond.py +++ b/tests/transforms/test_randtorchvisiond.py @@ -18,7 +18,7 @@ from monai.transforms import RandomizableTrait, RandTorchVisiond from monai.utils import set_determinism -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_1 = [ {"keys": "img", "name": "ColorJitter"}, diff --git a/tests/transforms/test_regularization.py b/tests/transforms/test_regularization.py index b93e3158ed..81af3df6e4 100644 --- a/tests/transforms/test_regularization.py +++ b/tests/transforms/test_regularization.py @@ -17,7 +17,7 @@ import torch from monai.transforms import CutMix, CutMixd, CutOut, CutOutd, MixUp, MixUpd -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose class TestMixup(unittest.TestCase): diff --git a/tests/transforms/test_remove_repeated_channel.py b/tests/transforms/test_remove_repeated_channel.py index 3793b6c673..e549fba5cb 100644 --- a/tests/transforms/test_remove_repeated_channel.py +++ b/tests/transforms/test_remove_repeated_channel.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.transforms import RemoveRepeatedChannel -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TEST_CASES = [] for q in TEST_NDARRAYS: diff --git a/tests/transforms/test_remove_repeated_channeld.py b/tests/transforms/test_remove_repeated_channeld.py index ed59e164ab..6afd41392b 100644 --- a/tests/transforms/test_remove_repeated_channeld.py +++ b/tests/transforms/test_remove_repeated_channeld.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RemoveRepeatedChanneld -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_repeat_channel.py b/tests/transforms/test_repeat_channel.py index d7f5f490a0..70d9a8bd56 100644 --- a/tests/transforms/test_repeat_channel.py +++ b/tests/transforms/test_repeat_channel.py @@ -16,7 +16,7 @@ from parameterized import parameterized from monai.transforms import RepeatChannel -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_repeat_channeld.py b/tests/transforms/test_repeat_channeld.py index a1d816a30c..0ce9492644 100644 --- a/tests/transforms/test_repeat_channeld.py +++ b/tests/transforms/test_repeat_channeld.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import RepeatChanneld -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_resample_backends.py b/tests/transforms/test_resample_backends.py index b6116c66fe..54dd7dda20 100644 --- a/tests/transforms/test_resample_backends.py +++ b/tests/transforms/test_resample_backends.py @@ -22,7 +22,7 @@ from monai.transforms import Resample from monai.transforms.utils import create_grid from monai.utils import GridSampleMode, GridSamplePadMode, NdimageMode, SplineMode, convert_to_numpy -from tests.utils.utils import SkipIfBeforePyTorchVersion, assert_allclose, is_tf32_env +from tests.util import SkipIfBeforePyTorchVersion, assert_allclose, is_tf32_env _rtol = 1e-3 if is_tf32_env() else 1e-4 diff --git a/tests/transforms/test_resample_to_match.py b/tests/transforms/test_resample_to_match.py index e18b46f751..03fd58cd27 100644 --- a/tests/transforms/test_resample_to_match.py +++ b/tests/transforms/test_resample_to_match.py @@ -30,7 +30,7 @@ from monai.transforms import Compose, EnsureChannelFirstd, LoadImaged, ResampleToMatch, SaveImage, SaveImaged from monai.utils import optional_import from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import assert_allclose, download_url_or_skip_test, testing_data_config +from tests.util import assert_allclose, download_url_or_skip_test, testing_data_config _, has_itk = optional_import("itk", allow_namespace_pkg=True) diff --git a/tests/transforms/test_resample_to_matchd.py b/tests/transforms/test_resample_to_matchd.py index 62b4765fe0..6d3d6d7a92 100644 --- a/tests/transforms/test_resample_to_matchd.py +++ b/tests/transforms/test_resample_to_matchd.py @@ -27,7 +27,7 @@ SaveImaged, ) from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import assert_allclose, download_url_or_skip_test, testing_data_config +from tests.util import assert_allclose, download_url_or_skip_test, testing_data_config def update_fname(d): diff --git a/tests/transforms/test_resampler.py b/tests/transforms/test_resampler.py index bca4c57bf2..9a7dacbd79 100644 --- a/tests/transforms/test_resampler.py +++ b/tests/transforms/test_resampler.py @@ -19,7 +19,7 @@ from monai.transforms import Resample from monai.transforms.utils import create_grid -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TESTS = [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_resize.py b/tests/transforms/test_resize.py index 620d742f3b..8a3cfcabcf 100644 --- a/tests/transforms/test_resize.py +++ b/tests/transforms/test_resize.py @@ -21,7 +21,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import Resize from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import ( +from tests.util import ( TEST_NDARRAYS_ALL, NumpyImageTestCase2D, SkipIfAtLeastPyTorchVersion, diff --git a/tests/transforms/test_resize_with_pad_or_crop.py b/tests/transforms/test_resize_with_pad_or_crop.py index 4828518eee..885dd1fe94 100644 --- a/tests/transforms/test_resize_with_pad_or_crop.py +++ b/tests/transforms/test_resize_with_pad_or_crop.py @@ -20,7 +20,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import ResizeWithPadOrCrop from monai.transforms.lazy.functional import apply_pending -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose, pytorch_after +from tests.util import TEST_NDARRAYS_ALL, assert_allclose, pytorch_after TEST_CASES = [ [{"spatial_size": [15, 8, 8], "mode": "constant"}, (3, 8, 8, 4), (3, 15, 8, 8), True], diff --git a/tests/transforms/test_resize_with_pad_or_cropd.py b/tests/transforms/test_resize_with_pad_or_cropd.py index 8900e5917b..d5e145437c 100644 --- a/tests/transforms/test_resize_with_pad_or_cropd.py +++ b/tests/transforms/test_resize_with_pad_or_cropd.py @@ -22,7 +22,7 @@ from monai.transforms import ResizeWithPadOrCropd from monai.transforms.lazy.functional import apply_pending from tests.transforms.test_resize_with_pad_or_crop import TESTS_PENDING_MODE -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose, pytorch_after +from tests.util import TEST_NDARRAYS_ALL, assert_allclose, pytorch_after TEST_CASES = [ [{"keys": "img", "spatial_size": [15, 8, 8], "mode": "constant"}, {"img": np.zeros((3, 8, 8, 4))}, (3, 15, 8, 8)], diff --git a/tests/transforms/test_resized.py b/tests/transforms/test_resized.py index 42741b3b20..534be7cb91 100644 --- a/tests/transforms/test_resized.py +++ b/tests/transforms/test_resized.py @@ -21,7 +21,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import Invertd, Resize, Resized from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import ( +from tests.util import ( TEST_NDARRAYS_ALL, NumpyImageTestCase2D, SkipIfAtLeastPyTorchVersion, diff --git a/tests/transforms/test_rotate.py b/tests/transforms/test_rotate.py index f07090bec9..63ff32851d 100644 --- a/tests/transforms/test_rotate.py +++ b/tests/transforms/test_rotate.py @@ -22,7 +22,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import Rotate from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import HAS_CUPY, TEST_NDARRAYS_ALL, NumpyImageTestCase2D, NumpyImageTestCase3D, test_local_inversion +from tests.util import HAS_CUPY, TEST_NDARRAYS_ALL, NumpyImageTestCase2D, NumpyImageTestCase3D, test_local_inversion TEST_CASES_2D: list[tuple] = [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_rotate90.py b/tests/transforms/test_rotate90.py index 016827cef5..00d7a70342 100644 --- a/tests/transforms/test_rotate90.py +++ b/tests/transforms/test_rotate90.py @@ -21,7 +21,7 @@ from monai.transforms.lazy.functional import apply_pending from monai.utils import optional_import from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import ( +from tests.util import ( TEST_NDARRAYS_ALL, NumpyImageTestCase2D, NumpyImageTestCase3D, diff --git a/tests/transforms/test_rotate90d.py b/tests/transforms/test_rotate90d.py index 082c11a75d..432cd66143 100644 --- a/tests/transforms/test_rotate90d.py +++ b/tests/transforms/test_rotate90d.py @@ -18,7 +18,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import Rotate90d from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion class TestRotate90d(NumpyImageTestCase2D): diff --git a/tests/transforms/test_rotated.py b/tests/transforms/test_rotated.py index 2b24282c33..e5fd1a1abd 100644 --- a/tests/transforms/test_rotated.py +++ b/tests/transforms/test_rotated.py @@ -22,7 +22,7 @@ from monai.data import MetaTensor from monai.transforms import Rotated from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, NumpyImageTestCase3D, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, NumpyImageTestCase3D, test_local_inversion TEST_CASES_2D: list[tuple] = [] for p in TEST_NDARRAYS_ALL: diff --git a/tests/transforms/test_savitzky_golay_smooth.py b/tests/transforms/test_savitzky_golay_smooth.py index a01dd56129..7d608fc3b3 100644 --- a/tests/transforms/test_savitzky_golay_smooth.py +++ b/tests/transforms/test_savitzky_golay_smooth.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import SavitzkyGolaySmooth -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose # Zero-padding trivial tests diff --git a/tests/transforms/test_savitzky_golay_smoothd.py b/tests/transforms/test_savitzky_golay_smoothd.py index dff3830aa0..91546cd4b9 100644 --- a/tests/transforms/test_savitzky_golay_smoothd.py +++ b/tests/transforms/test_savitzky_golay_smoothd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import SavitzkyGolaySmoothd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose # Zero-padding trivial tests diff --git a/tests/transforms/test_scale_intensity.py b/tests/transforms/test_scale_intensity.py index 50f6e67d0f..f58d623e8a 100644 --- a/tests/transforms/test_scale_intensity.py +++ b/tests/transforms/test_scale_intensity.py @@ -18,7 +18,7 @@ from monai.transforms import ScaleIntensity from monai.transforms.utils import rescale_array -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestScaleIntensity(NumpyImageTestCase2D): diff --git a/tests/transforms/test_scale_intensity_fixed_mean.py b/tests/transforms/test_scale_intensity_fixed_mean.py index 8f4926bd48..88f64e1598 100644 --- a/tests/transforms/test_scale_intensity_fixed_mean.py +++ b/tests/transforms/test_scale_intensity_fixed_mean.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import ScaleIntensityFixedMean -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestScaleIntensityFixedMean(NumpyImageTestCase2D): diff --git a/tests/transforms/test_scale_intensity_range.py b/tests/transforms/test_scale_intensity_range.py index b03a46ef63..e45b2cdc32 100644 --- a/tests/transforms/test_scale_intensity_range.py +++ b/tests/transforms/test_scale_intensity_range.py @@ -16,7 +16,7 @@ import numpy as np from monai.transforms import ScaleIntensityRange -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class IntensityScaleIntensityRange(NumpyImageTestCase2D): diff --git a/tests/transforms/test_scale_intensity_ranged.py b/tests/transforms/test_scale_intensity_ranged.py index fe152bf048..bd654aab01 100644 --- a/tests/transforms/test_scale_intensity_ranged.py +++ b/tests/transforms/test_scale_intensity_ranged.py @@ -14,7 +14,7 @@ import unittest from monai.transforms import ScaleIntensityRanged -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class IntensityScaleIntensityRanged(NumpyImageTestCase2D): diff --git a/tests/transforms/test_scale_intensityd.py b/tests/transforms/test_scale_intensityd.py index 761d4b9f7d..2ee27bb652 100644 --- a/tests/transforms/test_scale_intensityd.py +++ b/tests/transforms/test_scale_intensityd.py @@ -16,7 +16,7 @@ import numpy as np from monai.transforms import ScaleIntensityd -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestScaleIntensityd(NumpyImageTestCase2D): diff --git a/tests/transforms/test_shift_intensity.py b/tests/transforms/test_shift_intensity.py index 41071c4aaf..32bf74052e 100644 --- a/tests/transforms/test_shift_intensity.py +++ b/tests/transforms/test_shift_intensity.py @@ -16,7 +16,7 @@ import numpy as np from monai.transforms import ShiftIntensity -from tests.utils.utils import NumpyImageTestCase2D +from tests.util import NumpyImageTestCase2D class TestShiftIntensity(NumpyImageTestCase2D): diff --git a/tests/transforms/test_shift_intensityd.py b/tests/transforms/test_shift_intensityd.py index a752eacc4a..6f87f119b6 100644 --- a/tests/transforms/test_shift_intensityd.py +++ b/tests/transforms/test_shift_intensityd.py @@ -17,7 +17,7 @@ from monai.transforms import IntensityStatsd, ShiftIntensityd from monai.utils.enums import PostFix -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestShiftIntensityd(NumpyImageTestCase2D): diff --git a/tests/transforms/test_signal_fillempty.py b/tests/transforms/test_signal_fillempty.py index 97648dca14..b1975e9079 100644 --- a/tests/transforms/test_signal_fillempty.py +++ b/tests/transforms/test_signal_fillempty.py @@ -20,7 +20,7 @@ from monai.transforms import SignalFillEmpty from monai.utils.type_conversion import convert_to_tensor -from tests.utils.utils import SkipIfBeforePyTorchVersion +from tests.util import SkipIfBeforePyTorchVersion TESTS_PATH = Path(__file__).parents[1] TEST_SIGNAL = os.path.join(TESTS_PATH, "testing_data", "signal.npy") diff --git a/tests/transforms/test_signal_fillemptyd.py b/tests/transforms/test_signal_fillemptyd.py index 6994338f5c..9e66d9fe8f 100644 --- a/tests/transforms/test_signal_fillemptyd.py +++ b/tests/transforms/test_signal_fillemptyd.py @@ -20,7 +20,7 @@ from monai.transforms import SignalFillEmptyd from monai.utils.type_conversion import convert_to_tensor -from tests.utils.utils import SkipIfBeforePyTorchVersion +from tests.util import SkipIfBeforePyTorchVersion TESTS_PATH = Path(__file__).parents[1] TEST_SIGNAL = os.path.join(TESTS_PATH, "testing_data", "signal.npy") diff --git a/tests/transforms/test_signal_rand_add_squarepulse.py b/tests/transforms/test_signal_rand_add_squarepulse.py index bf103d1663..f79f7f073c 100644 --- a/tests/transforms/test_signal_rand_add_squarepulse.py +++ b/tests/transforms/test_signal_rand_add_squarepulse.py @@ -22,7 +22,7 @@ from monai.transforms import SignalRandAddSquarePulse from monai.utils import optional_import from monai.utils.type_conversion import convert_to_tensor -from tests.utils.utils import SkipIfBeforePyTorchVersion +from tests.util import SkipIfBeforePyTorchVersion _, has_scipy = optional_import("scipy") TESTS_PATH = Path(__file__).parents[1] diff --git a/tests/transforms/test_signal_rand_add_squarepulse_partial.py b/tests/transforms/test_signal_rand_add_squarepulse_partial.py index 6c1b631ee5..6caeb3e7f6 100644 --- a/tests/transforms/test_signal_rand_add_squarepulse_partial.py +++ b/tests/transforms/test_signal_rand_add_squarepulse_partial.py @@ -22,7 +22,7 @@ from monai.transforms import SignalRandAddSquarePulsePartial from monai.utils import optional_import from monai.utils.type_conversion import convert_to_tensor -from tests.utils.utils import SkipIfBeforePyTorchVersion +from tests.util import SkipIfBeforePyTorchVersion _, has_scipy = optional_import("scipy") TESTS_PATH = Path(__file__).parents[1] diff --git a/tests/transforms/test_smooth_field.py b/tests/transforms/test_smooth_field.py index a880261524..2de439a791 100644 --- a/tests/transforms/test_smooth_field.py +++ b/tests/transforms/test_smooth_field.py @@ -20,7 +20,7 @@ from monai.networks.utils import meshgrid_xy from monai.transforms import RandSmoothDeformd, RandSmoothFieldAdjustContrastd, RandSmoothFieldAdjustIntensityd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose, is_tf32_env +from tests.util import TEST_NDARRAYS, assert_allclose, is_tf32_env _rtol = 5e-3 if is_tf32_env() else 1e-4 diff --git a/tests/transforms/test_sobel_gradient.py b/tests/transforms/test_sobel_gradient.py index 2c795e7e18..b387a80be6 100644 --- a/tests/transforms/test_sobel_gradient.py +++ b/tests/transforms/test_sobel_gradient.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import SobelGradients -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose IMAGE = torch.zeros(1, 16, 16, dtype=torch.float32) IMAGE[0, 8, :] = 1 diff --git a/tests/transforms/test_sobel_gradientd.py b/tests/transforms/test_sobel_gradientd.py index 521aa25a91..9a2e4e3f53 100644 --- a/tests/transforms/test_sobel_gradientd.py +++ b/tests/transforms/test_sobel_gradientd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import SobelGradientsd -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose IMAGE = torch.zeros(1, 16, 16, dtype=torch.float32) IMAGE[0, 8, :] = 1 diff --git a/tests/transforms/test_spacing.py b/tests/transforms/test_spacing.py index 4059da9a7a..c8ab46f384 100644 --- a/tests/transforms/test_spacing.py +++ b/tests/transforms/test_spacing.py @@ -24,7 +24,7 @@ from monai.transforms import Spacing from monai.utils import fall_back_tuple from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_DEVICES, TEST_NDARRAYS_ALL, assert_allclose, skip_if_quick +from tests.util import TEST_DEVICES, TEST_NDARRAYS_ALL, assert_allclose, skip_if_quick TESTS: list[list] = [] for device in TEST_DEVICES: diff --git a/tests/transforms/test_spacingd.py b/tests/transforms/test_spacingd.py index da68b06225..4723524f5f 100644 --- a/tests/transforms/test_spacingd.py +++ b/tests/transforms/test_spacingd.py @@ -23,7 +23,7 @@ from monai.transforms import Spacingd from monai.utils import ensure_tuple_rep from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_DEVICES, assert_allclose, skip_if_quick +from tests.util import TEST_DEVICES, assert_allclose, skip_if_quick TESTS: list[tuple] = [] for device in TEST_DEVICES: diff --git a/tests/transforms/test_spatial_resample.py b/tests/transforms/test_spatial_resample.py index 21e14626bc..010a448dd2 100644 --- a/tests/transforms/test_spatial_resample.py +++ b/tests/transforms/test_spatial_resample.py @@ -24,7 +24,7 @@ from monai.transforms import SpatialResample from monai.utils import optional_import from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_DEVICES, TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_DEVICES, TEST_NDARRAYS_ALL, assert_allclose TESTS = [] diff --git a/tests/transforms/test_squeezedim.py b/tests/transforms/test_squeezedim.py index 37f9fc2b6f..96f5ae0ae6 100644 --- a/tests/transforms/test_squeezedim.py +++ b/tests/transforms/test_squeezedim.py @@ -18,7 +18,7 @@ from monai.data import MetaTensor from monai.transforms import SqueezeDim -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS, TESTS_FAIL = [], [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_squeezedimd.py b/tests/transforms/test_squeezedimd.py index 6f3f5d6c65..99b7fceffa 100644 --- a/tests/transforms/test_squeezedimd.py +++ b/tests/transforms/test_squeezedimd.py @@ -18,7 +18,7 @@ from monai.data import MetaTensor from monai.transforms import SqueezeDimd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS, TESTS_FAIL = [], [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_std_shift_intensity.py b/tests/transforms/test_std_shift_intensity.py index d98f17e923..3cf39aa66a 100644 --- a/tests/transforms/test_std_shift_intensity.py +++ b/tests/transforms/test_std_shift_intensity.py @@ -17,7 +17,7 @@ from monai.transforms import ShiftIntensity, StdShiftIntensity from monai.utils import dtype_numpy_to_torch -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestStdShiftIntensity(NumpyImageTestCase2D): diff --git a/tests/transforms/test_std_shift_intensityd.py b/tests/transforms/test_std_shift_intensityd.py index bfd23e0298..2e646cc698 100644 --- a/tests/transforms/test_std_shift_intensityd.py +++ b/tests/transforms/test_std_shift_intensityd.py @@ -17,7 +17,7 @@ from monai.transforms import ShiftIntensityd, StdShiftIntensityd from monai.utils import dtype_numpy_to_torch -from tests.utils.utils import NumpyImageTestCase2D +from tests.util import NumpyImageTestCase2D class TestStdShiftIntensityd(NumpyImageTestCase2D): diff --git a/tests/transforms/test_threshold_intensity.py b/tests/transforms/test_threshold_intensity.py index 20d7704bf2..e0298abc10 100644 --- a/tests/transforms/test_threshold_intensity.py +++ b/tests/transforms/test_threshold_intensity.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import ThresholdIntensity -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_threshold_intensityd.py b/tests/transforms/test_threshold_intensityd.py index 1c5cd04d6b..e1d6b0eabf 100644 --- a/tests/transforms/test_threshold_intensityd.py +++ b/tests/transforms/test_threshold_intensityd.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import ThresholdIntensityd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_to_contiguous.py b/tests/transforms/test_to_contiguous.py index c01912e398..9c70e69787 100644 --- a/tests/transforms/test_to_contiguous.py +++ b/tests/transforms/test_to_contiguous.py @@ -17,7 +17,7 @@ import torch from monai.transforms import convert_to_contiguous -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose class TestToContiguous(unittest.TestCase): diff --git a/tests/transforms/test_to_cupy.py b/tests/transforms/test_to_cupy.py index f1d28f902e..701d3fc2ea 100644 --- a/tests/transforms/test_to_cupy.py +++ b/tests/transforms/test_to_cupy.py @@ -19,7 +19,7 @@ from monai.transforms import ToCupy from monai.utils import optional_import -from tests.utils.utils import HAS_CUPY, skip_if_no_cuda +from tests.util import HAS_CUPY, skip_if_no_cuda cp, _ = optional_import("cupy") diff --git a/tests/transforms/test_to_cupyd.py b/tests/transforms/test_to_cupyd.py index 61efbff33c..abbd7dcb3a 100644 --- a/tests/transforms/test_to_cupyd.py +++ b/tests/transforms/test_to_cupyd.py @@ -19,7 +19,7 @@ from monai.transforms import ToCupyd from monai.utils import optional_import -from tests.utils.utils import HAS_CUPY, skip_if_no_cuda +from tests.util import HAS_CUPY, skip_if_no_cuda cp, _ = optional_import("cupy") diff --git a/tests/transforms/test_to_device.py b/tests/transforms/test_to_device.py index e18f085939..dafb3a0822 100644 --- a/tests/transforms/test_to_device.py +++ b/tests/transforms/test_to_device.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import ToDevice -from tests.utils.utils import assert_allclose, skip_if_no_cuda +from tests.util import assert_allclose, skip_if_no_cuda TEST_CASE_1 = ["cuda:0"] diff --git a/tests/transforms/test_to_deviced.py b/tests/transforms/test_to_deviced.py index 9c6a3ef967..dc864534fa 100644 --- a/tests/transforms/test_to_deviced.py +++ b/tests/transforms/test_to_deviced.py @@ -17,7 +17,7 @@ from monai.data import CacheDataset, ThreadDataLoader from monai.transforms import ToDeviced -from tests.utils.utils import assert_allclose, skip_if_no_cuda +from tests.util import assert_allclose, skip_if_no_cuda @skip_if_no_cuda diff --git a/tests/transforms/test_to_numpy.py b/tests/transforms/test_to_numpy.py index 8822f5f8c5..de71ccd4d7 100644 --- a/tests/transforms/test_to_numpy.py +++ b/tests/transforms/test_to_numpy.py @@ -19,7 +19,7 @@ from monai.transforms import ToNumpy from monai.utils import optional_import -from tests.utils.utils import HAS_CUPY, assert_allclose, skip_if_no_cuda +from tests.util import HAS_CUPY, assert_allclose, skip_if_no_cuda cp, _ = optional_import("cupy") diff --git a/tests/transforms/test_to_numpyd.py b/tests/transforms/test_to_numpyd.py index 1f7212f8ca..160c3b622b 100644 --- a/tests/transforms/test_to_numpyd.py +++ b/tests/transforms/test_to_numpyd.py @@ -19,7 +19,7 @@ from monai.transforms import ToNumpyd from monai.utils import optional_import -from tests.utils.utils import HAS_CUPY, assert_allclose, skip_if_no_cuda +from tests.util import HAS_CUPY, assert_allclose, skip_if_no_cuda cp, _ = optional_import("cupy") diff --git a/tests/transforms/test_to_pil.py b/tests/transforms/test_to_pil.py index 43f01e7945..33a9329360 100644 --- a/tests/transforms/test_to_pil.py +++ b/tests/transforms/test_to_pil.py @@ -20,7 +20,7 @@ from monai.transforms import ToPIL from monai.utils import optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose if TYPE_CHECKING: from PIL.Image import Image as PILImageImage diff --git a/tests/transforms/test_to_pild.py b/tests/transforms/test_to_pild.py index be029bfc6f..ffe45b1405 100644 --- a/tests/transforms/test_to_pild.py +++ b/tests/transforms/test_to_pild.py @@ -20,7 +20,7 @@ from monai.transforms import ToPILd from monai.utils import optional_import -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose if TYPE_CHECKING: from PIL.Image import Image as PILImageImage diff --git a/tests/transforms/test_to_tensor.py b/tests/transforms/test_to_tensor.py index c0066d6921..99d09f49ac 100644 --- a/tests/transforms/test_to_tensor.py +++ b/tests/transforms/test_to_tensor.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import ToTensor -from tests.utils.utils import HAS_CUPY, TEST_NDARRAYS, assert_allclose, optional_import +from tests.util import HAS_CUPY, TEST_NDARRAYS, assert_allclose, optional_import cp, _ = optional_import("cupy") diff --git a/tests/transforms/test_to_tensord.py b/tests/transforms/test_to_tensord.py index 1d762d2a82..2385874732 100644 --- a/tests/transforms/test_to_tensord.py +++ b/tests/transforms/test_to_tensord.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import ToTensord -from tests.utils.utils import HAS_CUPY, TEST_NDARRAYS, assert_allclose, optional_import +from tests.util import HAS_CUPY, TEST_NDARRAYS, assert_allclose, optional_import cp, _ = optional_import("cupy") diff --git a/tests/transforms/test_torchvision.py b/tests/transforms/test_torchvision.py index a31dd22c98..27e639aa79 100644 --- a/tests/transforms/test_torchvision.py +++ b/tests/transforms/test_torchvision.py @@ -17,7 +17,7 @@ from monai.transforms import TorchVision from monai.utils import set_determinism -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_torchvisiond.py b/tests/transforms/test_torchvisiond.py index 77e12ed77b..91affc3ef5 100644 --- a/tests/transforms/test_torchvisiond.py +++ b/tests/transforms/test_torchvisiond.py @@ -18,7 +18,7 @@ from monai.transforms import TorchVisiond from monai.utils import set_determinism -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TEST_CASE_1 = [ {"keys": "img", "name": "ColorJitter"}, diff --git a/tests/transforms/test_transpose.py b/tests/transforms/test_transpose.py index d489586683..f781d768fd 100644 --- a/tests/transforms/test_transpose.py +++ b/tests/transforms/test_transpose.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms import Transpose -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_transposed.py b/tests/transforms/test_transposed.py index 976c04bf15..4cd0f30095 100644 --- a/tests/transforms/test_transposed.py +++ b/tests/transforms/test_transposed.py @@ -19,7 +19,7 @@ from parameterized import parameterized from monai.transforms import Transposed -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_ultrasound_confidence_map_transform.py b/tests/transforms/test_ultrasound_confidence_map_transform.py index 9adf7793f5..b9dd823983 100644 --- a/tests/transforms/test_ultrasound_confidence_map_transform.py +++ b/tests/transforms/test_ultrasound_confidence_map_transform.py @@ -22,7 +22,7 @@ from monai.transforms import UltrasoundConfidenceMapTransform from monai.utils import optional_import -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose _, has_scipy = optional_import("scipy") diff --git a/tests/transforms/test_utils_pytorch_numpy_unification.py b/tests/transforms/test_utils_pytorch_numpy_unification.py index 19f1a25040..52ba7dd569 100644 --- a/tests/transforms/test_utils_pytorch_numpy_unification.py +++ b/tests/transforms/test_utils_pytorch_numpy_unification.py @@ -19,7 +19,7 @@ from monai.transforms.utils_pytorch_numpy_unification import max, min, mode, percentile from monai.utils import set_determinism -from tests.utils.utils import TEST_NDARRAYS, assert_allclose, skip_if_quick +from tests.util import TEST_NDARRAYS, assert_allclose, skip_if_quick TEST_MODE = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_vote_ensemble.py b/tests/transforms/test_vote_ensemble.py index ff5dd4fe92..6ed97da92f 100644 --- a/tests/transforms/test_vote_ensemble.py +++ b/tests/transforms/test_vote_ensemble.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import VoteEnsemble -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_vote_ensembled.py b/tests/transforms/test_vote_ensembled.py index 039e684cb7..9043a77f20 100644 --- a/tests/transforms/test_vote_ensembled.py +++ b/tests/transforms/test_vote_ensembled.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms import VoteEnsembled -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/test_zoom.py b/tests/transforms/test_zoom.py index 6fde1e7094..3a43c6cbb6 100644 --- a/tests/transforms/test_zoom.py +++ b/tests/transforms/test_zoom.py @@ -21,7 +21,7 @@ from monai.data import MetaTensor, set_track_meta from monai.transforms import Zoom from monai.transforms.lazy.functional import apply_pending -from tests.utils.utils import ( +from tests.util import ( DEFAULT_TEST_AFFINE, TEST_NDARRAYS_ALL, NumpyImageTestCase2D, diff --git a/tests/transforms/test_zoomd.py b/tests/transforms/test_zoomd.py index 9b7e9efd15..555e2ace94 100644 --- a/tests/transforms/test_zoomd.py +++ b/tests/transforms/test_zoomd.py @@ -21,7 +21,7 @@ from monai.config import USE_COMPILED from monai.transforms import Zoomd from tests.lazy_transforms_utils import test_resampler_lazy -from tests.utils.utils import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion +from tests.util import TEST_NDARRAYS_ALL, NumpyImageTestCase2D, assert_allclose, test_local_inversion VALID_CASES = [ (1.5, "nearest", False), diff --git a/tests/transforms/utility/test_identity.py b/tests/transforms/utility/test_identity.py index d47ad0d63e..1786fddbd3 100644 --- a/tests/transforms/utility/test_identity.py +++ b/tests/transforms/utility/test_identity.py @@ -14,7 +14,7 @@ import unittest from monai.transforms.utility.array import Identity -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestIdentity(NumpyImageTestCase2D): diff --git a/tests/transforms/utility/test_identityd.py b/tests/transforms/utility/test_identityd.py index 1cd32cf63c..17f49fea03 100644 --- a/tests/transforms/utility/test_identityd.py +++ b/tests/transforms/utility/test_identityd.py @@ -14,7 +14,7 @@ import unittest from monai.transforms.utility.dictionary import Identityd -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestIdentityd(NumpyImageTestCase2D): diff --git a/tests/transforms/utility/test_lambda.py b/tests/transforms/utility/test_lambda.py index 16a6d8cf07..16a5ba7202 100644 --- a/tests/transforms/utility/test_lambda.py +++ b/tests/transforms/utility/test_lambda.py @@ -19,7 +19,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms.utility.array import Lambda from monai.utils.type_conversion import convert_to_numpy, convert_to_tensor -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestLambda(NumpyImageTestCase2D): diff --git a/tests/transforms/utility/test_lambdad.py b/tests/transforms/utility/test_lambdad.py index 300fd7a90a..38eaf758d5 100644 --- a/tests/transforms/utility/test_lambdad.py +++ b/tests/transforms/utility/test_lambdad.py @@ -19,7 +19,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms.utility.dictionary import Lambdad from monai.utils.type_conversion import convert_to_numpy, convert_to_tensor -from tests.utils.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose +from tests.util import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose class TestLambdad(NumpyImageTestCase2D): diff --git a/tests/transforms/utility/test_rand_lambda.py b/tests/transforms/utility/test_rand_lambda.py index 47900ce5a1..7796810618 100644 --- a/tests/transforms/utility/test_rand_lambda.py +++ b/tests/transforms/utility/test_rand_lambda.py @@ -20,7 +20,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms.transform import Randomizable from monai.transforms.utility.array import RandLambda -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose class RandTest(Randomizable): diff --git a/tests/transforms/utility/test_rand_lambdad.py b/tests/transforms/utility/test_rand_lambdad.py index bc209413b8..cd65acc7ef 100644 --- a/tests/transforms/utility/test_rand_lambdad.py +++ b/tests/transforms/utility/test_rand_lambdad.py @@ -20,7 +20,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms.transform import Randomizable from monai.transforms.utility.dictionary import RandLambdad -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose class RandTest(Randomizable): diff --git a/tests/transforms/utility/test_simulatedelay.py b/tests/transforms/utility/test_simulatedelay.py index d726a32f64..1ccf702ccb 100644 --- a/tests/transforms/utility/test_simulatedelay.py +++ b/tests/transforms/utility/test_simulatedelay.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms.utility.array import SimulateDelay -from tests.utils.utils import NumpyImageTestCase2D +from tests.util import NumpyImageTestCase2D class TestSimulateDelay(NumpyImageTestCase2D): diff --git a/tests/transforms/utility/test_simulatedelayd.py b/tests/transforms/utility/test_simulatedelayd.py index b2a5458ada..049ec2ce38 100644 --- a/tests/transforms/utility/test_simulatedelayd.py +++ b/tests/transforms/utility/test_simulatedelayd.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.transforms.utility.dictionary import SimulateDelayd -from tests.utils.utils import NumpyImageTestCase2D +from tests.util import NumpyImageTestCase2D class TestSimulateDelay(NumpyImageTestCase2D): diff --git a/tests/transforms/utility/test_splitdim.py b/tests/transforms/utility/test_splitdim.py index 5f3835d80b..9b9958b6dd 100644 --- a/tests/transforms/utility/test_splitdim.py +++ b/tests/transforms/utility/test_splitdim.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms.utility.array import SplitDim -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/utility/test_splitdimd.py b/tests/transforms/utility/test_splitdimd.py index 040ce2907a..a4ce417bcd 100644 --- a/tests/transforms/utility/test_splitdimd.py +++ b/tests/transforms/utility/test_splitdimd.py @@ -21,7 +21,7 @@ from monai.data.meta_tensor import MetaTensor from monai.transforms import LoadImaged from monai.transforms.utility.dictionary import SplitDimd -from tests.utils.utils import TEST_NDARRAYS, assert_allclose, make_nifti_image, make_rand_affine +from tests.util import TEST_NDARRAYS, assert_allclose, make_nifti_image, make_rand_affine TESTS = [] for p in TEST_NDARRAYS: diff --git a/tests/transforms/utils/test_correct_crop_centers.py b/tests/transforms/utils/test_correct_crop_centers.py index c6a3947b6e..eaf4848048 100644 --- a/tests/transforms/utils/test_correct_crop_centers.py +++ b/tests/transforms/utils/test_correct_crop_centers.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.transforms.utils import correct_crop_centers -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TESTS = [[[1, 5, 0], [2, 2, 2], [10, 10, 10]], [[4, 4, 4], [2, 2, 1], [10, 10, 10]]] diff --git a/tests/transforms/utils/test_get_unique_labels.py b/tests/transforms/utils/test_get_unique_labels.py index 9d3321a976..2c41cc1888 100644 --- a/tests/transforms/utils/test_get_unique_labels.py +++ b/tests/transforms/utils/test_get_unique_labels.py @@ -19,7 +19,7 @@ from monai.transforms.utils import get_unique_labels from monai.transforms.utils_pytorch_numpy_unification import moveaxis -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS grid_raw = [[0, 0, 0], [0, 0, 1], [2, 2, 3], [5, 5, 6], [3, 6, 2], [5, 6, 6]] grid = torch.Tensor(grid_raw).unsqueeze(0).to(torch.int64) diff --git a/tests/utils.py b/tests/util.py similarity index 100% rename from tests/utils.py rename to tests/util.py diff --git a/tests/utils/enums/test_wsireader.py b/tests/utils/enums/test_wsireader.py index a137c5a58a..0b8313c038 100644 --- a/tests/utils/enums/test_wsireader.py +++ b/tests/utils/enums/test_wsireader.py @@ -27,7 +27,7 @@ from monai.transforms import Compose, LoadImaged, ToTensord from monai.utils import first, optional_import from monai.utils.enums import PostFix, WSIPatchKeys -from tests.utils.utils import assert_allclose, download_url_or_skip_test, skip_if_no_cuda, testing_data_config +from tests.util import assert_allclose, download_url_or_skip_test, skip_if_no_cuda, testing_data_config cucim, has_cucim = optional_import("cucim") has_cucim = has_cucim and hasattr(cucim, "CuImage") diff --git a/tests/utils/misc/test_ensure_tuple.py b/tests/utils/misc/test_ensure_tuple.py index 9a3e925b7e..09c1196cdd 100644 --- a/tests/utils/misc/test_ensure_tuple.py +++ b/tests/utils/misc/test_ensure_tuple.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.utils.misc import ensure_tuple -from tests.utils.utils import assert_allclose +from tests.util import assert_allclose TESTS = [ ["test", ("test",)], diff --git a/tests/utils/test_enum_bound_interp.py b/tests/utils/test_enum_bound_interp.py index 4a3f775793..0dd58006fa 100644 --- a/tests/utils/test_enum_bound_interp.py +++ b/tests/utils/test_enum_bound_interp.py @@ -14,7 +14,7 @@ import unittest from monai.utils import optional_import -from tests.utils.utils import skip_if_no_cpp_extension +from tests.util import skip_if_no_cpp_extension b, _ = optional_import("monai._C", name="BoundType") p, _ = optional_import("monai._C", name="InterpolationType") diff --git a/tests/utils/test_evenly_divisible_all_gather_dist.py b/tests/utils/test_evenly_divisible_all_gather_dist.py index 9d3bbf8b92..1bac8a41d9 100644 --- a/tests/utils/test_evenly_divisible_all_gather_dist.py +++ b/tests/utils/test_evenly_divisible_all_gather_dist.py @@ -17,7 +17,7 @@ import torch.distributed as dist from monai.utils import evenly_divisible_all_gather -from tests.utils.utils import DistCall, DistTestCase, assert_allclose +from tests.util import DistCall, DistTestCase, assert_allclose class DistributedEvenlyDivisibleAllGather(DistTestCase): diff --git a/tests/utils/test_handler_logfile.py b/tests/utils/test_handler_logfile.py index c9e8b212b2..a6a47378e1 100644 --- a/tests/utils/test_handler_logfile.py +++ b/tests/utils/test_handler_logfile.py @@ -18,7 +18,7 @@ import torch from monai.utils import optional_import -from tests.utils.utils import SkipIfNoModule +from tests.util import SkipIfNoModule try: _, has_ignite = optional_import("ignite") diff --git a/tests/utils/test_handler_metric_logger.py b/tests/utils/test_handler_metric_logger.py index ddc665e7a6..6136409f61 100644 --- a/tests/utils/test_handler_metric_logger.py +++ b/tests/utils/test_handler_metric_logger.py @@ -16,7 +16,7 @@ import torch from monai.utils import optional_import -from tests.utils.utils import SkipIfNoModule +from tests.util import SkipIfNoModule try: _, has_ignite = optional_import("ignite") diff --git a/tests/utils/test_pad_mode.py b/tests/utils/test_pad_mode.py index fa4dd89724..fce4f3a8ea 100644 --- a/tests/utils/test_pad_mode.py +++ b/tests/utils/test_pad_mode.py @@ -18,7 +18,7 @@ from monai.transforms import CastToType, Pad from monai.utils import NumpyPadMode, PytorchPadMode -from tests.utils.utils import SkipIfBeforePyTorchVersion +from tests.util import SkipIfBeforePyTorchVersion @SkipIfBeforePyTorchVersion((1, 10, 1)) diff --git a/tests/utils/test_profiling.py b/tests/utils/test_profiling.py index f0227ec30e..c24b2174d0 100644 --- a/tests/utils/test_profiling.py +++ b/tests/utils/test_profiling.py @@ -23,7 +23,7 @@ from monai.utils import first, optional_import from monai.utils.enums import CommonKeys from monai.utils.profiling import ProfileHandler, ProfileResult, WorkflowProfiler -from tests.utils.utils import SkipIfNoModule +from tests.util import SkipIfNoModule pd, _ = optional_import("pandas") diff --git a/tests/utils/test_rankfilter_dist.py b/tests/utils/test_rankfilter_dist.py index 962999d0fb..9a976db668 100644 --- a/tests/utils/test_rankfilter_dist.py +++ b/tests/utils/test_rankfilter_dist.py @@ -19,7 +19,7 @@ import torch.distributed as dist from monai.utils import RankFilter -from tests.utils.utils import DistCall, DistTestCase +from tests.util import DistCall, DistTestCase class DistributedRankFilterTest(DistTestCase): diff --git a/tests/utils/test_sample_slices.py b/tests/utils/test_sample_slices.py index 0d46bda5fb..523bb33bc4 100644 --- a/tests/utils/test_sample_slices.py +++ b/tests/utils/test_sample_slices.py @@ -17,7 +17,7 @@ from parameterized import parameterized from monai.utils import sample_slices -from tests.utils.utils import TEST_NDARRAYS, assert_allclose +from tests.util import TEST_NDARRAYS, assert_allclose # test data[:, [1, ], ...] TEST_CASE_1 = [torch.tensor([[[0, 2], [1, 0]]]), 1, True, (1,), torch.tensor([[[1, 0]]])] diff --git a/tests/utils/test_set_determinism.py b/tests/utils/test_set_determinism.py index 22e785b094..a6a3de1bc4 100644 --- a/tests/utils/test_set_determinism.py +++ b/tests/utils/test_set_determinism.py @@ -17,7 +17,7 @@ import torch from monai.utils import get_seed, set_determinism -from tests.utils.utils import SkipIfBeforePyTorchVersion, skip_if_no_cuda +from tests.util import SkipIfBeforePyTorchVersion, skip_if_no_cuda class TestSetDeterminism(unittest.TestCase): diff --git a/tests/utils/type_conversion/test_convert_data_type.py b/tests/utils/type_conversion/test_convert_data_type.py index 870456e226..9b5a101d6c 100644 --- a/tests/utils/type_conversion/test_convert_data_type.py +++ b/tests/utils/type_conversion/test_convert_data_type.py @@ -19,7 +19,7 @@ from monai.data import MetaTensor from monai.utils.type_conversion import convert_data_type, convert_to_dst_type, get_equivalent_dtype -from tests.utils.utils import TEST_NDARRAYS_ALL, assert_allclose +from tests.util import TEST_NDARRAYS_ALL, assert_allclose TESTS: list[tuple] = [] for in_type in TEST_NDARRAYS_ALL + (int, float): diff --git a/tests/utils/type_conversion/test_get_equivalent_dtype.py b/tests/utils/type_conversion/test_get_equivalent_dtype.py index 099860e252..79c02fbe0f 100644 --- a/tests/utils/type_conversion/test_get_equivalent_dtype.py +++ b/tests/utils/type_conversion/test_get_equivalent_dtype.py @@ -18,7 +18,7 @@ from parameterized import parameterized from monai.utils.type_conversion import get_equivalent_dtype, get_numpy_dtype_from_string, get_torch_dtype_from_string -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS DTYPES = [torch.float32, np.float32, np.dtype(np.float32)] diff --git a/tests/utils/type_conversion/test_safe_dtype_range.py b/tests/utils/type_conversion/test_safe_dtype_range.py index 0e66646b97..01526b58a5 100644 --- a/tests/utils/type_conversion/test_safe_dtype_range.py +++ b/tests/utils/type_conversion/test_safe_dtype_range.py @@ -19,7 +19,7 @@ from monai.utils import optional_import from monai.utils.type_conversion import get_equivalent_dtype, safe_dtype_range -from tests.utils.utils import HAS_CUPY, TEST_NDARRAYS_ALL, assert_allclose +from tests.util import HAS_CUPY, TEST_NDARRAYS_ALL, assert_allclose cp, _ = optional_import("cupy") diff --git a/tests/utils/utils.py b/tests/utils/utils.py deleted file mode 100644 index 2a00af50e9..0000000000 --- a/tests/utils/utils.py +++ /dev/null @@ -1,867 +0,0 @@ -# Copyright (c) MONAI Consortium -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from __future__ import annotations - -import argparse -import copy -import datetime -import functools -import importlib -import json -import operator -import os -import queue -import ssl -import subprocess -import sys -import tempfile -import time -import traceback -import unittest -import warnings -from contextlib import contextmanager -from functools import partial, reduce -from subprocess import PIPE, Popen -from typing import Callable -from urllib.error import ContentTooShortError, HTTPError - -import numpy as np -import torch -import torch.distributed as dist - -from monai.apps.utils import download_url -from monai.config import NdarrayTensor -from monai.config.deviceconfig import USE_COMPILED -from monai.config.type_definitions import NdarrayOrTensor -from monai.data import create_test_image_2d, create_test_image_3d -from monai.data.meta_tensor import MetaTensor, get_track_meta -from monai.networks import convert_to_onnx, convert_to_torchscript -from monai.utils import optional_import -from monai.utils.misc import MONAIEnvVars -from monai.utils.module import compute_capabilities_after, pytorch_after -from monai.utils.tf32 import detect_default_tf32 -from monai.utils.type_conversion import convert_data_type - -nib, _ = optional_import("nibabel") -http_error, has_req = optional_import("requests", name="HTTPError") - -quick_test_var = "QUICKTEST" -_tf32_enabled = None -_test_data_config: dict = {} - - -def testing_data_config(*keys): - """get _test_data_config[keys0][keys1]...[keysN]""" - if not _test_data_config: - with open(os.path.join(os.path.dirname(__file__), "testing_data", "data_config.json")) as c: - _config = json.load(c) - for k, v in _config.items(): - _test_data_config[k] = v - return reduce(operator.getitem, keys, _test_data_config) - - -def get_testing_algo_template_path(): - """ - a local folder to the testing algorithm template or a url to the compressed template file. - Default to None, which effectively uses bundle_gen's ``default_algo_zip`` path. - - https://github.com/Project-MONAI/MONAI/blob/1.1.0/monai/apps/auto3dseg/bundle_gen.py#L380-L381 - """ - return MONAIEnvVars.testing_algo_template() - - -def clone(data: NdarrayTensor) -> NdarrayTensor: - """ - Clone data independent of type. - - Args: - data (NdarrayTensor): This can be a Pytorch Tensor or numpy array. - - Returns: - Any: Cloned data object - """ - return copy.deepcopy(data) - - -def assert_allclose( - actual: NdarrayOrTensor, - desired: NdarrayOrTensor, - type_test: bool | str = True, - device_test: bool = False, - *args, - **kwargs, -): - """ - Assert that types and all values of two data objects are close. - - Args: - actual: Pytorch Tensor or numpy array for comparison. - desired: Pytorch Tensor or numpy array to compare against. - type_test: whether to test that `actual` and `desired` are both numpy arrays or torch tensors. - if type_test == "tensor", it checks whether the `actual` is a torch.tensor or metatensor according to - `get_track_meta`. - device_test: whether to test the device property. - args: extra arguments to pass on to `np.testing.assert_allclose`. - kwargs: extra arguments to pass on to `np.testing.assert_allclose`. - - - """ - if isinstance(type_test, str) and type_test == "tensor": - if get_track_meta(): - np.testing.assert_equal(isinstance(actual, MetaTensor), True, "must be a MetaTensor") - else: - np.testing.assert_equal( - isinstance(actual, torch.Tensor) and not isinstance(actual, MetaTensor), True, "must be a torch.Tensor" - ) - elif type_test: - # check both actual and desired are of the same type - np.testing.assert_equal(isinstance(actual, np.ndarray), isinstance(desired, np.ndarray), "numpy type") - np.testing.assert_equal(isinstance(actual, torch.Tensor), isinstance(desired, torch.Tensor), "torch type") - - if isinstance(desired, torch.Tensor) or isinstance(actual, torch.Tensor): - if device_test: - np.testing.assert_equal(str(actual.device), str(desired.device), "torch device check") # type: ignore - actual = actual.detach().cpu().numpy() if isinstance(actual, torch.Tensor) else actual - desired = desired.detach().cpu().numpy() if isinstance(desired, torch.Tensor) else desired - np.testing.assert_allclose(actual, desired, *args, **kwargs) - - -@contextmanager -def skip_if_downloading_fails(): - try: - yield - except (ContentTooShortError, HTTPError, ConnectionError) + (http_error,) if has_req else () as e: # noqa: B030 - raise unittest.SkipTest(f"error while downloading: {e}") from e - except ssl.SSLError as ssl_e: - if "decryption failed" in str(ssl_e): - raise unittest.SkipTest(f"SSL error while downloading: {ssl_e}") from ssl_e - except (RuntimeError, OSError) as rt_e: - err_str = str(rt_e) - if any( - k in err_str - for k in ( - "unexpected EOF", # incomplete download - "network issue", - "gdown dependency", # gdown not installed - "md5 check", - "limit", # HTTP Error 503: Egress is over the account limit - "authenticate", - "timed out", # urlopen error [Errno 110] Connection timed out - "HTTPError", # HTTPError: 429 Client Error: Too Many Requests for huggingface hub - ) - ): - raise unittest.SkipTest(f"error while downloading: {rt_e}") from rt_e # incomplete download - - raise rt_e - - -def test_pretrained_networks(network, input_param, device): - with skip_if_downloading_fails(): - return network(**input_param).to(device) - - -def test_is_quick(): - return os.environ.get(quick_test_var, "").lower() == "true" - - -def is_tf32_env(): - """ - When we may be using TF32 mode, check the precision of matrix operation. - If the checking result is greater than the threshold 0.001, - set _tf32_enabled=True (and relax _rtol for tests). - """ - global _tf32_enabled - if _tf32_enabled is None: - _tf32_enabled = False - if torch.cuda.is_available() and (detect_default_tf32() or torch.backends.cuda.matmul.allow_tf32): - try: - # with TF32 enabled, the speed is ~8x faster, but the precision has ~2 digits less in the result - g_gpu = torch.Generator(device="cuda") - g_gpu.manual_seed(2147483647) - a_full = torch.randn(1024, 1024, dtype=torch.double, device="cuda", generator=g_gpu) - b_full = torch.randn(1024, 1024, dtype=torch.double, device="cuda", generator=g_gpu) - _tf32_enabled = (a_full.float() @ b_full.float() - a_full @ b_full).abs().max().item() > 0.001 # 0.1713 - except BaseException: - pass - print(f"tf32 enabled: {_tf32_enabled}") - return _tf32_enabled - - -def skip_if_quick(obj): - """ - Skip the unit tests if environment variable `quick_test_var=true`. - For example, the user can skip the relevant tests by setting ``export QUICKTEST=true``. - """ - is_quick = test_is_quick() - - return unittest.skipIf(is_quick, "Skipping slow tests")(obj) - - -class SkipIfNoModule: - """Decorator to be used if test should be skipped - when optional module is not present.""" - - def __init__(self, module_name): - self.module_name = module_name - self.module_missing = not optional_import(self.module_name)[1] - - def __call__(self, obj): - return unittest.skipIf(self.module_missing, f"optional module not present: {self.module_name}")(obj) - - -class SkipIfModule: - """Decorator to be used if test should be skipped - when optional module is present.""" - - def __init__(self, module_name): - self.module_name = module_name - self.module_avail = optional_import(self.module_name)[1] - - def __call__(self, obj): - return unittest.skipIf(self.module_avail, f"Skipping because optional module present: {self.module_name}")(obj) - - -def skip_if_no_cpp_extension(obj): - """ - Skip the unit tests if the cpp extension is not available. - """ - return unittest.skipUnless(USE_COMPILED, "Skipping cpp extension tests")(obj) - - -def skip_if_no_cuda(obj): - """ - Skip the unit tests if torch.cuda.is_available is False. - """ - return unittest.skipUnless(torch.cuda.is_available(), "Skipping CUDA-based tests")(obj) - - -def skip_if_windows(obj): - """ - Skip the unit tests if platform is win32. - """ - return unittest.skipIf(sys.platform == "win32", "Skipping tests on Windows")(obj) - - -def skip_if_darwin(obj): - """ - Skip the unit tests if platform is macOS (Darwin). - """ - return unittest.skipIf(sys.platform == "darwin", "Skipping tests on macOS/Darwin")(obj) - - -class SkipIfBeforePyTorchVersion: - """Decorator to be used if test should be skipped - with PyTorch versions older than that given.""" - - def __init__(self, pytorch_version_tuple): - self.min_version = pytorch_version_tuple - self.version_too_old = not pytorch_after(*pytorch_version_tuple) - - def __call__(self, obj): - return unittest.skipIf( - self.version_too_old, f"Skipping tests that fail on PyTorch versions before: {self.min_version}" - )(obj) - - -class SkipIfAtLeastPyTorchVersion: - """Decorator to be used if test should be skipped - with PyTorch versions newer than or equal to that given.""" - - def __init__(self, pytorch_version_tuple): - self.max_version = pytorch_version_tuple - self.version_too_new = pytorch_after(*pytorch_version_tuple) - - def __call__(self, obj): - return unittest.skipIf( - self.version_too_new, f"Skipping tests that fail on PyTorch versions at least: {self.max_version}" - )(obj) - - -class SkipIfBeforeComputeCapabilityVersion: - """Decorator to be used if test should be skipped - with Compute Capability older than that given.""" - - def __init__(self, compute_capability_tuple): - self.min_version = compute_capability_tuple - self.version_too_old = not compute_capabilities_after(*compute_capability_tuple) - - def __call__(self, obj): - return unittest.skipIf( - self.version_too_old, f"Skipping tests that fail on Compute Capability versions before: {self.min_version}" - )(obj) - - -def is_main_test_process(): - ps = torch.multiprocessing.current_process() - if not ps or not hasattr(ps, "name"): - return False - return ps.name.startswith("Main") - - -def has_cupy(): - """ - Returns True if the user has installed a version of cupy. - """ - cp, has_cp = optional_import("cupy") - if not is_main_test_process(): - return has_cp # skip the check if we are running in subprocess - if not has_cp: - return False - try: # test cupy installation with a basic example - x = cp.arange(6, dtype="f").reshape(2, 3) - y = cp.arange(3, dtype="f") - kernel = cp.ElementwiseKernel( - "float32 x, float32 y", "float32 z", """ if (x - 2 > y) { z = x * y; } else { z = x + y; } """, "my_kernel" - ) - flag = kernel(x, y)[0, 0] == 0 - del x, y, kernel - cp.get_default_memory_pool().free_all_blocks() - return flag - except Exception: - return False - - -HAS_CUPY = has_cupy() - - -def make_nifti_image( - array: NdarrayOrTensor, affine=None, dir=None, fname=None, suffix=".nii.gz", verbose=False, dtype=float -): - """ - Create a temporary nifti image on the disk and return the image name. - User is responsible for deleting the temporary file when done with it. - """ - if isinstance(array, torch.Tensor): - array, *_ = convert_data_type(array, np.ndarray) - if isinstance(affine, torch.Tensor): - affine, *_ = convert_data_type(affine, np.ndarray) - if affine is None: - affine = np.eye(4) - test_image = nib.Nifti1Image(array.astype(dtype), affine) # type: ignore - - # if dir not given, create random. Else, make sure it exists. - if dir is None: - dir = tempfile.mkdtemp() - else: - os.makedirs(dir, exist_ok=True) - - # If fname not given, get random one. Else, concat dir, fname and suffix. - if fname is None: - temp_f, fname = tempfile.mkstemp(suffix=suffix, dir=dir) - os.close(temp_f) - else: - fname = os.path.join(dir, fname + suffix) - - nib.save(test_image, fname) - if verbose: - print(f"File written: {fname}.") - return fname - - -def make_rand_affine(ndim: int = 3, random_state: np.random.RandomState | None = None): - """Create random affine transformation (with values == -1, 0 or 1).""" - rs = np.random.random.__self__ if random_state is None else random_state # type: ignore - - vals = rs.choice([-1, 1], size=ndim) - positions = rs.choice(range(ndim), size=ndim, replace=False) - af = np.zeros([ndim + 1, ndim + 1]) - af[ndim, ndim] = 1 - for i, (v, p) in enumerate(zip(vals, positions)): - af[i, p] = v - return af - - -def get_arange_img(size, dtype=np.float32, offset=0): - """ - Returns an image as a numpy array (complete with channel as dim 0) - with contents that iterate like an arange. - """ - n_elem = np.prod(size) - img = np.arange(offset, offset + n_elem, dtype=dtype).reshape(size) - return np.expand_dims(img, 0) - - -class DistTestCase(unittest.TestCase): - """ - testcase without _outcome, so that it's picklable. - """ - - def __getstate__(self): - self_dict = self.__dict__.copy() - del self_dict["_outcome"] - return self_dict - - def __setstate__(self, data_dict): - self.__dict__.update(data_dict) - - -class DistCall: - """ - Wrap a test case so that it will run in multiple processes on a single machine using `torch.distributed`. - It is designed to be used with `tests.utils.DistTestCase`. - - Usage: - - decorate a unittest testcase method with a `DistCall` instance:: - - class MyTests(unittest.TestCase): - @DistCall(nnodes=1, nproc_per_node=3, master_addr="localhost") - def test_compute(self): - ... - - the `test_compute` method should trigger different worker logic according to `dist.get_rank()`. - - Multi-node tests require a fixed master_addr:master_port, with node_rank set manually in multiple scripts - or from environment variable "NODE_RANK". - """ - - def __init__( - self, - nnodes: int = 1, - nproc_per_node: int = 1, - master_addr: str = "localhost", - master_port: int | None = None, - node_rank: int | None = None, - timeout=60, - init_method=None, - backend: str | None = None, - daemon: bool | None = None, - method: str | None = "spawn", - verbose: bool = False, - ): - """ - - Args: - nnodes: The number of nodes to use for distributed call. - nproc_per_node: The number of processes to call on each node. - master_addr: Master node (rank 0)'s address, should be either the IP address or the hostname of node 0. - master_port: Master node (rank 0)'s free port. - node_rank: The rank of the node, this could be set via environment variable "NODE_RANK". - timeout: Timeout for operations executed against the process group. - init_method: URL specifying how to initialize the process group. - Default is "env://" or "file:///d:/a_temp" (windows) if unspecified. - If ``"no_init"``, the `dist.init_process_group` must be called within the code to be tested. - backend: The backend to use. Depending on build-time configurations, - valid values include ``mpi``, ``gloo``, and ``nccl``. - daemon: the process’s daemon flag. - When daemon=None, the initial value is inherited from the creating process. - method: set the method which should be used to start a child process. - method can be 'fork', 'spawn' or 'forkserver'. - verbose: whether to print NCCL debug info. - """ - self.nnodes = int(nnodes) - self.nproc_per_node = int(nproc_per_node) - if self.nnodes < 1 or self.nproc_per_node < 1: - raise ValueError( - f"number of nodes and processes per node must be >= 1, got {self.nnodes} and {self.nproc_per_node}" - ) - self.node_rank = int(os.environ.get("NODE_RANK", "0")) if node_rank is None else int(node_rank) - self.master_addr = master_addr - self.master_port = np.random.randint(10000, 20000) if master_port is None else master_port - - if backend is None: - self.backend = "nccl" if torch.distributed.is_nccl_available() and torch.cuda.is_available() else "gloo" - else: - self.backend = backend - self.init_method = init_method - if self.init_method is None and sys.platform == "win32": - self.init_method = "file:///d:/a_temp" - self.timeout = datetime.timedelta(0, timeout) - self.daemon = daemon - self.method = method - self.verbose = verbose - - def run_process(self, func, local_rank, args, kwargs, results): - _env = os.environ.copy() # keep the original system env - try: - os.environ["MASTER_ADDR"] = self.master_addr - os.environ["MASTER_PORT"] = str(self.master_port) - os.environ["LOCAL_RANK"] = str(local_rank) - if self.verbose: - os.environ["NCCL_DEBUG"] = "INFO" - os.environ["NCCL_DEBUG_SUBSYS"] = "ALL" - os.environ["TORCH_NCCL_BLOCKING_WAIT"] = str(1) - os.environ["OMP_NUM_THREADS"] = str(1) - os.environ["WORLD_SIZE"] = str(self.nproc_per_node * self.nnodes) - os.environ["RANK"] = str(self.nproc_per_node * self.node_rank + local_rank) - - if torch.cuda.is_available(): - torch.cuda.set_device(int(local_rank)) # using device ids from CUDA_VISIBILE_DEVICES - - if self.init_method != "no_init": - dist.init_process_group( - backend=self.backend, - init_method=self.init_method, - timeout=self.timeout, - world_size=int(os.environ["WORLD_SIZE"]), - rank=int(os.environ["RANK"]), - ) - func(*args, **kwargs) - # the primary node lives longer to - # avoid _store_based_barrier, RuntimeError: Broken pipe - # as the TCP store daemon is on the rank 0 - if int(os.environ["RANK"]) == 0: - time.sleep(0.1) - results.put(True) - except Exception as e: - results.put(False) - raise e - finally: - os.environ.clear() - os.environ.update(_env) - try: - dist.destroy_process_group() - except RuntimeError as e: - warnings.warn(f"While closing process group: {e}.") - - def __call__(self, obj): - if not torch.distributed.is_available(): - return unittest.skipIf(True, "Skipping distributed tests because not torch.distributed.is_available()")(obj) - if torch.cuda.is_available() and torch.cuda.device_count() < self.nproc_per_node: - return unittest.skipIf( - True, - f"Skipping distributed tests because it requires {self.nnodes} devices " - f"but got {torch.cuda.device_count()}", - )(obj) - - _cache_original_func(obj) - - @functools.wraps(obj) - def _wrapper(*args, **kwargs): - tmp = torch.multiprocessing.get_context(self.method) - processes = [] - results = tmp.Queue() - func = _call_original_func - args = [obj.__name__, obj.__module__] + list(args) - for proc_rank in range(self.nproc_per_node): - p = tmp.Process( - target=self.run_process, args=(func, proc_rank, args, kwargs, results), daemon=self.daemon - ) - p.start() - processes.append(p) - for p in processes: - p.join() - assert results.get(), "Distributed call failed." - _del_original_func(obj) - - return _wrapper - - -class TimedCall: - """ - Wrap a test case so that it will run in a new process, raises a TimeoutError if the decorated method takes - more than `seconds` to finish. It is designed to be used with `tests.utils.DistTestCase`. - """ - - def __init__( - self, - seconds: float = 60.0, - daemon: bool | None = None, - method: str | None = "spawn", - force_quit: bool = True, - skip_timing=False, - ): - """ - - Args: - seconds: timeout seconds. - daemon: the process’s daemon flag. - When daemon=None, the initial value is inherited from the creating process. - method: set the method which should be used to start a child process. - method can be 'fork', 'spawn' or 'forkserver'. - force_quit: whether to terminate the child process when `seconds` elapsed. - skip_timing: whether to skip the timing constraint. - this is useful to include some system conditions such as - `torch.cuda.is_available()`. - """ - self.timeout_seconds = seconds - self.daemon = daemon - self.force_quit = force_quit - self.skip_timing = skip_timing - self.method = method - - @staticmethod - def run_process(func, args, kwargs, results): - try: - output = func(*args, **kwargs) - results.put(output) - except Exception as e: - e.traceback = traceback.format_exc() - results.put(e) - - def __call__(self, obj): - if self.skip_timing: - return obj - - _cache_original_func(obj) - - @functools.wraps(obj) - def _wrapper(*args, **kwargs): - tmp = torch.multiprocessing.get_context(self.method) - func = _call_original_func - args = [obj.__name__, obj.__module__] + list(args) - results = tmp.Queue() - p = tmp.Process(target=TimedCall.run_process, args=(func, args, kwargs, results), daemon=self.daemon) - p.start() - - p.join(timeout=self.timeout_seconds) - - timeout_error = None - try: - if p.is_alive(): - # create an Exception - timeout_error = torch.multiprocessing.TimeoutError( - f"'{obj.__name__}' in '{obj.__module__}' did not finish in {self.timeout_seconds}s." - ) - if self.force_quit: - p.terminate() - else: - warnings.warn( - f"TimedCall: deadline ({self.timeout_seconds}s) " - f"reached but waiting for {obj.__name__} to finish." - ) - finally: - p.join() - - _del_original_func(obj) - res = None - try: - res = results.get(block=False) - except queue.Empty: # no result returned, took too long - pass - if isinstance(res, Exception): # other errors from obj - if hasattr(res, "traceback"): - raise RuntimeError(res.traceback) from res - raise res - if timeout_error: # no force_quit finished - raise timeout_error - return res - - return _wrapper - - -_original_funcs = {} - - -def _cache_original_func(obj) -> None: - """cache the original function by name, so that the decorator doesn't shadow it.""" - _original_funcs[obj.__name__] = obj - - -def _del_original_func(obj): - """pop the original function from cache.""" - _original_funcs.pop(obj.__name__, None) - if torch.cuda.is_available(): # clean up the cached function - torch.cuda.synchronize() - torch.cuda.empty_cache() - - -def _call_original_func(name, module, *args, **kwargs): - if name not in _original_funcs: - _original_module = importlib.import_module(module) # reimport, refresh _original_funcs - if not hasattr(_original_module, name): - # refresh module doesn't work - raise RuntimeError(f"Could not recover the original {name} from {module}: {_original_funcs}.") - f = _original_funcs[name] - return f(*args, **kwargs) - - -class NumpyImageTestCase2D(unittest.TestCase): - im_shape = (128, 64) - input_channels = 1 - output_channels = 4 - num_classes = 3 - - def setUp(self): - im, msk = create_test_image_2d( - self.im_shape[0], self.im_shape[1], num_objs=4, rad_max=20, noise_max=0.0, num_seg_classes=self.num_classes - ) - - self.imt = im[None, None] - self.seg1 = (msk[None, None] > 0).astype(np.float32) - self.segn = msk[None, None] - - -class TorchImageTestCase2D(NumpyImageTestCase2D): - - def setUp(self): - NumpyImageTestCase2D.setUp(self) - self.imt = torch.tensor(self.imt) - self.seg1 = torch.tensor(self.seg1) - self.segn = torch.tensor(self.segn) - - -class NumpyImageTestCase3D(unittest.TestCase): - im_shape = (64, 48, 80) - input_channels = 1 - output_channels = 4 - num_classes = 3 - - def setUp(self): - im, msk = create_test_image_3d( - self.im_shape[0], - self.im_shape[1], - self.im_shape[2], - num_objs=4, - rad_max=20, - noise_max=0.0, - num_seg_classes=self.num_classes, - ) - - self.imt = im[None, None] - self.seg1 = (msk[None, None] > 0).astype(np.float32) - self.segn = msk[None, None] - - -class TorchImageTestCase3D(NumpyImageTestCase3D): - - def setUp(self): - NumpyImageTestCase3D.setUp(self) - self.imt = torch.tensor(self.imt) - self.seg1 = torch.tensor(self.seg1) - self.segn = torch.tensor(self.segn) - - -def test_script_save(net, *inputs, device=None, rtol=1e-4, atol=0.0): - """ - Test the ability to save `net` as a Torchscript object, reload it, and apply inference. The value `inputs` is - forward-passed through the original and loaded copy of the network and their results returned. - The forward pass for both is done without gradient accumulation. - - The test will be performed with CUDA if available, else CPU. - """ - # TODO: would be nice to use GPU if available, but it currently causes CI failures. - device = "cpu" - with tempfile.TemporaryDirectory() as tempdir: - convert_to_torchscript( - model=net, - filename_or_obj=os.path.join(tempdir, "model.ts"), - verify=True, - inputs=inputs, - device=device, - rtol=rtol, - atol=atol, - ) - - -def test_onnx_save(net, *inputs, device=None, rtol=1e-4, atol=0.0): - """ - Test the ability to save `net` in ONNX format, reload it and validate with runtime. - The value `inputs` is forward-passed through the `net` without gradient accumulation - to do onnx export and PyTorch inference. - PyTorch model inference is performed with CUDA if available, else CPU. - Saved ONNX model is validated with onnxruntime, if available, else ONNX native implementation. - """ - # TODO: would be nice to use GPU if available, but it currently causes CI failures. - device = "cpu" - _, has_onnxruntime = optional_import("onnxruntime") - with tempfile.TemporaryDirectory() as tempdir: - convert_to_onnx( - model=net, - filename=os.path.join(tempdir, "model.onnx"), - verify=True, - inputs=inputs, - device=device, - use_ort=has_onnxruntime, - rtol=rtol, - atol=atol, - ) - - -def download_url_or_skip_test(*args, **kwargs): - """``download_url`` and skip the tests if any downloading error occurs.""" - with skip_if_downloading_fails(): - download_url(*args, **kwargs) - - -def query_memory(n=2): - """ - Find best n idle devices and return a string of device ids using the `nvidia-smi` command. - """ - bash_string = "nvidia-smi --query-gpu=power.draw,temperature.gpu,memory.used --format=csv,noheader,nounits" - - try: - print(f"query memory with n={n}") - p1 = Popen(bash_string.split(), stdout=PIPE) - output, error = p1.communicate() - free_memory = [x.split(",") for x in output.decode("utf-8").split("\n")[:-1]] - free_memory = np.asarray(free_memory, dtype=float).T - free_memory[1] += free_memory[0] # combine 0/1 column measures - ids = np.lexsort(free_memory)[:n] - except (TypeError, ValueError, IndexError, OSError): - ids = range(n) if isinstance(n, int) else [] - return ",".join(f"{int(x)}" for x in ids) - - -def test_local_inversion(invertible_xform, to_invert, im, dict_key=None): - """test that invertible_xform can bring to_invert back to im""" - im_item = im if dict_key is None else im[dict_key] - if not isinstance(im_item, MetaTensor): - return - im_ref = copy.deepcopy(im) - im_inv = invertible_xform.inverse(to_invert) - if dict_key: - im_inv = im_inv[dict_key] - im_ref = im_ref[dict_key] - np.testing.assert_array_equal(im_inv.applied_operations, []) - assert_allclose(im_inv.shape, im_ref.shape) - assert_allclose(im_inv.affine, im_ref.affine, atol=1e-3, rtol=1e-3) - - -def command_line_tests(cmd, copy_env=True): - test_env = os.environ.copy() if copy_env else os.environ - print(f"CUDA_VISIBLE_DEVICES in {__file__}", test_env.get("CUDA_VISIBLE_DEVICES")) - try: - normal_out = subprocess.run(cmd, env=test_env, check=True, capture_output=True) - print(repr(normal_out).replace("\\n", "\n").replace("\\t", "\t")) - return repr(normal_out) - except subprocess.CalledProcessError as e: - output = repr(e.stdout).replace("\\n", "\n").replace("\\t", "\t") - errors = repr(e.stderr).replace("\\n", "\n").replace("\\t", "\t") - raise RuntimeError(f"subprocess call error {e.returncode}: {errors}, {output}") from e - - -def equal_state_dict(st_1, st_2): - """ - assert equal state_dict (for the shared keys between st_1 and st_2). - """ - for key_st_1, val_st_1 in st_1.items(): - if key_st_1 in st_2: - val_st_2 = st_2.get(key_st_1) - assert_allclose(val_st_1, val_st_2) - - -TEST_TORCH_TENSORS: tuple = (torch.as_tensor,) -if torch.cuda.is_available(): - gpu_tensor: Callable = partial(torch.as_tensor, device="cuda") - TEST_TORCH_TENSORS = TEST_TORCH_TENSORS + (gpu_tensor,) - -DEFAULT_TEST_AFFINE = torch.tensor( - [[2.0, 0.0, 0.0, 0.0], [0.0, 2.0, 0.0, 0.0], [0.0, 0.0, 2.0, 0.0], [0.0, 0.0, 0.0, 1.0]] -) -_metatensor_creator = partial(MetaTensor, meta={"a": "b", "affine": DEFAULT_TEST_AFFINE}) -TEST_NDARRAYS_NO_META_TENSOR: tuple[Callable] = (np.array,) + TEST_TORCH_TENSORS -TEST_NDARRAYS: tuple[Callable] = TEST_NDARRAYS_NO_META_TENSOR + (_metatensor_creator,) # type: ignore -TEST_TORCH_AND_META_TENSORS: tuple[Callable] = TEST_TORCH_TENSORS + (_metatensor_creator,) -# alias for branch tests -TEST_NDARRAYS_ALL = TEST_NDARRAYS - -TEST_DEVICES = [[torch.device("cpu")]] -if torch.cuda.is_available(): - TEST_DEVICES.append([torch.device("cuda")]) - -if __name__ == "__main__": - parser = argparse.ArgumentParser(prog="util") - parser.add_argument("-c", "--count", default=2, help="max number of gpus") - args = parser.parse_args() - print("\n", query_memory(int(args.count)), sep="\n") # print to stdout - sys.exit(0) diff --git a/tests/visualize/test_plot_2d_or_3d_image.py b/tests/visualize/test_plot_2d_or_3d_image.py index b2c875c2d3..a7cd6522f7 100644 --- a/tests/visualize/test_plot_2d_or_3d_image.py +++ b/tests/visualize/test_plot_2d_or_3d_image.py @@ -20,7 +20,7 @@ from monai.utils import optional_import from monai.visualize import plot_2d_or_3d_image -from tests.utils.utils import SkipIfBeforePyTorchVersion, SkipIfNoModule +from tests.util import SkipIfBeforePyTorchVersion, SkipIfNoModule SummaryWriter, has_tb = optional_import("torch.utils.tensorboard", name="SummaryWriter") diff --git a/tests/visualize/test_vis_gradcam.py b/tests/visualize/test_vis_gradcam.py index 797750a3e2..1870f431bc 100644 --- a/tests/visualize/test_vis_gradcam.py +++ b/tests/visualize/test_vis_gradcam.py @@ -20,7 +20,7 @@ from monai.networks.nets import DenseNet, DenseNet121, SEResNet50 from monai.visualize import GradCAM, GradCAMpp -from tests.utils.utils import assert_allclose, skip_if_quick +from tests.util import assert_allclose, skip_if_quick class DenseNetAdjoint(DenseNet121): diff --git a/tests/visualize/utils/test_blend_images.py b/tests/visualize/utils/test_blend_images.py index 4a37142458..a1d2e46c8d 100644 --- a/tests/visualize/utils/test_blend_images.py +++ b/tests/visualize/utils/test_blend_images.py @@ -22,7 +22,7 @@ from monai.transforms.utils_pytorch_numpy_unification import moveaxis from monai.utils.module import optional_import from monai.visualize.utils import blend_images -from tests.utils.utils import TEST_NDARRAYS +from tests.util import TEST_NDARRAYS plt, has_matplotlib = optional_import("matplotlib.pyplot") diff --git a/tests/visualize/utils/test_matshow3d.py b/tests/visualize/utils/test_matshow3d.py index aca7c5ffd7..e7484a536f 100644 --- a/tests/visualize/utils/test_matshow3d.py +++ b/tests/visualize/utils/test_matshow3d.py @@ -28,7 +28,7 @@ ) from monai.utils import optional_import from monai.visualize.utils import matshow3d -from tests.utils.utils import SkipIfNoModule +from tests.util import SkipIfNoModule compare_images, _ = optional_import("matplotlib.testing.compare", name="compare_images") pyplot, has_pyplot = optional_import("matplotlib", name="pyplot")