Skip to content

Use column_views instead of column_device_views in binary operations. #10780

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
rapids-bot merged 13 commits into from
May 4, 2022
Merged

Use column_views instead of column_device_views in binary operations. #10780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
33173e4
Small changes from #9452.
bdice May 3, 2022
8ebe02b
Revert include changes.
bdice May 3, 2022
7b1ad92
Use column_view instead of column_device_view in binary operations.
bdice May 3, 2022
54566e2
Remove struct support, keep column_view changes.
bdice May 3, 2022
4b754ba
Fix docs/includes/whitespace.
bdice May 3, 2022
6c623e3
Revert struct support in is_supported_operation.
bdice May 3, 2022
62ef997
Remove unnecessary includes.
bdice May 3, 2022
d2f2ae6
Remove unused includes.
bdice May 3, 2022
b591943
Revert "Small changes from #9452."
bdice May 3, 2022
54a3d90
Remove redundant supported operation check.
bdice May 3, 2022
b296113
Remove is_supported_operation on column_views.
bdice May 3, 2022
53d4fed
Remove scalar_as_column_view struct support.
bdice May 3, 2022
a444649
Fix outd -> out.
bdice May 4, 2022
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
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/ATan2.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::ATan2>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::ATan2>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/Add.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::Add>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::Add>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/BitwiseAnd.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::BitwiseAnd>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::BitwiseAnd>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/BitwiseOr.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::BitwiseOr>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::BitwiseOr>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/BitwiseXor.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::BitwiseXor>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::BitwiseXor>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/Div.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::Div>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::Div>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/FloorDiv.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::FloorDiv>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::FloorDiv>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/Greater.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::Greater>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::Greater>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/GreaterEqual.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::GreaterEqual>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::GreaterEqual>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/Less.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::Less>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::Less>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/LessEqual.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::LessEqual>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::LessEqual>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/LogBase.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::LogBase>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::LogBase>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/LogicalAnd.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::LogicalAnd>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::LogicalAnd>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/LogicalOr.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::LogicalOr>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::LogicalOr>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/Mod.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::Mod>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::Mod>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/Mul.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::Mul>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::Mul>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/NullEquals.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::NullEquals>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::NullEquals>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
6 changes: 3 additions & 3 deletions cpp/src/binaryop/compiled/NullLogicalAnd.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::NullLogicalAnd>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::NullLogicalAnd>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
6 changes: 3 additions & 3 deletions cpp/src/binaryop/compiled/NullLogicalOr.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::NullLogicalOr>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::NullLogicalOr>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/binaryop/compiled/NullMax.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, NVIDIA CORPORATION.
* Copyright (c) 2021-2022, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,9 +17,9 @@
#include "binary_ops.cuh"

namespace cudf::binops::compiled {
template void apply_binary_op<ops::NullMax>(mutable_column_device_view&,
column_device_view const&,
column_device_view const&,
template void apply_binary_op<ops::NullMax>(mutable_column_view&,
column_view const&,
column_view const&,
bool is_lhs_scalar,
bool is_rhs_scalar,
rmm::cuda_stream_view);
Expand Down
Loading