Fix `nose` imports #5698

mzient · 2024-11-04T10:13:16Z

Category:

Bug fix (non-breaking change which fixes an issue)

Description:

We need to import nose_utils before anything directly using nose in Python 3.12.
Since Python 3.12 is not tested at pre-merge, it was easy to miss.
This PR replaces all direct imports of nose, nose.tool, nose.plugins, etc. so there's no bad example to copy from.

Additional information:

Affected modules and functionalities:

Key points relevant for the review:

Tests:

Checklist

Documentation

DALI team only

Requirements

Implements new requirements
Affects existing requirements
N/A

REQ IDs: N/A

JIRA TASK: N/A

Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>

dali/test/python/nose_utils.py

JanuszL · 2024-11-04T10:16:38Z

dali/test/python/reader/test_numpy.py

@@ -23,7 +23,7 @@
 import random
 import tempfile
 from nose_utils import assert_raises
-from nose import SkipTest
+from nose_utils import SkipTest


Maybe you can merge it with the above.

JanuszL · 2024-11-04T10:16:47Z

dali/test/python/test_backend_impl.py

@@ -23,7 +23,7 @@
 import nvidia.dali as dali

 from nose_utils import assert_raises
-from nose import SkipTest
+from nose_utils import SkipTest


Maybe you can merge it with the above and below.

dali-automaton · 2024-11-04T10:16:55Z

CI MESSAGE: [20053934]: BUILD STARTED

JanuszL · 2024-11-04T10:17:04Z

dali/test/python/checkpointing/test_dali_stateless_operators.py

@@ -28,7 +28,7 @@
 )
 from nose2.tools import params, cartesian_params
 from nose_utils import assert_raises, SkipTest
-from nose.plugins.attrib import attr
+from nose_utils import attr


Maybe you can merge it with the above.

JanuszL · 2024-11-04T10:17:29Z

dali/test/python/decoder/test_image.py

@@ -279,7 +279,7 @@ def check_fancy_upsampling_body(batch_size, img_type, device):
 @params(1, 8)
 def test_fancy_upsampling(batch_size):
    if nvidia.dali.backend.GetNvjpegVersion() < 12001:
-        from nose import SkipTest
+        from nose_utils import SkipTest


I would move this to the beginning of the file.

JanuszL · 2024-11-04T10:17:52Z

dali/test/python/decoder/test_imgcodec.py

@@ -280,7 +280,7 @@ def check_fancy_upsampling_body(batch_size, img_type, device):
 @params(1, 8)
 def test_fancy_upsampling(batch_size):
    if nvidia.dali.backend.GetNvjpegVersion() < 12001:
-        from nose import SkipTest
+        from nose_utils import SkipTest


I think it can be removed here as is duplicates L32.

JanuszL · 2024-11-04T10:17:59Z

dali/test/python/decoder/test_jpeg_scan_limit.py

@@ -19,7 +19,7 @@
 from nvidia.dali import pipeline_def

 from nose_utils import assert_raises
-from nose.plugins.attrib import attr
+from nose_utils import attr


Maybe you can merge it with the above.

JanuszL · 2024-11-04T10:18:07Z

dali/test/python/decoder/test_video.py

-from nose import SkipTest
-from nose.plugins.attrib import attr
+from nose_utils import SkipTest
+from nose_utils import attr
 from nose_utils import assert_raises


Maybe you can merge it with the above.

JanuszL · 2024-11-04T10:18:34Z

dali/test/python/operator_1/test_gaussian_blur.py

@@ -22,7 +22,7 @@
 from scipy.ndimage import convolve1d
 import os
 from nose_utils import assert_raises, raises
-from nose.plugins.attrib import attr
+from nose_utils import attr


Maybe you can merge it with the above.

JanuszL · 2024-11-04T10:18:45Z

dali/test/python/operator_1/test_laplacian.py

@@ -21,7 +21,7 @@
 from scipy.ndimage import convolve1d, filters as sp_filters
 import os
 from nose_utils import assert_raises
-from nose.plugins.attrib import attr
+from nose_utils import attr


Maybe you can merge it with the above.

JanuszL · 2024-11-04T10:19:02Z

dali/test/python/operator_1/test_numba_func.py

@@ -28,7 +28,7 @@
 )
 from nvidia.dali.plugin.numba.fn.experimental import numba_function
 from numba import cuda
-from nose.plugins.attrib import attr
+from nose_utils import attr


Maybe you can merge it with L22.

JanuszL · 2024-11-04T10:19:25Z

dali/test/python/operator_2/test_random_object_bbox.py

@@ -23,8 +23,7 @@
 import scipy.ndimage.measurements
 import random
 from test_utils import check_batch, np_type_to_dali
-from nose.tools import nottest
-from nose.plugins.attrib import attr
+from nose_utils import attr, nottest


Can be merged with L17

JanuszL · 2024-11-04T10:19:39Z

dali/test/python/reader/test_index.py

@@ -23,7 +23,7 @@
 from test_utils import compare_pipelines, get_dali_extra_path
 from nose_utils import assert_raises, raises
 from nose2.tools import cartesian_params
-from nose import SkipTest
+from nose_utils import SkipTest


Can be merged with L24

JanuszL · 2024-11-04T10:20:04Z

dali/test/python/test_dali_tf_dataset_mnist_eager.py

@@ -18,7 +18,7 @@
 import test_dali_tf_dataset_mnist as mnist
 from test_utils_tensorflow import skip_for_incompatible_tf, available_gpus
 from nose_utils import raises
-from nose import SkipTest
+from nose_utils import SkipTest


Maybe you can merge it with the above.

JanuszL · 2024-11-04T10:20:24Z

dali/test/python/test_external_source_impl_utils.py

@@ -16,7 +16,7 @@
 from nvidia.dali import tensors, pipeline_def
 import nvidia.dali.fn as fn
 from nose_utils import raises, assert_equals
-from nose.plugins.attrib import attr
+from nose_utils import attr


Maybe you can merge it with the above.

JanuszL · 2024-11-04T10:20:40Z

dali/test/python/test_functional_api.py

@@ -20,7 +20,7 @@
 from nose_utils import assert_raises
 import sys
 import inspect
-from nose.plugins.attrib import attr
+from nose_utils import attr


Can be merged with L20

JanuszL · 2024-11-04T10:20:51Z

dali/test/python/test_optical_flow.py

@@ -21,7 +21,7 @@
 from nvidia.dali import fn, types
 from test_utils import get_dali_extra_path, get_arch
 from nose_utils import raises, assert_raises
-from nose import SkipTest
+from nose_utils import SkipTest


Maybe you can merge it with the above.

JanuszL · 2024-11-04T10:21:10Z

dali/test/python/test_pipeline_debug.py

@@ -14,7 +14,7 @@

 import numpy as np
 import os
-from nose.plugins.attrib import attr
+from nose_utils import attr


Can be merged with L23 and L25

JanuszL · 2024-11-04T10:21:28Z

dali/test/python/test_pipeline_inputs.py

@@ -15,7 +15,7 @@

 import numpy as np
 import nvidia.dali.fn as fn
-from nose.plugins.attrib import attr
+from nose_utils import attr


Can be merged with L24

Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>

JanuszL · 2024-11-04T10:21:47Z

dali/test/python/test_torch_pipeline_rnnt.py

@@ -23,7 +23,7 @@
 import math
 import random
 import os
-from nose.tools import nottest
+from nose_utils import nottest


Can be moved to L15

dali-automaton · 2024-11-04T10:31:30Z

CI MESSAGE: [20054170]: BUILD STARTED

dali/test/python/operator_1/test_arithmetic_ops.py

dali-automaton · 2024-11-04T10:45:16Z

CI MESSAGE: [20054170]: BUILD FAILED

Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>

dali-automaton · 2024-11-04T11:14:14Z

CI MESSAGE: [20055387]: BUILD STARTED

dali-automaton · 2024-11-04T16:35:18Z

CI MESSAGE: [20055387]: BUILD PASSED

mzient added 2 commits November 4, 2024 11:10

Remove direct import of nose module from tests.

085eca9

Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>

Remove debug prints.

352d3da

Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>

github-advanced-security bot found potential problems Nov 4, 2024

View reviewed changes

dali/test/python/nose_utils.py Dismissed Show dismissed Hide dismissed

dali/test/python/nose_utils.py Dismissed Show dismissed Hide dismissed

JanuszL reviewed Nov 4, 2024

View reviewed changes

Minor cleanup.

628e146

Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>

JanuszL reviewed Nov 4, 2024

View reviewed changes

JanuszL approved these changes Nov 4, 2024

View reviewed changes

mzient force-pushed the fix_nose_imports branch from 0b85217 to 0474225 Compare November 4, 2024 10:30

github-advanced-security bot found potential problems Nov 4, 2024

View reviewed changes

dali/test/python/operator_1/test_arithmetic_ops.py Fixed Show fixed Hide fixed

JanuszL approved these changes Nov 4, 2024

View reviewed changes

Import regrouping.

934e43a

Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>

mzient force-pushed the fix_nose_imports branch from 0474225 to 934e43a Compare November 4, 2024 11:13

dali-automaton assigned mdabek-nvidia and stiepan Nov 4, 2024

mdabek-nvidia approved these changes Nov 4, 2024

View reviewed changes

mzient assigned JanuszL and unassigned stiepan Nov 4, 2024

mzient merged commit abde033 into NVIDIA:main Nov 5, 2024
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix `nose` imports #5698

Fix `nose` imports #5698

mzient commented Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

dali-automaton commented Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

mzient Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

JanuszL Nov 4, 2024

dali-automaton commented Nov 4, 2024

dali-automaton commented Nov 4, 2024

dali-automaton commented Nov 4, 2024

dali-automaton commented Nov 4, 2024

Fix nose imports #5698

Fix nose imports #5698

Conversation

mzient commented Nov 4, 2024

Category:

Description:

Additional information:

Affected modules and functionalities:

Key points relevant for the review:

Tests:

Checklist

Documentation

DALI team only

Requirements

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dali-automaton commented Nov 4, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dali-automaton commented Nov 4, 2024

dali-automaton commented Nov 4, 2024

dali-automaton commented Nov 4, 2024

dali-automaton commented Nov 4, 2024

Fix `nose` imports #5698

Fix `nose` imports #5698