Merge pull request #4389 from sbrodehl/dev-catcherror

Catch errors during mkdirs, prevent duplicated download

research/inception/inception/data/download_imagenet.sh

@@ -59,9 +59,8 @@ wget "${BOUNDING_BOX_ANNOTATIONS}" -O "${BBOX_TAR_BALL}" || BASE_URL_CHANGE=1
 if [ $BASE_URL_CHANGE ]; then
   BASE_URL="http://www.image-net.org/challenges/LSVRC/2012/nnoupb"
   BOUNDING_BOX_ANNOTATIONS="${BASE_URL}/ILSVRC2012_bbox_train_v2.tar.gz"
-  BBOX_TAR_BALL="${BBOX_DIR}/annotations.tar.gz"
+  wget "${BOUNDING_BOX_ANNOTATIONS}" -O "${BBOX_TAR_BALL}"
 fi
-wget "${BOUNDING_BOX_ANNOTATIONS}" -O "${BBOX_TAR_BALL}"
 echo "Uncompressing bounding box annotations ..."
 tar xzf "${BBOX_TAR_BALL}" -C "${BBOX_DIR}"
 

research/inception/inception/data/preprocess_imagenet_validation_data.py

@@ -49,6 +49,7 @@ from __future__ import division
 from __future__ import print_function
 
 import os
+import errno
 import os.path
 import sys
 
@@ -69,7 +70,13 @@ if __name__ == '__main__':
   # Make all sub-directories in the validation data dir.
   for label in unique_labels:
     labeled_data_dir = os.path.join(data_dir, label)
-    os.makedirs(labeled_data_dir)
+    # Catch error if sub-directory exists
+    try:
+      os.makedirs(labeled_data_dir)
+    except OSError as e:
+      # Raise all errors but 'EEXIST'
+      if e.errno != errno.EEXIST:
+        raise
 
   # Move all of the image to the appropriate sub-directory.
   for i in range(len(labels)):