Merge pull request #1200 from lattice/hotfix/cub-legacy

Hotfix/cub legacy
lattice · Oct 28, 2021 · 4ad5fcf · 4ad5fcf
2 parents 6eb3255 + 6d0ea3d
commit 4ad5fcf
Show file tree

Hide file tree

Showing 87 changed files with 4 additions and 3 deletions.
diff --git a/include/cub_helper.cuh b/include/cub_helper.cuh
@@ -20,4 +20,8 @@ using namespace quda;
 struct __half { };
 #endif
 
+#if CUDA_VERSION >= 11000
 #include <cub/block/block_reduce.cuh>
+#else
+#include <cub_legacy/block/block_reduce.cuh>
+#endif
diff --git a/...e/externals/cub/agent/agent_histogram.cuh → ...nals/cub_legacy/agent/agent_histogram.cuh b/...e/externals/cub/agent/agent_histogram.cuh → ...nals/cub_legacy/agent/agent_histogram.cuh
diff --git a/.../cub/agent/agent_radix_sort_downsweep.cuh → ...gacy/agent/agent_radix_sort_downsweep.cuh b/.../cub/agent/agent_radix_sort_downsweep.cuh → ...gacy/agent/agent_radix_sort_downsweep.cuh
diff --git a/...ls/cub/agent/agent_radix_sort_upsweep.cuh → ...legacy/agent/agent_radix_sort_upsweep.cuh b/...ls/cub/agent/agent_radix_sort_upsweep.cuh → ...legacy/agent/agent_radix_sort_upsweep.cuh
diff --git a/include/externals/cub/agent/agent_reduce.cuh → ...ternals/cub_legacy/agent/agent_reduce.cuh b/include/externals/cub/agent/agent_reduce.cuh → ...ternals/cub_legacy/agent/agent_reduce.cuh
diff --git a/...ternals/cub/agent/agent_reduce_by_key.cuh → .../cub_legacy/agent/agent_reduce_by_key.cuh b/...ternals/cub/agent/agent_reduce_by_key.cuh → .../cub_legacy/agent/agent_reduce_by_key.cuh
diff --git a/include/externals/cub/agent/agent_rle.cuh → .../externals/cub_legacy/agent/agent_rle.cuh b/include/externals/cub/agent/agent_rle.cuh → .../externals/cub_legacy/agent/agent_rle.cuh
diff --git a/include/externals/cub/agent/agent_scan.cuh → ...externals/cub_legacy/agent/agent_scan.cuh b/include/externals/cub/agent/agent_scan.cuh → ...externals/cub_legacy/agent/agent_scan.cuh
diff --git a/...ternals/cub/agent/agent_segment_fixup.cuh → .../cub_legacy/agent/agent_segment_fixup.cuh b/...ternals/cub/agent/agent_segment_fixup.cuh → .../cub_legacy/agent/agent_segment_fixup.cuh
diff --git a/...e/externals/cub/agent/agent_select_if.cuh → ...nals/cub_legacy/agent/agent_select_if.cuh b/...e/externals/cub/agent/agent_select_if.cuh → ...nals/cub_legacy/agent/agent_select_if.cuh
diff --git a/...e/externals/cub/agent/agent_spmv_orig.cuh → ...nals/cub_legacy/agent/agent_spmv_orig.cuh b/...e/externals/cub/agent/agent_spmv_orig.cuh → ...nals/cub_legacy/agent/agent_spmv_orig.cuh
diff --git a/.../cub/agent/single_pass_scan_operators.cuh → ...gacy/agent/single_pass_scan_operators.cuh b/.../cub/agent/single_pass_scan_operators.cuh → ...gacy/agent/single_pass_scan_operators.cuh
diff --git a/...s/cub/block/block_adjacent_difference.cuh → ...egacy/block/block_adjacent_difference.cuh b/...s/cub/block/block_adjacent_difference.cuh → ...egacy/block/block_adjacent_difference.cuh
diff --git a/...ternals/cub/block/block_discontinuity.cuh → .../cub_legacy/block/block_discontinuity.cuh b/...ternals/cub/block/block_discontinuity.cuh → .../cub_legacy/block/block_discontinuity.cuh
diff --git a/...de/externals/cub/block/block_exchange.cuh → ...rnals/cub_legacy/block/block_exchange.cuh b/...de/externals/cub/block/block_exchange.cuh → ...rnals/cub_legacy/block/block_exchange.cuh
diff --git a/...e/externals/cub/block/block_histogram.cuh → ...nals/cub_legacy/block/block_histogram.cuh b/...e/externals/cub/block/block_histogram.cuh → ...nals/cub_legacy/block/block_histogram.cuh
diff --git a/include/externals/cub/block/block_load.cuh → ...externals/cub_legacy/block/block_load.cuh b/include/externals/cub/block/block_load.cuh → ...externals/cub_legacy/block/block_load.cuh
diff --git a/.../externals/cub/block/block_radix_rank.cuh → ...als/cub_legacy/block/block_radix_rank.cuh b/.../externals/cub/block/block_radix_rank.cuh → ...als/cub_legacy/block/block_radix_rank.cuh
diff --git a/.../externals/cub/block/block_radix_sort.cuh → ...als/cub_legacy/block/block_radix_sort.cuh b/.../externals/cub/block/block_radix_sort.cuh → ...als/cub_legacy/block/block_radix_sort.cuh
diff --git a/...ternals/cub/block/block_raking_layout.cuh → .../cub_legacy/block/block_raking_layout.cuh b/...ternals/cub/block/block_raking_layout.cuh → .../cub_legacy/block/block_raking_layout.cuh
diff --git a/include/externals/cub/block/block_reduce.cuh → ...ternals/cub_legacy/block/block_reduce.cuh b/include/externals/cub/block/block_reduce.cuh → ...ternals/cub_legacy/block/block_reduce.cuh
diff --git a/include/externals/cub/block/block_scan.cuh → ...externals/cub_legacy/block/block_scan.cuh b/include/externals/cub/block/block_scan.cuh → ...externals/cub_legacy/block/block_scan.cuh
diff --git a/...ude/externals/cub/block/block_shuffle.cuh → ...ernals/cub_legacy/block/block_shuffle.cuh b/...ude/externals/cub/block/block_shuffle.cuh → ...ernals/cub_legacy/block/block_shuffle.cuh
diff --git a/include/externals/cub/block/block_store.cuh → ...xternals/cub_legacy/block/block_store.cuh b/include/externals/cub/block/block_store.cuh → ...xternals/cub_legacy/block/block_store.cuh
diff --git a/...pecializations/block_histogram_atomic.cuh → ...pecializations/block_histogram_atomic.cuh b/...pecializations/block_histogram_atomic.cuh → ...pecializations/block_histogram_atomic.cuh
diff --git a/.../specializations/block_histogram_sort.cuh → .../specializations/block_histogram_sort.cuh b/.../specializations/block_histogram_sort.cuh → .../specializations/block_histogram_sort.cuh
diff --git a/...k/specializations/block_reduce_raking.cuh → ...k/specializations/block_reduce_raking.cuh b/...k/specializations/block_reduce_raking.cuh → ...k/specializations/block_reduce_raking.cuh
diff --git a/.../block_reduce_raking_commutative_only.cuh → .../block_reduce_raking_commutative_only.cuh b/.../block_reduce_raking_commutative_only.cuh → .../block_reduce_raking_commutative_only.cuh
diff --git a/...izations/block_reduce_warp_reductions.cuh → ...izations/block_reduce_warp_reductions.cuh b/...izations/block_reduce_warp_reductions.cuh → ...izations/block_reduce_warp_reductions.cuh
diff --git a/...ock/specializations/block_scan_raking.cuh → ...ock/specializations/block_scan_raking.cuh b/...ock/specializations/block_scan_raking.cuh → ...ock/specializations/block_scan_raking.cuh
diff --git a/...specializations/block_scan_warp_scans.cuh → ...specializations/block_scan_warp_scans.cuh b/...specializations/block_scan_warp_scans.cuh → ...specializations/block_scan_warp_scans.cuh
diff --git a/...pecializations/block_scan_warp_scans2.cuh → ...pecializations/block_scan_warp_scans2.cuh b/...pecializations/block_scan_warp_scans2.cuh → ...pecializations/block_scan_warp_scans2.cuh
diff --git a/...pecializations/block_scan_warp_scans3.cuh → ...pecializations/block_scan_warp_scans3.cuh b/...pecializations/block_scan_warp_scans3.cuh → ...pecializations/block_scan_warp_scans3.cuh
diff --git a/include/externals/cub/cub.cuh → include/externals/cub_legacy/cub.cuh b/include/externals/cub/cub.cuh → include/externals/cub_legacy/cub.cuh
diff --git a/...externals/cub/device/device_histogram.cuh → ...ls/cub_legacy/device/device_histogram.cuh b/...externals/cub/device/device_histogram.cuh → ...ls/cub_legacy/device/device_histogram.cuh
diff --git a/...externals/cub/device/device_partition.cuh → ...ls/cub_legacy/device/device_partition.cuh b/...externals/cub/device/device_partition.cuh → ...ls/cub_legacy/device/device_partition.cuh
diff --git a/...xternals/cub/device/device_radix_sort.cuh → ...s/cub_legacy/device/device_radix_sort.cuh b/...xternals/cub/device/device_radix_sort.cuh → ...s/cub_legacy/device/device_radix_sort.cuh
diff --git a/...de/externals/cub/device/device_reduce.cuh → ...rnals/cub_legacy/device/device_reduce.cuh b/...de/externals/cub/device/device_reduce.cuh → ...rnals/cub_legacy/device/device_reduce.cuh
diff --git a/...s/cub/device/device_run_length_encode.cuh → ...egacy/device/device_run_length_encode.cuh b/...s/cub/device/device_run_length_encode.cuh → ...egacy/device/device_run_length_encode.cuh
diff --git a/include/externals/cub/device/device_scan.cuh → ...ternals/cub_legacy/device/device_scan.cuh b/include/externals/cub/device/device_scan.cuh → ...ternals/cub_legacy/device/device_scan.cuh
diff --git a/...ub/device/device_segmented_radix_sort.cuh → ...cy/device/device_segmented_radix_sort.cuh b/...ub/device/device_segmented_radix_sort.cuh → ...cy/device/device_segmented_radix_sort.cuh
diff --git a/...ls/cub/device/device_segmented_reduce.cuh → ...legacy/device/device_segmented_reduce.cuh b/...ls/cub/device/device_segmented_reduce.cuh → ...legacy/device/device_segmented_reduce.cuh
diff --git a/...de/externals/cub/device/device_select.cuh → ...rnals/cub_legacy/device/device_select.cuh b/...de/externals/cub/device/device_select.cuh → ...rnals/cub_legacy/device/device_select.cuh
diff --git a/include/externals/cub/device/device_spmv.cuh → ...ternals/cub_legacy/device/device_spmv.cuh b/include/externals/cub/device/device_spmv.cuh → ...ternals/cub_legacy/device/device_spmv.cuh
diff --git a/...ub/device/dispatch/dispatch_histogram.cuh → ...cy/device/dispatch/dispatch_histogram.cuh b/...ub/device/dispatch/dispatch_histogram.cuh → ...cy/device/dispatch/dispatch_histogram.cuh
diff --git a/...b/device/dispatch/dispatch_radix_sort.cuh → ...y/device/dispatch/dispatch_radix_sort.cuh b/...b/device/dispatch/dispatch_radix_sort.cuh → ...y/device/dispatch/dispatch_radix_sort.cuh
diff --git a/...s/cub/device/dispatch/dispatch_reduce.cuh → ...egacy/device/dispatch/dispatch_reduce.cuh b/...s/cub/device/dispatch/dispatch_reduce.cuh → ...egacy/device/dispatch/dispatch_reduce.cuh
diff --git a/...evice/dispatch/dispatch_reduce_by_key.cuh → ...evice/dispatch/dispatch_reduce_by_key.cuh b/...evice/dispatch/dispatch_reduce_by_key.cuh → ...evice/dispatch/dispatch_reduce_by_key.cuh
diff --git a/...nals/cub/device/dispatch/dispatch_rle.cuh → ...b_legacy/device/dispatch/dispatch_rle.cuh b/...nals/cub/device/dispatch/dispatch_rle.cuh → ...b_legacy/device/dispatch/dispatch_rle.cuh
diff --git a/...als/cub/device/dispatch/dispatch_scan.cuh → ..._legacy/device/dispatch/dispatch_scan.cuh b/...als/cub/device/dispatch/dispatch_scan.cuh → ..._legacy/device/dispatch/dispatch_scan.cuh
diff --git a/...ub/device/dispatch/dispatch_select_if.cuh → ...cy/device/dispatch/dispatch_select_if.cuh b/...ub/device/dispatch/dispatch_select_if.cuh → ...cy/device/dispatch/dispatch_select_if.cuh
diff --git a/...ub/device/dispatch/dispatch_spmv_orig.cuh → ...cy/device/dispatch/dispatch_spmv_orig.cuh b/...ub/device/dispatch/dispatch_spmv_orig.cuh → ...cy/device/dispatch/dispatch_spmv_orig.cuh
diff --git a/include/externals/cub/grid/grid_barrier.cuh → ...xternals/cub_legacy/grid/grid_barrier.cuh b/include/externals/cub/grid/grid_barrier.cuh → ...xternals/cub_legacy/grid/grid_barrier.cuh
diff --git a/...de/externals/cub/grid/grid_even_share.cuh → ...rnals/cub_legacy/grid/grid_even_share.cuh b/...de/externals/cub/grid/grid_even_share.cuh → ...rnals/cub_legacy/grid/grid_even_share.cuh
diff --git a/include/externals/cub/grid/grid_mapping.cuh → ...xternals/cub_legacy/grid/grid_mapping.cuh b/include/externals/cub/grid/grid_mapping.cuh → ...xternals/cub_legacy/grid/grid_mapping.cuh
diff --git a/include/externals/cub/grid/grid_queue.cuh → .../externals/cub_legacy/grid/grid_queue.cuh b/include/externals/cub/grid/grid_queue.cuh → .../externals/cub_legacy/grid/grid_queue.cuh
diff --git a/include/externals/cub/host/mutex.cuh → include/externals/cub_legacy/host/mutex.cuh b/include/externals/cub/host/mutex.cuh → include/externals/cub_legacy/host/mutex.cuh
diff --git a/...cub/iterator/arg_index_input_iterator.cuh → ...acy/iterator/arg_index_input_iterator.cuh b/...cub/iterator/arg_index_input_iterator.cuh → ...acy/iterator/arg_index_input_iterator.cuh
diff --git a/...terator/cache_modified_input_iterator.cuh → ...terator/cache_modified_input_iterator.cuh b/...terator/cache_modified_input_iterator.cuh → ...terator/cache_modified_input_iterator.cuh
diff --git a/...erator/cache_modified_output_iterator.cuh → ...erator/cache_modified_output_iterator.cuh b/...erator/cache_modified_output_iterator.cuh → ...erator/cache_modified_output_iterator.cuh
diff --git a/.../cub/iterator/constant_input_iterator.cuh → ...gacy/iterator/constant_input_iterator.cuh b/.../cub/iterator/constant_input_iterator.cuh → ...gacy/iterator/constant_input_iterator.cuh
diff --git a/.../cub/iterator/counting_input_iterator.cuh → ...gacy/iterator/counting_input_iterator.cuh b/.../cub/iterator/counting_input_iterator.cuh → ...gacy/iterator/counting_input_iterator.cuh
diff --git a/.../cub/iterator/discard_output_iterator.cuh → ...gacy/iterator/discard_output_iterator.cuh b/.../cub/iterator/discard_output_iterator.cuh → ...gacy/iterator/discard_output_iterator.cuh
diff --git a/...s/cub/iterator/tex_obj_input_iterator.cuh → ...egacy/iterator/tex_obj_input_iterator.cuh b/...s/cub/iterator/tex_obj_input_iterator.cuh → ...egacy/iterator/tex_obj_input_iterator.cuh
diff --git a/...s/cub/iterator/tex_ref_input_iterator.cuh → ...egacy/iterator/tex_ref_input_iterator.cuh b/...s/cub/iterator/tex_ref_input_iterator.cuh → ...egacy/iterator/tex_ref_input_iterator.cuh
diff --git a/...cub/iterator/transform_input_iterator.cuh → ...acy/iterator/transform_input_iterator.cuh b/...cub/iterator/transform_input_iterator.cuh → ...acy/iterator/transform_input_iterator.cuh
diff --git a/include/externals/cub/thread/thread_load.cuh → ...ternals/cub_legacy/thread/thread_load.cuh b/include/externals/cub/thread/thread_load.cuh → ...ternals/cub_legacy/thread/thread_load.cuh
diff --git a/...externals/cub/thread/thread_operators.cuh → ...ls/cub_legacy/thread/thread_operators.cuh b/...externals/cub/thread/thread_operators.cuh → ...ls/cub_legacy/thread/thread_operators.cuh
diff --git a/...de/externals/cub/thread/thread_reduce.cuh → ...rnals/cub_legacy/thread/thread_reduce.cuh b/...de/externals/cub/thread/thread_reduce.cuh → ...rnals/cub_legacy/thread/thread_reduce.cuh
diff --git a/include/externals/cub/thread/thread_scan.cuh → ...ternals/cub_legacy/thread/thread_scan.cuh b/include/externals/cub/thread/thread_scan.cuh → ...ternals/cub_legacy/thread/thread_scan.cuh
diff --git a/...de/externals/cub/thread/thread_search.cuh → ...rnals/cub_legacy/thread/thread_search.cuh b/...de/externals/cub/thread/thread_search.cuh → ...rnals/cub_legacy/thread/thread_search.cuh
diff --git a/...ude/externals/cub/thread/thread_store.cuh → ...ernals/cub_legacy/thread/thread_store.cuh b/...ude/externals/cub/thread/thread_store.cuh → ...ernals/cub_legacy/thread/thread_store.cuh
diff --git a/include/externals/cub/util_allocator.cuh → ...e/externals/cub_legacy/util_allocator.cuh b/include/externals/cub/util_allocator.cuh → ...e/externals/cub_legacy/util_allocator.cuh
diff --git a/include/externals/cub/util_arch.cuh → include/externals/cub_legacy/util_arch.cuh b/include/externals/cub/util_arch.cuh → include/externals/cub_legacy/util_arch.cuh
diff --git a/include/externals/cub/util_debug.cuh → include/externals/cub_legacy/util_debug.cuh b/include/externals/cub/util_debug.cuh → include/externals/cub_legacy/util_debug.cuh
diff --git a/include/externals/cub/util_device.cuh → include/externals/cub_legacy/util_device.cuh b/include/externals/cub/util_device.cuh → include/externals/cub_legacy/util_device.cuh
diff --git a/include/externals/cub/util_macro.cuh → include/externals/cub_legacy/util_macro.cuh b/include/externals/cub/util_macro.cuh → include/externals/cub_legacy/util_macro.cuh
diff --git a/include/externals/cub/util_namespace.cuh → ...e/externals/cub_legacy/util_namespace.cuh b/include/externals/cub/util_namespace.cuh → ...e/externals/cub_legacy/util_namespace.cuh
diff --git a/include/externals/cub/util_ptx.cuh → include/externals/cub_legacy/util_ptx.cuh b/include/externals/cub/util_ptx.cuh → include/externals/cub_legacy/util_ptx.cuh
diff --git a/include/externals/cub/util_type.cuh → include/externals/cub_legacy/util_type.cuh b/include/externals/cub/util_type.cuh → include/externals/cub_legacy/util_type.cuh
diff --git a/...warp/specializations/warp_reduce_shfl.cuh → ...warp/specializations/warp_reduce_shfl.cuh b/...warp/specializations/warp_reduce_shfl.cuh → ...warp/specializations/warp_reduce_shfl.cuh
diff --git a/...warp/specializations/warp_reduce_smem.cuh → ...warp/specializations/warp_reduce_smem.cuh b/...warp/specializations/warp_reduce_smem.cuh → ...warp/specializations/warp_reduce_smem.cuh
diff --git a/...b/warp/specializations/warp_scan_shfl.cuh → ...y/warp/specializations/warp_scan_shfl.cuh b/...b/warp/specializations/warp_scan_shfl.cuh → ...y/warp/specializations/warp_scan_shfl.cuh
diff --git a/...b/warp/specializations/warp_scan_smem.cuh → ...y/warp/specializations/warp_scan_smem.cuh b/...b/warp/specializations/warp_scan_smem.cuh → ...y/warp/specializations/warp_scan_smem.cuh
diff --git a/include/externals/cub/warp/warp_reduce.cuh → ...externals/cub_legacy/warp/warp_reduce.cuh b/include/externals/cub/warp/warp_reduce.cuh → ...externals/cub_legacy/warp/warp_reduce.cuh
diff --git a/include/externals/cub/warp/warp_scan.cuh → ...e/externals/cub_legacy/warp/warp_scan.cuh b/include/externals/cub/warp/warp_scan.cuh → ...e/externals/cub_legacy/warp/warp_scan.cuh
diff --git a/include/thrust_helper.cuh b/include/thrust_helper.cuh
@@ -13,9 +13,6 @@
 #define CUB_USE_COOPERATIVE_GROUPS
 #endif
 
-// needed for newer versions of thrust/cub
-#define CUB_NS_QUALIFIER cub
-
 // hack required to silence a thrust complaint with clang-11
 #if defined(__clang__) && defined(__CUDA__)
 #define _CubLog(...)