Skip to content

[rocPRIM][Cherry Pick] Fix rocPRIM block_shuffle syntax error #1030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vamovsik merged 4 commits into from
Aug 7, 2025
Merged

[rocPRIM][Cherry Pick] Fix rocPRIM block_shuffle syntax error #1030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74fa48d
chery-pick syntax fix from fork
NguyenNhuDi Aug 1, 2025
ee7fe6c
deleted .jenkins to get correct math-ci configuration
NguyenNhuDi Aug 1, 2025
71ccaec
Merge branch 'release/rocm-rel-7.0' into zenguyen/NguyenNhuDi/fix-roc…
NguyenNhuDi Aug 5, 2025
efae416
Merge branch 'release/rocm-rel-7.0' into zenguyen/NguyenNhuDi/fix-roc…
NguyenNhuDi Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 0 additions & 105 deletions projects/rocprim/.jenkins/common.groovy
View file
Open in desktop

This file was deleted.

81 changes: 0 additions & 81 deletions projects/rocprim/.jenkins/precheckin.groovy
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions projects/rocprim/.jenkins/static.groovy
View file
Open in desktop

This file was deleted.

54 changes: 29 additions & 25 deletions projects/rocprim/rocprim/include/rocprim/block/block_shuffle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ class block_shuffle
/// \param [out] output reference to a output value, that receives data from another thread
/// \param [in] distance The input threadId + distance = output threadId.
/// \param [in] storage reference to a temporary storage object of type storage_type.
ROCPRIM_DEVICE ROCPRIM_INLINE void
offset(const size_t& flat_id, T input, T& output, int distance, storage_type& storage)
ROCPRIM_DEVICE ROCPRIM_INLINE
void offset(const size_t& flat_id, T input, T& output, int distance, storage_type& storage)
{
storage.buffer.emplace(flat_id, input);

Expand Down Expand Up @@ -243,8 +243,8 @@ class block_shuffle
/// \param [out] output reference to a output value, that receives data from another thread
/// \param [in] distance The input threadId + distance = output threadId.
/// \param [in] storage reference to a temporary storage object of type storage_type.
ROCPRIM_DEVICE ROCPRIM_INLINE void
rotate(const size_t& flat_id, T input, T& output, int distance, storage_type& storage)
ROCPRIM_DEVICE ROCPRIM_INLINE
void rotate(const size_t& flat_id, T input, T& output, int distance, storage_type& storage)
{
storage.buffer.emplace(flat_id, input);

Expand Down Expand Up @@ -320,10 +320,11 @@ class block_shuffle
/// \param [in] storage reference to a temporary storage object of type storage_type.
/// The item \p prev[0] is not updated for <em>thread</em><sub>0</sub>.
template<unsigned int ItemsPerThread>
ROCPRIM_DEVICE ROCPRIM_INLINE void up(const size_t& flat_id,
T (&input)[ItemsPerThread],
T (&prev)[ItemsPerThread],
storage_type& storage)
ROCPRIM_DEVICE ROCPRIM_INLINE
void up(const size_t& flat_id,
T (&input)[ItemsPerThread],
T (&prev)[ItemsPerThread],
storage_type& storage)
{
storage.buffer.emplace(flat_id, input[ItemsPerThread - 1]);

Expand Down Expand Up @@ -390,16 +391,17 @@ class block_shuffle
/// <em>thread</em><sub><tt>BlockSize-1</tt></sub>, provided to all threads
/// \param [in] storage reference to a temporary storage object of type storage_type.
template<int ItemsPerThread>
ROCPRIM_DEVICE ROCPRIM_INLINE void up(const size_t& flat_id,
T (&input)[ItemsPerThread],
T (&prev)[ItemsPerThread],
T& block_suffix,
storage_type& storage)
ROCPRIM_DEVICE ROCPRIM_INLINE
void up(const size_t& flat_id,
T (&input)[ItemsPerThread],
T (&prev)[ItemsPerThread],
T& block_suffix,
storage_type& storage)
{
up(flat_id, input, prev, storage);

// Update block prefix
block_suffix = storage->buffer.get_unsafe_array()[BlockSize - 1];
block_suffix = storage.buffer.get_unsafe_array()[BlockSize - 1];
}

/// \brief The thread block rotates a blocked arrange of input items,
Expand Down Expand Up @@ -458,10 +460,11 @@ class block_shuffle
/// The item \p prev[0] is not updated for <em>thread</em><sub>BlockSize - 1</sub>.
/// \param [in] storage reference to a temporary storage object of type storage_type.
template<unsigned int ItemsPerThread>
ROCPRIM_DEVICE ROCPRIM_INLINE void down(const size_t& flat_id,
T (&input)[ItemsPerThread],
T (&next)[ItemsPerThread],
storage_type& storage)
ROCPRIM_DEVICE ROCPRIM_INLINE
void down(const size_t& flat_id,
T (&input)[ItemsPerThread],
T (&next)[ItemsPerThread],
storage_type& storage)
{
storage.buffer.emplace(flat_id, input[0]);

Expand Down Expand Up @@ -525,16 +528,17 @@ class block_shuffle
/// \param [out] block_prefix The item \p input[0] from <em>thread</em><sub><tt>0</tt></sub>, provided to all threads
/// \param [in] storage reference to a temporary storage object of type storage_type.
template<unsigned int ItemsPerThread>
ROCPRIM_DEVICE ROCPRIM_INLINE void down(const size_t& flat_id,
T (&input)[ItemsPerThread],
T (&next)[ItemsPerThread],
T& block_prefix,
storage_type& storage)
ROCPRIM_DEVICE ROCPRIM_INLINE
void down(const size_t& flat_id,
T (&input)[ItemsPerThread],
T (&next)[ItemsPerThread],
T& block_prefix,
storage_type& storage)
{
this->down(flat_id, input, next, storage);

// Update block prefixstorage_->
block_prefix = storage->next[0];
block_prefix = storage.buffer.get_unsafe_array()[0];
}
};

Expand All @@ -543,4 +547,4 @@ END_ROCPRIM_NAMESPACE
/// @}
// end of group blockmodule

#endif // ROCPRIM_BLOCK_BLOCK_SHUFFLE_HPP_
#endif // ROCPRIM_BLOCK_BLOCK_SHUFFLE_HPP_
Loading