Fix datasets for aws and get_coco.sh (#3788)

* merge master

* Update get_coco.sh

data/scripts/get_coco.sh

@@ -8,14 +8,14 @@
 #     /yolov5
 
 # Download/unzip labels
-d='../' # unzip directory
+d='../datasets' # unzip directory
 url=https://github.com/ultralytics/yolov5/releases/download/v1.0/
 f='coco2017labels.zip' # or 'coco2017labels-segments.zip', 68 MB
 echo 'Downloading' $url$f ' ...'
 curl -L $url$f -o $f && unzip -q $f -d $d && rm $f & # download, unzip, remove in background
 
 # Download/unzip images
-d='../coco/images' # unzip directory
+d='../datasets/coco/images' # unzip directory
 url=http://images.cocodataset.org/zips/
 f1='train2017.zip' # 19G, 118k images
 f2='val2017.zip'   # 1G, 5k images

utils/aws/userdata.sh

@@ -10,7 +10,6 @@ if [ ! -d yolov5 ]; then
   git clone https://github.com/ultralytics/yolov5 -b master && sudo chmod -R 777 yolov5
   cd yolov5
   bash data/scripts/get_coco.sh && echo "COCO done." &
-  bash data/scripts/get_voc.sh && echo "VOC done." &
   sudo docker pull ultralytics/yolov5:latest && echo "Docker done." &
   python -m pip install --upgrade pip && pip install -r requirements.txt && python detect.py && echo "Requirements done." &
   wait && echo "All tasks done." # finish background tasks