Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -839,15 +839,16 @@ def set_tf_cuda_version(environ_cp):
cuda_toolkit_path = cygpath(cuda_toolkit_path)

if is_windows():
cuda_rt_lib_path = 'lib/x64/cudart.lib'
cuda_rt_lib_paths = ['lib/x64/cudart.lib']
elif is_linux():
cuda_rt_lib_path = 'lib64/libcudart.so.%s' % tf_cuda_version
cuda_rt_lib_paths = ['%s/libcudart.so.%s' % (x, tf_cuda_version)
for x in ['lib64', 'lib/x86_64-linux-gnu']]
elif is_macos():
cuda_rt_lib_path = 'lib/libcudart.%s.dylib' % tf_cuda_version
cuda_rt_lib_paths = ['lib/libcudart.%s.dylib' % tf_cuda_version]

cuda_toolkit_path_full = os.path.join(cuda_toolkit_path, cuda_rt_lib_path)
if os.path.exists(cuda_toolkit_path_full):
break
cuda_toolkit_paths_full = [os.path.join(cuda_toolkit_path, x) for x in cuda_rt_lib_paths]
if any([os.path.exists(x) for x in cuda_toolkit_paths_full]):
break

# Reset and retry
print('Invalid path to CUDA %s toolkit. %s cannot be found' %
Expand Down
4 changes: 3 additions & 1 deletion third_party/gpus/cuda_configure.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ CUDA_LIB_PATHS = [
CUPTI_HEADER_PATHS = [
"extras/CUPTI/include/",
"include/cuda/CUPTI/",
"include/",
]

# Lookup paths for the cupti library, relative to the
Expand All @@ -69,7 +70,7 @@ CUPTI_HEADER_PATHS = [
# the other CUDA libraries but rather in a special extras/CUPTI directory.
CUPTI_LIB_PATHS = [
"extras/CUPTI/lib64/",
"lib/x86_64-linux-gnu",
"lib/x86_64-linux-gnu/",
"lib64/",
"extras/CUPTI/libx64/",
"extras/CUPTI/lib/",
Expand All @@ -96,6 +97,7 @@ CUDNN_INCLUDE_PATHS = [
NVVM_LIBDEVICE_PATHS = [
"nvvm/libdevice/",
"share/cuda/",
"lib/nvidia-cuda-toolkit/libdevice/",
]

# Files used to detect the NVVM libdevice path.
Expand Down