Use @needs_cuda instead of pyest.mark.needs_cuda

Author: NicolasHug

test/smoke_test.py

@@ -3,7 +3,7 @@
 import pytest
 import torch
 
-from test.utils import assert_tensor_close_on_at_least
+from test.utils import assert_tensor_close_on_at_least, needs_cuda
 
 from torchcodec import ffmpeg_major_version
 from torchcodec._frame import AudioSamples, Frame, FrameBatch
@@ -337,7 +337,7 @@ def test_video_and_audio_chunked(self, tmp_path):
         # TODO: validate audio on a mostly lossless codec?
         assert decoded_samples.sample_rate == sr
 
-    @pytest.mark.needs_cuda
+    @needs_cuda
     def test_cuda_encoding(self, tmp_path):
         if ffmpeg_major_version == 4:
             pytest.skip("CUDA encoding not supported with FFmpeg 4")

test/test_encoders.py

@@ -24,6 +24,7 @@
     NASA_AUDIO_MP3,
     NASA_AUDIO_MP3_44100,
     NASA_VIDEO,
+    needs_cuda,
     needs_ffmpeg_cli,
     psnr,
     SINE_MONO_S32,
@@ -1347,7 +1348,7 @@ def test_extra_options_utilized(self, tmp_path, profile, colorspace, color_range
         assert metadata["color_range"] == color_range
 
     @needs_ffmpeg_cli
-    @pytest.mark.needs_cuda
+    @needs_cuda
     @pytest.mark.parametrize("method", ("to_file", "to_tensor", "to_file_like"))
     @pytest.mark.parametrize(
         ("format", "codec"),
@@ -1765,7 +1766,7 @@ def test_write_frames_mismatched_dimensions_errors(self, tmp_path, method, devic
         with pytest.raises(RuntimeError, match="same dimensions"):
             video.add_frames(frames_512)
 
-    @pytest.mark.needs_cuda
+    @needs_cuda
     @pytest.mark.parametrize("method", ("to_file", "to_file_like"))
     def test_write_frames_different_devices_errors(self, tmp_path, method):
         cpu_frames = torch.randint(0, 256, (2, 3, 256, 256), dtype=torch.uint8)
@@ -1789,7 +1790,7 @@ def test_write_frames_different_devices_errors(self, tmp_path, method):
         with pytest.raises(RuntimeError, match="same device"):
             video.add_frames(cpu_frames)
 
-    @pytest.mark.needs_cuda
+    @needs_cuda
     @pytest.mark.parametrize("method", ("to_file", "to_file_like"))
     def test_device_None_respects_default_device(self, tmp_path, method):
         source_decoder = VideoDecoder(str(TEST_SRC_2_720P.path))
@@ -1835,7 +1836,7 @@ def test_device_torch_device_object(self, tmp_path, method):
         )
         assert decoded_frames.shape == frames.shape
 
-    @pytest.mark.needs_cuda
+    @needs_cuda
     @pytest.mark.parametrize("method", ("to_file", "to_file_like"))
     def test_device_cuda_0_string(self, tmp_path, method):
         source_decoder = VideoDecoder(str(TEST_SRC_2_720P.path))
@@ -1862,7 +1863,7 @@ def test_device_cuda_0_string(self, tmp_path, method):
         )
         assert decoded_frames.shape == source_frames.shape
 
-    @pytest.mark.needs_cuda
+    @needs_cuda
     @pytest.mark.parametrize("method", ("to_file", "to_file_like"))
     def test_write_samples_on_cuda_errors(self, tmp_path, method):
         enc, _, open_kwargs = self._create_encoder(method, tmp_path, "wav")
@@ -2058,7 +2059,7 @@ def test_add_audio_and_video_and_encode(self, tmp_path, format, method):
             atol=0.1 if format == "mkv" else 0.01,
         )
 
-    @pytest.mark.needs_cuda
+    @needs_cuda
     @pytest.mark.skipif(in_fbcode(), reason="NVENC not available in fbcode")
     @pytest.mark.parametrize("method", ("to_file", "to_file_like"))
     def test_cuda_video_with_cpu_video_and_cpu_audio(self, tmp_path, method):
@@ -2965,7 +2966,7 @@ def test_pixel_format_errors(self, method, tmp_path):
         ):
             self._open_encoder(enc2, open_kwargs2)
 
-    @pytest.mark.needs_cuda
+    @needs_cuda
     @pytest.mark.skipif(in_fbcode(), reason="NVENC not available in fbcode")
     @pytest.mark.parametrize("method", ("to_file", "to_file_like"))
     def test_pixel_format_gpu_override_errors(self, method, tmp_path):
@@ -3485,7 +3486,7 @@ def test_fragmented_mp4_truncation(self, format, method, tmp_path):
             )
 
     @needs_ffmpeg_cli
-    @pytest.mark.needs_cuda
+    @needs_cuda
     @pytest.mark.skipif(in_fbcode(), reason="NVENC not available in fbcode")
     @pytest.mark.parametrize("method", ("to_file", "to_file_like"))
     @pytest.mark.parametrize(