Merge pull request #31849 from ROCmSoftwarePlatform:google_upstream_clang_10

PiperOrigin-RevId: 264707133
This commit is contained in:
TensorFlower Gardener 2019-08-21 17:17:50 -07:00
commit c854ad3923
2 changed files with 14 additions and 0 deletions

View File

@ -186,6 +186,7 @@ def _rocm_include_path(repository_ctx, rocm_config):
# Add HIP-Clang headers
inc_dirs.append("/opt/rocm/llvm/lib/clang/8.0/include")
inc_dirs.append("/opt/rocm/llvm/lib/clang/9.0.0/include")
inc_dirs.append("/opt/rocm/llvm/lib/clang/10.0.0/include")
# Add rocrand and hiprand headers
inc_dirs.append("/opt/rocm/rocrand/include")
@ -213,6 +214,10 @@ def _rocm_include_path(repository_ctx, rocm_config):
inc_dirs.append("/opt/rocm/hcc/compiler/lib/clang/9.0.0/include/")
inc_dirs.append("/opt/rocm/hcc/lib/clang/9.0.0/include")
# Support hcc based off clang 10.0.0, included in ROCm2.8
inc_dirs.append("/opt/rocm/hcc/compiler/lib/clang/10.0.0/include/")
inc_dirs.append("/opt/rocm/hcc/lib/clang/10.0.0/include")
return inc_dirs
def _enable_rocm(repository_ctx):

View File

@ -72,6 +72,7 @@ cc_toolchain_config(
"/opt/rocm/hip/include",
"/opt/rocm/llvm/lib/clang/8.0/include",
"/opt/rocm/llvm/lib/clang/9.0.0/include",
"/opt/rocm/llvm/lib/clang/10.0.0/include",
"/opt/rocm/rocrand/include",
"/opt/rocm/hiprand/include",
"/opt/rocm/rocfft/include",
@ -85,6 +86,8 @@ cc_toolchain_config(
"/opt/rocm/hcc/lib/clang/8.0.0/include",
"/opt/rocm/hcc/compiler/lib/clang/9.0.0/include/",
"/opt/rocm/hcc/lib/clang/9.0.0/include",
"/opt/rocm/hcc/compiler/lib/clang/10.0.0/include/",
"/opt/rocm/hcc/lib/clang/10.0.0/include",
],
cpu = "local",
extra_no_canonical_prefixes_flags = ["-fno-canonical-system-headers"],
@ -133,6 +136,7 @@ cc_toolchain_config(
"/opt/rocm/hip/include",
"/opt/rocm/llvm/lib/clang/8.0/include",
"/opt/rocm/llvm/lib/clang/9.0.0/include",
"/opt/rocm/llvm/lib/clang/10.0.0/include",
"/opt/rocm/rocrand/include",
"/opt/rocm/hiprand/include",
"/opt/rocm/rocfft/include",
@ -146,6 +150,8 @@ cc_toolchain_config(
"/opt/rocm/hcc/lib/clang/8.0.0/include",
"/opt/rocm/hcc/compiler/lib/clang/9.0.0/include/",
"/opt/rocm/hcc/lib/clang/9.0.0/include",
"/opt/rocm/hcc/compiler/lib/clang/10.0.0/include/",
"/opt/rocm/hcc/lib/clang/10.0.0/include",
],
cpu = "darwin",
extra_no_canonical_prefixes_flags = ["-fno-canonical-system-headers"],
@ -194,6 +200,7 @@ cc_toolchain_config(
"/opt/rocm/hip/include",
"/opt/rocm/llvm/lib/clang/8.0/include",
"/opt/rocm/llvm/lib/clang/9.0.0/include",
"/opt/rocm/llvm/lib/clang/10.0.0/include",
"/opt/rocm/rocrand/include",
"/opt/rocm/hiprand/include",
"/opt/rocm/rocfft/include",
@ -207,6 +214,8 @@ cc_toolchain_config(
"/opt/rocm/hcc/lib/clang/8.0.0/include",
"/opt/rocm/hcc/compiler/lib/clang/9.0.0/include/",
"/opt/rocm/hcc/lib/clang/9.0.0/include",
"/opt/rocm/hcc/compiler/lib/clang/10.0.0/include/",
"/opt/rocm/hcc/lib/clang/10.0.0/include",
],
cpu = "x64_windows",
msvc_cl_path = "msvc_not_used",