update for supporting vehicleid

Author: ZHANG Zhiwei

openunreid/apis/test.py

@@ -11,6 +11,7 @@
 
 from .train import set_random_seed
 from openunreid.data import build_test_dataloader
+from openunreid.utils.logger import display
 from ..core.metrics.rank import evaluate_rank
 from ..core.utils.compute_dist import build_dist
 from ..models.utils.dsbn_utils import switch_target_bn
@@ -221,8 +222,11 @@ def final_test(cfg, model, cmc_topk=(1, 5, 10)):
             all_cmc.append(cmc)
             all_mAP.append(mAP)
 
-
-    display(cfg, all_mAP, all_cmc, cmc_topk)
+    if cfg.TRAIN.num_repeat != 1:
+        print("\n ")
+        print("Average CMC Scores:")
+        for k in cmc_topk:
+            print("  top-{:<4}{:12.1%}".format(k, np.mean(all_cmc, axis=0)[k - 1]))
 
     end_time = time.monotonic()
     print("Testing time: ", timedelta(seconds=end_time - start_time))

openunreid/data/datasets/vehicleid.py

@@ -34,6 +34,7 @@ def __init__(
     ):
         self.root = osp.abspath(osp.expanduser(root))
         self.dataset_dir = osp.join(self.root, self.dataset_dir)
+        self.mode = mode
         self.del_labels = del_labels
         self.download_dataset(self.dataset_dir, self.dataset_url)
         assert (val_split > 0.0) and (

openunreid/utils/logger.py

@@ -47,14 +47,14 @@ def close(self):
 
 
 def display(cfg, map, cmc, cmc_topk=(1, 5, 10)):
-    if cfg.TRAIN.num_repeat == 10:
+    if cfg.TRAIN.num_repeat != 1:
         print("\n")
-        print("Mean AP: {:4.1%}".format(np.mean(map)))
         print("CMC Scores:")
         for k in cmc_topk:
-            print("  top-{:<4}{:12.1%}".format(k, np.mean(cmc, axis=0)[k - 1]))
+            print("  top-{:<4}{:12.1%}".format(k, cmc[k - 1]))
     else:
         print("\n")
+        print("Mean AP: {:4.1%}".format(np.mean(map)))
         print("CMC Scores:")
         for k in cmc_topk:
-            print("  top-{:<4}{:12.1%}".format(k, np.mean(cmc, axis=0)[k - 1]))
+            print("  top-{:<4}{:12.1%}".format(k, cmc[k - 1]))

tools/SpCL/config.yaml

@@ -24,8 +24,8 @@ MODEL:
 
 DATA:
 
-  height: 256
-  width: 128
+  height: 224
+  width: 224
   norm_mean: [0.485, 0.456, 0.406]
   norm_std: [0.229, 0.224, 0.225]
 
@@ -57,23 +57,23 @@ TRAIN:
   amp: False
 
   # datasets
-  datasets: {'market1501': 'trainval',}
+  datasets: {'vehicleid': 'trainval',}
   # datasets: {'market1501': 'trainval', 'dukemtmcreid': 'trainval'}
   unsup_dataset_indexes: [0,]
 
   # repeated number of evaluation
   num_repeat: 10     # 10 only for vehicleid dataset, otherwise 1
 
   epochs: 50
-  iters: 400
+  iters: 800
 
   LOSS:
     losses: {'hybrid_memory': 1.,}
     temp: 0.05
     momentum: 0.2
 
   # validate
-  val_dataset: 'market1501'
+  val_dataset: 'vehicleid'
   val_freq: 5
 
   # sampler
@@ -121,7 +121,7 @@ TRAIN:
 TEST:
 
   # datasets
-  datasets: ['market1501',]
+  datasets: ['vehicleid',]
 
   # data loader
   LOADER:

tools/strong_baseline/config.yaml

@@ -24,8 +24,8 @@ MODEL:
 
 DATA:
 
-  height: 256
-  width: 128
+  height: 224
+  width: 224
   norm_mean: [0.485, 0.456, 0.406]
   norm_std: [0.229, 0.224, 0.225]
 
@@ -57,22 +57,22 @@ TRAIN:
   amp: False
 
   # datasets
-  datasets: {'market1501': 'trainval',}
+  datasets: {'vehicleid': 'trainval',}
   # datasets: {'market1501': 'trainval', 'dukemtmcreid': 'trainval'}
   unsup_dataset_indexes: [0,]
 
   # repeated number of evaluation
   num_repeat: 10     # 10 only for vehicleid dataset, otherwise 1
 
   epochs: 50
-  iters: 400
+  iters: 800
 
   LOSS:
     losses: {'cross_entropy': 1., 'softmax_triplet': 1.}
     margin: 0.
 
   # validate
-  val_dataset: 'market1501'
+  val_dataset: 'vehicleid'
   val_freq: 5
 
   # sampler
@@ -118,7 +118,7 @@ TRAIN:
 TEST:
 
   # datasets
-  datasets: ['market1501',]
+  datasets: ['vehicleid',]
 
   # data loader
   LOADER: