Fix test_nvfp4_tensor.py merge conflict (#2857)

andrewor14 · web-flow · commit 8079abcafb48 · 2025-08-22T18:43:22.000-04:00
Merge conflict between: #2812 #2852
diff --git a/test/prototype/mx_formats/test_nvfp4_tensor.py b/test/prototype/mx_formats/test_nvfp4_tensor.py
@@ -527,7 +527,7 @@ def test_nvfp4_matmul_with_amax(
 
 @pytest.mark.skipif(not torch.cuda.is_available(), reason="CUDA not available")
 @pytest.mark.skipif(
-    not TORCH_VERSION_AT_LEAST_2_8, reason="NVFP4 requires PyTorch 2.8+"
+    not torch_version_at_least("2.8.0"), reason="NVFP4 requires PyTorch 2.8+"
 )
 def test_nvfp4_to_copy():
     from torchao.prototype.mx_formats.nvfp4_tensor import NVFP4Tensor

Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ def test_nvfp4_matmul_with_amax(`
`527`	`527`
`528`	`528`	`@pytest.mark.skipif(not torch.cuda.is_available(), reason="CUDA not available")`
`529`	`529`	`@pytest.mark.skipif(`
`530`		`- not TORCH_VERSION_AT_LEAST_2_8, reason="NVFP4 requires PyTorch 2.8+"`
	`530`	`+ not torch_version_at_least("2.8.0"), reason="NVFP4 requires PyTorch 2.8+"`
`531`	`531`	`)`
`532`	`532`	`def test_nvfp4_to_copy():`
`533`	`533`	`from torchao.prototype.mx_formats.nvfp4_tensor import NVFP4Tensor`