Migrate the remote and remote_config directories of toolchains directly to GitHub. Update the toolchains version to 1.1.6.

PiperOrigin-RevId: 360515759
Change-Id: I5107ad1155e2647e90aa210727b6a778e4faf4ab
This commit is contained in:
Amit Patankar 2021-03-02 14:29:17 -08:00 committed by TensorFlower Gardener
parent 06a07eced4
commit 83981c9b0b
8 changed files with 5 additions and 164 deletions

View File

@ -275,11 +275,6 @@ tensorflow/third_party/toolchains/preconfig/win_1803/BUILD
tensorflow/third_party/toolchains/preconfig/win_1803/py36/BUILD
tensorflow/third_party/toolchains/preconfig/win_1803/py37/BUILD
tensorflow/third_party/toolchains/preconfig/win_1803/py38/BUILD
tensorflow/third_party/toolchains/remote/BUILD
tensorflow/third_party/toolchains/remote/BUILD.tpl
tensorflow/third_party/toolchains/remote/configure.bzl
tensorflow/third_party/toolchains/remote/execution.bzl.tpl
tensorflow/third_party/toolchains/remote_config/configs.bzl
tensorflow/third_party/typing_extensions.BUILD
tensorflow/third_party/wrapt.BUILD
tensorflow/third_party/zlib.BUILD

View File

@ -9,7 +9,6 @@ load("//third_party/nccl:nccl_configure.bzl", "nccl_configure")
load("//third_party/git:git_configure.bzl", "git_configure")
load("//third_party/py:python_configure.bzl", "python_configure")
load("//third_party/systemlibs:syslibs_configure.bzl", "syslibs_configure")
load("//third_party/toolchains/remote:configure.bzl", "remote_execution_configure")
load("//third_party/toolchains/clang6:repo.bzl", "clang6_configure")
load("//third_party/toolchains/cpus/arm:arm_compiler_configure.bzl", "arm_compiler_configure")
load("//third_party/toolchains/embedded/arm-linux:arm_linux_toolchain_configure.bzl", "arm_linux_toolchain_configure")
@ -48,6 +47,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
load("@bazel_tools//tools/build_defs/repo:java.bzl", "java_import_external")
load("@io_bazel_rules_closure//closure:defs.bzl", "filegroup_external")
load("@tf_toolchains//toolchains/remote_config:configs.bzl", "initialize_rbe_configs")
load("@tf_toolchains//toolchains/remote:configure.bzl", "remote_execution_configure")
def _initialize_third_party():
""" Load third party repositories. See above load() statements. """

View File

@ -15,11 +15,11 @@ def workspace():
http_archive(
name = "tf_toolchains",
sha256 = "d60f9637c64829e92dac3f4477a2c45cdddb9946c5da0dd46db97765eb9de08e",
strip_prefix = "toolchains-1.1.5",
sha256 = "981521c28f71477d75c86c6e74cf80f2f7e8d3068253a98f7fffba50ad80e0d8",
strip_prefix = "toolchains-1.1.6",
urls = [
"http://mirror.tensorflow.org/github.com/tensorflow/toolchains/archive/v1.1.5.tar.gz",
"https://github.com/tensorflow/toolchains/archive/v1.1.5.tar.gz",
"http://mirror.tensorflow.org/github.com/tensorflow/toolchains/archive/v1.1.6.tar.gz",
"https://github.com/tensorflow/toolchains/archive/v1.1.6.tar.gz",
],
)

View File

View File

@ -1,43 +0,0 @@
"""Repository rule for remote GPU autoconfiguration.
This rule creates the starlark file
//third_party/toolchains/remote:execution.bzl
providing the function `gpu_test_tags`.
`gpu_test_tags` will return:
* `local`: if `REMOTE_GPU_TESTING` is false, allowing CPU tests to run
remotely and GPU tests to run locally in the same bazel invocation.
* `remote-gpu`: if `REMOTE_GPU_TESTING` is true; this allows rules to
set an execution requirement that enables a GPU-enabled remote platform.
"""
_REMOTE_GPU_TESTING = "REMOTE_GPU_TESTING"
def _flag_enabled(repository_ctx, flag_name):
if flag_name not in repository_ctx.os.environ:
return False
return repository_ctx.os.environ[flag_name].strip() == "1"
def _remote_execution_configure(repository_ctx):
# If we do not support remote gpu test execution, mark them as local, so we
# can combine remote builds with local gpu tests.
gpu_test_tags = "\"local\""
if _flag_enabled(repository_ctx, _REMOTE_GPU_TESTING):
gpu_test_tags = "\"remote-gpu\""
repository_ctx.template(
"remote_execution.bzl",
Label("//third_party/toolchains/remote:execution.bzl.tpl"),
{
"%{gpu_test_tags}": gpu_test_tags,
},
)
repository_ctx.template(
"BUILD",
Label("//third_party/toolchains/remote:BUILD.tpl"),
)
remote_execution_configure = repository_rule(
implementation = _remote_execution_configure,
environ = [_REMOTE_GPU_TESTING],
)

View File

@ -1,2 +0,0 @@
def gpu_test_tags():
return [%{gpu_test_tags}]

View File

@ -1,109 +0,0 @@
"""Configurations of RBE builds used with remote config."""
load("//third_party/toolchains/remote_config:rbe_config.bzl", "tensorflow_local_config", "tensorflow_rbe_config", "tensorflow_rbe_win_config")
def initialize_rbe_configs():
tensorflow_local_config(
name = "local_execution",
)
tensorflow_rbe_config(
name = "ubuntu16.04-manylinux2010-py3",
os = "ubuntu16.04-manylinux2010",
python_versions = ["3"],
compiler = "",
)
tensorflow_rbe_config(
name = "ubuntu16.04-py3-gcc7_manylinux2010-cuda10.0-cudnn7-tensorrt5.1",
compiler = "/dt7/usr/bin/gcc",
compiler_prefix = "/usr/bin",
cuda_version = "10.0",
cudnn_version = "7",
os = "ubuntu16.04-manylinux2010",
python_versions = ["3"],
tensorrt_install_path = "/usr",
tensorrt_version = "5.1",
)
tensorflow_rbe_config(
name = "ubuntu16.04-gcc7_manylinux2010-cuda10.1-cudnn7-tensorrt6.0",
compiler = "/dt7/usr/bin/gcc",
compiler_prefix = "/usr/bin",
cuda_version = "10.1",
cudnn_version = "7",
os = "ubuntu16.04-manylinux2010-multipython",
python_versions = ["2.7", "3.5", "3.6", "3.7", "3.8"],
tensorrt_install_path = "/usr",
tensorrt_version = "6.0",
python_install_path = "/usr/local",
)
tensorflow_rbe_config(
name = "ubuntu18.04-gcc7_manylinux2010-cuda10.1-cudnn7-tensorrt6.0",
compiler = "/dt7/usr/bin/gcc",
compiler_prefix = "/usr/bin",
cuda_version = "10.1",
cudnn_version = "7",
os = "ubuntu18.04-manylinux2010-multipython",
python_versions = ["2.7", "3.5", "3.6", "3.7", "3.8"],
tensorrt_install_path = "/usr",
tensorrt_version = "6.0",
python_install_path = "/usr/local",
)
tensorflow_rbe_config(
name = "ubuntu18.04-gcc7_manylinux2010-cuda11.0-cudnn8-tensorrt7.1",
compiler = "/dt7/usr/bin/gcc",
compiler_prefix = "/usr/bin",
cuda_version = "11.0",
cudnn_version = "8",
os = "ubuntu18.04-manylinux2010-multipython",
python_versions = ["2.7", "3.5", "3.6", "3.7", "3.8"],
tensorrt_install_path = "/usr",
tensorrt_version = "7.1",
python_install_path = "/usr/local",
)
# TODO(klimek): Delete this once all users are migrated to a python-version
# independent configuration. In the future, use
# "ubuntu16.04-gcc7_manylinux2010-cuda10.1-cudnn7-tensorrt6.0" instead.
tensorflow_rbe_config(
name = "ubuntu16.04-py3-gcc7_manylinux2010-cuda10.1-cudnn7-tensorrt6.0",
compiler = "/dt7/usr/bin/gcc",
compiler_prefix = "/usr/bin",
cuda_version = "10.1",
cudnn_version = "7",
os = "ubuntu16.04-manylinux2010",
python_versions = ["3"],
tensorrt_install_path = "/usr",
tensorrt_version = "6.0",
)
tensorflow_rbe_config(
name = "ubuntu18.04-clang_manylinux2010-cuda11.0-cudnn8-tensorrt7.1",
compiler = "/clang_r7f6f9f4cf966c78a315d15d6e913c43cfa45c47c/bin/clang",
cuda_version = "11.0",
cudnn_version = "8",
os = "ubuntu18.04-manylinux2010-multipython",
python_versions = ["2.7", "3.5", "3.6", "3.7", "3.8"],
tensorrt_install_path = "/usr",
tensorrt_version = "7.1",
sysroot = "/dt7",
python_install_path = "/usr/local",
)
tensorflow_rbe_config(
name = "ubuntu18.04-gcc7_manylinux2010-rocm",
compiler = "/dt7/usr/bin/gcc",
compiler_prefix = "/usr/bin",
rocm_version = "3.5", # Any version will do.
os = "ubuntu18.04-manylinux2010-multipython",
python_versions = ["2.7", "3.5", "3.6", "3.7", "3.8"],
python_install_path = "/usr/local",
)
tensorflow_rbe_win_config(
name = "windows_py37",
python_bin_path = "C:/Python37/python.exe",
)