From e10154d4b32a4b8f505bc8e474741ea36370f47e Mon Sep 17 00:00:00 2001 From: dumerrill Date: Mon, 3 Mar 2014 09:52:03 -0500 Subject: [PATCH] Fix linux compilation issue on certain platforms Former-commit-id: 93696c4bce447b71c4bd0b25d1e26f1247341c04 --- CHANGE_LOG.TXT | 2 +- README.md | 4 ++-- .../block_reduce_raking_commutative_only.cuh | 2 +- docs/download_cub.html | 6 +++--- docs/html/CHANGE_LOG.TXT | 2 +- docs/html/annotated.html | 2 +- docs/html/arg__index__input__iterator_8cuh.html | 2 +- docs/html/arg__index__input__iterator_8cuh_source.html | 2 +- docs/html/block__discontinuity_8cuh.html | 2 +- docs/html/block__discontinuity_8cuh_source.html | 2 +- docs/html/block__exchange_8cuh.html | 2 +- docs/html/block__exchange_8cuh_source.html.REMOVED.git-id | 2 +- docs/html/block__histogram_8cuh.html | 2 +- docs/html/block__histogram_8cuh_source.html | 2 +- docs/html/block__load_8cuh.html | 2 +- docs/html/block__load_8cuh_source.html.REMOVED.git-id | 2 +- docs/html/block__radix__sort_8cuh.html | 2 +- docs/html/block__radix__sort_8cuh_source.html | 2 +- docs/html/block__reduce_8cuh.html | 2 +- docs/html/block__reduce_8cuh_source.html | 2 +- docs/html/block__scan_8cuh.html | 2 +- docs/html/block__scan_8cuh_source.html.REMOVED.git-id | 2 +- docs/html/block__store_8cuh.html | 2 +- docs/html/block__store_8cuh_source.html | 2 +- docs/html/cache__modified__input__iterator_8cuh.html | 2 +- .../cache__modified__input__iterator_8cuh_source.html | 2 +- docs/html/cache__modified__output__iterator_8cuh.html | 2 +- .../cache__modified__output__iterator_8cuh_source.html | 2 +- .../classcub_1_1_arg_index_input_iterator-members.html | 2 +- docs/html/classcub_1_1_arg_index_input_iterator.html | 2 +- docs/html/classcub_1_1_block_discontinuity-members.html | 2 +- docs/html/classcub_1_1_block_discontinuity.html | 2 +- docs/html/classcub_1_1_block_exchange-members.html | 2 +- docs/html/classcub_1_1_block_exchange.html | 2 +- docs/html/classcub_1_1_block_histogram-members.html | 2 +- docs/html/classcub_1_1_block_histogram.html | 2 +- docs/html/classcub_1_1_block_load-members.html | 2 +- docs/html/classcub_1_1_block_load.html | 2 +- docs/html/classcub_1_1_block_radix_sort-members.html | 2 +- docs/html/classcub_1_1_block_radix_sort.html | 2 +- docs/html/classcub_1_1_block_reduce-members.html | 2 +- docs/html/classcub_1_1_block_reduce.html | 2 +- docs/html/classcub_1_1_block_scan-members.html | 2 +- docs/html/classcub_1_1_block_scan.html.REMOVED.git-id | 2 +- docs/html/classcub_1_1_block_store-members.html | 2 +- docs/html/classcub_1_1_block_store.html | 2 +- ...lasscub_1_1_cache_modified_input_iterator-members.html | 2 +- docs/html/classcub_1_1_cache_modified_input_iterator.html | 2 +- ...asscub_1_1_cache_modified_output_iterator-members.html | 2 +- .../html/classcub_1_1_cache_modified_output_iterator.html | 2 +- .../classcub_1_1_constant_input_iterator-members.html | 2 +- docs/html/classcub_1_1_constant_input_iterator.html | 2 +- .../classcub_1_1_counting_input_iterator-members.html | 2 +- docs/html/classcub_1_1_counting_input_iterator.html | 2 +- .../html/classcub_1_1_tex_obj_input_iterator-members.html | 2 +- docs/html/classcub_1_1_tex_obj_input_iterator.html | 2 +- .../html/classcub_1_1_tex_ref_input_iterator-members.html | 2 +- docs/html/classcub_1_1_tex_ref_input_iterator.html | 2 +- .../classcub_1_1_transform_input_iterator-members.html | 2 +- docs/html/classcub_1_1_transform_input_iterator.html | 2 +- docs/html/classcub_1_1_warp_reduce-members.html | 2 +- docs/html/classcub_1_1_warp_reduce.html | 2 +- docs/html/classcub_1_1_warp_scan-members.html | 2 +- docs/html/classcub_1_1_warp_scan.html.REMOVED.git-id | 2 +- docs/html/classes.html | 2 +- docs/html/constant__input__iterator_8cuh.html | 2 +- docs/html/constant__input__iterator_8cuh_source.html | 2 +- docs/html/counting__input__iterator_8cuh.html | 2 +- docs/html/counting__input__iterator_8cuh_source.html | 2 +- docs/html/cub_8cuh.html | 2 +- docs/html/cub_8cuh_source.html | 2 +- docs/html/device__histogram_8cuh.html | 2 +- docs/html/device__histogram_8cuh_source.html | 2 +- docs/html/device__partition_8cuh.html | 2 +- docs/html/device__partition_8cuh_source.html | 2 +- docs/html/device__radix__sort_8cuh.html | 2 +- docs/html/device__radix__sort_8cuh_source.html | 2 +- docs/html/device__reduce_8cuh.html | 2 +- docs/html/device__reduce_8cuh_source.html | 2 +- docs/html/device__scan_8cuh.html | 2 +- docs/html/device__scan_8cuh_source.html | 2 +- docs/html/device__select_8cuh.html | 2 +- docs/html/device__select_8cuh_source.html | 2 +- docs/html/dir_011e1c944d88f71be72e1e24a5fda7cf.html | 2 +- docs/html/dir_18fc672d63781b5a743137aee24ff656.html | 2 +- docs/html/dir_80932b4cec52750ff92b1a1912314cf5.html | 2 +- docs/html/dir_bb50a5ef59f19d030d06415663184d05.html | 2 +- docs/html/dir_cb3a671affffe7eeb3fdf5ae58e42cc8.html | 2 +- docs/html/dir_d583f216f1aafe19404e836b0c097ad2.html | 2 +- docs/html/download_cub.html | 6 +++--- docs/html/example_block_radix_sort_8cu-example.html | 2 +- docs/html/example_block_reduce_8cu-example.html | 2 +- docs/html/example_block_scan_8cu-example.html | 2 +- docs/html/example_device_histogram_8cu-example.html | 2 +- .../example_device_partition_flagged_8cu-example.html | 2 +- docs/html/example_device_partition_if_8cu-example.html | 2 +- docs/html/example_device_radix_sort_8cu-example.html | 2 +- docs/html/example_device_reduce_8cu-example.html | 2 +- docs/html/example_device_scan_8cu-example.html | 2 +- docs/html/example_device_select_flagged_8cu-example.html | 2 +- docs/html/example_device_select_if_8cu-example.html | 2 +- docs/html/example_device_select_unique_8cu-example.html | 2 +- docs/html/examples.html | 2 +- docs/html/files.html | 2 +- docs/html/functions.html | 2 +- docs/html/functions_0x62.html | 2 +- docs/html/functions_0x63.html | 2 +- docs/html/functions_0x64.html | 2 +- docs/html/functions_0x65.html | 2 +- docs/html/functions_0x66.html | 2 +- docs/html/functions_0x68.html | 2 +- docs/html/functions_0x69.html | 2 +- docs/html/functions_0x6b.html | 2 +- docs/html/functions_0x6c.html | 2 +- docs/html/functions_0x6d.html | 2 +- docs/html/functions_0x6f.html | 2 +- docs/html/functions_0x70.html | 2 +- docs/html/functions_0x72.html | 2 +- docs/html/functions_0x73.html | 2 +- docs/html/functions_0x74.html | 2 +- docs/html/functions_0x75.html | 2 +- docs/html/functions_0x76.html | 2 +- docs/html/functions_0x77.html | 2 +- docs/html/functions_0x7e.html | 2 +- docs/html/functions_func.html | 2 +- docs/html/functions_func_0x62.html | 2 +- docs/html/functions_func_0x63.html | 2 +- docs/html/functions_func_0x64.html | 2 +- docs/html/functions_func_0x65.html | 2 +- docs/html/functions_func_0x66.html | 2 +- docs/html/functions_func_0x68.html | 2 +- docs/html/functions_func_0x69.html | 2 +- docs/html/functions_func_0x6c.html | 2 +- docs/html/functions_func_0x6d.html | 2 +- docs/html/functions_func_0x6f.html | 2 +- docs/html/functions_func_0x72.html | 2 +- docs/html/functions_func_0x73.html | 2 +- docs/html/functions_func_0x74.html | 2 +- docs/html/functions_func_0x75.html | 2 +- docs/html/functions_func_0x77.html | 2 +- docs/html/functions_func_0x7e.html | 2 +- docs/html/functions_rela.html | 2 +- docs/html/functions_type.html | 2 +- docs/html/functions_vars.html | 2 +- docs/html/globals.html | 2 +- docs/html/globals_defs.html | 2 +- docs/html/group___block_module.html | 2 +- docs/html/group___device_module.html | 2 +- docs/html/group___primitive_module.html | 2 +- docs/html/group___util_io.html | 2 +- docs/html/group___util_iterator.html | 2 +- docs/html/group___util_mgmt.html | 2 +- docs/html/group___util_module.html | 2 +- docs/html/group___util_ptx.html | 2 +- docs/html/group___warp_module.html | 2 +- docs/html/hierarchy.html | 2 +- docs/html/index.html | 8 ++++---- docs/html/modules.html | 2 +- docs/html/namespacecub.html.REMOVED.git-id | 2 +- docs/html/namespacemembers.html | 2 +- docs/html/namespacemembers_enum.html | 2 +- docs/html/namespacemembers_eval.html | 2 +- docs/html/namespacemembers_func.html | 2 +- docs/html/namespaces.html | 2 +- docs/html/structcub_1_1_arg_max-members.html | 2 +- docs/html/structcub_1_1_arg_max.html | 2 +- docs/html/structcub_1_1_arg_min-members.html | 2 +- docs/html/structcub_1_1_arg_min.html | 2 +- docs/html/structcub_1_1_base_traits-members.html | 2 +- docs/html/structcub_1_1_base_traits.html | 2 +- ..._1_1_block_discontinuity_1_1_temp_storage-members.html | 2 +- ...tructcub_1_1_block_discontinuity_1_1_temp_storage.html | 2 +- ...ctcub_1_1_block_exchange_1_1_temp_storage-members.html | 2 +- .../structcub_1_1_block_exchange_1_1_temp_storage.html | 2 +- ...tcub_1_1_block_histogram_1_1_temp_storage-members.html | 2 +- .../structcub_1_1_block_histogram_1_1_temp_storage.html | 2 +- ..._p_o_s_e_00_01_d_5ea8dad2df262b118ec77ecff8dc9dd3.html | 2 +- ...n_s_p_o_s_e_00_01_d_u_m_m_y_01_4_1_1_temp_storage.html | 2 +- ..._t_r_a_n_s_p_o_s_402c3164d23f1ec647db5dad06a54584.html | 2 +- ..._t_r_a_n_s_p_o_s_b58863673477c12a4e46def6747d1835.html | 2 +- ...structcub_1_1_block_load_1_1_temp_storage-members.html | 2 +- docs/html/structcub_1_1_block_load_1_1_temp_storage.html | 2 +- ...cub_1_1_block_radix_sort_1_1_temp_storage-members.html | 2 +- .../structcub_1_1_block_radix_sort_1_1_temp_storage.html | 2 +- ...ructcub_1_1_block_reduce_1_1_temp_storage-members.html | 2 +- .../html/structcub_1_1_block_reduce_1_1_temp_storage.html | 2 +- ...structcub_1_1_block_scan_1_1_temp_storage-members.html | 2 +- docs/html/structcub_1_1_block_scan_1_1_temp_storage.html | 2 +- ..._n_s_p_o_s_e_00_07dc8a0abd37bbc1ba3abf8440890a6c0.html | 2 +- ..._n_s_p_o_s_e_00_09dfae03f13932c7dbdb41be30a5767ba.html | 2 +- ..._p___t_r_a_n_s_p_2a6ef8c29850a6a6dfbf5e4acbc50c1f.html | 2 +- ..._p___t_r_a_n_s_p_8d170856b7ed1df0ed565731a681b449.html | 2 +- ...tructcub_1_1_block_store_1_1_temp_storage-members.html | 2 +- docs/html/structcub_1_1_block_store_1_1_temp_storage.html | 2 +- .../structcub_1_1_caching_device_allocator-members.html | 2 +- docs/html/structcub_1_1_caching_device_allocator.html | 2 +- docs/html/structcub_1_1_cast-members.html | 2 +- docs/html/structcub_1_1_cast.html | 2 +- docs/html/structcub_1_1_cub_vector.html | 2 +- docs/html/structcub_1_1_device_histogram-members.html | 2 +- docs/html/structcub_1_1_device_histogram.html | 2 +- docs/html/structcub_1_1_device_partition-members.html | 2 +- docs/html/structcub_1_1_device_partition.html | 2 +- docs/html/structcub_1_1_device_radix_sort-members.html | 2 +- docs/html/structcub_1_1_device_radix_sort.html | 2 +- docs/html/structcub_1_1_device_reduce-members.html | 2 +- docs/html/structcub_1_1_device_reduce.html | 2 +- docs/html/structcub_1_1_device_scan-members.html | 2 +- docs/html/structcub_1_1_device_scan.html | 2 +- docs/html/structcub_1_1_device_select-members.html | 2 +- docs/html/structcub_1_1_device_select.html | 2 +- docs/html/structcub_1_1_double_buffer-members.html | 2 +- docs/html/structcub_1_1_double_buffer.html | 2 +- docs/html/structcub_1_1_equality-members.html | 2 +- docs/html/structcub_1_1_equality.html | 2 +- docs/html/structcub_1_1_equals-members.html | 2 +- docs/html/structcub_1_1_equals.html | 2 +- docs/html/structcub_1_1_if-members.html | 2 +- docs/html/structcub_1_1_if.html | 2 +- docs/html/structcub_1_1_inequality-members.html | 2 +- docs/html/structcub_1_1_inequality.html | 2 +- docs/html/structcub_1_1_inequality_wrapper-members.html | 2 +- docs/html/structcub_1_1_inequality_wrapper.html | 2 +- docs/html/structcub_1_1_int2_type-members.html | 2 +- docs/html/structcub_1_1_int2_type.html | 2 +- docs/html/structcub_1_1_item_offset_pair-members.html | 2 +- docs/html/structcub_1_1_item_offset_pair.html | 2 +- docs/html/structcub_1_1_key_value_pair-members.html | 2 +- docs/html/structcub_1_1_key_value_pair.html | 2 +- docs/html/structcub_1_1_log2-members.html | 2 +- docs/html/structcub_1_1_log2.html | 2 +- docs/html/structcub_1_1_max-members.html | 2 +- docs/html/structcub_1_1_max.html | 2 +- docs/html/structcub_1_1_min-members.html | 2 +- docs/html/structcub_1_1_min.html | 2 +- docs/html/structcub_1_1_null_type.html | 2 +- docs/html/structcub_1_1_numeric_traits-members.html | 2 +- docs/html/structcub_1_1_numeric_traits.html | 2 +- docs/html/structcub_1_1_power_of_two-members.html | 2 +- docs/html/structcub_1_1_power_of_two.html | 2 +- docs/html/structcub_1_1_sum-members.html | 2 +- docs/html/structcub_1_1_sum.html | 2 +- docs/html/structcub_1_1_traits-members.html | 2 +- docs/html/structcub_1_1_traits.html | 2 +- docs/html/structcub_1_1_uninitialized-members.html | 2 +- docs/html/structcub_1_1_uninitialized.html | 2 +- ...tructcub_1_1_warp_reduce_1_1_temp_storage-members.html | 2 +- docs/html/structcub_1_1_warp_reduce_1_1_temp_storage.html | 2 +- .../structcub_1_1_warp_scan_1_1_temp_storage-members.html | 2 +- docs/html/structcub_1_1_warp_scan_1_1_temp_storage.html | 2 +- docs/html/tex__obj__input__iterator_8cuh.html | 2 +- docs/html/tex__obj__input__iterator_8cuh_source.html | 2 +- docs/html/tex__ref__input__iterator_8cuh.html | 2 +- docs/html/tex__ref__input__iterator_8cuh_source.html | 2 +- docs/html/thread__load_8cuh.html | 2 +- docs/html/thread__load_8cuh_source.html | 2 +- docs/html/thread__operators_8cuh.html | 2 +- docs/html/thread__operators_8cuh_source.html | 2 +- docs/html/thread__store_8cuh.html | 2 +- docs/html/thread__store_8cuh_source.html | 2 +- docs/html/transform__input__iterator_8cuh.html | 2 +- docs/html/transform__input__iterator_8cuh_source.html | 2 +- docs/html/util__allocator_8cuh_source.html | 2 +- docs/html/util__arch_8cuh.html | 2 +- docs/html/util__arch_8cuh_source.html | 2 +- docs/html/util__debug_8cuh.html | 2 +- docs/html/util__debug_8cuh_source.html | 2 +- docs/html/util__device_8cuh.html | 2 +- docs/html/util__device_8cuh_source.html | 2 +- docs/html/util__ptx_8cuh.html | 2 +- docs/html/util__ptx_8cuh_source.html | 2 +- docs/html/util__type_8cuh.html | 2 +- docs/html/util__type_8cuh_source.html.REMOVED.git-id | 2 +- docs/html/warp__reduce_8cuh.html | 2 +- docs/html/warp__reduce_8cuh_source.html | 2 +- docs/html/warp__scan_8cuh.html | 2 +- docs/html/warp__scan_8cuh_source.html | 2 +- docs/mainpage.dox | 6 +++--- 278 files changed, 288 insertions(+), 288 deletions(-) diff --git a/CHANGE_LOG.TXT b/CHANGE_LOG.TXT index daf1f795ef..b08ab45454 100644 --- a/CHANGE_LOG.TXT +++ b/CHANGE_LOG.TXT @@ -1,6 +1,6 @@ //----------------------------------------------------------------------------- -1.2.1 02/25/2014 +1.2.2 03/03/2014 - New features: - Added device-wide reduce-by-key (DeviceReduce::ReduceByKey, DeviceReduce::RunLengthEncode) - Added MS VC++ project solutions for device-wide and block-wide examples diff --git a/README.md b/README.md index b8be9ae0d2..cfdcef72da 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

About CUB

-Current release: v1.2.1 (February 28, 2014) +Current release: v1.2.3 (March 3, 2014) We recommend the [CUB Project Website](http://nvlabs.github.com/cub) and the [cub-users discussion forum](http://groups.google.com/group/cub-users) for further information and examples. @@ -84,7 +84,7 @@ See [CUB Project Website](http://nvlabs.github.com/cub) for more information. | Date | Version | | ---- | ------- | -| 02/25/2014 | [CUB v1.2.1 Primary Release](https://github.com/NVlabs/cub/archive/1.2.1.zip) | +| 02/25/2014 | [CUB v1.2.3 Primary Release](https://github.com/NVlabs/cub/archive/1.2.3.zip) | | 12/10/2013 | [CUB v1.1.1 Primary Release](https://github.com/NVlabs/cub/archive/1.1.1.zip) | | 08/08/2013 | [CUB v1.0.1 Primary Release](https://github.com/NVlabs/cub/archive/1.0.1.zip) | | 05/07/2013 | [CUB v0.9.4 Update Release](https://github.com/NVlabs/cub/archive/0.9.4.zip) | diff --git a/cub/block/specializations/block_reduce_raking_commutative_only.cuh b/cub/block/specializations/block_reduce_raking_commutative_only.cuh index e1bda90c31..6ab79e8281 100644 --- a/cub/block/specializations/block_reduce_raking_commutative_only.cuh +++ b/cub/block/specializations/block_reduce_raking_commutative_only.cuh @@ -73,7 +73,7 @@ struct BlockReduceRakingCommutativeOnly }; /// WarpReduce utility type - typedef typename WarpReduce WarpReduce; + typedef WarpReduce WarpReduce; /// Layout type for padded thread block raking grid typedef BlockRakingLayout BlockRakingLayout; diff --git a/docs/download_cub.html b/docs/download_cub.html index a5e08be719..03026e7427 100644 --- a/docs/download_cub.html +++ b/docs/download_cub.html @@ -37,14 +37,14 @@
If your download doesn't start in 3s:

- -Download CUB! + +Download CUB!
diff --git a/docs/html/CHANGE_LOG.TXT b/docs/html/CHANGE_LOG.TXT index daf1f795ef..b08ab45454 100644 --- a/docs/html/CHANGE_LOG.TXT +++ b/docs/html/CHANGE_LOG.TXT @@ -1,6 +1,6 @@ //----------------------------------------------------------------------------- -1.2.1 02/25/2014 +1.2.2 03/03/2014 - New features: - Added device-wide reduce-by-key (DeviceReduce::ReduceByKey, DeviceReduce::RunLengthEncode) - Added MS VC++ project solutions for device-wide and block-wide examples diff --git a/docs/html/annotated.html b/docs/html/annotated.html index 514084d01d..6a1deece32 100644 --- a/docs/html/annotated.html +++ b/docs/html/annotated.html @@ -228,7 +228,7 @@