Skip to content
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

Remove Thrust pair type from prefix sum code #819

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Remove Thrust pair type from prefix sum code #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions device/common/include/traccc/device/fill_prefix_sum.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,16 @@
// Project include(s).
#include "traccc/definitions/qualifiers.hpp"
#include "traccc/edm/container.hpp"
#include "traccc/utils/pair.hpp"

// VecMem include(s).
#include <vecmem/memory/memory_resource.hpp>
#include <vecmem/utils/copy.hpp>

// Thrust include(s).
#include <thrust/pair.h>

namespace traccc::device {

/// Type for the individual elements in the prefix sum vector
typedef thrust::pair<unsigned int, unsigned int> prefix_sum_element_t;
typedef traccc::pair<unsigned int, unsigned int> prefix_sum_element_t;

/// Convenience type definition for the return value of the helper function
typedef vecmem::vector<prefix_sum_element_t> prefix_sum_t;
Expand Down
2 changes: 1 addition & 1 deletion device/common/include/traccc/device/impl/fill_prefix_sum.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ inline void fill_prefix_sum(
const prefix_sum_size_t current =
sizes[static_cast<unsigned int>(globalIndex)];
for (prefix_sum_size_t i = 0; i < current - previous; ++i) {
result.at(previous + i) = {globalIndex, i};
result.at(previous + i) = {static_cast<unsigned int>(globalIndex), i};
}
}

Expand Down
Loading