Partial refactor following Vyas

Move direction/order to runtime dispatch
rapidsai · Feb 24, 2025 · fec5788 · fec5788
1 parent bb09793
commit fec5788
Show file tree

Hide file tree

Showing 6 changed files with 332 additions and 310 deletions.
diff --git a/cpp/include/cudf/detail/rolling.hpp b/cpp/include/cudf/detail/rolling.hpp
@@ -103,28 +103,10 @@ std::unique_ptr<column> rolling_window(column_view const& input,
  * launches.
  * @param mr Device memory resource used for allocations.
  */
-template <rolling::direction Direction>
 [[nodiscard]] std::unique_ptr<column> make_range_window(
   column_view const& orderby,
   std::optional<rolling::preprocessed_group_info> const& grouping,
-  order order,
-  null_order null_order,
-  range_window_type window,
-  rmm::cuda_stream_view stream,
-  rmm::device_async_resource_ref mr);
-
-extern template std::unique_ptr<column> make_range_window<rolling::direction::PRECEDING>(
-  column_view const& orderby,
-  std::optional<rolling::preprocessed_group_info> const& grouping,
-  order order,
-  null_order null_order,
-  range_window_type window,
-  rmm::cuda_stream_view stream,
-  rmm::device_async_resource_ref mr);
-
-extern template std::unique_ptr<column> make_range_window<rolling::direction::FOLLOWING>(
-  column_view const& orderby,
-  std::optional<rolling::preprocessed_group_info> const& grouping,
+  rolling::direction direction,
   order order,
   null_order null_order,
   range_window_type window,

diff --git a/cpp/src/rolling/detail/range_following.cu b/cpp/src/rolling/detail/range_following.cu
@@ -14,30 +14,30 @@
  * limitations under the License.
  */
 
-#include "range_utils.cuh"
+// #include "range_utils.cuh"
 
-#include <cudf/column/column.hpp>
-#include <cudf/column/column_view.hpp>
-#include <cudf/detail/rolling.hpp>
-#include <cudf/rolling.hpp>
-#include <cudf/types.hpp>
+// #include <cudf/column/column.hpp>
+// #include <cudf/column/column_view.hpp>
+// #include <cudf/detail/rolling.hpp>
+// #include <cudf/rolling.hpp>
+// #include <cudf/types.hpp>
 
-#include <rmm/cuda_stream_view.hpp>
-#include <rmm/resource_ref.hpp>
+// #include <rmm/cuda_stream_view.hpp>
+// #include <rmm/resource_ref.hpp>
 
-#include <optional>
+// #include <optional>
 
-namespace CUDF_EXPORT cudf {
-namespace detail {
+// namespace CUDF_EXPORT cudf {
+// namespace detail {
 
-template std::unique_ptr<column> make_range_window<rolling::direction::FOLLOWING>(
-  column_view const& orderby,
-  std::optional<rolling::preprocessed_group_info> const& grouping,
-  order order,
-  null_order null_order,
-  range_window_type window,
-  rmm::cuda_stream_view stream,
-  rmm::device_async_resource_ref mr);
+// template std::unique_ptr<column> make_range_window<rolling::direction::FOLLOWING>(
+//   column_view const& orderby,
+//   std::optional<rolling::preprocessed_group_info> const& grouping,
+//   order order,
+//   null_order null_order,
+//   range_window_type window,
+//   rmm::cuda_stream_view stream,
+//   rmm::device_async_resource_ref mr);
 
-}  // namespace detail
-}  // namespace CUDF_EXPORT cudf
+// }  // namespace detail
+// }  // namespace CUDF_EXPORT cudf
diff --git a/cpp/src/rolling/detail/range_preceding.cu b/cpp/src/rolling/detail/range_preceding.cu
@@ -14,30 +14,30 @@
  * limitations under the License.
  */
 
-#include "range_utils.cuh"
+// #include "range_utils.cuh"
 
-#include <cudf/column/column.hpp>
-#include <cudf/column/column_view.hpp>
-#include <cudf/detail/rolling.hpp>
-#include <cudf/rolling.hpp>
-#include <cudf/types.hpp>
+// #include <cudf/column/column.hpp>
+// #include <cudf/column/column_view.hpp>
+// #include <cudf/detail/rolling.hpp>
+// #include <cudf/rolling.hpp>
+// #include <cudf/types.hpp>
 
-#include <rmm/cuda_stream_view.hpp>
-#include <rmm/resource_ref.hpp>
+// #include <rmm/cuda_stream_view.hpp>
+// #include <rmm/resource_ref.hpp>
 
-#include <optional>
+// #include <optional>
 
-namespace CUDF_EXPORT cudf {
-namespace detail {
+// namespace CUDF_EXPORT cudf {
+// namespace detail {
 
-template std::unique_ptr<column> make_range_window<rolling::direction::PRECEDING>(
-  column_view const& orderby,
-  std::optional<rolling::preprocessed_group_info> const& grouping,
-  order order,
-  null_order null_order,
-  range_window_type window,
-  rmm::cuda_stream_view stream,
-  rmm::device_async_resource_ref mr);
+// template std::unique_ptr<column> make_range_window<rolling::direction::PRECEDING>(
+//   column_view const& orderby,
+//   std::optional<rolling::preprocessed_group_info> const& grouping,
+//   order order,
+//   null_order null_order,
+//   range_window_type window,
+//   rmm::cuda_stream_view stream,
+//   rmm::device_async_resource_ref mr);
 
-}  // namespace detail
-}  // namespace CUDF_EXPORT cudf
+// }  // namespace detail
+// }  // namespace CUDF_EXPORT cudf