Skip to content

Mark CV-CUDA tests with needs_cuda #9305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zy1git wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Mark CV-CUDA tests with needs_cuda #9305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8c0def
Mark CV-CUDA tests with needs_cuda
zy1git Dec 8, 2025
8a2c4c7
Merge branch 'main' of github.com:pytorch/vision into add-cvcuda-need…
zy1git Dec 8, 2025
b67dfc4
create a @needs_cvcuda decorator
zy1git Dec 10, 2025
d9db715
only use the needs_cvcuda mark for the cv-cuda test
zy1git Dec 11, 2025
b195ef2
remove the global variable CV_CUDA_TEST, correct the Typo, fix the te…
zy1git Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions test/common_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
IN_RE_WORKER = os.environ.get("INSIDE_RE_WORKER") is not None
IN_FBCODE = os.environ.get("IN_FBCODE_TORCHVISION") == "1"
CUDA_NOT_AVAILABLE_MSG = "CUDA device not available"
CVCUDA_NOT_AVAILABLE_MSG = "CV-CUDA not available"
MPS_NOT_AVAILABLE_MSG = "MPS device not available"
OSS_CI_GPU_NO_CUDA_MSG = "We're in an OSS GPU machine, and this test doesn't need cuda."

Expand Down Expand Up @@ -134,6 +135,12 @@ def needs_cuda(test_func):
return pytest.mark.needs_cuda(test_func)


def needs_cvcuda(test_func):
import pytest # noqa

return pytest.mark.needs_cvcuda(test_func)


def needs_mps(test_func):
import pytest # noqa

Expand Down
9 changes: 9 additions & 0 deletions test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
import torch

from common_utils import (
_is_cvcuda_available,
CUDA_NOT_AVAILABLE_MSG,
CVCUDA_NOT_AVAILABLE_MSG,
IN_FBCODE,
IN_OSS_CI,
IN_RE_WORKER,
Expand All @@ -17,6 +19,7 @@
def pytest_configure(config):
# register an additional marker (see pytest_collection_modifyitems)
config.addinivalue_line("markers", "needs_cuda: mark for tests that rely on a CUDA device")
config.addinivalue_line("markers", "needs_cvcuda: mark for tests that rely on CV-CUDA")
config.addinivalue_line("markers", "needs_mps: mark for tests that rely on a MPS device")
config.addinivalue_line("markers", "dont_collect: mark for tests that should not be collected")
config.addinivalue_line("markers", "opcheck_only_one: only opcheck one parametrization")
Expand All @@ -41,6 +44,9 @@ def pytest_collection_modifyitems(items):
# @pytest.mark.parametrize('device', cpu_and_cuda())
# the "instances" of the tests where device == 'cuda' will have the 'needs_cuda' mark,
# and the ones with device == 'cpu' won't have the mark.
needs_cvcuda = item.get_closest_marker("needs_cvcuda") is not None
if needs_cvcuda:
item.add_marker(pytest.mark.needs_cuda)
needs_cuda = item.get_closest_marker("needs_cuda") is not None
needs_mps = item.get_closest_marker("needs_mps") is not None

Expand All @@ -52,6 +58,9 @@ def pytest_collection_modifyitems(items):
if needs_mps and not torch.backends.mps.is_available():
item.add_marker(pytest.mark.skip(reason=MPS_NOT_AVAILABLE_MSG))

if needs_cvcuda and not _is_cvcuda_available():
item.add_marker(pytest.mark.skip(reason=CVCUDA_NOT_AVAILABLE_MSG))

if IN_FBCODE:
# fbcode doesn't like skipping tests, so instead we just don't collect the test
# so that they don't even "exist", hence the continue statements.
Expand Down
42 changes: 16 additions & 26 deletions test/test_transforms_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
make_video,
make_video_tensor,
needs_cuda,
needs_cvcuda,
set_rng_seed,
)

Expand All @@ -52,17 +53,8 @@
from torchvision.transforms.v2 import functional as F
from torchvision.transforms.v2._utils import check_type, is_pure_tensor
from torchvision.transforms.v2.functional._geometry import _get_perspective_coeffs, _parallelogram_to_bounding_boxes
from torchvision.transforms.v2.functional._utils import (
_get_kernel,
_import_cvcuda,
_is_cvcuda_available,
_register_kernel_internal,
)

from torchvision.transforms.v2.functional._utils import _get_kernel, _import_cvcuda, _register_kernel_internal

CVCUDA_AVAILABLE = _is_cvcuda_available()
if CVCUDA_AVAILABLE:
cvcuda = _import_cvcuda()
Copy link
Member

@NicolasHug NicolasHug Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some tests in TestToCVCUDATensor are failing because cvcuda is now removed.

It's good that it's removed, but we should update the parts in TestToCVCUDATensor to now use _import_cvcuda() instead


# turns all warnings into errors for this module
pytestmark = [pytest.mark.filterwarnings("error")]
Expand Down Expand Up @@ -1242,7 +1234,7 @@ def test_kernel_video(self):
make_image,
pytest.param(
make_image_cvcuda,
marks=pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="CVCUDA is not available"),
marks=pytest.mark.needs_cvcuda,
),
make_bounding_boxes,
make_segmentation_mask,
Expand All @@ -1262,7 +1254,7 @@ def test_functional(self, make_input):
pytest.param(
F._geometry._horizontal_flip_image_cvcuda,
None,
marks=pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="CVCUDA is not available"),
marks=pytest.mark.needs_cvcuda,
),
(F.horizontal_flip_bounding_boxes, tv_tensors.BoundingBoxes),
(F.horizontal_flip_mask, tv_tensors.Mask),
Expand All @@ -1283,7 +1275,7 @@ def test_functional_signature(self, kernel, input_type):
make_image,
pytest.param(
make_image_cvcuda,
marks=pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="CVCUDA is not available"),
marks=pytest.mark.needs_cvcuda,
),
make_bounding_boxes,
make_segmentation_mask,
Expand All @@ -1304,7 +1296,7 @@ def test_transform(self, make_input, device):
make_image,
pytest.param(
make_image_cvcuda,
marks=pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="CVCUDA is not available"),
marks=pytest.mark.needs_cvcuda,
),
],
)
Expand Down Expand Up @@ -1372,7 +1364,7 @@ def test_keypoints_correctness(self, fn):
make_image,
pytest.param(
make_image_cvcuda,
marks=pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="CVCUDA is not available"),
marks=pytest.mark.needs_cvcuda,
),
make_bounding_boxes,
make_segmentation_mask,
Expand Down Expand Up @@ -1884,7 +1876,7 @@ def test_kernel_video(self):
make_image,
pytest.param(
make_image_cvcuda,
marks=pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="CVCUDA is not available"),
marks=pytest.mark.needs_cvcuda,
),
make_bounding_boxes,
make_segmentation_mask,
Expand All @@ -1904,7 +1896,7 @@ def test_functional(self, make_input):
pytest.param(
F._geometry._vertical_flip_image_cvcuda,
None,
marks=pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="CVCUDA is not available"),
marks=pytest.mark.needs_cvcuda,
),
(F.vertical_flip_bounding_boxes, tv_tensors.BoundingBoxes),
(F.vertical_flip_mask, tv_tensors.Mask),
Expand All @@ -1925,7 +1917,7 @@ def test_functional_signature(self, kernel, input_type):
make_image,
pytest.param(
make_image_cvcuda,
marks=pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="CVCUDA is not available"),
marks=pytest.mark.needs_cvcuda,
),
make_bounding_boxes,
make_segmentation_mask,
Expand All @@ -1944,7 +1936,7 @@ def test_transform(self, make_input, device):
make_image,
pytest.param(
make_image_cvcuda,
marks=pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="CVCUDA is not available"),
marks=pytest.mark.needs_cvcuda,
),
],
)
Expand Down Expand Up @@ -2008,7 +2000,7 @@ def test_keypoints_correctness(self, fn):
make_image,
pytest.param(
make_image_cvcuda,
marks=pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="CVCUDA is not available"),
marks=pytest.mark.needs_cvcuda,
),
make_bounding_boxes,
make_segmentation_mask,
Expand Down Expand Up @@ -6794,8 +6786,7 @@ def test_functional_error(self):
F.pil_to_tensor(object())


@pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="test requires CVCUDA")
@needs_cuda
@needs_cvcuda
class TestToCVCUDATensor:
@pytest.mark.parametrize("image_type", (torch.Tensor, tv_tensors.Image))
@pytest.mark.parametrize("dtype", [torch.uint8, torch.uint16, torch.float32, torch.float64])
Expand All @@ -6813,7 +6804,7 @@ def test_functional_and_transform(self, image_type, dtype, device, color_space,
assert is_pure_tensor(image)
output = fn(image)

assert isinstance(output, cvcuda.Tensor)
assert isinstance(output, _import_cvcuda().Tensor)
assert F.get_size(output) == F.get_size(image)
assert output is not None

Expand Down Expand Up @@ -6856,9 +6847,8 @@ def test_round_trip(self, dtype, device, color_space, batch_size):
assert result_tensor.shape[0] == batch_size


@pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="test requires CVCUDA")
@needs_cuda
class TestCVDUDAToTensor:
@needs_cvcuda
class TestCVCUDAToTensor:
@pytest.mark.parametrize("dtype", [torch.uint8, torch.uint16, torch.float32, torch.float64])
@pytest.mark.parametrize("device", cpu_and_cuda())
@pytest.mark.parametrize("color_space", ["RGB", "GRAY"])
Expand Down