diff options
Diffstat (limited to 'tensorflow/workspace.bzl')
-rw-r--r-- | tensorflow/workspace.bzl | 71 |
1 files changed, 43 insertions, 28 deletions
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 71e4b8f5bb..c2f42ba0c5 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -3,9 +3,12 @@ load("//third_party/gpus:cuda_configure.bzl", "cuda_configure") load("//third_party/sycl:sycl_configure.bzl", "sycl_configure") load("//third_party/mkl:build_defs.bzl", "mkl_repository") -load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", "java_import_external") +load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", + "java_import_external") load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external") load("//third_party/py:python_configure.bzl", "python_configure") +load("//third_party/toolchains/cpus/arm:arm_compiler_configure.bzl", + "arm_compiler_configure") def _is_windows(repository_ctx): @@ -83,7 +86,6 @@ temp_workaround_http_archive = repository_rule( }, ) - # Executes specified command with arguments and calls 'fail' if it exited with # non-zero code def _execute_and_check_ret_code(repo_ctx, cmd_and_args): @@ -142,6 +144,12 @@ def tf_workspace(path_prefix="", tf_repo_name=""): sycl_configure(name="local_config_sycl") python_configure(name="local_config_python") + # Point //external/local_config_arm_compiler to //external/arm_compiler + arm_compiler_configure( + name="local_config_arm_compiler", + remote_config_repo="../arm_compiler", + build_file = str(Label("//third_party/toolchains/cpus/arm:BUILD"))) + mkl_repository( name = "mkl", urls = [ @@ -170,6 +178,17 @@ def tf_workspace(path_prefix="", tf_repo_name=""): ) native.new_http_archive( + name = "arm_compiler", + build_file = str(Label("//:arm_compiler.BUILD")), + sha256 = "970285762565c7890c6c087d262b0a18286e7d0384f13a37786d8521773bc969", + strip_prefix = "tools-0e906ebc527eab1cdbf7adabff5b474da9562e9f/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf", + urls = [ + "http://mirror.bazel.build/github.com/raspberrypi/tools/archive/0e906ebc527eab1cdbf7adabff5b474da9562e9f.tar.gz", + "https://github.com/raspberrypi/tools/archive/0e906ebc527eab1cdbf7adabff5b474da9562e9f.tar.gz", + ], + ) + + native.new_http_archive( name = "libxsmm_archive", urls = [ "http://mirror.bazel.build/github.com/hfp/libxsmm/archive/1.8.1.tar.gz", @@ -339,7 +358,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""): ) patched_http_archive( - name = "protobuf", + name = "protobuf_archive", urls = [ "https://github.com/google/protobuf/archive/0b059a3d8a8f8aa40dde7bea55edca4ec5dfea66.tar.gz", "http://mirror.bazel.build/github.com/google/protobuf/archive/0b059a3d8a8f8aa40dde7bea55edca4ec5dfea66.tar.gz", @@ -353,6 +372,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""): patch_file = str(Label("//third_party/protobuf:add_noinlines.patch")), ) + native.bind( + name = "protobuf", + actual = "@protobuf_archive//:protobuf", + ) + # We need to import the protobuf library under the names com_google_protobuf # and com_google_protobuf_cc to enable proto_library support in bazel. # Unfortunately there is no way to alias http_archives at the moment. @@ -451,23 +475,30 @@ def tf_workspace(path_prefix="", tf_repo_name=""): # to point to the protobuf's compiler library. native.bind( name = "protobuf_clib", - actual = "@protobuf//:protoc_lib", + actual = "@protobuf_archive//:protoc_lib", ) native.bind( - name = "protobuf_compiler", - actual = "@protobuf//:protoc_lib", + name = "libssl", + actual = "@boringssl//:ssl", ) - native.new_http_archive( + # gRPC has includes directly from their third_party path for nanopb, so we + # must depend on their version of it. + native.bind( + name = "nanopb", + actual = "@grpc//third_party/nanopb:nanopb", + ) + + patched_http_archive( name = "grpc", urls = [ - "http://mirror.bazel.build/github.com/grpc/grpc/archive/d7ff4ff40071d2b486a052183e3e9f9382afb745.tar.gz", - "https://github.com/grpc/grpc/archive/d7ff4ff40071d2b486a052183e3e9f9382afb745.tar.gz", + "http://mirror.bazel.build/github.com/grpc/grpc/archive/781fd6f6ea03645a520cd5c675da67ab61f87e4b.tar.gz", + "https://github.com/grpc/grpc/archive/781fd6f6ea03645a520cd5c675da67ab61f87e4b.tar.gz", ], - sha256 = "a15f352436ab92c521b1ac11e729e155ace38d0856380cf25048c5d1d9ba8e31", - strip_prefix = "grpc-d7ff4ff40071d2b486a052183e3e9f9382afb745", - build_file = str(Label("//third_party:grpc.BUILD")), + sha256 = "2004635e6a078acfac8ffa71738397796be4f8fb72f572cc44ecee5d99511d9f", + strip_prefix = "grpc-781fd6f6ea03645a520cd5c675da67ab61f87e4b", + patch_file = str(Label("//third_party/grpc:grpc.patch")), ) # protobuf expects //external:grpc_cpp_plugin to point to grpc's @@ -548,22 +579,6 @@ def tf_workspace(path_prefix="", tf_repo_name=""): ) native.new_http_archive( - name = "nanopb_git", - urls = [ - "http://mirror.bazel.build/github.com/nanopb/nanopb/archive/1251fa1065afc0d62f635e0f63fec8276e14e13c.tar.gz", - "https://github.com/nanopb/nanopb/archive/1251fa1065afc0d62f635e0f63fec8276e14e13c.tar.gz", - ], - sha256 = "ab1455c8edff855f4f55b68480991559e51c11e7dab060bbab7cffb12dd3af33", - strip_prefix = "nanopb-1251fa1065afc0d62f635e0f63fec8276e14e13c", - build_file = str(Label("//third_party:nanopb.BUILD")), - ) - - native.bind( - name = "nanopb", - actual = "@nanopb_git//:nanopb", - ) - - native.new_http_archive( name = "zlib_archive", urls = [ "http://mirror.bazel.build/zlib.net/zlib-1.2.8.tar.gz", |