Merge pull request tensorflow#441 from cshallue/bazel-path

Add Bazel workspace name to fix bug in relative path of shell scripts.
tarasglek · Sep 22, 2016 · 71f239f · 71f239f
2 parents 4203765 + c778f4a
commit 71f239f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/im2txt/WORKSPACE b/im2txt/WORKSPACE
@@ -0,0 +1 @@
+workspace(name = "im2txt")
diff --git a/im2txt/im2txt/data/download_and_preprocess_mscoco.sh b/im2txt/im2txt/data/download_and_preprocess_mscoco.sh
@@ -35,7 +35,7 @@ SCRATCH_DIR="${OUTPUT_DIR}/raw-data"
 mkdir -p "${OUTPUT_DIR}"
 mkdir -p "${SCRATCH_DIR}"
 CURRENT_DIR=$(pwd)
-WORK_DIR="$0.runfiles/__main__/im2txt"
+WORK_DIR="$0.runfiles/im2txt/im2txt"
 
 # Helper function to download and unpack a .zip file.
 function download_and_unzip() {

diff --git a/inception/WORKSPACE b/inception/WORKSPACE
@@ -0,0 +1 @@
+workspace(name = "inception")
diff --git a/inception/inception/data/download_and_preprocess_flowers.sh b/inception/inception/data/download_and_preprocess_flowers.sh
@@ -44,7 +44,7 @@ DATA_DIR="${1%/}"
 SCRATCH_DIR="${DATA_DIR}/raw-data/"
 mkdir -p "${DATA_DIR}"
 mkdir -p "${SCRATCH_DIR}"
-WORK_DIR="$0.runfiles/inception"
+WORK_DIR="$0.runfiles/inception/inception"
 
 # Download the flowers data.
 DATA_URL="http://download.tensorflow.org/example_images/flower_photos.tgz"

diff --git a/inception/inception/data/download_and_preprocess_flowers_mac.sh b/inception/inception/data/download_and_preprocess_flowers_mac.sh
@@ -44,7 +44,7 @@ DATA_DIR="${1%/}"
 SCRATCH_DIR="${DATA_DIR}/raw-data/"
 mkdir -p "${DATA_DIR}"
 mkdir -p "${SCRATCH_DIR}"
-WORK_DIR="$0.runfiles/inception"
+WORK_DIR="$0.runfiles/inception/inception"
 
 # Download the flowers data.
 DATA_URL="http://download.tensorflow.org/example_images/flower_photos.tgz"

diff --git a/inception/inception/data/download_and_preprocess_imagenet.sh b/inception/inception/data/download_and_preprocess_imagenet.sh
@@ -58,7 +58,7 @@ DATA_DIR="${1%/}"
 SCRATCH_DIR="${DATA_DIR}/raw-data/"
 mkdir -p "${DATA_DIR}"
 mkdir -p "${SCRATCH_DIR}"
-WORK_DIR="$0.runfiles/inception"
+WORK_DIR="$0.runfiles/inception/inception"
 
 # Download the ImageNet data.
 LABELS_FILE="${WORK_DIR}/data/imagenet_lsvrc_2015_synsets.txt"