fix online knn on STL10 (#200)

vturrisi · Dec 1, 2021 · 0ac7b8f · 0ac7b8f
1 parent 95886b6
commit 0ac7b8f
Show file tree

Hide file tree

Showing 83 changed files with 267 additions and 253 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ While the library is self-contained, it is possible to use the models outside of
 * Increased data processing speed by up to 100% using [Nvidia Dali](https://github.com/NVIDIA/DALI).
 * Asymmetric and symmetric augmentations.
 ### Evaluation and logging
-* Online linear evaluation via stop-gradient for easier debugging and prototyping (optionally available for the momentum encoder as well).
+* Online linear evaluation via stop-gradient for easier debugging and prototyping (optionally available for the momentum backbone as well).
 * Online Knn evaluation.
 * Normal offline linear evaluation.
 * All the perks of PyTorch Lightning (mixed precision, gradient accumulation, clipping, automatic logging and much more).
@@ -119,7 +119,7 @@ pip3 install .
 
 ## Training
 
-For pretraining the encoder, follow one of the many bash files in `bash_files/pretrain/`.
+For pretraining the backbone, follow one of the many bash files in `bash_files/pretrain/`.
 
 After that, for offline linear evaluation, follow the examples on `bash_files/linear`.
 

diff --git a/bash_files/linear/imagenet-100/barlow_linear.sh b/bash_files/linear/imagenet-100/barlow_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/linear/imagenet-100/byol_linear.sh b/bash_files/linear/imagenet-100/byol_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/linear/imagenet-100/deepclusterv2_linear.sh b/bash_files/linear/imagenet-100/deepclusterv2_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /data/datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/linear/imagenet-100/dino_linear.sh b/bash_files/linear/imagenet-100/dino_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/linear/imagenet-100/general_linear.sh b/bash_files/linear/imagenet-100/general_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/linear/imagenet-100/mocov2plus_linear.sh b/bash_files/linear/imagenet-100/mocov2plus_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/linear/imagenet-100/nnclr_linear.sh b/bash_files/linear/imagenet-100/nnclr_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/linear/imagenet-100/ressl_linear.sh b/bash_files/linear/imagenet-100/ressl_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/test \

diff --git a/bash_files/linear/imagenet-100/simclr_linear.sh b/bash_files/linear/imagenet-100/simclr_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /data/datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/linear/imagenet-100/simsiam_linear.sh b/bash_files/linear/imagenet-100/simsiam_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/linear/imagenet-100/swav_linear.sh b/bash_files/linear/imagenet-100/swav_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /data/datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/linear/imagenet-100/vibcreg_linear.sh b/bash_files/linear/imagenet-100/vibcreg_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/linear/imagenet-100/vicreg_linear.sh b/bash_files/linear/imagenet-100/vicreg_linear.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/linear/imagenet/byol.sh b/bash_files/linear/imagenet/byol.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_linear.py \
     --dataset imagenet \
-    --encoder resnet50 \
+    --backbone resnet50 \
     --data_dir /datasets \
     --train_dir ILSVRC2012/train \
     --val_dir ILSVRC2012/val \

diff --git a/bash_files/pretrain/cifar/barlow.sh b/bash_files/pretrain/cifar/barlow.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir ./datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/byol.sh b/bash_files/pretrain/cifar/byol.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir ./datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/deepclusterv2.sh b/bash_files/pretrain/cifar/deepclusterv2.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir ./datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/dino.sh b/bash_files/pretrain/cifar/dino.sh
@@ -1,6 +1,6 @@
 python3 ../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir ./datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/mocov2plus.sh b/bash_files/pretrain/cifar/mocov2plus.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/nnbyol.sh b/bash_files/pretrain/cifar/nnbyol.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir ./datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/nnclr.sh b/bash_files/pretrain/cifar/nnclr.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/nnsiam.sh b/bash_files/pretrain/cifar/nnsiam.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir ./datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/ressl.sh b/bash_files/pretrain/cifar/ressl.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir ./datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/simclr.sh b/bash_files/pretrain/cifar/simclr.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/simsiam.sh b/bash_files/pretrain/cifar/simsiam.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir ./datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/swav.sh b/bash_files/pretrain/cifar/swav.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir ./datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/vibcreg.sh b/bash_files/pretrain/cifar/vibcreg.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir ./datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/vicreg.sh b/bash_files/pretrain/cifar/vicreg.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir ./datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/cifar/wmse.sh b/bash_files/pretrain/cifar/wmse.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset $1 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir ./datasets \
     --max_epochs 1000 \
     --gpus 0 \

diff --git a/bash_files/pretrain/custom/byol.sh b/bash_files/pretrain/custom/byol.sh
@@ -4,7 +4,7 @@
 # --dali flag is also supported
 python3 ../../../main_pretrain.py \
     --dataset custom \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir PATH_TO_DIR \
     --train_dir PATH_TO_TRAIN_DIR \
     --no_labels \

diff --git a/bash_files/pretrain/imagenet-100/barlow.sh b/bash_files/pretrain/imagenet-100/barlow.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/byol.sh b/bash_files/pretrain/imagenet-100/byol.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/deepclusterv2.sh b/bash_files/pretrain/imagenet-100/deepclusterv2.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/dino.sh b/bash_files/pretrain/imagenet-100/dino.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/dino_vit.sh b/bash_files/pretrain/imagenet-100/dino_vit.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder vit_tiny \
+    --backbone vit_tiny \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/test \

diff --git a/bash_files/pretrain/imagenet-100/mocov2plus.sh b/bash_files/pretrain/imagenet-100/mocov2plus.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/multicrop/byol.sh b/bash_files/pretrain/imagenet-100/multicrop/byol.sh
@@ -1,7 +1,7 @@
 # multicrop byol
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/nnclr.sh b/bash_files/pretrain/imagenet-100/nnclr.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/ressl.sh b/bash_files/pretrain/imagenet-100/ressl.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/simclr.sh b/bash_files/pretrain/imagenet-100/simclr.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \
@@ -37,7 +37,7 @@ python3 ../../../main_pretrain.py \
 
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \
@@ -75,7 +75,7 @@ python3 ../../../main_pretrain.py \
 
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/simsiam.sh b/bash_files/pretrain/imagenet-100/simsiam.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/swav.sh b/bash_files/pretrain/imagenet-100/swav.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/vibcreg.sh b/bash_files/pretrain/imagenet-100/vibcreg.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/vicreg.sh b/bash_files/pretrain/imagenet-100/vicreg.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/val \

diff --git a/bash_files/pretrain/imagenet-100/wmse.sh b/bash_files/pretrain/imagenet-100/wmse.sh
@@ -1,6 +1,6 @@
 python3 ../../../main_pretrain.py \
     --dataset imagenet100 \
-    --encoder resnet18 \
+    --backbone resnet18 \
     --data_dir /datasets \
     --train_dir imagenet-100/train \
     --val_dir imagenet-100/test \