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 CUDA_DEVICE_CALLABLE macro usage #10015

Merged
merged 1 commit into from
Jan 11, 2022
+8 −11
Merged

Remove CUDA_DEVICE_CALLABLE macro usage #10015

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
19 changes: 8 additions & 11 deletions java/src/main/native/src/row_conversion.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,18 +152,15 @@ struct tile_info {
int end_row;
int batch_number;

CUDA_DEVICE_CALLABLE
size_type get_shared_row_size(size_type const *const col_offsets,
size_type const *const col_sizes) const {
__device__ inline size_type get_shared_row_size(size_type const *const col_offsets,
size_type const *const col_sizes) const {
return util::round_up_unsafe(col_offsets[end_col] + col_sizes[end_col] - col_offsets[start_col],
JCUDF_ROW_ALIGNMENT);
}

CUDA_DEVICE_CALLABLE
size_type num_cols() const { return end_col - start_col + 1; }
__device__ inline size_type num_cols() const { return end_col - start_col + 1; }

CUDA_DEVICE_CALLABLE
size_type num_rows() const { return end_row - start_row + 1; }
__device__ inline size_type num_rows() const { return end_row - start_row + 1; }
};

/**
Expand Down Expand Up @@ -194,8 +191,7 @@ struct row_offset_functor {
row_offset_functor(size_type fixed_width_only_row_size)
: _fixed_width_only_row_size(fixed_width_only_row_size){};

CUDA_DEVICE_CALLABLE
size_type operator()(int row_number, int tile_row_start) const {
__device__ inline size_type operator()(int row_number, int tile_row_start) const {
return (row_number - tile_row_start) * _fixed_width_only_row_size;
}

Expand Down Expand Up @@ -1270,8 +1266,9 @@ template <typename RowSize> struct row_size_functor {
row_size_functor(size_type row_end, RowSize row_sizes, size_type last_row_end)
: _row_end(row_end), _row_sizes(row_sizes), _last_row_end(last_row_end) {}

CUDA_DEVICE_CALLABLE
uint64_t operator()(int i) const { return i >= _row_end ? 0 : _row_sizes[i + _last_row_end]; }
__device__ inline uint64_t operator()(int i) const {
return i >= _row_end ? 0 : _row_sizes[i + _last_row_end];
}

size_type _row_end;
RowSize _row_sizes;
Expand Down