Skip to content

Commit

Permalink
Merge branch 'prerelease_doc_update' into 'master'
Browse files Browse the repository at this point in the history
Update info about hipCUB

See merge request amd/rocPRIM!116
  • Loading branch information
AJcodes committed Mar 23, 2018
2 parents d72611f + 8f361f5 commit 64505a8
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ INPUT = mainpage.dox \
intrinsicsmodule.dox \
hipcub.dox \
glossary.dox \
../library/rocprim/include
../rocprim/include/rocprim

# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
Expand Down
12 changes: 7 additions & 5 deletions doc/hipcub.dox
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,20 @@
* Not-supported features and differences:
*
* * Functions, classes and macros which are not in the public API are not supported.
* * `BlockHistogram` block primitive.
* * From device-wide primitives only `DeviceRadixSort`, `DeviceReduce`, and `DeviceScan` are supported. It's planned to
* add support for all device-wide primitives except `DeviceSpmv`.
* * Fancy iterators.
* * Device-wide primitives can't be called from kernels (dynamic parallelism is not supported in HIP/HC).
* * From device-wide primitives `DeviceRadixSort`, `DeviceReduce`, `DeviceScan`, `DeviceHistogram` (limited support),
* `DeviceSegmentedRadixSort`, and `DeviceSegmentedReduce` are supported. It's planned to add support for all
* device-wide primitives except `DeviceSpmv`.
* * Fancy iterators: `CacheModifiedInputIterator`, `CacheModifiedOutputIterator`, `TexObjInputIterator`, and `TexRefInputIterator`
* are not supported. Support for `TexObjInputIterator` is planned.
* * Thread I/O:
* * `CacheLoadModifier`, `CacheStoreModifier` cache modifiers are not supported.
* * `ThreadLoad`, `ThreadStore` functions are not supported.
* * Storage management and debug functions:
* * `CachingDeviceAllocator` class is not supported.
* * `Debug`, `PtxVersion`, `SmVersion` functions and `CubDebug`, `CubDebugExit`, `_CubLog` macros are not supported.
* * Intrinsics:
* * `ThreadExit`, `ThreadTrap`, `PRMT` - not supported.
* * `ThreadExit`, `ThreadTrap` - not supported.
* * Warp thread masks (when used) are 64-bit unsigned integers.
* * `member_mask` input argument is ignored in `WARP_*` functions.
* * Arguments `first_lane`, `last_lane`, and `member_mask` are ignored in `Shuffle*` functions.
Expand Down
6 changes: 6 additions & 0 deletions rocprim/include/rocprim/block/block_histogram.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@

BEGIN_ROCPRIM_NAMESPACE

/// \addtogroup blockmodule
/// @{

enum class block_histogram_algorithm
{
using_atomic,
Expand Down Expand Up @@ -139,4 +142,7 @@ class block_histogram

END_ROCPRIM_NAMESPACE

/// @}
// end of group blockmodule

#endif // ROCPRIM_BLOCK_BLOCK_HISTOGRAM_HPP_
5 changes: 5 additions & 0 deletions rocprim/include/rocprim/device/device_select_hc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ BEGIN_ROCPRIM_NAMESPACE
/// \addtogroup devicemodule_hc
/// @{

namespace detail
{

#define ROCPRIM_DETAIL_HC_SYNC(name, size, start) \
{ \
if(debug_synchronous) \
Expand All @@ -49,6 +52,8 @@ BEGIN_ROCPRIM_NAMESPACE
} \
}

} // end detail namespace

template<
class InputIterator,
class FlagIterator,
Expand Down
4 changes: 2 additions & 2 deletions rocprim/include/rocprim/device/device_select_hip.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ void flag_unique_kernel(InputIterator input,
);
}

} // end detail namespace

#define ROCPRIM_DETAIL_HIP_SYNC_AND_RETURN_ON_ERROR(name, size, start) \
{ \
if(error != hipSuccess) return error; \
Expand All @@ -119,6 +117,8 @@ void flag_unique_kernel(InputIterator input,
} \
}

} // end detail namespace

template<
class InputIterator,
class FlagIterator,
Expand Down

0 comments on commit 64505a8

Please sign in to comment.