Skip to content

Commit dff1a4a

Browse files
ericspodCan-Zhao
authored andcommitted
Changing utils.py to test_utils.py (Project-MONAI#8335)
Related to Project-MONAI#8185. ### Description This changes the name of `tests/utils.py` to `tests/test_utils.py` to conform to the changes introduced with the daily CICD tests. This is done in Project-MONAI#8231 but the change is being pre-merged now to get tests working again while issues are sorted out there. This also includes changes this PR made to that file, and changes anywhere else to correctly import the module. ### Types of changes <!--- Put an `x` in all the boxes that apply, and remove the not applicable items --> - [x] Non-breaking change (fix or new feature that would not break existing functionality). - [ ] Breaking change (fix or new feature that would cause existing functionality to change). - [ ] New tests added to cover the changes. - [ ] Integration tests passed locally by running `./runtests.sh -f -u --net --coverage`. - [ ] Quick tests passed locally by running `./runtests.sh --quick --unittests --disttests`. - [ ] In-line docstrings updated. - [ ] Documentation updated, tested `make html` command in the `docs/` folder. --------- Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk> Signed-off-by: Can-Zhao <volcanofly@gmail.com>
1 parent 3b83a56 commit dff1a4a

File tree

529 files changed

+556
-529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

529 files changed

+556
-529
lines changed

tests/croppers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from monai.transforms import Randomizable
2121
from monai.transforms.lazy.functional import apply_pending
2222
from monai.transforms.transform import MapTransform
23-
from tests.utils import TEST_NDARRAYS_ALL, assert_allclose
23+
from tests.test_utils import TEST_NDARRAYS_ALL, assert_allclose
2424

2525

2626
class CropTest(unittest.TestCase):

tests/hvd_evenly_divisible_all_gather.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
from monai.utils import evenly_divisible_all_gather
1717
from monai.utils.module import optional_import
18-
from tests.utils import assert_allclose
18+
from tests.test_utils import assert_allclose
1919

2020
hvd, has_hvd = optional_import("horovod", name="torch")
2121

tests/lazy_transforms_utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from monai.data import MetaTensor, set_track_meta
1717
from monai.transforms import InvertibleTransform, MapTransform, Randomizable
1818
from monai.transforms.lazy.functional import apply_pending
19-
from tests.utils import assert_allclose
19+
from tests.test_utils import assert_allclose
2020

2121
apply_transforms_kwargs = ("pending", "mode", "padding_mode", "dtype", "align_corners")
2222

tests/ngc_bundle_download.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from monai.bundle import download, load
2525
from monai.config import print_debug_info
2626
from monai.networks.utils import copy_model_state
27-
from tests.utils import assert_allclose, skip_if_downloading_fails, skip_if_quick, skip_if_windows
27+
from tests.test_utils import assert_allclose, skip_if_downloading_fails, skip_if_quick, skip_if_windows
2828

2929
TEST_CASE_NGC_1 = [
3030
"spleen_ct_segmentation",

tests/padders.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from monai.transforms.lazy.functional import apply_pending
2222
from monai.transforms.transform import MapTransform
2323
from monai.utils.enums import NumpyPadMode, PytorchPadMode
24-
from tests.utils import TEST_NDARRAYS_ALL, assert_allclose
24+
from tests.test_utils import TEST_NDARRAYS_ALL, assert_allclose
2525

2626
MODES = []
2727
# Test modes

tests/test_activations.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
from monai.networks.layers.factories import Act
2020
from monai.transforms import Activations
21-
from tests.utils import TEST_NDARRAYS, assert_allclose
21+
from tests.test_utils import TEST_NDARRAYS, assert_allclose
2222

2323
TEST_CASES = []
2424
for p in TEST_NDARRAYS:

tests/test_activationsd.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from parameterized import parameterized
1818

1919
from monai.transforms import Activationsd
20-
from tests.utils import TEST_NDARRAYS, assert_allclose
20+
from tests.test_utils import TEST_NDARRAYS, assert_allclose
2121

2222
TEST_CASES = []
2323
for p in TEST_NDARRAYS:

tests/test_add_coordinate_channels.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from parameterized import parameterized
1919

2020
from monai.transforms import AddCoordinateChannels
21-
from tests.utils import TEST_NDARRAYS, assert_allclose
21+
from tests.test_utils import TEST_NDARRAYS, assert_allclose
2222

2323
TESTS, TEST_CASES_ERROR_1, TEST_CASES_ERROR_2 = [], [], []
2424
for p in TEST_NDARRAYS:

tests/test_add_coordinate_channelsd.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from parameterized import parameterized
1919

2020
from monai.transforms import AddCoordinateChannelsd
21-
from tests.utils import TEST_NDARRAYS, assert_allclose
21+
from tests.test_utils import TEST_NDARRAYS, assert_allclose
2222

2323
TESTS, TEST_CASES_ERROR_1, TEST_CASES_ERROR_2 = [], [], []
2424
for p in TEST_NDARRAYS:

tests/test_add_extreme_points_channel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from parameterized import parameterized
1818

1919
from monai.transforms import AddExtremePointsChannel
20-
from tests.utils import TEST_NDARRAYS, assert_allclose
20+
from tests.test_utils import TEST_NDARRAYS, assert_allclose
2121

2222
IMG_CHANNEL = 3
2323
TESTS = []

tests/test_add_extreme_points_channeld.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from parameterized import parameterized
1818

1919
from monai.transforms import AddExtremePointsChanneld
20-
from tests.utils import TEST_NDARRAYS, assert_allclose
20+
from tests.test_utils import TEST_NDARRAYS, assert_allclose
2121

2222
IMG_CHANNEL = 3
2323

tests/test_adjust_contrast.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from parameterized import parameterized
1818

1919
from monai.transforms import AdjustContrast
20-
from tests.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose
20+
from tests.test_utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose
2121

2222
TESTS = []
2323
for invert_image in (True, False):

tests/test_adjust_contrastd.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from parameterized import parameterized
1818

1919
from monai.transforms import AdjustContrastd
20-
from tests.utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose
20+
from tests.test_utils import TEST_NDARRAYS, NumpyImageTestCase2D, assert_allclose
2121

2222
TESTS = []
2323
for invert_image in (True, False):

tests/test_adn.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from parameterized import parameterized
1717

1818
from monai.networks.blocks import ADN
19-
from tests.utils import TorchImageTestCase2D, TorchImageTestCase3D
19+
from tests.test_utils import TorchImageTestCase2D, TorchImageTestCase3D
2020

2121
TEST_CASES_2D = [
2222
[{"act": None}],

tests/test_affine.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from monai.transforms.lazy.functional import apply_pending
2424
from monai.utils import optional_import
2525
from tests.lazy_transforms_utils import test_resampler_lazy
26-
from tests.utils import TEST_NDARRAYS_ALL, assert_allclose, test_local_inversion
26+
from tests.test_utils import TEST_NDARRAYS_ALL, assert_allclose, test_local_inversion
2727

2828
TESTS = []
2929
for p in TEST_NDARRAYS_ALL:

tests/test_affine_grid.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
from monai.data import MetaTensor, set_track_meta
2121
from monai.transforms import AffineGrid
22-
from tests.utils import TEST_NDARRAYS_ALL, assert_allclose, is_tf32_env
22+
from tests.test_utils import TEST_NDARRAYS_ALL, assert_allclose, is_tf32_env
2323

2424
TESTS = []
2525
for p in TEST_NDARRAYS_ALL:

tests/test_affine_transform.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
from monai.networks import normalize_transform, to_norm_affine
2121
from monai.networks.layers import AffineTransform
22-
from tests.utils import is_tf32_env
22+
from tests.test_utils import is_tf32_env
2323

2424
_rtol = 1e-4 if not is_tf32_env() else 5e-3
2525

tests/test_affined.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from monai.transforms import Affined
2222
from tests.lazy_transforms_utils import test_resampler_lazy
23-
from tests.utils import TEST_NDARRAYS_ALL, assert_allclose, test_local_inversion
23+
from tests.test_utils import TEST_NDARRAYS_ALL, assert_allclose, test_local_inversion
2424

2525
TESTS = []
2626
for p in TEST_NDARRAYS_ALL:

tests/test_ahnet.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from monai.networks import eval_mode
2020
from monai.networks.blocks import FCN, MCFCN
2121
from monai.networks.nets import AHNet
22-
from tests.utils import skip_if_quick, test_pretrained_networks, test_script_save
22+
from tests.test_utils import skip_if_quick, test_pretrained_networks, test_script_save
2323

2424
device = "cuda" if torch.cuda.is_available() else "cpu"
2525

tests/test_anchor_box.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
from monai.apps.detection.utils.anchor_utils import AnchorGenerator, AnchorGeneratorWithAnchorShape
2020
from monai.utils import optional_import
21-
from tests.utils import SkipIfBeforePyTorchVersion, assert_allclose, test_script_save
21+
from tests.test_utils import SkipIfBeforePyTorchVersion, assert_allclose, test_script_save
2222

2323
_, has_torchvision = optional_import("torchvision")
2424

tests/test_apply.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from monai.transforms.lazy.functional import apply_pending
2020
from monai.transforms.utils import create_rotate
2121
from monai.utils import LazyAttr, convert_to_tensor
22-
from tests.utils import get_arange_img
22+
from tests.test_utils import get_arange_img
2323

2424

2525
def single_2d_transform_cases():

tests/test_as_channel_last.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from parameterized import parameterized
1818

1919
from monai.transforms import AsChannelLast
20-
from tests.utils import TEST_NDARRAYS
20+
from tests.test_utils import TEST_NDARRAYS
2121

2222
TESTS = []
2323
for p in TEST_NDARRAYS:

tests/test_as_channel_lastd.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from parameterized import parameterized
1818

1919
from monai.transforms import AsChannelLastd
20-
from tests.utils import TEST_NDARRAYS
20+
from tests.test_utils import TEST_NDARRAYS
2121

2222
TESTS = []
2323
for p in TEST_NDARRAYS:

tests/test_as_discrete.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from parameterized import parameterized
1717

1818
from monai.transforms import AsDiscrete
19-
from tests.utils import TEST_NDARRAYS, assert_allclose
19+
from tests.test_utils import TEST_NDARRAYS, assert_allclose
2020

2121
TEST_CASES = []
2222
for p in TEST_NDARRAYS:

tests/test_as_discreted.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from parameterized import parameterized
1717

1818
from monai.transforms import AsDiscreted
19-
from tests.utils import TEST_NDARRAYS, assert_allclose
19+
from tests.test_utils import TEST_NDARRAYS, assert_allclose
2020

2121
TEST_CASES = []
2222
for p in TEST_NDARRAYS:

tests/test_atss_box_matcher.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
from monai.apps.detection.utils.ATSS_matcher import ATSSMatcher
2020
from monai.data.box_utils import box_iou
21-
from tests.utils import assert_allclose
21+
from tests.test_utils import assert_allclose
2222

2323
TEST_CASES = [
2424
[

tests/test_attentionunet.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import torch.nn as nn
1818

1919
import monai.networks.nets.attentionunet as att
20-
from tests.utils import skip_if_no_cuda, skip_if_quick
20+
from tests.test_utils import skip_if_no_cuda, skip_if_quick
2121

2222

2323
def get_net_parameters(net: nn.Module) -> int:

tests/test_auto3dseg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
ToDeviced,
5555
)
5656
from monai.utils.enums import DataStatsKeys
57-
from tests.utils import skip_if_no_cuda
57+
from tests.test_utils import skip_if_no_cuda
5858

5959
device = "cpu"
6060
n_workers = 2

tests/test_auto3dseg_bundlegen.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from monai.bundle.config_parser import ConfigParser
2727
from monai.data import create_test_image_3d
2828
from monai.utils import set_determinism
29-
from tests.utils import (
29+
from tests.test_utils import (
3030
SkipIfBeforePyTorchVersion,
3131
get_testing_algo_template_path,
3232
skip_if_downloading_fails,

tests/test_auto3dseg_ensemble.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from monai.transforms import SaveImage
3333
from monai.utils import check_parent_dir, optional_import, set_determinism
3434
from monai.utils.enums import AlgoKeys
35-
from tests.utils import (
35+
from tests.test_utils import (
3636
SkipIfBeforePyTorchVersion,
3737
get_testing_algo_template_path,
3838
skip_if_downloading_fails,

tests/test_auto3dseg_hpo.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from monai.data import create_test_image_3d
2626
from monai.utils import optional_import
2727
from monai.utils.enums import AlgoKeys
28-
from tests.utils import (
28+
from tests.test_utils import (
2929
SkipIfBeforePyTorchVersion,
3030
get_testing_algo_template_path,
3131
skip_if_downloading_fails,

tests/test_autoencoder.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from monai.networks import eval_mode
2020
from monai.networks.layers import Act
2121
from monai.networks.nets import AutoEncoder
22-
from tests.utils import test_script_save
22+
from tests.test_utils import test_script_save
2323

2424
device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu")
2525

tests/test_autoencoderkl.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from monai.networks import eval_mode
2424
from monai.networks.nets import AutoencoderKL
2525
from monai.utils import optional_import
26-
from tests.utils import SkipIfBeforePyTorchVersion, skip_if_downloading_fails, testing_data_config
26+
from tests.test_utils import SkipIfBeforePyTorchVersion, skip_if_downloading_fails, testing_data_config
2727

2828
tqdm, has_tqdm = optional_import("tqdm", name="tqdm")
2929
_, has_einops = optional_import("einops")

tests/test_autoencoderkl_maisi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from monai.apps.generation.maisi.networks.autoencoderkl_maisi import AutoencoderKlMaisi
2020
from monai.networks import eval_mode
2121
from monai.utils import optional_import
22-
from tests.utils import SkipIfBeforePyTorchVersion
22+
from tests.test_utils import SkipIfBeforePyTorchVersion
2323

2424
tqdm, has_tqdm = optional_import("tqdm", name="tqdm")
2525
_, has_einops = optional_import("einops")

tests/test_avg_merger.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from torch.nn.functional import pad
1919

2020
from monai.inferers import AvgMerger
21-
from tests.utils import assert_allclose
21+
from tests.test_utils import assert_allclose
2222

2323
TENSOR_4x4 = torch.randint(low=0, high=255, size=(2, 3, 4, 4), dtype=torch.float32)
2424
TENSOR_4x4_WITH_NAN = TENSOR_4x4.clone()

tests/test_basic_unet.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
from monai.networks import eval_mode
2020
from monai.networks.nets import BasicUNet
21-
from tests.utils import test_script_save
21+
from tests.test_utils import test_script_save
2222

2323
CASES_1D = []
2424
for mode in ["pixelshuffle", "nontrainable", "deconv", None]:

tests/test_basic_unetplusplus.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
from monai.networks import eval_mode
2020
from monai.networks.nets import BasicUNetPlusPlus
21-
from tests.utils import test_script_save
21+
from tests.test_utils import test_script_save
2222

2323
CASES_1D = []
2424
for mode in ["pixelshuffle", "nontrainable", "deconv", None]:

tests/test_bilateral_approx_cpu.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from torch.autograd import gradcheck
2020

2121
from monai.networks.layers.filtering import BilateralFilter
22-
from tests.utils import skip_if_no_cpp_extension
22+
from tests.test_utils import skip_if_no_cpp_extension
2323

2424
TEST_CASES = [
2525
[

tests/test_bilateral_approx_cuda.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from torch.autograd import gradcheck
2020

2121
from monai.networks.layers.filtering import BilateralFilter
22-
from tests.utils import skip_if_no_cpp_extension, skip_if_no_cuda
22+
from tests.test_utils import skip_if_no_cpp_extension, skip_if_no_cuda
2323

2424
TEST_CASES = [
2525
[

tests/test_bilateral_precise.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from torch.autograd import gradcheck
2020

2121
from monai.networks.layers.filtering import BilateralFilter
22-
from tests.utils import skip_if_no_cpp_extension, skip_if_no_cuda, skip_if_quick
22+
from tests.test_utils import skip_if_no_cpp_extension, skip_if_no_cuda, skip_if_quick
2323

2424
TEST_CASES = [
2525
[

tests/test_blend_images.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from monai.transforms.utils_pytorch_numpy_unification import moveaxis
2323
from monai.utils.module import optional_import
2424
from monai.visualize.utils import blend_images
25-
from tests.utils import TEST_NDARRAYS
25+
from tests.test_utils import TEST_NDARRAYS
2626

2727
plt, has_matplotlib = optional_import("matplotlib.pyplot")
2828

tests/test_bounding_rect.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import monai
2020
from monai.transforms import BoundingRect
21-
from tests.utils import TEST_NDARRAYS
21+
from tests.test_utils import TEST_NDARRAYS
2222

2323
TEST_CASE_1 = [(2, 3), [[0, 0], [1, 2]]]
2424

tests/test_bounding_rectd.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import monai
2020
from monai.transforms import BoundingRectD
21-
from tests.utils import TEST_NDARRAYS
21+
from tests.test_utils import TEST_NDARRAYS
2222

2323
TEST_CASE_1 = [(2, 3), [[0, 0], [1, 2]]]
2424

tests/test_box_coder.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from monai.apps.detection.utils.box_coder import BoxCoder
1919
from monai.transforms import CastToType
20-
from tests.utils import assert_allclose
20+
from tests.test_utils import assert_allclose
2121

2222

2323
class TestBoxTransform(unittest.TestCase):

0 commit comments

Comments
 (0)