Fixes in Makefile and Readme

Author: vadimkantorov

README.md

@@ -20,13 +20,14 @@ This is a joint work of [Vadim Kantorov](http://vadimkantorov.com), [Maxime Oqua
   $ wigwam install torch hdf5 matio protobuf -DPATH_TO_NVCC="/path/to/cuda/bin/nvcc" -DPATH_TO_CUDNN_SO="/path/to/cudnn/lib64/libcudnn.so"
   $ wigwam install lua-rapidjson lua-hdf5 lua-matio lua-loadcaffe
   ```
-2. Clone this repository and compile the ROI pooling module:
+2. Clone this repository, change the current directory to `contextlocnet`, and compile the ROI pooling module:
 
   ```
   $ git clone https://github.com/vadimkantorov/contextlocnet
-  $ (cd ./contextlocnet/model && luarocks make)
+  $ cd contextlocnet
+  $ (cd ./model && luarocks make)
   ```
-3. Download the [VOC 2007](http://host.robots.ox.ac.uk/pascal/VOC/voc2007/) dataset and Koen van de Sande's [selective search windows](http://koen.me/research/selectivesearch/) for VOC 2007 (optionally download the [VOC 2012](http://host.robots.ox.ac.uk/pascal/VOC/voc2012/) and Rob Girshick's [selective search windows](https://github.com/rbgirshick/fast-rcnn/blob/master/data/scripts/fetch_fast_rcnn_models.sh)) and the [VGG-F](https://gist.github.com/ksimonyan/a32c9063ec8e1118221a) model:
+3. Download the [VOC 2007](http://host.robots.ox.ac.uk/pascal/VOC/voc2007/) dataset and Koen van de Sande's [selective search windows](http://koen.me/research/selectivesearch/) for VOC 2007 and the [VGG-F](https://gist.github.com/ksimonyan/a32c9063ec8e1118221a) model. Optionally download the [VOC 2012](http://host.robots.ox.ac.uk/pascal/VOC/voc2012/) and Rob Girshick's [selective search windows](https://github.com/rbgirshick/fast-rcnn/blob/master/data/scripts/fetch_fast_rcnn_models.sh) by manually downloading [VOC 2012 test data tarball](http://host.robots.ox.ac.uk:8080/eval/downloads/VOC2012test.tar) to `data/common` and then running the second command):
 
   ```
   $ make -f data/common/Makefile download_and_extract_VOC2007 download_VGGF

data/common/Makefile

@@ -2,20 +2,19 @@ DOWNLOADS = ./data/common
 
 download_and_extract_VOC2007:
 	wget -P $(DOWNLOADS) \
+		http://host.robots.ox.ac.uk/pascal/VOC/voc2007/VOCdevkit_08-Jun-2007.tar \
 		http://host.robots.ox.ac.uk/pascal/VOC/voc2007/VOCtrainval_06-Nov-2007.tar \
 		http://host.robots.ox.ac.uk/pascal/VOC/voc2007/VOCtest_06-Nov-2007.tar \
-		http://host.robots.ox.ac.uk/pascal/VOC/voc2007/VOCdevkit_08-Jun-2007.tar \
 		http://koen.me/research/downloads/SelectiveSearchVOC2007trainval.mat \
 		http://koen.me/research/downloads/SelectiveSearchVOC2007test.mat
-	cd $(DOWNLOADS) && for f in *.tar; do tar -xf $$f; done
+	cd $(DOWNLOADS) && for f in VOCdevkit_08-Jun-2007.tar VOCtrainval_06-Nov-2007.tar VOCtest_06-Nov-2007.tar; do tar -xf $$f; done && mv VOCdevkit VOCdevkit_2007
 
 download_and_extract_VOC2012:
 	wget -P $(DOWNLOADS) \
-		http://host.robots.ox.ac.uk:8080/pascal/VOC/voc2012/VOCtrainval_11-May-2012.tar \
-		http://host.robots.ox.ac.uk:8080/eval/downloads/VOC2012test.tar \
 		http://host.robots.ox.ac.uk:8080/pascal/VOC/voc2012/VOCdevkit_18-May-2011.tar \
+		http://host.robots.ox.ac.uk:8080/pascal/VOC/voc2012/VOCtrainval_11-May-2012.tar \
 		http://people.eecs.berkeley.edu/~rbg/fast-rcnn-data/selective_search_data.tgz
-	cd $(DOWNLOADS) && for f in *.tar *.tgz; do tar -xf $$f; done
+	cd $(DOWNLOADS) && for f in VOCdevkit_18-May-2011.tar VOCtrainval_11-May-2012.tar VOC2012test.tar selective_search_data.tgz; do tar -xf $$f; done && mv VOCdevkit VOCdevkit_2012
 
 download_VGGF:
 	wget -P $(DOWNLOADS) \