Merge branch 'main' of github.com:pytorch/torchcodec into center_crop

scotts · scotts · commit e889c595b090 · 2025-12-04T06:04:36.000-08:00
diff --git a/test/test_transform_ops.py b/test/test_transform_ops.py
@@ -154,6 +154,7 @@ def test_resize_fails(self):
                 transforms=[torchcodec.transforms.Resize(size=(100, 100, 100))],
             )
 
+<<<<<<< HEAD
     @pytest.mark.parametrize(
         "height_scaling_factor, width_scaling_factor",
         ((0.5, 0.5), (0.25, 0.1), (1.0, 1.0), (0.15, 0.75)),
@@ -209,6 +210,8 @@ def test_center_crop_fails(self):
                 transforms=[torchcodec.transforms.CenterCrop(size=(100,))],
             )
 
+=======
+>>>>>>> 1b13e58cf75033a8e7bd3a8974cf126af603f226
     @pytest.mark.parametrize(
         "height_scaling_factor, width_scaling_factor",
         ((0.5, 0.5), (0.25, 0.1), (1.0, 1.0), (0.15, 0.75)),

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ def test_resize_fails(self):`
`154`	`154`	`transforms=[torchcodec.transforms.Resize(size=(100, 100, 100))],`
`155`	`155`	`)`
`156`	`156`
	`157`	`+<<<<<<< HEAD`
`157`	`158`	`@pytest.mark.parametrize(`
`158`	`159`	`"height_scaling_factor, width_scaling_factor",`
`159`	`160`	`((0.5, 0.5), (0.25, 0.1), (1.0, 1.0), (0.15, 0.75)),`
`@@ -209,6 +210,8 @@ def test_center_crop_fails(self):`
`209`	`210`	`transforms=[torchcodec.transforms.CenterCrop(size=(100,))],`
`210`	`211`	`)`
`211`	`212`
	`213`	`+=======`
	`214`	`+>>>>>>> 1b13e58cf75033a8e7bd3a8974cf126af603f226`
`212`	`215`	`@pytest.mark.parametrize(`
`213`	`216`	`"height_scaling_factor, width_scaling_factor",`
`214`	`217`	`((0.5, 0.5), (0.25, 0.1), (1.0, 1.0), (0.15, 0.75)),`