Skip to content
Permalink
Browse files

Automated rollback of commit 9a43dfe

PiperOrigin-RevId: 238803934
  • Loading branch information...
tensorflower-gardener committed Mar 16, 2019
1 parent 2da5a30 commit ebc91eda27bf03966ce60e0b8084086303cdd354
Showing with 1 addition and 20 deletions.
  1. +1 −16 tensorflow/tensorflow.bzl
  2. +0 −4 third_party/gpus/cuda_configure.bzl
@@ -211,12 +211,6 @@ def if_windows(a, otherwise = []):
"//conditions:default": otherwise,
})

def if_windows_cuda(a, otherwise = []):
return select({
clean_dep("//tensorflow:with_cuda_support_windows_override"): a,
"//conditions:default": otherwise,
})

def if_not_windows_cuda(a):
return select({
clean_dep("//tensorflow:with_cuda_support_windows_override"): [],
@@ -2182,16 +2176,7 @@ def tf_py_build_info_genrule():
name = "py_build_info_gen",
outs = ["platform/build_info.py"],
cmd =
"$(location //tensorflow/tools/build_info:gen_build_info) --raw_generate \"$@\" --build_config " +
if_cuda("cuda", "cpu") +
" --key_value " +
if_cuda(" cuda_version_number=$${TF_CUDA_VERSION} cudnn_version_number=$${TF_CUDNN_VERSION} ", "") +
if_windows(" msvcp_dll_name=msvcp140.dll ", "") +
if_windows_cuda(" ".join([
"nvcuda_dll_name=nvcuda.dll",
"cudart_dll_name=cudart64_$${TF_CUDA_VERSION/\\./}.dll",
"cudnn_dll_name=cudnn64_$${TF_CUDNN_VERSION}.dll",
]), ""),
"$(location //tensorflow/tools/build_info:gen_build_info) --raw_generate \"$@\" --build_config " + if_cuda("cuda", "cpu") + if_windows(" --key_value msvcp_dll_name=msvcp140.dll", ""),
local = 1,
tools = [clean_dep("//tensorflow/tools/build_info:gen_build_info")],
)
@@ -1494,10 +1494,6 @@ def _cuda_autoconf_impl(repository_ctx):
if not enable_cuda(repository_ctx):
_create_dummy_repository(repository_ctx)
elif _TF_CUDA_CONFIG_REPO in repository_ctx.os.environ:
if (_TF_CUDA_VERSION not in repository_ctx.os.environ or
_TF_CUDNN_VERSION not in repository_ctx.os.environ):
auto_configure_fail("%s and %s must also be set if %s is specified" %
(_TF_CUDA_VERSION, _TF_CUDNN_VERSION, _TF_CUDA_CONFIG_REPO))
_create_remote_cuda_repository(
repository_ctx,
repository_ctx.os.environ[_TF_CUDA_CONFIG_REPO],

0 comments on commit ebc91ed

Please sign in to comment.
You can’t perform that action at this time.