From 8ebe02b6c40cb1bbc3a4408ca8676078bc4df298 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 3 May 2022 16:49:16 -0500 Subject: [PATCH] Revert include changes. --- cpp/src/binaryop/compiled/ATan2.cu | 4 ++-- cpp/src/binaryop/compiled/Add.cu | 4 ++-- cpp/src/binaryop/compiled/BitwiseAnd.cu | 4 ++-- cpp/src/binaryop/compiled/BitwiseOr.cu | 4 ++-- cpp/src/binaryop/compiled/BitwiseXor.cu | 4 ++-- cpp/src/binaryop/compiled/Div.cu | 4 ++-- cpp/src/binaryop/compiled/FloorDiv.cu | 4 ++-- cpp/src/binaryop/compiled/Greater.cu | 4 ++-- cpp/src/binaryop/compiled/GreaterEqual.cu | 4 ++-- cpp/src/binaryop/compiled/Less.cu | 4 ++-- cpp/src/binaryop/compiled/LessEqual.cu | 4 ++-- cpp/src/binaryop/compiled/LogBase.cu | 4 ++-- cpp/src/binaryop/compiled/LogicalAnd.cu | 4 ++-- cpp/src/binaryop/compiled/LogicalOr.cu | 4 ++-- cpp/src/binaryop/compiled/Mod.cu | 4 ++-- cpp/src/binaryop/compiled/Mul.cu | 4 ++-- cpp/src/binaryop/compiled/NullEquals.cu | 4 ++-- cpp/src/binaryop/compiled/NullLogicalAnd.cu | 2 +- cpp/src/binaryop/compiled/NullLogicalOr.cu | 2 +- cpp/src/binaryop/compiled/NullMax.cu | 4 ++-- cpp/src/binaryop/compiled/NullMin.cu | 4 ++-- cpp/src/binaryop/compiled/PMod.cu | 4 ++-- cpp/src/binaryop/compiled/Pow.cu | 4 ++-- cpp/src/binaryop/compiled/PyMod.cu | 4 ++-- cpp/src/binaryop/compiled/ShiftLeft.cu | 4 ++-- cpp/src/binaryop/compiled/ShiftRight.cu | 4 ++-- cpp/src/binaryop/compiled/ShiftRightUnsigned.cu | 4 ++-- cpp/src/binaryop/compiled/Sub.cu | 4 ++-- cpp/src/binaryop/compiled/TrueDiv.cu | 4 ++-- cpp/src/binaryop/compiled/binary_ops.cu | 4 ++-- cpp/src/binaryop/compiled/binary_ops.cuh | 4 ++-- cpp/src/binaryop/compiled/binary_ops.hpp | 8 ++++---- cpp/src/binaryop/compiled/equality_ops.cu | 4 ++-- cpp/src/binaryop/compiled/util.cpp | 2 +- 34 files changed, 67 insertions(+), 67 deletions(-) diff --git a/cpp/src/binaryop/compiled/ATan2.cu b/cpp/src/binaryop/compiled/ATan2.cu index 90c2bead8a7..8e5cbf57f55 100644 --- a/cpp/src/binaryop/compiled/ATan2.cu +++ b/cpp/src/binaryop/compiled/ATan2.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/Add.cu b/cpp/src/binaryop/compiled/Add.cu index 18375cc0680..4cd2ced66f4 100644 --- a/cpp/src/binaryop/compiled/Add.cu +++ b/cpp/src/binaryop/compiled/Add.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/BitwiseAnd.cu b/cpp/src/binaryop/compiled/BitwiseAnd.cu index 77374683c4f..6abac2bd197 100644 --- a/cpp/src/binaryop/compiled/BitwiseAnd.cu +++ b/cpp/src/binaryop/compiled/BitwiseAnd.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/BitwiseOr.cu b/cpp/src/binaryop/compiled/BitwiseOr.cu index 7eda9800598..6d523cbf1d1 100644 --- a/cpp/src/binaryop/compiled/BitwiseOr.cu +++ b/cpp/src/binaryop/compiled/BitwiseOr.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/BitwiseXor.cu b/cpp/src/binaryop/compiled/BitwiseXor.cu index 5d6bb9d2cb3..45175681574 100644 --- a/cpp/src/binaryop/compiled/BitwiseXor.cu +++ b/cpp/src/binaryop/compiled/BitwiseXor.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/Div.cu b/cpp/src/binaryop/compiled/Div.cu index ce8a7519da0..7cc895ecd06 100644 --- a/cpp/src/binaryop/compiled/Div.cu +++ b/cpp/src/binaryop/compiled/Div.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/FloorDiv.cu b/cpp/src/binaryop/compiled/FloorDiv.cu index 5b68defa598..99ea2706b86 100644 --- a/cpp/src/binaryop/compiled/FloorDiv.cu +++ b/cpp/src/binaryop/compiled/FloorDiv.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/Greater.cu b/cpp/src/binaryop/compiled/Greater.cu index 00195237486..679e029b5fc 100644 --- a/cpp/src/binaryop/compiled/Greater.cu +++ b/cpp/src/binaryop/compiled/Greater.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/GreaterEqual.cu b/cpp/src/binaryop/compiled/GreaterEqual.cu index d1cd0e484a5..23b0c6aaa0d 100644 --- a/cpp/src/binaryop/compiled/GreaterEqual.cu +++ b/cpp/src/binaryop/compiled/GreaterEqual.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/Less.cu b/cpp/src/binaryop/compiled/Less.cu index 8ca237f564a..7ab5dfe3478 100644 --- a/cpp/src/binaryop/compiled/Less.cu +++ b/cpp/src/binaryop/compiled/Less.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/LessEqual.cu b/cpp/src/binaryop/compiled/LessEqual.cu index 61031155dc6..983c50c9575 100644 --- a/cpp/src/binaryop/compiled/LessEqual.cu +++ b/cpp/src/binaryop/compiled/LessEqual.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/LogBase.cu b/cpp/src/binaryop/compiled/LogBase.cu index b75d1723299..bdc709b86bf 100644 --- a/cpp/src/binaryop/compiled/LogBase.cu +++ b/cpp/src/binaryop/compiled/LogBase.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/LogicalAnd.cu b/cpp/src/binaryop/compiled/LogicalAnd.cu index ad4cea633fb..08112fadfff 100644 --- a/cpp/src/binaryop/compiled/LogicalAnd.cu +++ b/cpp/src/binaryop/compiled/LogicalAnd.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/LogicalOr.cu b/cpp/src/binaryop/compiled/LogicalOr.cu index 1bb35ed3510..bc400afd4cd 100644 --- a/cpp/src/binaryop/compiled/LogicalOr.cu +++ b/cpp/src/binaryop/compiled/LogicalOr.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/Mod.cu b/cpp/src/binaryop/compiled/Mod.cu index e15e33ad664..0b82c09c8a6 100644 --- a/cpp/src/binaryop/compiled/Mod.cu +++ b/cpp/src/binaryop/compiled/Mod.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/Mul.cu b/cpp/src/binaryop/compiled/Mul.cu index e6b15942c4f..15394245259 100644 --- a/cpp/src/binaryop/compiled/Mul.cu +++ b/cpp/src/binaryop/compiled/Mul.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/NullEquals.cu b/cpp/src/binaryop/compiled/NullEquals.cu index 3d1207b1a6c..3fc76e804f7 100644 --- a/cpp/src/binaryop/compiled/NullEquals.cu +++ b/cpp/src/binaryop/compiled/NullEquals.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/NullLogicalAnd.cu b/cpp/src/binaryop/compiled/NullLogicalAnd.cu index 747a6175b33..48ae125bc93 100644 --- a/cpp/src/binaryop/compiled/NullLogicalAnd.cu +++ b/cpp/src/binaryop/compiled/NullLogicalAnd.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/NullLogicalOr.cu b/cpp/src/binaryop/compiled/NullLogicalOr.cu index 6203cf899eb..e0ea95ac3ee 100644 --- a/cpp/src/binaryop/compiled/NullLogicalOr.cu +++ b/cpp/src/binaryop/compiled/NullLogicalOr.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/NullMax.cu b/cpp/src/binaryop/compiled/NullMax.cu index 2624cb86945..78a44041cba 100644 --- a/cpp/src/binaryop/compiled/NullMax.cu +++ b/cpp/src/binaryop/compiled/NullMax.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/NullMin.cu b/cpp/src/binaryop/compiled/NullMin.cu index 09e4781610b..629ab600fd7 100644 --- a/cpp/src/binaryop/compiled/NullMin.cu +++ b/cpp/src/binaryop/compiled/NullMin.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/PMod.cu b/cpp/src/binaryop/compiled/PMod.cu index 3ad6f61b66c..36902c0ed10 100644 --- a/cpp/src/binaryop/compiled/PMod.cu +++ b/cpp/src/binaryop/compiled/PMod.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/Pow.cu b/cpp/src/binaryop/compiled/Pow.cu index 3fc8dcee206..c6f897ee18d 100644 --- a/cpp/src/binaryop/compiled/Pow.cu +++ b/cpp/src/binaryop/compiled/Pow.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/PyMod.cu b/cpp/src/binaryop/compiled/PyMod.cu index 1d59a6aac4d..b05dcd8e7bc 100644 --- a/cpp/src/binaryop/compiled/PyMod.cu +++ b/cpp/src/binaryop/compiled/PyMod.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/ShiftLeft.cu b/cpp/src/binaryop/compiled/ShiftLeft.cu index 050a7632d20..6cc950b2d50 100644 --- a/cpp/src/binaryop/compiled/ShiftLeft.cu +++ b/cpp/src/binaryop/compiled/ShiftLeft.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/ShiftRight.cu b/cpp/src/binaryop/compiled/ShiftRight.cu index cf17a5af549..1ddd7100a73 100644 --- a/cpp/src/binaryop/compiled/ShiftRight.cu +++ b/cpp/src/binaryop/compiled/ShiftRight.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/ShiftRightUnsigned.cu b/cpp/src/binaryop/compiled/ShiftRightUnsigned.cu index a3bfe9e2d15..a87b4b9f9ac 100644 --- a/cpp/src/binaryop/compiled/ShiftRightUnsigned.cu +++ b/cpp/src/binaryop/compiled/ShiftRightUnsigned.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/Sub.cu b/cpp/src/binaryop/compiled/Sub.cu index 327a7a7c7de..e0cf47c1310 100644 --- a/cpp/src/binaryop/compiled/Sub.cu +++ b/cpp/src/binaryop/compiled/Sub.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/TrueDiv.cu b/cpp/src/binaryop/compiled/TrueDiv.cu index bf01226f96a..d8f1d956340 100644 --- a/cpp/src/binaryop/compiled/TrueDiv.cu +++ b/cpp/src/binaryop/compiled/TrueDiv.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { template void apply_binary_op(mutable_column_device_view&, diff --git a/cpp/src/binaryop/compiled/binary_ops.cu b/cpp/src/binaryop/compiled/binary_ops.cu index a50be6379e6..c01359b80d0 100644 --- a/cpp/src/binaryop/compiled/binary_ops.cu +++ b/cpp/src/binaryop/compiled/binary_ops.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include "binary_ops.hpp" +#include "operation.cuh" #include #include diff --git a/cpp/src/binaryop/compiled/binary_ops.cuh b/cpp/src/binaryop/compiled/binary_ops.cuh index be3d1ab775a..ec41fbb8883 100644 --- a/cpp/src/binaryop/compiled/binary_ops.cuh +++ b/cpp/src/binaryop/compiled/binary_ops.cuh @@ -16,8 +16,8 @@ #pragma once -#include -#include +#include "binary_ops.hpp" +#include "operation.cuh" #include #include diff --git a/cpp/src/binaryop/compiled/binary_ops.hpp b/cpp/src/binaryop/compiled/binary_ops.hpp index 85ef254c5a1..26a0f26b59c 100644 --- a/cpp/src/binaryop/compiled/binary_ops.hpp +++ b/cpp/src/binaryop/compiled/binary_ops.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2022, NVIDIA CORPORATION. + * Copyright (c) 2018-2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -167,7 +167,7 @@ std::optional get_common_type(data_type out, data_type lhs, data_type * @param out output type of the binary operation * @param lhs first operand type of the binary operation * @param rhs second operand type of the binary operation - * @param op binary operator enum + * @param op binary operator enum. * @return true if given binary operator supports given input and output types. */ bool is_supported_operation(data_type out, data_type lhs, data_type rhs, binary_operator op); @@ -195,8 +195,8 @@ void apply_binary_op(mutable_column_device_view&, bool is_rhs_scalar, rmm::cuda_stream_view stream); /** - * @brief Deploys single type or double type dispatcher that runs equality operation on each - * element of @p lhsd and @p rhsd columns. + * @brief Deploys single type or double type dispatcher that runs equality operation on each element + * of @p lhsd and @p rhsd columns. * * Comparison operators are EQUAL, NOT_EQUAL, NULL_EQUALS. * @p outd type is boolean. diff --git a/cpp/src/binaryop/compiled/equality_ops.cu b/cpp/src/binaryop/compiled/equality_ops.cu index fe34f3ef373..03c3e373476 100644 --- a/cpp/src/binaryop/compiled/equality_ops.cu +++ b/cpp/src/binaryop/compiled/equality_ops.cu @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022, NVIDIA CORPORATION. + * Copyright (c) 2021, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "binary_ops.cuh" namespace cudf::binops::compiled { void dispatch_equality_op(mutable_column_device_view& outd, diff --git a/cpp/src/binaryop/compiled/util.cpp b/cpp/src/binaryop/compiled/util.cpp index b79bc52fc94..d8f1eb03a16 100644 --- a/cpp/src/binaryop/compiled/util.cpp +++ b/cpp/src/binaryop/compiled/util.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include "operation.cuh" #include #include