update contextdesc to newest version

ubc-vision · Jun 2, 2020 · ed6701c · ed6701c
1 parent ebf2f1c
commit ed6701c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -162,9 +162,12 @@ Use environment `hardnet` and download the model weights:
 mkdir third_party/contextdesc/pretrained
 wget https://research.altizure.com/data/contextdesc_models/contextdesc_pp.tar -O third_party/contextdesc/pretrained/contextdesc_pp.tar
 wget https://research.altizure.com/data/contextdesc_models/retrieval_model.tar -O third_party/contextdesc/pretrained/retrieval_model.tar
+wget https://research.altizure.com/data/contextdesc_models/contextdesc_pp_upright.tar -O third_party/contextdesc/pretrained/contextdesc_pp_upright.tar
 tar -C third_party/contextdesc/pretrained/ -xf third_party/contextdesc/pretrained/contextdesc_pp.tar
+tar -C third_party/contextdesc/pretrained/ -xf third_party/contextdesc/pretrained/contextdesc_pp_upright.tar
 tar -C third_party/contextdesc/pretrained/ -xf third_party/contextdesc/pretrained/retrieval_model.tar
 rm third_party/contextdesc/pretrained/contextdesc_pp.tar
+rm third_party/contextdesc/pretrained/contextdesc_pp_upright.tar
 rm third_party/contextdesc/pretrained/retrieval_model.tar
 ```
 Generate the `.yaml` file for ContextDesc:

diff --git a/generate_yaml.py b/generate_yaml.py
@@ -5,6 +5,11 @@
 if not os.path.isdir('yaml'):
     os.makedirs('yaml')
 
+model_dict = {}
+model_dict['contextdesc++'] = 'contextdesc++/model.ckpt-400000'
+model_dict['reg_model'] = 'retrieval_model/model.ckpt-550000'
+model_dict['contextdesc++_upright'] ='contextdesc++_upright/model.ckpt-390000'
+
 parser = argparse.ArgumentParser(description='Geenerate yaml for contextdesc script')
 
 parser.add_argument(
@@ -26,18 +31,29 @@
   help = 'number of keypoints to extract'
   )
 
+parser.add_argument(
+  '--upright',
+  action='store_true',
+  default=False,
+  help = 'number of keypoints to extract'
+  )
+
 args, unparsed = parser.parse_known_args()
 
 dict_file = {}
 dict_file['data_name']='imw2019'
 dict_file['data_split'] =''
 dict_file['data_root'] = args.data_root
-
+dict_file['all_jpeg'] = True
 dict_file['truncate'] = [0, None]
 
 dict_file['pretrained'] = {}
-dict_file['pretrained']['loc_model'] = 'third_party/contextdesc/pretrained/contextdesc++'
-dict_file['pretrained']['reg_model'] = 'third_party/contextdesc/pretrained/retrieval_model'
+dict_file['pretrained']['reg_model'] = 'third_party/contextdesc/pretrained/' + model_dict['reg_model']
+
+if args.upright:
+  dict_file['pretrained']['loc_model'] = 'third_party/contextdesc/pretrained/' + model_dict['contextdesc++_upright']
+else:
+  dict_file['pretrained']['loc_model'] = 'third_party/contextdesc/pretrained/' + model_dict['contextdesc++']
 
 dict_file['reg_feat'] ={}
 dict_file['reg_feat']['infer'] = True
@@ -50,15 +66,17 @@
 dict_file['loc_feat']['n_feature']= args.num_keypoints
 dict_file['loc_feat']['batch_size']= 512
 dict_file['loc_feat']['dense_desc']= False
-dict_file['loc_feat']['peak_thld']= 0
+dict_file['loc_feat']['peak_thld']= -10000
+dict_file['loc_feat']['edge_thld']= -10000
 dict_file['loc_feat']['max_dim']= 1280
-dict_file['loc_feat']['upright']= False
+dict_file['loc_feat']['upright']= args.upright
 dict_file['loc_feat']['scale_diff']= True
 
 dict_file['aug_feat'] = {}
 dict_file['aug_feat']['infer']= True
 dict_file['aug_feat']['overwrite']= False
-dict_file['aug_feat']['quantz']= True
+dict_file['aug_feat']['reg_feat_dim']= 2048
+dict_file['aug_feat']['quantz']= False
 
 dict_file['post_format'] = {}
 dict_file['post_format']['enable'] = True

diff --git a/third_party/contextdesc b/third_party/contextdesc
+20 −5		README.md
+3 −2		configs/aachen_eval.yaml
+37 −0		configs/eth_eval.yaml
+3 −1		configs/example.yaml
+8 −4		configs/hseq_eval.yaml
+4 −3		configs/imw2019_eval.yaml
+38 −0		configs/imw2020_eval.yaml
+36 −0		configs/oxford_eval.yaml
+4 −3		configs/yfcc_eval.yaml
+8 −3		datasets/base_dataset.py
+97 −0		datasets/eth.py
+88 −0		datasets/imw2020.py
+93 −0		datasets/oxford.py
+3 −0		docs/dense_model.md
+5 −8		evaluations.py
+63 −0		evaluations_geodesc.py
+63 −0		evaluations_rootsift.py
+9 −12		hseq_eval.py
+1 −1		image_matching.py
+2 −13		models/aug_model.py
+26 −17		models/base_model.py
+87 −3		models/cnn_wrapper/augdesc.py
+86 −0		models/geodesc_model.py
+3 −5		models/inference_model.py
+8 −6		models/loc_model.py
+1 −1		models/reg_model.py
+38 −0		models/rootsift_model.py
+4 −4		requirements.txt
+4 −4		utils/evaluator.py
+8 −28		utils/hseq_utils.py
+32 −12		utils/opencvhelper.py
+6 −3		utils/tf.py