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

Automated g4 rollback of changelist 159570549

Browse Source 
PiperOrigin-RevId: 159643278
This commit is contained in:
A. Unique TensorFlower 2017-06-20 18:14:20 -07:00 committed by TensorFlower Gardener
parent 9403e4f824
commit f671c5caad
2 changed files with 35 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
third_party/gpus/cuda/BUILD.tpl vendored
View File

@ -40,23 +40,20 @@ config_setting(
cc_library(
name = "cuda_headers",
hdrs = [
"cuda/cuda_config.h",
"cuda_config.h",
%{cuda_headers}
],
includes = [
".",
"cuda/include",
"include",
],
visibility = ["//visibility:public"],
)
cc_library(
name = "cudart_static",
srcs = ["cuda/lib/%{cudart_static_lib}"],
includes = [
".",
"cuda/include",
],
srcs = ["lib/%{cudart_static_lib}"],
includes = ["include"],
linkopts = select({
":freebsd": [],
"//conditions:default": ["-ldl"],
@ -69,46 +66,34 @@ cc_library(
cc_library(
name = "cuda_driver",
srcs = ["cuda/lib/%{cuda_driver_lib}"],
includes = [
".",
"cuda/include",
],
srcs = ["lib/%{cuda_driver_lib}"],
includes = ["include"],
visibility = ["//visibility:public"],
)
cc_library(
name = "cudart",
srcs = ["cuda/lib/%{cudart_lib}"],
data = ["cuda/lib/%{cudart_lib}"],
includes = [
".",
"cuda/include",
],
srcs = ["lib/%{cudart_lib}"],
data = ["lib/%{cudart_lib}"],
includes = ["include"],
linkstatic = 1,
visibility = ["//visibility:public"],
)
cc_library(
name = "cublas",
srcs = ["cuda/lib/%{cublas_lib}"],
data = ["cuda/lib/%{cublas_lib}"],
includes = [
".",
"cuda/include",
],
srcs = ["lib/%{cublas_lib}"],
data = ["lib/%{cublas_lib}"],
includes = ["include"],
linkstatic = 1,
visibility = ["//visibility:public"],
)
cc_library(
name = "cusolver",
srcs = ["cuda/lib/%{cusolver_lib}"],
data = ["cuda/lib/%{cusolver_lib}"],
includes = [
".",
"cuda/include",
],
srcs = ["lib/%{cusolver_lib}"],
data = ["lib/%{cusolver_lib}"],
includes = ["include"],
linkstatic = 1,
linkopts = ["-lgomp"],
visibility = ["//visibility:public"],
@ -116,36 +101,27 @@ cc_library(
cc_library(
name = "cudnn",
srcs = ["cuda/lib/%{cudnn_lib}"],
data = ["cuda/lib/%{cudnn_lib}"],
includes = [
".",
"cuda/include",
],
srcs = ["lib/%{cudnn_lib}"],
data = ["lib/%{cudnn_lib}"],
includes = ["include"],
linkstatic = 1,
visibility = ["//visibility:public"],
)
cc_library(
name = "cufft",
srcs = ["cuda/lib/%{cufft_lib}"],
data = ["cuda/lib/%{cufft_lib}"],
includes = [
".",
"cuda/include",
],
srcs = ["lib/%{cufft_lib}"],
data = ["lib/%{cufft_lib}"],
includes = ["include"],
linkstatic = 1,
visibility = ["//visibility:public"],
)
cc_library(
name = "curand",
srcs = ["cuda/lib/%{curand_lib}"],
data = ["cuda/lib/%{curand_lib}"],
includes = [
".",
"cuda/include",
],
srcs = ["lib/%{curand_lib}"],
data = ["lib/%{curand_lib}"],
includes = ["include"],
linkstatic = 1,
visibility = ["//visibility:public"],
)
@ -166,23 +142,19 @@ cc_library(
cc_library(
name = "cupti_headers",
hdrs = [
"cuda/cuda_config.h",
"cuda_config.h",
":cuda-extras",
],
includes = [
".",
"cuda/extras/CUPTI/include/",
"extras/CUPTI/include/",
],
visibility = ["//visibility:public"],
)
cc_library(
name = "cupti_dsos",
data = ["cuda/lib/%{cupti_lib}"],
includes = [
".",
"cuda/include",
],
data = ["lib/%{cupti_lib}"],
visibility = ["//visibility:public"],
)

17
third_party/gpus/cuda_configure.bzl vendored
View File

@ -764,7 +764,7 @@ def _create_dummy_repository(repository_ctx):
"CudaVersion(\"%s\")" % c
for c in _DEFAULT_CUDA_COMPUTE_CAPABILITIES]),
"%{cuda_toolkit_path}": _DEFAULT_CUDA_TOOLKIT_PATH,
}, "cuda/cuda/cuda_config.h")
})
# If cuda_configure is not configured to build with GPU support, and the user
# attempts to build with --config=cuda, add a dummy build rule to intercept
@ -906,19 +906,19 @@ def _create_local_cuda_repository(repository_ctx):
cuda_toolkit_path = cuda_config.cuda_toolkit_path
cuda_include_path = cuda_toolkit_path + "/include"
genrules = [_symlink_genrule_for_dir(repository_ctx,
cuda_include_path, "cuda/include", "cuda-include")]
cuda_include_path, "include", "cuda-include")]
genrules.append(_symlink_genrule_for_dir(repository_ctx,
cuda_toolkit_path + "/nvvm", "cuda/nvvm", "cuda-nvvm"))
cuda_toolkit_path + "/nvvm", "nvvm", "cuda-nvvm"))
genrules.append(_symlink_genrule_for_dir(repository_ctx,
cuda_toolkit_path + "/extras/CUPTI/include",
"cuda/extras/CUPTI/include", "cuda-extras"))
"extras/CUPTI/include", "cuda-extras"))
cuda_libs = _find_libs(repository_ctx, cuda_config)
cuda_lib_src = []
cuda_lib_dest = []
for lib in cuda_libs.values():
cuda_lib_src.append(lib.path)
cuda_lib_dest.append("cuda/lib/" + lib.file_name)
cuda_lib_dest.append("lib/" + lib.file_name)
genrules.append(_symlink_genrule_for_dir(repository_ctx, None, "", "cuda-lib",
cuda_lib_src, cuda_lib_dest))
@ -927,9 +927,8 @@ def _create_local_cuda_repository(repository_ctx):
included_files = _read_dir(repository_ctx, cuda_include_path).replace(
cuda_include_path, '').splitlines()
if '/cudnn.h' not in included_files:
genrules.append(_symlink_genrule_for_dir(repository_ctx, None,
"cuda/include/", "cudnn-include", [cudnn_header_dir + "/cudnn.h"],
["cudnn.h"]))
genrules.append(_symlink_genrule_for_dir(repository_ctx, None, "include/",
"cudnn-include", [cudnn_header_dir + "/cudnn.h"], ["cudnn.h"]))
else:
genrules.append(
'filegroup(\n' +
@ -1001,7 +1000,7 @@ def _create_local_cuda_repository(repository_ctx):
["CudaVersion(\"%s\")" % c
for c in cuda_config.compute_capabilities]),
"%{cuda_toolkit_path}": cuda_config.cuda_toolkit_path,
}, "cuda/cuda/cuda_config.h")
})
def _create_remote_cuda_repository(repository_ctx, remote_config_repo):
"""Creates pointers to a remotely configured repo set up to build with CUDA."""