diff options
| author |  Yifei Feng <yifeif@google.com> | 2018-02-12 10:49:56 -0800 |
|---|---|---|
| committer | Yifei Feng <yifeif@google.com> | 2018-02-12 10:49:56 -0800 |
| commit | 55747c5588045b0a06dc6446a00a189568679dea (patch) | |
| tree | 11f3465adae6c44a44b890e9a8135566fafe42a1 /third_party | |
| parent | 3ee1721b46d0e61097d0ee72f01e3de9739f0b6f (diff) | |
| parent | a55c133748b695778163035f098cf3ac34302872 (diff) | |
Merge commit for internal changes
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/cub/BUILD | 0 | ||||
| -rw-r--r-- | third_party/cub/fix_compilation_in_clang.patch | 23 | ||||
| -rw-r--r-- | third_party/llvm/llvm.BUILD | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/third_party/cub/BUILD b/third_party/cub/BUILD new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/third_party/cub/BUILD diff --git a/third_party/cub/fix_compilation_in_clang.patch b/third_party/cub/fix_compilation_in_clang.patch new file mode 100644 index 0000000000..384e674f20 --- /dev/null +++ b/third_party/cub/fix_compilation_in_clang.patch @@ -0,0 +1,23 @@ +From 565b77f7c82048871a4d5e3e506dc663d53cd469 Mon Sep 17 00:00:00 2001 +From: Ilya Biryukov <ibiryukov@google.com> +Date: Fri, 26 Jan 2018 18:46:06 +0100 +Subject: [PATCH] Added missing 'template' keyword. + +To unbreak compilation with clang. +--- + cub/device/dispatch/dispatch_radix_sort.cuh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cub/device/dispatch/dispatch_radix_sort.cuh b/cub/device/dispatch/dispatch_radix_sort.cuh +index 7fbc621f..f622e212 100644 +--- a/cub/device/dispatch/dispatch_radix_sort.cuh ++++ b/cub/device/dispatch/dispatch_radix_sort.cuh +@@ -104,7 +104,7 @@ __global__ void DeviceRadixSortUpsweepKernel( + CTA_SYNC(); + + // Write out digit counts (striped) +- upsweep.ExtractCounts<IS_DESCENDING>(d_spine, gridDim.x, blockIdx.x); ++ upsweep.template ExtractCounts<IS_DESCENDING>(d_spine, gridDim.x, blockIdx.x); + } + + diff --git a/third_party/llvm/llvm.BUILD b/third_party/llvm/llvm.BUILD index a9e1341a03..28293a3659 100644 --- a/third_party/llvm/llvm.BUILD +++ b/third_party/llvm/llvm.BUILD @@ -1024,6 +1024,7 @@ cc_library( deps = [ ":arm_desc", ":arm_info", + ":arm_utils", ":config", ":mc_disassembler", ":support", |