Renamed 'adversarial_attack_linear' -> 'adversarial_attack'

PierreMarza · PierreMarza · commit af296e693079 · 2025-06-04T12:04:52.000+02:00
diff --git a/src/thunder/benchmark.py b/src/thunder/benchmark.py
@@ -24,7 +24,7 @@ def benchmark(
     where options are:
         - dataset: *bach*, *bracs*, *break_his*, *ccrcc*, *crc*, *esca*, *mhist*, *ocelot*, *pannuke*, *patch_camelyon*, *segpath_epithelial*, *segpath_lymphocytes*, *tcga_crc_msi*, *tcga_tils*, *tcga_uniform*, *wilds*
         - model: *hiboub*, *hiboul*, *hoptimus0*, *hoptimus1*, *midnight*, *phikon*, *phikon2*, *uni*, *uni2h*, *virchow*, *virchow2*, *conch*, *titan*, *keep*, *musk*, *plip*, *quiltnetb32*, *dinov2base*, *dinov2large*, *vitbasepatch16224in21k*, *vitlargepatch16224in21k*, *clipvitbasepatch32*, *clipvitlargepatch14*
-        - task: *adversarial_attack_linear*, *alignment_scoring*, *image_retrieval*, *knn*, *linear_probing*, *pre_computing_embeddings*, *segmentation*, *simple_shot*, *transformation_invariance*
+        - task: *adversarial_attack*, *alignment_scoring*, *image_retrieval*, *knn*, *linear_probing*, *pre_computing_embeddings*, *segmentation*, *simple_shot*, *transformation_invariance*
         - loading_mode: *online_loading*, *image_pre_loading*, *embedding_pre_loading*
 
     Args:
@@ -92,7 +92,7 @@ def run_benchmark(cfg: DictConfig, model_cls: Callable = None) -> None:
     import wandb
     from omegaconf import OmegaConf
 
-    from .tasks.adversarial_attack_linear import adversarial_attack_linear
+    from .tasks.adversarial_attack import adversarial_attack
     from .tasks.alignment_scoring import alignment_scoring
     from .tasks.image_retrieval import image_retrieval
     from .tasks.knn_classification import knn
@@ -344,8 +344,8 @@ def run_benchmark(cfg: DictConfig, model_cls: Callable = None) -> None:
             wandb_base_folder,
             res_folder,
         )
-    elif task_type == "adversarial_attack_linear":
-        adversarial_attack_linear(
+    elif task_type == "adversarial_attack":
+        adversarial_attack(
             cfg,
             dataset_name,
             model_name,
diff --git a/src/thunder/config/dataset/bach.yaml b/src/thunder/config/dataset/bach.yaml
@@ -1,7 +1,7 @@
 dataset_name: bach
 nb_classes: 4
 base_data_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/datasets/
-compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack_linear"]
+compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack"]
 nb_train_samples: 218
 nb_val_samples: 50
 nb_test_samples: 132
diff --git a/src/thunder/config/dataset/bracs.yaml b/src/thunder/config/dataset/bracs.yaml
@@ -1,7 +1,7 @@
 dataset_name: bracs
 nb_classes: 7
 base_data_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/datasets/
-compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "adversarial_attack_linear"]
+compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "adversarial_attack"]
 nb_train_samples: 3657 
 nb_val_samples: 312
 nb_test_samples: 570
diff --git a/src/thunder/config/dataset/break_his.yaml b/src/thunder/config/dataset/break_his.yaml
@@ -1,7 +1,7 @@
 dataset_name: break_his
 nb_classes: 4
 base_data_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/datasets/
-compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack_linear"]
+compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack"]
 nb_train_samples: 936
 nb_val_samples: 196 
 nb_test_samples: 339
diff --git a/src/thunder/config/dataset/ccrcc.yaml b/src/thunder/config/dataset/ccrcc.yaml
@@ -1,7 +1,7 @@
 dataset_name: ccrcc
 nb_classes: 3
 base_data_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/datasets/
-compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack_linear"]
+compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack"]
 nb_train_samples: 16797
 nb_val_samples: 4298
 nb_test_samples: 6074
diff --git a/src/thunder/config/dataset/crc.yaml b/src/thunder/config/dataset/crc.yaml
@@ -1,7 +1,7 @@
 dataset_name: crc
 nb_classes: 9
 base_data_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/datasets/
-compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack_linear"]
+compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack"]
 nb_train_samples: 80000
 nb_val_samples: 20000
 nb_test_samples: 7180
diff --git a/src/thunder/config/dataset/esca.yaml b/src/thunder/config/dataset/esca.yaml
@@ -1,7 +1,7 @@
 dataset_name: esca
 nb_classes: 11
 base_data_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/datasets/
-compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack_linear"]
+compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack"]
 nb_train_samples: 154438
 nb_val_samples: 34704
 nb_test_samples: 178187
diff --git a/src/thunder/config/dataset/mhist.yaml b/src/thunder/config/dataset/mhist.yaml
@@ -1,7 +1,7 @@
 dataset_name: mhist
 nb_classes: 2
 base_data_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/datasets/
-compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack_linear"]
+compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack"]
 nb_train_samples: 1743
 nb_val_samples: 432
 nb_test_samples: 977
diff --git a/src/thunder/config/dataset/patch_camelyon.yaml b/src/thunder/config/dataset/patch_camelyon.yaml
@@ -1,7 +1,7 @@
 dataset_name: patch_camelyon
 nb_classes: 2
 base_data_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/datasets/
-compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack_linear"]
+compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack"]
 nb_train_samples: 262144
 nb_val_samples: 32768
 nb_test_samples: 32768
diff --git a/src/thunder/config/dataset/tcga_crc_msi.yaml b/src/thunder/config/dataset/tcga_crc_msi.yaml
@@ -1,7 +1,7 @@
 dataset_name: tcga_crc_msi
 nb_classes: 2
 base_data_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/datasets/
-compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack_linear"]
+compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack"]
 nb_train_samples: 14762
 nb_val_samples: 4795
 nb_test_samples: 32361
diff --git a/src/thunder/config/dataset/tcga_tils.yaml b/src/thunder/config/dataset/tcga_tils.yaml
@@ -1,7 +1,7 @@
 dataset_name: tcga_tils
 nb_classes: 2
 base_data_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/datasets/
-compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack_linear"]
+compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack"]
 nb_train_samples: 209221
 nb_val_samples: 38601
 nb_test_samples: 56275
diff --git a/src/thunder/config/dataset/tcga_uniform.yaml b/src/thunder/config/dataset/tcga_uniform.yaml
@@ -1,7 +1,7 @@
 dataset_name: tcga_uniform
 nb_classes: 32
 base_data_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/datasets/
-compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack_linear"]
+compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack"]
 nb_train_samples: 170840
 nb_val_samples: 44670
 nb_test_samples: 56200
diff --git a/src/thunder/config/dataset/wilds.yaml b/src/thunder/config/dataset/wilds.yaml
@@ -1,7 +1,7 @@
 dataset_name: wilds
 nb_classes: 2
 base_data_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/datasets/
-compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack_linear"]
+compatible_tasks: ["alignment_scoring",  "embedding_space_visualization", "emir", "image_retrieval", "knn", "knn_ensembling", "linear_probing", "pre_computing_embeddings", "simple_shot", "transformation_invariance", "adversarial_attack"]
 nb_train_samples: 302436
 nb_val_samples: 34904
 nb_test_samples: 85054
diff --git a/src/thunder/config/task/adversarial_attack.yaml b/src/thunder/config/task/adversarial_attack.yaml
@@ -1,4 +1,4 @@
-type: adversarial_attack_linear
+type: adversarial_attack
 compatible_adaptation_types: ["frozen"]
 base_embeddings_folder: ${oc.env:THUNDER_BASE_DATA_FOLDER}/embeddings/
 pre_comp_emb_batch_size: 128
diff --git a/src/thunder/tasks/adversarial_attack.py b/src/thunder/tasks/adversarial_attack.py
@@ -32,7 +32,7 @@ def _pil_from_any(img):
     return img
 
 
-def adversarial_attack_linear(
+def adversarial_attack(
     cfg: DictConfig,
     dataset_name: str,
     model_name: str,
diff --git a/src/thunder/utils/results.py b/src/thunder/utils/results.py
@@ -3,7 +3,7 @@
 METRICS = ["accuracy", "balanced_accuracy", "f1", "jaccard", "roc_auc"]
 
 TASK2CATS = {
-    "adversarial_attack_linear": ["adversarial", "clean"],
+    "adversarial_attack": ["adversarial", "clean"],
     "simple_shot": ["1", "2", "4", "8", "16"],
     "image_retrieval": ["1", "3", "5", "10"],
 }
@@ -107,5 +107,5 @@ def gather_results():
     df.to_csv(os.path.join(results_dir, "results.csv"), index=False)
     print("Saved at:", os.path.join(results_dir, "results.csv"))
     print(
-        "The setting column corresponds to: (i) Adversarial/Clean for adversarial_attack_linear, (ii) nb shots for simple_shot, (iii) k for image_retrieval."
+        "The setting column corresponds to: (i) Adversarial/Clean for adversarial_attack, (ii) nb shots for simple_shot, (iii) k for image_retrieval."
     )
