Merge branch 'fbopt' of github.com:marrlab/DomainLab into fbopt

marrlab · Oct 2, 2023 · 27e14bd · 27e14bd
2 parents 0fc3585 + 9042ff1
commit 27e14bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/domainlab/algos/trainers/train_fbopt.py b/domainlab/algos/trainers/train_fbopt.py
@@ -137,9 +137,6 @@ def tr_epoch(self, epoch):
                 self.epo_loss_tr = epo_reg_loss
             elif self.aconf.msel_tr_loss =="task":
                 self.epo_loss_tr = epo_task_loss
-            elif self.aconf.msel_tr_loss == "p_loss":
-                epo_p_loss = self.eval_p_loss()
-                self.epo_loss_tr = epo_p_loss
             else:
                 raise RuntimeError("msel_tr_loss set to be the wrong value")
         elif self.aconf.msel == "last" or self.aconf.msel == "val":

diff --git a/domainlab/arg_parser.py b/domainlab/arg_parser.py
@@ -142,8 +142,8 @@ def mk_parser_main():
                         help='model selection for early stop: val, loss_tr, recon, the \
                         elbo and recon only make sense for vae models,\
                         will be ignored by other methods')
-    
-    parser.add_argument('--msel_tr_loss', choices=['reg', 'task', 'ploss'], default="task",
+
+    parser.add_argument('--msel_tr_loss', choices=['reg', 'task'], default="task",
                         help='model selection for tr loss')
 
     parser.add_argument('--aname', metavar="an", type=str,