experiments
/
STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #37006 from njzjz:resolve-symbolic-links-for-cuda 

PiperOrigin-RevId: 299867430
Change-Id: I5622a0eb6cd89373a00a07be755f4b3ea572374d
This commit is contained in:
TensorFlower Gardener 2020-03-09 10:06:18 -07:00
parent b8da76a5fe aba8e45155
commit 336724e40a
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
third_party/gpus/cuda_configure.bzl vendored
View File

@ -49,6 +49,7 @@ load(
"is_windows", "is_windows",
"raw_exec", "raw_exec",
"read_dir", "read_dir",
"realpath",
"which", "which",
) )
@ -360,8 +361,8 @@ def _cuda_include_path(repository_ctx, cuda_config):
) )
inc_entries = [] inc_entries = []
if target_dir != "": if target_dir != "":
inc_entries.append(target_dir) inc_entries.append(realpath(repository_ctx, target_dir))
inc_entries.append(cuda_config.cuda_toolkit_path + "/include") inc_entries.append(realpath(repository_ctx, cuda_config.cuda_toolkit_path + "/include"))
return inc_entries return inc_entries
def enable_cuda(repository_ctx): def enable_cuda(repository_ctx):

2
third_party/gpus/find_cuda_config.py vendored
View File

@ -437,7 +437,7 @@ def _get_legacy_path(env_name, default=[]):
def _normalize_path(path): def _normalize_path(path):
"""Returns normalized path, with forward slashes on Windows.""" """Returns normalized path, with forward slashes on Windows."""
path = os.path.normpath(path) path = os.path.realpath(path)
if _is_windows(): if _is_windows():
path = path.replace("\\", "/") path = path.replace("\\", "/")
return path return path

2
third_party/gpus/find_cuda_config.py.gz.base64 vendored
View File

File diff suppressed because one or more lines are too long

2
third_party/remote_config/common.bzl vendored
View File

@ -265,7 +265,7 @@ def realpath(repository_ctx, path, bash_bin = None):
if bash_bin == None: if bash_bin == None:
bash_bin = get_bash_bin(repository_ctx) bash_bin = get_bash_bin(repository_ctx)
return execute(repository_ctx, [bash_bin, "-c", "realpath %s" % path]).stdout.strip() return execute(repository_ctx, [bash_bin, "-c", "realpath \"%s\"" % path]).stdout.strip()
def err_out(result): def err_out(result):
"""Returns stderr if set, else stdout. """Returns stderr if set, else stdout.