aboutsummaryrefslogtreecommitdiffhomepage
path: root/WORKSPACE
diff options
context:
space:
mode:
authorGravatar Shanqing Cai <cais@google.com>2017-01-08 20:31:30 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2017-01-08 20:47:05 -0800
commitefd40e5b73a08525909cbee036df44205e839c0d (patch)
tree1d9ba170bb277e43ee1219b0f1b122afb0fc17a6 /WORKSPACE
parentbbdf8811ce81166b3e46c05ceddaa255bf869ef6 (diff)
Merge changes from github.
Change: 143922699
Diffstat (limited to 'WORKSPACE')
-rw-r--r--WORKSPACE12
1 files changed, 7 insertions, 5 deletions
diff --git a/WORKSPACE b/WORKSPACE
index 8c16fdee93..9d3622878c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,5 +1,12 @@
workspace(name = "org_tensorflow")
+load("//tensorflow:workspace.bzl", "check_version", "tf_workspace")
+
+# We must check the bazel version before trying to parse any other BUILD files,
+# in case the parsing of those build files depends on the bazel version we
+# require here.
+check_version("0.4.2")
+
# Uncomment and update the paths in these entries to build the Android demo.
#android_sdk_repository(
# name = "androidsdk",
@@ -15,13 +22,8 @@ workspace(name = "org_tensorflow")
# api_level=21)
# Please add all new TensorFlow dependencies in workspace.bzl.
-load("//tensorflow:workspace.bzl", "tf_workspace")
tf_workspace()
-# Specify the minimum required bazel version.
-load("//tensorflow:tensorflow.bzl", "check_version")
-check_version("0.4.2")
-
new_http_archive(
name = "inception5h",
build_file = "models.BUILD",