diff options
| author |  Gunhan Gulsoy <gunan@google.com> | 2018-02-26 10:20:02 -0800 |
|---|---|---|
| committer | Gunhan Gulsoy <gunan@google.com> | 2018-02-26 10:20:02 -0800 |
| commit | 82d9618f47501a6ebf17fb006759d0a57ffc93a9 (patch) | |
| tree | 356c3a76e3fea3d4a8348310550d57e3d1d9df54 /third_party | |
| parent | 26ae3287a12c71fccaec9ea74f55b6a51a3d33c6 (diff) | |
| parent | f4e70be18b104fbb2efeefeb83bea190aec12727 (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 |
2 files changed, 0 insertions, 23 deletions
diff --git a/third_party/cub/BUILD b/third_party/cub/BUILD deleted file mode 100644 index e69de29bb2..0000000000 --- a/third_party/cub/BUILD +++ /dev/null diff --git a/third_party/cub/fix_compilation_in_clang.patch b/third_party/cub/fix_compilation_in_clang.patch deleted file mode 100644 index 384e674f20..0000000000 --- a/third_party/cub/fix_compilation_in_clang.patch +++ /dev/null @@ -1,23 +0,0 @@ -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); - } - - |