swap

Author: Borda

.azure/gpu-benchmarks.yml

@@ -75,6 +75,13 @@ jobs:
           pip list
         displayName: "Image info & NVIDIA"
 
+      - bash: |
+          pip install -q -r .actions/requirements.txt
+          python .actions/assistant.py copy_replace_imports --source_dir="./tests" \
+            --source_import="lightning.fabric,lightning.pytorch" \
+            --target_import="lightning_fabric,pytorch_lightning"
+        displayName: "Adjust tests"
+
       - bash: pip install -e .[dev] --find-links ${TORCH_URL}
         env:
           FREEZE_REQUIREMENTS: "1"
@@ -86,13 +93,6 @@ jobs:
           python -c "import torch ; mgpu = torch.cuda.device_count() ; assert mgpu == 2, f'GPU: {mgpu}'"
         displayName: "Env details"
 
-      - bash: |
-          pip install -q -r .actions/requirements.txt
-          python .actions/assistant.py copy_replace_imports --source_dir="./tests" \
-            --source_import="lightning.fabric,lightning.pytorch" \
-            --target_import="lightning_fabric,pytorch_lightning"
-        displayName: "Adjust tests"
-
       - bash: python -m pytest parity_$(PACKAGE_NAME) -v --durations=0
         env:
           PL_RUNNING_BENCHMARKS: "1"

.azure/gpu-tests-fabric.yml

@@ -109,6 +109,18 @@ jobs:
           done
         displayName: "Adjust dependencies"
 
+      - bash: |
+          pip install -q -r .actions/requirements.txt
+          python .actions/assistant.py copy_replace_imports --source_dir="./tests/tests_fabric" \
+            --source_import="lightning.fabric" \
+            --target_import="lightning_fabric"
+          python .actions/assistant.py copy_replace_imports --source_dir="./examples/fabric" \
+            --source_import="lightning.fabric" \
+            --target_import="lightning_fabric"
+        # without succeeded this could run even if the job has already failed
+        condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'fabric'))
+        displayName: "Adjust tests & examples"
+
       - bash: |
           set -e
           extra=$(python -c "print({'lightning': 'fabric-'}.get('$(PACKAGE_NAME)', ''))")
@@ -129,18 +141,6 @@ jobs:
         condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'fabric'))
         displayName: "Testing: Fabric doctests"
 
-      - bash: |
-          pip install -q -r .actions/requirements.txt
-          python .actions/assistant.py copy_replace_imports --source_dir="./tests/tests_fabric" \
-            --source_import="lightning.fabric" \
-            --target_import="lightning_fabric"
-          python .actions/assistant.py copy_replace_imports --source_dir="./examples/fabric" \
-            --source_import="lightning.fabric" \
-            --target_import="lightning_fabric"
-        # without succeeded this could run even if the job has already failed
-        condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'fabric'))
-        displayName: "Adjust tests & examples"
-
       - bash: python -m coverage run --source ${COVERAGE_SOURCE} -m pytest tests_fabric/ -v --durations=50
         workingDirectory: tests/
         displayName: "Testing: fabric standard"

.azure/gpu-tests-pytorch.yml

@@ -113,6 +113,17 @@ jobs:
           done
         displayName: "Adjust dependencies"
 
+      - bash: |
+          python .actions/assistant.py copy_replace_imports --source_dir="./tests/tests_pytorch" \
+            --source_import="lightning.fabric,lightning.pytorch" \
+            --target_import="lightning_fabric,pytorch_lightning"
+          python .actions/assistant.py copy_replace_imports --source_dir="./examples/pytorch/basics" \
+            --source_import="lightning.fabric,lightning.pytorch" \
+            --target_import="lightning_fabric,pytorch_lightning"
+        # without succeeded this could run even if the job has already failed
+        condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'pytorch'))
+        displayName: "Adjust tests & examples"
+
       - bash: |
           set -e
           extra=$(python -c "print({'lightning': 'pytorch-'}.get('$(PACKAGE_NAME)', ''))")
@@ -143,17 +154,6 @@ jobs:
         condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'pytorch'))
         displayName: "Testing: PyTorch doctests"
 
-      - bash: |
-          python .actions/assistant.py copy_replace_imports --source_dir="./tests/tests_pytorch" \
-            --source_import="lightning.fabric,lightning.pytorch" \
-            --target_import="lightning_fabric,pytorch_lightning"
-          python .actions/assistant.py copy_replace_imports --source_dir="./examples/pytorch/basics" \
-            --source_import="lightning.fabric,lightning.pytorch" \
-            --target_import="lightning_fabric,pytorch_lightning"
-        # without succeeded this could run even if the job has already failed
-        condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'pytorch'))
-        displayName: "Adjust tests & examples"
-
       - bash: |
           bash .actions/pull_legacy_checkpoints.sh
           cd tests/legacy