Resolve merge conflicts and update project structure

viictorjimenezzz · Mar 22, 2024 · 8e1f352 · 8e1f352
2 parents f2fe80f + eb83fe1
commit 8e1f352
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 224 deletions.
diff --git a/.gitignore b/.gitignore
@@ -148,6 +148,7 @@ dmypy.json
 configs/local/default.yaml
 /data/
 /logs/
+/outputs/
 .env
 
 # Aim logging

diff --git a/notebooks/.gitkeep b/notebooks/.gitkeep
diff --git a/scripts/debug_slurm.sh b/scripts/debug_slurm.sh
diff --git a/scripts/eval_adv_pa_logits.sh b/scripts/eval_adv_pa_logits.sh
diff --git a/scripts/pa_trainer.sh b/scripts/pa_trainer.sh
diff --git a/scripts/proves.sh b/scripts/proves.sh
diff --git a/scripts/submit.sh b/scripts/submit.sh
diff --git a/scripts/train_dg_erm_2.sh b/scripts/train_dg_erm_2.sh
diff --git a/scripts/train_dg_erm_old.sh b/scripts/train_dg_erm_old.sh
diff --git a/scripts/train_dg_irm.sh b/scripts/train_dg_irm.sh
diff --git a/scripts/train_dg_lisa.sh b/scripts/train_dg_lisa.sh
diff --git a/scripts/victor_proves.sh b/scripts/victor_proves.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,6 +148,7 @@ dmypy.json @@
     configs/local/default.yaml
     /data/
     /logs/
+    /outputs/
     .env
     # Aim logging
@@ Expand Down @@