[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -13,18 +13,18 @@ repos:
       - id: detect-private-key
 
 -   repo: https://github.com/kynan/nbstripout
-    rev: 0.6.1
+    rev: 0.7.1
     hooks:
     -   id: nbstripout
 -   repo: https://github.com/mwouts/jupytext
-    rev: v1.16.0
+    rev: v1.16.4b
     hooks:
     -   id: jupytext
         args: [--sync, --pipe, black]
         additional_dependencies:
             - black==22.6.0 # Matches hook
 -   repo: https://github.com/psf/black
-    rev: 23.12.0
+    rev: 24.8.0
     hooks:
     -   id: black
         args: [--line-length, "100"]

docs/source/solo/utils.rst

@@ -257,4 +257,3 @@ forward
 ~~~~~~~
 .. automethod:: solo.utils.positional_encoding.Summer.forward
    :noindex:
-

main_linear.py

@@ -203,9 +203,9 @@ def main(cfg: DictConfig):
             "logger": wandb_logger if cfg.wandb.enabled else None,
             "callbacks": callbacks,
             "enable_checkpointing": False,
-            "strategy": DDPStrategy(find_unused_parameters=False)
-            if cfg.strategy == "ddp"
-            else cfg.strategy,
+            "strategy": (
+                DDPStrategy(find_unused_parameters=False) if cfg.strategy == "ddp" else cfg.strategy
+            ),
         }
     )
     trainer = Trainer(**trainer_kwargs)

main_pretrain.py

@@ -221,9 +221,9 @@ def main(cfg: DictConfig):
             "logger": wandb_logger if cfg.wandb.enabled else None,
             "callbacks": callbacks,
             "enable_checkpointing": False,
-            "strategy": DDPStrategy(find_unused_parameters=False)
-            if cfg.strategy == "ddp"
-            else cfg.strategy,
+            "strategy": (
+                DDPStrategy(find_unused_parameters=False) if cfg.strategy == "ddp" else cfg.strategy
+            ),
         }
     )
     trainer = Trainer(**trainer_kwargs)

scripts/pretrain/cifar/all4one.yaml

@@ -28,7 +28,7 @@ data:
   dataset: cifar100 # change here for cifar10
   train_path: "./datasets/"
   val_path: "./datasets/"
-  format: "image_folder" 
+  format: "image_folder"
   num_workers: 4
 optimizer:
   name: "lars"

solo/methods/base.py

@@ -389,9 +389,11 @@ def configure_optimizers(self) -> Tuple[List, List]:
         if idxs_no_scheduler:
             partial_fn = partial(
                 static_lr,
-                get_lr=scheduler["scheduler"].get_lr
-                if isinstance(scheduler, dict)
-                else scheduler.get_lr,
+                get_lr=(
+                    scheduler["scheduler"].get_lr
+                    if isinstance(scheduler, dict)
+                    else scheduler.get_lr
+                ),
                 param_group_indexes=idxs_no_scheduler,
                 lrs_to_replace=[self.lr] * len(idxs_no_scheduler),
             )

solo/utils/positional_encodings.py

@@ -100,9 +100,7 @@
         sin_inp_y = torch.einsum("i,j->ij", pos_y, self.inv_freq)
         emb_x = get_emb(sin_inp_x).unsqueeze(1)
         emb_y = get_emb(sin_inp_y)
-        emb = torch.zeros((x, y, self.channels * 2), device=tensor.device).type(
-            tensor.type()
-        )
+        emb = torch.zeros((x, y, self.channels * 2), device=tensor.device).type(tensor.type())
         emb[:, :, : self.channels] = emb_x
         emb[:, :, self.channels : 2 * self.channels] = emb_y
 
@@ -165,9 +163,7 @@
         emb_x = get_emb(sin_inp_x).unsqueeze(1).unsqueeze(1)
         emb_y = get_emb(sin_inp_y).unsqueeze(1)
         emb_z = get_emb(sin_inp_z)
-        emb = torch.zeros((x, y, z, self.channels * 3), device=tensor.device).type(
-            tensor.type()
-        )
+        emb = torch.zeros((x, y, z, self.channels * 3), device=tensor.device).type(tensor.type())
         emb[:, :, :, : self.channels] = emb_x
         emb[:, :, :, self.channels : 2 * self.channels] = emb_y
         emb[:, :, :, 2 * self.channels :] = emb_z