Skip to content

Commit 56d174d

Browse files
lizekai-richardlizekai-richard
committed
Fix bugs
1 parent fb9c9d6 commit 56d174d

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎ddranking/metrics/aug_robust.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -528,9 +528,9 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, soft_
528528
with_aug_scores = []
529529
without_aug_scores = []
530530
ars_list = []
531-
seed_list = [0, 1, 42, 1234, 3407]
531+
532532
for i in range(self.num_eval):
533-
set_seed(seed_list[i])
533+
set_seed()
534534
logging(f"================ EVALUATION RUN {i+1}/{self.num_eval} ================")
535535

536536
syn_data_with_aug_acc, best_lr = self._compute_with_aug_metrics_helper(
@@ -541,7 +541,7 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, soft_
541541
lr=syn_lr,
542542
hyper_param_search=True if syn_lr is None else False
543543
)
544-
logging(f"With augmentation acc: {syn_data_with_aug_acc:.2f}% under learning rate {best_lr}")
544+
logging(f"With augmentation acc: {syn_data_with_aug_acc:.2f}%")
545545

546546
random_data_path, random_data_tensors, random_data_hard_labels, random_data_soft_labels = self._get_random_data_helper(eval_iter=i)
547547
random_data_with_aug_acc, best_lr = self._compute_with_aug_metrics_helper(
@@ -552,7 +552,7 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, soft_
552552
lr=None,
553553
hyper_param_search=True
554554
)
555-
logging(f"Without augmentation acc: {random_data_with_aug_acc:.2f}% under learning rate {best_lr}")
555+
logging(f"Without augmentation acc: {random_data_with_aug_acc:.2f}%")
556556

557557
syn_data_without_aug_acc, best_lr = self._compute_without_aug_metrics_helper(
558558
image_tensor=image_tensor,
@@ -562,7 +562,7 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, soft_
562562
lr=syn_lr,
563563
hyper_param_search=True if syn_lr is None else False
564564
)
565-
logging(f"Without augmentation acc: {syn_data_without_aug_acc:.2f}% under learning rate {best_lr}")
565+
logging(f"Without augmentation acc: {syn_data_without_aug_acc:.2f}%")
566566

567567
random_data_without_aug_acc, best_lr = self._compute_without_aug_metrics_helper(
568568
image_tensor=random_data_tensors,
@@ -572,7 +572,7 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, soft_
572572
lr=None,
573573
hyper_param_search=True
574574
)
575-
logging(f"Without augmentation acc: {random_data_without_aug_acc:.2f}% under learning rate {best_lr}")
575+
logging(f"Without augmentation acc: {random_data_without_aug_acc:.2f}%")
576576

577577
with_aug_score = 1.00 * (syn_data_with_aug_acc - random_data_with_aug_acc)
578578
without_aug_score = 1.00 * (syn_data_without_aug_acc - random_data_without_aug_acc)

‎ddranking/metrics/hard_label.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,9 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, hard_
335335
hard_label_recovery = []
336336
improvement_over_random = []
337337
lrs_list = []
338-
seed_list = [0, 1, 42, 1234, 3407]
338+
339339
for i in range(self.num_eval):
340-
set_seed(seed_list[i])
340+
set_seed()
341341
logging(f"================ EVALUATION RUN {i+1}/{self.num_eval} ================")
342342

343343
syn_data_hard_label_acc, best_lr = self._compute_hard_label_metrics_helper(
@@ -348,7 +348,7 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, hard_
348348
mode='syn',
349349
hyper_param_search=True if syn_lr is None else False
350350
)
351-
logging(f"Syn data hard label acc: {syn_data_hard_label_acc:.2f}% under learning rate {best_lr}")
351+
logging(f"Syn data hard label acc: {syn_data_hard_label_acc:.2f}%")
352352

353353
if self.eval_full_data:
354354
full_data_hard_label_acc, best_lr = self._compute_hard_label_metrics_helper(
@@ -359,7 +359,7 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, hard_
359359
mode='real',
360360
hyper_param_search=False
361361
)
362-
logging(f"Full data hard label acc: {full_data_hard_label_acc:.2f}% under learning rate {best_lr}")
362+
logging(f"Full data hard label acc: {full_data_hard_label_acc:.2f}%")
363363
else:
364364
key = f"{self.dataset}-{self.model_name}"
365365
if key not in REAL_DATA_ACC_CACHE:
@@ -375,7 +375,7 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, hard_
375375
mode='syn',
376376
hyper_param_search=True
377377
)
378-
logging(f"Random data hard label acc: {random_data_hard_label_acc:.2f}% under learning rate {best_lr}")
378+
logging(f"Random data hard label acc: {random_data_hard_label_acc:.2f}%")
379379

380380
hlr = 1.00 * (full_data_hard_label_acc - syn_data_hard_label_acc)
381381
ior = 1.00 * (syn_data_hard_label_acc - random_data_hard_label_acc)

‎ddranking/metrics/soft_label.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,9 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, soft_
508508
hard_label_recovery = []
509509
improvement_over_random = []
510510
lrs_list = []
511-
seed_list = [0, 1, 42, 1234, 3407]
511+
512512
for i in range(self.num_eval):
513-
set_seed(seed_list[i])
513+
set_seed()
514514
logging(f"================ EVALUATION RUN {i+1}/{self.num_eval} ================")
515515

516516
syn_data_hard_label_acc, best_lr = self._compute_hard_label_metrics_helper(
@@ -521,7 +521,7 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, soft_
521521
mode='syn',
522522
hyper_param_search=True
523523
)
524-
logging(f"Syn data hard label acc: {syn_data_hard_label_acc:.2f}% under learning rate {best_lr}")
524+
logging(f"Syn data hard label acc: {syn_data_hard_label_acc:.2f}%")
525525

526526
if self.eval_full_data:
527527
full_data_hard_label_acc, best_lr = self._compute_hard_label_metrics_helper(
@@ -532,7 +532,7 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, soft_
532532
mode='real',
533533
hyper_param_search=False
534534
)
535-
logging(f"Full data hard label acc: {full_data_hard_label_acc:.2f}% under learning rate {best_lr}")
535+
logging(f"Full data hard label acc: {full_data_hard_label_acc:.2f}%")
536536
else:
537537
key = f"{self.dataset}-{self.model_name}"
538538
if key not in REAL_DATA_ACC_CACHE:
@@ -546,7 +546,7 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, soft_
546546
lr=syn_lr,
547547
hyper_param_search=True if syn_lr is None else False
548548
)
549-
logging(f"Syn data soft label acc: {syn_data_soft_label_acc:.2f}% under learning rate {best_lr}")
549+
logging(f"Syn data soft label acc: {syn_data_soft_label_acc:.2f}%")
550550

551551
random_data_path, random_data_tensors, random_data_soft_labels = self._get_random_data_helper(eval_iter=i)
552552
random_data_soft_label_acc, best_lr = self._compute_soft_label_metrics_helper(
@@ -556,7 +556,7 @@ def compute_metrics(self, image_tensor: Tensor=None, image_path: str=None, soft_
556556
lr=None,
557557
hyper_param_search=True
558558
)
559-
logging(f"Random data soft label acc: {random_data_soft_label_acc:.2f}% under learning rate {best_lr}")
559+
logging(f"Random data soft label acc: {random_data_soft_label_acc:.2f}%")
560560

561561
hlr = 1.00 * (full_data_hard_label_acc - syn_data_hard_label_acc)
562562
ior = 1.00 * (syn_data_soft_label_acc - random_data_soft_label_acc)

0 commit comments

Comments
 (0)