convert to xfail

Author: awaelchli

tests/tests_fabric/plugins/precision/test_amp_integration.py

@@ -40,7 +40,7 @@ def forward(self, x):
         return output
 
 
-@pytest.mark.skipif(
+@pytest.mark.xfail(
     # https://github.com/pytorch/pytorch/issues/116056
     sys.platform == "win32" and _TORCH_GREATER_EQUAL_2_2,
     reason="Windows + DDP issue in PyTorch 2.2",

tests/tests_fabric/strategies/launchers/test_multiprocessing_integration.py

@@ -31,7 +31,7 @@ def __init__(self):
         self.register_buffer("buffer", torch.ones(3))
 
 
-@pytest.mark.skipif(
+@pytest.mark.xfail(
     # https://github.com/pytorch/pytorch/issues/116056
     sys.platform == "win32" and _TORCH_GREATER_EQUAL_2_2,
     reason="Windows + DDP issue in PyTorch 2.2",

tests/tests_fabric/strategies/test_ddp_integration.py

@@ -28,7 +28,7 @@
 from tests_fabric.test_fabric import BoringModel
 
 
-@pytest.mark.skipif(
+@pytest.mark.xfail(
     # https://github.com/pytorch/pytorch/issues/116056
     sys.platform == "win32" and _TORCH_GREATER_EQUAL_2_2,
     reason="Windows + DDP issue in PyTorch 2.2",

tests/tests_fabric/strategies/test_fsdp_integration.py

@@ -22,7 +22,9 @@
 from lightning.fabric import Fabric
 from lightning.fabric.plugins import FSDPPrecision
 from lightning.fabric.strategies import FSDPStrategy
-from lightning.fabric.utilities.imports import _TORCH_GREATER_EQUAL_2_0, _TORCH_GREATER_EQUAL_2_1
+from lightning.fabric.utilities.imports import (
+    _TORCH_GREATER_EQUAL_2_0, _TORCH_GREATER_EQUAL_2_1, _TORCH_GREATER_EQUAL_2_2
+)
 from lightning.fabric.utilities.load import _load_distributed_checkpoint
 from lightning.fabric.wrappers import _FabricOptimizer
 from torch.distributed.fsdp import FlatParameter, FullyShardedDataParallel, OptimStateKeyType
@@ -560,7 +562,8 @@ def test_clip_gradients(clip_type, precision):
     optimizer.zero_grad()
 
 
-@RunIf(min_cuda_gpus=2, standalone=True, min_torch="2.1.0")
+@pytest.mark.xfail(_TORCH_GREATER_EQUAL_2_2, reason="Checkpoint consolidation not supported with PyTorch >= 2.2")
+@RunIf(min_cuda_gpus=2, standalone=True, min_torch="2.1.0", max_torch="2.2.0")
 def test_save_sharded_and_consolidate_and_load(tmp_path):
     """Test the consolidation of a FSDP-sharded checkpoint into a single file."""
 

tests/tests_fabric/utilities/test_distributed.py

@@ -120,7 +120,7 @@ def test_collective_operations(devices, process):
     spawn_launch(process, devices)
 
 
-@pytest.mark.skipif(
+@pytest.mark.xfail(
     # https://github.com/pytorch/pytorch/issues/116056
     sys.platform == "win32" and _TORCH_GREATER_EQUAL_2_2,
     reason="Windows + DDP issue in PyTorch 2.2",

tests/tests_fabric/utilities/test_spike.py

@@ -29,7 +29,7 @@ def spike_detection_test(fabric, global_rank_spike, spike_value, should_raise):
             )
 
 
-@pytest.mark.skipif(
+@pytest.mark.xfail(
     # https://github.com/pytorch/pytorch/issues/116056
     sys.platform == "win32" and _TORCH_GREATER_EQUAL_2_2,
     reason="Windows + DDP issue in PyTorch 2.2",