switch to testB

TomHeaven · Dec 31, 2019 · 34b83d9 · 34b83d9
1 parent 896ded0
commit 34b83d9
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 209 deletions.
diff --git a/continue_ft.sh b/continue_ft.sh
diff --git a/data/datasets/competition1910.py b/data/datasets/competition1910.py
@@ -28,7 +28,7 @@ class Competition1910(ImageDataset):
     # images: 12936 (train) + 3368 (query) + 15913 (gallery)
     """
     dataset_dir = '复赛'
-    test_data_dir = '复赛/测试集A'
+    test_data_dir = '复赛/测试集B'
 
     def __init__(self, root, test_phase=False, fine_tune=False, **kwargs):
         #print('fine_tune', fine_tune)

diff --git a/data_preprocess.py b/data_preprocess.py
@@ -138,15 +138,15 @@ def split_myval(data_dir):
     print('gallery', len(gallery), gallery)
 
 if __name__ == '__main__':
-    data_dir = '/Volumes/Data/比赛/行人重识别2019/data/复赛'
+    data_dir = '../data/复赛'
     list_file = 'train_list.txt'
-    preprocess_train(data_dir, list_file)
-    split_myval(data_dir)
+    #preprocess_train(data_dir, list_file)
+    #split_myval(data_dir)
 
-    data_dir = '/Volumes/Data/比赛/行人重识别2019/data/复赛/测试集A'
-    #preprocess_query(data_dir, sub_dir='query_a')
+    data_dir = '../data/复赛/测试集B'
+    preprocess_query(data_dir, sub_dir='query_b')
 
 
-    data_dir = '/Volumes/Data/比赛/行人重识别2019/data/复赛/测试集A'
-    #preprocess_gallery(data_dir, sub_dir='gallery_a')
+    data_dir = '../data/复赛/测试集B'
+    preprocess_gallery(data_dir, sub_dir='gallery_b')
 
diff --git a/data_preprocess_kfold.py b/data_preprocess_kfold.py
diff --git a/ft_test_resnext101.sh b/ft_test_resnext101.sh
@@ -38,14 +38,6 @@ ln -s -f  /home/tomheaven/比赛/行人重识别2019/data/复赛/测试集A/fine
 sh scripts/ft_resnext101.sh
 sh scripts/test_saving_resnext101.sh
 
-# 4
-echo 'Section 4'
-rm -r /home/tomheaven/比赛/行人重识别2019/data/复赛/测试集A/fine_tune_0.6
-rm /home/tomheaven/比赛/行人重识别2019/data/复赛/测试集A/fine_tune
-python3 prepare_fine_tune_data.py --thresh 0.6
-ln -s -f  /home/tomheaven/比赛/行人重识别2019/data/复赛/测试集A/fine_tune_0.6 /home/tomheaven/比赛/行人重识别2019/data/复赛/测试集A/fine_tune
-sh scripts/ft_resnext101.sh
-sh scripts/test_saving_resnext101.sh
 
 
 

diff --git a/prepare_fine_tune_data.py b/prepare_fine_tune_data.py
@@ -22,13 +22,13 @@ def prepare_fine_tune_data(json_path, dist_path, image_folder, thresh):
         os.mkdir(write_dir)
 
     for idx, query_path in enumerate(tqdm.tqdm(results.keys())):
-        full_query_path = osp.join(image_folder, 'query_a', query_path)
+        full_query_path = osp.join(image_folder, 'query_b', query_path)
         shutil.copy(full_query_path, osp.join(image_folder, f'fine_tune_{thresh:.1f}', str(idx) + '_' + query_path))
 
         for i in range(200):
             if dist_mat[idx][indicies[idx, i]] < thresh:
                 gallery_path = results[query_path][i]
-                img_path = osp.join(image_folder, 'gallery_a', gallery_path)
+                img_path = osp.join(image_folder, 'gallery_b', gallery_path)
                 shutil.copy(img_path, osp.join(image_folder, f'fine_tune_{thresh:.1f}', str(idx) + '_' + gallery_path))
             else:
                 break
@@ -42,7 +42,7 @@ def prepare_fine_tune_data(json_path, dist_path, image_folder, thresh):
     parser.add_argument('--json_path', type=str, help="json_path", default='submit/reid_resnext101_ibn_ft_flip_rerank_cross.json')
     parser.add_argument('--dist_path', type=str, help="dist_path", default='dist_mats/test_resnext101_ibn_ft_flip_rerank_cross.h5')
     parser.add_argument('--image_folder', type=str, help="image_folder",
-                        default='../data/复赛/测试集A')
+                        default='../data/复赛/测试集B')
     parser.add_argument('--thresh', type=float, help="threshold")
     args = parser.parse_args()
 

diff --git a/scripts/test_saving_multiple_model.sh b/scripts/test_saving_multiple_model.sh
@@ -1,12 +1,9 @@
-
 GPUS='0'
 
 CUDA_VISIBLE_DEVICES=$GPUS python3 tools/test_save_res_multi_model.py --test_phase -cfg='configs/softmax_triplet.yml' \
 DATASETS.TEST_NAMES 'competition1910' \
-TEST.DISTMAT1 '/Volumes/Data/比赛/行人重识别2019/dist_mats/sota/baseline_v5.1_distmat.h5' \
-TEST.DISTMAT2 '/Volumes/Data/比赛/行人重识别2019/dist_mats/sota/test_resnet101_ibn_20191218_230227_flip_rerank_both.h5_sorted.h5' \
-TEST.DISTMAT3 '/Volumes/Data/比赛/行人重识别2019/dist_mats/sota/test_resnext101_ibn_20191219_003243_flip_rerank_both.h5_sorted.h5' \
-TEST.DISTMAT4 '/Volumes/Data/比赛/行人重识别2019/dist_mats/sota/test_mgn_resnet50_ibn_20191222_004057_flip_rerank_cross.h5_sorted.h5' \
+TEST.DISTMAT1 'dist_mats/test_resnext101_ibn_ft_flip_rerank_cross.h5' \
+TEST.DISTMAT2 'dist_mats/test_resnet101_ibn_ft_flip_rerank_cross.h5' \
 
 
 

diff --git a/scripts/test_saving_resnet101.sh b/scripts/test_saving_resnet101.sh
@@ -1,4 +1,4 @@
-export CUDA_VISIBLE_DEVICES='0'
+export CUDA_VISIBLE_DEVICES='1'
 
 python3 tools/test_save_res.py --test_phase --fine_tune -cfg='configs/softmax_triplet.yml' \
 DATASETS.TEST_NAMES 'competition1910' \