From 61b8cc189b6dece1515279f625b9fabd1f36811c Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 17 May 2024 09:19:21 -0400 Subject: [PATCH] Fix up imports (#1383) --- python/cuspatial/cuspatial/_lib/cpp/distance.pxd | 8 ++++---- .../cuspatial/_lib/cpp/distance/polygon_distance.pxd | 4 ++-- .../cuspatial/_lib/cpp/linestring_bounding_boxes.pxd | 6 +++--- .../cuspatial/cuspatial/_lib/cpp/points_in_range.pxd | 4 ++-- .../cuspatial/_lib/cpp/polygon_bounding_boxes.pxd | 6 +++--- python/cuspatial/cuspatial/_lib/cpp/projection.pxd | 6 +++--- python/cuspatial/cuspatial/_lib/cpp/quadtree.pxd | 10 +++++----- python/cuspatial/cuspatial/_lib/cpp/spatial_join.pxd | 4 ++-- python/cuspatial/cuspatial/_lib/cpp/trajectory.pxd | 10 +++++----- python/cuspatial/cuspatial/_lib/distance.pyx | 8 ++++---- .../cuspatial/_lib/linestring_bounding_boxes.pyx | 6 +++--- python/cuspatial/cuspatial/_lib/nearest_points.pyx | 4 ++-- python/cuspatial/cuspatial/_lib/points_in_range.pyx | 4 ++-- .../cuspatial/_lib/polygon_bounding_boxes.pyx | 6 +++--- python/cuspatial/cuspatial/_lib/quadtree.pyx | 10 +++++----- python/cuspatial/cuspatial/_lib/spatial.pyx | 6 +++--- python/cuspatial/cuspatial/_lib/spatial_join.pyx | 4 ++-- python/cuspatial/cuspatial/_lib/trajectory.pyx | 10 +++++----- python/cuspatial/cuspatial/_lib/utils.pxd | 4 ++-- python/cuspatial/cuspatial/_lib/utils.pyx | 4 ++-- 20 files changed, 62 insertions(+), 62 deletions(-) diff --git a/python/cuspatial/cuspatial/_lib/cpp/distance.pxd b/python/cuspatial/cuspatial/_lib/cpp/distance.pxd index 1af0f97e0..98925a516 100644 --- a/python/cuspatial/cuspatial/_lib/cpp/distance.pxd +++ b/python/cuspatial/cuspatial/_lib/cpp/distance.pxd @@ -1,11 +1,11 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. from libcpp.memory cimport unique_ptr from libcpp.utility cimport pair -from cudf._lib.cpp.column.column cimport column -from cudf._lib.cpp.column.column_view cimport column_view -from cudf._lib.cpp.table.table_view cimport table_view +from cudf._lib.pylibcudf.libcudf.column.column cimport column +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.table.table_view cimport table_view from cuspatial._lib.cpp.column.geometry_column_view cimport ( geometry_column_view, diff --git a/python/cuspatial/cuspatial/_lib/cpp/distance/polygon_distance.pxd b/python/cuspatial/cuspatial/_lib/cpp/distance/polygon_distance.pxd index 62f3a318c..3a92adae3 100644 --- a/python/cuspatial/cuspatial/_lib/cpp/distance/polygon_distance.pxd +++ b/python/cuspatial/cuspatial/_lib/cpp/distance/polygon_distance.pxd @@ -1,8 +1,8 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. from libcpp.memory cimport unique_ptr -from cudf._lib.cpp.column.column cimport column +from cudf._lib.pylibcudf.libcudf.column.column cimport column from cuspatial._lib.cpp.column.geometry_column_view cimport ( geometry_column_view, diff --git a/python/cuspatial/cuspatial/_lib/cpp/linestring_bounding_boxes.pxd b/python/cuspatial/cuspatial/_lib/cpp/linestring_bounding_boxes.pxd index fa458a6cf..8622a417c 100644 --- a/python/cuspatial/cuspatial/_lib/cpp/linestring_bounding_boxes.pxd +++ b/python/cuspatial/cuspatial/_lib/cpp/linestring_bounding_boxes.pxd @@ -1,9 +1,9 @@ -# Copyright (c) 2020-2023, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. from libcpp.memory cimport unique_ptr -from cudf._lib.cpp.column.column_view cimport column_view -from cudf._lib.cpp.table.table cimport table +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.table.table cimport table cdef extern from "cuspatial/bounding_boxes.hpp" \ diff --git a/python/cuspatial/cuspatial/_lib/cpp/points_in_range.pxd b/python/cuspatial/cuspatial/_lib/cpp/points_in_range.pxd index e6534dc7b..d03b3a133 100644 --- a/python/cuspatial/cuspatial/_lib/cpp/points_in_range.pxd +++ b/python/cuspatial/cuspatial/_lib/cpp/points_in_range.pxd @@ -1,9 +1,9 @@ -# Copyright (c) 2020-2023, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. from libcpp.memory cimport unique_ptr from cudf._lib.column cimport column, column_view -from cudf._lib.cpp.table.table cimport table, table_view +from cudf._lib.pylibcudf.libcudf.table.table cimport table, table_view cdef extern from "cuspatial/points_in_range.hpp" namespace "cuspatial" nogil: diff --git a/python/cuspatial/cuspatial/_lib/cpp/polygon_bounding_boxes.pxd b/python/cuspatial/cuspatial/_lib/cpp/polygon_bounding_boxes.pxd index a6d28f965..45910626b 100644 --- a/python/cuspatial/cuspatial/_lib/cpp/polygon_bounding_boxes.pxd +++ b/python/cuspatial/cuspatial/_lib/cpp/polygon_bounding_boxes.pxd @@ -1,9 +1,9 @@ -# Copyright (c) 2020-2023, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. from libcpp.memory cimport unique_ptr -from cudf._lib.cpp.column.column_view cimport column_view -from cudf._lib.cpp.table.table cimport table +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.table.table cimport table cdef extern from "cuspatial/bounding_boxes.hpp" \ diff --git a/python/cuspatial/cuspatial/_lib/cpp/projection.pxd b/python/cuspatial/cuspatial/_lib/cpp/projection.pxd index 3c85461e7..724269486 100644 --- a/python/cuspatial/cuspatial/_lib/cpp/projection.pxd +++ b/python/cuspatial/cuspatial/_lib/cpp/projection.pxd @@ -1,10 +1,10 @@ -# Copyright (c) 2020-2023, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. from libcpp.memory cimport unique_ptr from libcpp.pair cimport pair -from cudf._lib.cpp.column.column cimport column -from cudf._lib.cpp.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.column.column cimport column +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view cdef extern from "cuspatial/projection.hpp" namespace "cuspatial" \ diff --git a/python/cuspatial/cuspatial/_lib/cpp/quadtree.pxd b/python/cuspatial/cuspatial/_lib/cpp/quadtree.pxd index be34d98a9..db2dabaca 100644 --- a/python/cuspatial/cuspatial/_lib/cpp/quadtree.pxd +++ b/python/cuspatial/cuspatial/_lib/cpp/quadtree.pxd @@ -1,13 +1,13 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. from libc.stdint cimport int8_t from libcpp.memory cimport unique_ptr from libcpp.pair cimport pair -from cudf._lib.cpp.column.column cimport column -from cudf._lib.cpp.column.column_view cimport column_view -from cudf._lib.cpp.table.table cimport table -from cudf._lib.cpp.types cimport size_type +from cudf._lib.pylibcudf.libcudf.column.column cimport column +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.table.table cimport table +from cudf._lib.pylibcudf.libcudf.types cimport size_type cdef extern from "cuspatial/point_quadtree.hpp" namespace "cuspatial" nogil: diff --git a/python/cuspatial/cuspatial/_lib/cpp/spatial_join.pxd b/python/cuspatial/cuspatial/_lib/cpp/spatial_join.pxd index 948aa77c9..ab96cf53c 100644 --- a/python/cuspatial/cuspatial/_lib/cpp/spatial_join.pxd +++ b/python/cuspatial/cuspatial/_lib/cpp/spatial_join.pxd @@ -1,10 +1,10 @@ -# Copyright (c) 2020-2022, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. from libc.stdint cimport int8_t from libcpp.memory cimport unique_ptr from cudf._lib.column cimport column_view -from cudf._lib.cpp.table.table cimport table, table_view +from cudf._lib.pylibcudf.libcudf.table.table cimport table, table_view cdef extern from "cuspatial/spatial_join.hpp" namespace "cuspatial" nogil: diff --git a/python/cuspatial/cuspatial/_lib/cpp/trajectory.pxd b/python/cuspatial/cuspatial/_lib/cpp/trajectory.pxd index 9031d17eb..5940349cc 100644 --- a/python/cuspatial/cuspatial/_lib/cpp/trajectory.pxd +++ b/python/cuspatial/cuspatial/_lib/cpp/trajectory.pxd @@ -1,12 +1,12 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. from libcpp.memory cimport unique_ptr from libcpp.pair cimport pair -from cudf._lib.cpp.column.column cimport column -from cudf._lib.cpp.column.column_view cimport column_view -from cudf._lib.cpp.table.table cimport table -from cudf._lib.cpp.types cimport size_type +from cudf._lib.pylibcudf.libcudf.column.column cimport column +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.table.table cimport table +from cudf._lib.pylibcudf.libcudf.types cimport size_type cdef extern from "cuspatial/trajectory.hpp" namespace "cuspatial" nogil: diff --git a/python/cuspatial/cuspatial/_lib/distance.pyx b/python/cuspatial/cuspatial/_lib/distance.pyx index cf61773e0..90e7b5ac0 100644 --- a/python/cuspatial/cuspatial/_lib/distance.pyx +++ b/python/cuspatial/cuspatial/_lib/distance.pyx @@ -1,12 +1,12 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. from libcpp.memory cimport make_shared, shared_ptr, unique_ptr from libcpp.utility cimport move, pair from cudf._lib.column cimport Column -from cudf._lib.cpp.column.column cimport column -from cudf._lib.cpp.column.column_view cimport column_view -from cudf._lib.cpp.table.table_view cimport table_view +from cudf._lib.pylibcudf.libcudf.column.column cimport column +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.table.table_view cimport table_view from cudf._lib.utils cimport columns_from_table_view from cuspatial._lib.cpp.column.geometry_column_view cimport ( diff --git a/python/cuspatial/cuspatial/_lib/linestring_bounding_boxes.pyx b/python/cuspatial/cuspatial/_lib/linestring_bounding_boxes.pyx index 28815cc57..4023f4965 100644 --- a/python/cuspatial/cuspatial/_lib/linestring_bounding_boxes.pyx +++ b/python/cuspatial/cuspatial/_lib/linestring_bounding_boxes.pyx @@ -1,11 +1,11 @@ -# Copyright (c) 2020-2023, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. from libcpp.memory cimport unique_ptr from libcpp.utility cimport move from cudf._lib.column cimport Column -from cudf._lib.cpp.column.column_view cimport column_view -from cudf._lib.cpp.table.table cimport table +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.table.table cimport table from cudf._lib.utils cimport columns_from_unique_ptr from cuspatial._lib.cpp.linestring_bounding_boxes cimport ( diff --git a/python/cuspatial/cuspatial/_lib/nearest_points.pyx b/python/cuspatial/cuspatial/_lib/nearest_points.pyx index d8ecebc58..da24357d3 100644 --- a/python/cuspatial/cuspatial/_lib/nearest_points.pyx +++ b/python/cuspatial/cuspatial/_lib/nearest_points.pyx @@ -1,9 +1,9 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. from libcpp.utility cimport move from cudf._lib.column cimport Column -from cudf._lib.cpp.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view from cuspatial._lib.cpp.nearest_points cimport ( pairwise_point_linestring_nearest_points as c_func, diff --git a/python/cuspatial/cuspatial/_lib/points_in_range.pyx b/python/cuspatial/cuspatial/_lib/points_in_range.pyx index e54b60a6b..4c25c2dbf 100644 --- a/python/cuspatial/cuspatial/_lib/points_in_range.pyx +++ b/python/cuspatial/cuspatial/_lib/points_in_range.pyx @@ -1,10 +1,10 @@ -# Copyright (c) 2020-2023, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. from libcpp.memory cimport unique_ptr from libcpp.utility cimport move from cudf._lib.column cimport Column, column_view -from cudf._lib.cpp.table.table cimport table +from cudf._lib.pylibcudf.libcudf.table.table cimport table from cudf._lib.utils cimport data_from_unique_ptr from cuspatial._lib.cpp.points_in_range cimport ( diff --git a/python/cuspatial/cuspatial/_lib/polygon_bounding_boxes.pyx b/python/cuspatial/cuspatial/_lib/polygon_bounding_boxes.pyx index d9419fe7b..0f963fd5a 100644 --- a/python/cuspatial/cuspatial/_lib/polygon_bounding_boxes.pyx +++ b/python/cuspatial/cuspatial/_lib/polygon_bounding_boxes.pyx @@ -1,11 +1,11 @@ -# Copyright (c) 2020-2023, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. from libcpp.memory cimport unique_ptr from libcpp.utility cimport move from cudf._lib.column cimport Column -from cudf._lib.cpp.column.column_view cimport column_view -from cudf._lib.cpp.table.table cimport table +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.table.table cimport table from cudf._lib.utils cimport columns_from_unique_ptr from cuspatial._lib.cpp.polygon_bounding_boxes cimport ( diff --git a/python/cuspatial/cuspatial/_lib/quadtree.pyx b/python/cuspatial/cuspatial/_lib/quadtree.pyx index de8246bc3..eb548a882 100644 --- a/python/cuspatial/cuspatial/_lib/quadtree.pyx +++ b/python/cuspatial/cuspatial/_lib/quadtree.pyx @@ -1,4 +1,4 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. from libc.stdint cimport int8_t from libcpp.memory cimport unique_ptr @@ -6,10 +6,10 @@ from libcpp.pair cimport pair from libcpp.utility cimport move from cudf._lib.column cimport Column -from cudf._lib.cpp.column.column cimport column -from cudf._lib.cpp.column.column_view cimport column_view -from cudf._lib.cpp.table.table cimport table -from cudf._lib.cpp.types cimport size_type +from cudf._lib.pylibcudf.libcudf.column.column cimport column +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.table.table cimport table +from cudf._lib.pylibcudf.libcudf.types cimport size_type from cudf._lib.utils cimport data_from_unique_ptr from cuspatial._lib.cpp.quadtree cimport ( diff --git a/python/cuspatial/cuspatial/_lib/spatial.pyx b/python/cuspatial/cuspatial/_lib/spatial.pyx index 916d66cec..6698da904 100644 --- a/python/cuspatial/cuspatial/_lib/spatial.pyx +++ b/python/cuspatial/cuspatial/_lib/spatial.pyx @@ -1,12 +1,12 @@ -# Copyright (c) 2019, NVIDIA CORPORATION. +# Copyright (c) 2019-2024, NVIDIA CORPORATION. from libcpp.memory cimport unique_ptr from libcpp.pair cimport pair from libcpp.utility cimport move from cudf._lib.column cimport Column -from cudf._lib.cpp.column.column cimport column -from cudf._lib.cpp.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.column.column cimport column +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view from cuspatial._lib.cpp.projection cimport ( sinusoidal_projection as cpp_sinusoidal_projection, diff --git a/python/cuspatial/cuspatial/_lib/spatial_join.pyx b/python/cuspatial/cuspatial/_lib/spatial_join.pyx index aab04c938..045014aba 100644 --- a/python/cuspatial/cuspatial/_lib/spatial_join.pyx +++ b/python/cuspatial/cuspatial/_lib/spatial_join.pyx @@ -1,11 +1,11 @@ -# Copyright (c) 2020-2022, NVIDIA CORPORATION. +# Copyright (c) 2020-2024, NVIDIA CORPORATION. from libc.stdint cimport int8_t from libcpp.memory cimport unique_ptr from libcpp.utility cimport move from cudf._lib.column cimport Column, column_view -from cudf._lib.cpp.table.table cimport table, table_view +from cudf._lib.pylibcudf.libcudf.table.table cimport table, table_view from cudf._lib.utils cimport data_from_unique_ptr, table_view_from_table from cuspatial._lib.cpp.spatial_join cimport ( diff --git a/python/cuspatial/cuspatial/_lib/trajectory.pyx b/python/cuspatial/cuspatial/_lib/trajectory.pyx index 012439904..df29dc05a 100644 --- a/python/cuspatial/cuspatial/_lib/trajectory.pyx +++ b/python/cuspatial/cuspatial/_lib/trajectory.pyx @@ -1,14 +1,14 @@ -# Copyright (c) 2019-2020, NVIDIA CORPORATION. +# Copyright (c) 2019-2024, NVIDIA CORPORATION. from libcpp.memory cimport unique_ptr from libcpp.pair cimport pair from libcpp.utility cimport move from cudf._lib.column cimport Column -from cudf._lib.cpp.column.column cimport column -from cudf._lib.cpp.column.column_view cimport column_view -from cudf._lib.cpp.table.table cimport table -from cudf._lib.cpp.types cimport size_type +from cudf._lib.pylibcudf.libcudf.column.column cimport column +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.table.table cimport table +from cudf._lib.pylibcudf.libcudf.types cimport size_type from cudf._lib.utils cimport data_from_unique_ptr from cuspatial._lib.cpp.trajectory cimport ( diff --git a/python/cuspatial/cuspatial/_lib/utils.pxd b/python/cuspatial/cuspatial/_lib/utils.pxd index 0567434d1..ad1714016 100644 --- a/python/cuspatial/cuspatial/_lib/utils.pxd +++ b/python/cuspatial/cuspatial/_lib/utils.pxd @@ -1,5 +1,5 @@ -# Copyright (c) 2022, NVIDIA CORPORATION. -from cudf._lib.cpp.column.column_view cimport column_view +# Copyright (c) 2022-2024, NVIDIA CORPORATION. +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view from cuspatial._lib.cpp.optional cimport nullopt, optional diff --git a/python/cuspatial/cuspatial/_lib/utils.pyx b/python/cuspatial/cuspatial/_lib/utils.pyx index cabad333c..4aea62863 100644 --- a/python/cuspatial/cuspatial/_lib/utils.pyx +++ b/python/cuspatial/cuspatial/_lib/utils.pyx @@ -1,6 +1,6 @@ -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. from cudf._lib.column cimport Column -from cudf._lib.cpp.column.column_view cimport column_view +from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view from cuspatial._lib.cpp.optional cimport nullopt, optional