Fix more issues with integration tests

conf/bigearthnet.yaml

@@ -1,5 +1,6 @@
 trainer:
-  gpus: 1
+  accelerator: gpu
+  devices: 1
   min_epochs: 10
   max_epochs: 40
   benchmark: True

conf/byol.yaml

@@ -1,5 +1,6 @@
 trainer:
-  gpus: 1
+  accelerator: gpu
+  devices: 1
   min_epochs: 20
   max_epochs: 100
   benchmark: True

conf/chesapeake_cvpr.yaml

@@ -1,5 +1,6 @@
 trainer:
-  gpus: 1
+  accelerator: gpu
+  devices: 1
   min_epochs: 20
   max_epochs: 100
   benchmark: True

conf/cowc_counting.yaml

@@ -1,5 +1,6 @@
 trainer:
-  gpus: 1
+  accelerator: gpu
+  devices: 1
   min_epochs: 15
 experiment:
   task: cowc_counting

conf/cyclone.yaml

@@ -1,5 +1,6 @@
 trainer:
-  gpus: 1
+  accelerator: gpu
+  devices: 1
   min_epochs: 15
 experiment:
   task: "cyclone"

conf/inria.yaml

@@ -1,9 +1,9 @@
 program:
   overwrite: True
 
-
 trainer:
-  gpus: 1
+  accelerator: gpu
+  devices: 1
   min_epochs: 5
   max_epochs: 100
   benchmark: True

conf/landcoverai.yaml

@@ -1,5 +1,6 @@
 trainer:
-  gpus: 1
+  accelerator: gpu
+  devices: 1
   min_epochs: 20
   max_epochs: 100
   benchmark: True

conf/nasa_marine_debris.yaml

@@ -2,7 +2,8 @@ program:
   overwrite: True
 
 trainer:
-  gpus: 1
+  accelerator: gpu
+  devices: 1
   min_epochs: 5
   max_epochs: 100
   auto_lr_find: False

conf/resisc45.yaml

@@ -1,5 +1,6 @@
 trainer:
-  gpus: 1
+  accelerator: gpu
+  devices: 1
   min_epochs: 10
   max_epochs: 40
   benchmark: True

conf/so2sat.yaml

@@ -1,5 +1,6 @@
 trainer:
-  gpus: 1
+  accelerator: gpu
+  devices: 1
   min_epochs: 10
   max_epochs: 40
   benchmark: True

conf/spacenet1.yaml

@@ -1,7 +1,8 @@
 program:
   overwrite: False
 trainer:
-  gpus: [3]
+  accelerator: gpu
+  devices: 3
   min_epochs: 50
   max_epochs: 200
   benchmark: True

pyproject.toml

@@ -93,6 +93,8 @@ filterwarnings = [
     # https://github.com/scikit-image/scikit-image/issues/6663
     # https://github.com/scikit-image/scikit-image/pull/6637
     "ignore:`np.bool8` is a deprecated alias for `np.bool_`.:DeprecationWarning:skimage.util.dtype",
+    # https://github.com/lanpa/tensorboardX/pull/677
+    "ignore:ANTIALIAS is deprecated and will be removed in Pillow 10:DeprecationWarning:tensorboardX.summary",
 
     # Expected warnings
     # pytorch-lightning warns us about using num_workers=0, but it's faster on macOS

tests/test_train.py

@@ -72,7 +72,7 @@ def test_overwrite_experiment_dir(tmp_path: Path) -> None:
         "experiment.datamodule.root=" + data_dir,
         "program.overwrite=True",
         "trainer.fast_dev_run=1",
-        "trainer.gpus=0",
+        "trainer.accelerator=cpu",
     ]
     ps = subprocess.run(args, capture_output=True, check=True)
     assert re.search(
@@ -129,7 +129,7 @@ experiment:
     root: {data_dir}
 trainer:
   fast_dev_run: true
-  gpus: 0
+  accelerator: cpu
 """
     )
     args = [sys.executable, "train.py", "config_file=" + str(config_file)]