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

Jump to bottom

Pin gdal to 3.3.x #420

Merged
merged 15 commits into from
Aug 20, 2021
Merged

Pin gdal to 3.3.x #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2ee69ed
Pin gdal to 3.3.x
weiji14 Jun 15, 2021
cfea6b8
Test cuspatial with gdal 3.3.0
weiji14 Jun 15, 2021
678aee4
Merge remote-tracking branch 'upstream/branch-21.08' into gdal-3.3
weiji14 Jun 22, 2021
c4e92c4
Merge remote-tracking branch 'upstream/branch-21.08' into gdal-3.3
weiji14 Jul 5, 2021
febe51c
Test cuspatial with gdal 3.3.1
weiji14 Jul 5, 2021
a35c820
Merge remote-tracking branch 'upstream/branch-21.10' into gdal-3.3
weiji14 Jul 31, 2021
2dd9104
Merge remote-tracking branch 'upstream/branch-21.10' into gdal-3.3
weiji14 Aug 17, 2021
1ed3045
Remove cudf.core
thomcom Aug 18, 2021
c5b8143
Merge branch 'pr-fix-cudf-core-name' into gdal-3.3
thomcom Aug 18, 2021
3baa7ec
Issue with gcpuci_mamba_retry attempted fix.
thomcom Aug 19, 2021
748161f
Update ci/gpu/build.sh
jjacobelli Aug 19, 2021
b3d5b90
Try a fix involving pointer ownership.
thomcom Aug 19, 2021
5486f24
Merge branch 'gdal-3.3' of github.com:weiji14/cuspatial into gdal-3.3
thomcom Aug 19, 2021
088e63c
Run clang-format
thomcom Aug 20, 2021
665a58d
Potentially other undefined behaviors involving fixed_width_column_wr…
thomcom Aug 20, 2021
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
2 changes: 1 addition & 1 deletion conda/recipes/cuspatial/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ requirements:
- python
- cudf {{ minor_version }}.*
- rmm {{ minor_version }}.*
- gdal >=3.2.0,<3.3.0a0
- gdal >=3.3.0,<3.4.0a0
- geopandas >=0.9.0,<0.10.0a0

test:
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/libcuspatial/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ requirements:
- libcudf {{ minor_version }}.*
- librmm {{ minor_version }}.*
- cudatoolkit {{ cuda_version }}.*
- gdal >=3.2.0,<3.3.0a0
- gdal >=3.3.0,<3.4.0a0
run:
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}

Expand Down
134 changes: 67 additions & 67 deletions cpp/tests/join/point_in_polygon_test_large.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ TYPED_TEST(PIPRefineTestLarge, TestLarge)
auto host_points = generate_points<T>(quads, min_size);
auto& h_x = std::get<0>(host_points);
auto& h_y = std::get<1>(host_points);
fixed_width_column_wrapper<T> x(h_x.begin(), h_x.end());
fixed_width_column_wrapper<T> y(h_y.begin(), h_y.end());
auto x = fixed_width_column_wrapper<T>(h_x.begin(), h_x.end());
auto y = fixed_width_column_wrapper<T>(h_y.begin(), h_y.end());

auto quadtree_pair = cuspatial::quadtree_on_points(
x, y, x_min, x_max, y_min, y_max, scale, max_depth, min_size, this->mr());
Expand All @@ -164,54 +164,54 @@ TYPED_TEST(PIPRefineTestLarge, TestLarge)
auto points = cudf::gather(
cudf::table_view{{x, y}}, *point_indices, cudf::out_of_bounds_policy::DONT_CHECK, this->mr());

fixed_width_column_wrapper<int32_t> poly_offsets({0, 1, 2, 3});
fixed_width_column_wrapper<int32_t> ring_offsets({0, 4, 10, 14});
fixed_width_column_wrapper<T> poly_x({// ring 1
2.488450,
1.333584,
3.460720,
2.488450,
// ring 2
5.039823,
5.561707,
7.103516,
7.190674,
5.998939,
5.039823,
// ring 3
5.998939,
5.573720,
6.703534,
5.998939,
// ring 4
2.088115,
1.034892,
2.415080,
3.208660,
2.088115});
fixed_width_column_wrapper<T> poly_y({// ring 1
5.856625,
5.008840,
4.586599,
5.856625,
// ring 2
4.229242,
1.825073,
1.503906,
4.025879,
5.653384,
4.229242,
// ring 3
1.235638,
0.197808,
0.086693,
1.235638,
// ring 4
4.541529,
3.530299,
2.896937,
3.745936,
4.541529});
auto poly_offsets = fixed_width_column_wrapper<int32_t>({0, 1, 2, 3});
auto ring_offsets = fixed_width_column_wrapper<int32_t>({0, 4, 10, 14});
auto poly_x = fixed_width_column_wrapper<T>({// ring 1
2.488450,
1.333584,
3.460720,
2.488450,
// ring 2
5.039823,
5.561707,
7.103516,
7.190674,
5.998939,
5.039823,
// ring 3
5.998939,
5.573720,
6.703534,
5.998939,
// ring 4
2.088115,
1.034892,
2.415080,
3.208660,
2.088115});
auto poly_y = fixed_width_column_wrapper<T>({// ring 1
5.856625,
5.008840,
4.586599,
5.856625,
// ring 2
4.229242,
1.825073,
1.503906,
4.025879,
5.653384,
4.229242,
// ring 3
1.235638,
0.197808,
0.086693,
1.235638,
// ring 4
4.541529,
3.530299,
2.896937,
3.745936,
4.541529});

auto polygon_bboxes =
cuspatial::polygon_bounding_boxes(poly_offsets, ring_offsets, poly_x, poly_y, this->mr());
Expand Down Expand Up @@ -269,21 +269,21 @@ TYPED_TEST(PIPRefineTestLarge, TestLarge)
actual_point_indices.shrink_to_fit();
actual_point_lengths.shrink_to_fit();

cudf::test::expect_columns_equal(
fixed_width_column_wrapper<uint32_t>(expected_poly_indices.begin(),
expected_poly_indices.end()),
fixed_width_column_wrapper<uint32_t>(actual_poly_indices.begin(), actual_poly_indices.end()),
verbosity);

cudf::test::expect_columns_equal(
fixed_width_column_wrapper<uint32_t>(expected_point_indices.begin(),
expected_point_indices.end()),
fixed_width_column_wrapper<uint32_t>(actual_point_indices.begin(), actual_point_indices.end()),
verbosity);

cudf::test::expect_columns_equal(
fixed_width_column_wrapper<uint32_t>(expected_point_lengths.begin(),
expected_point_lengths.end()),
fixed_width_column_wrapper<uint32_t>(actual_point_lengths.begin(), actual_point_lengths.end()),
verbosity);
auto poly_a = fixed_width_column_wrapper<uint32_t>(expected_poly_indices.begin(),
expected_poly_indices.end());
auto poly_b =
fixed_width_column_wrapper<uint32_t>(actual_poly_indices.begin(), actual_poly_indices.end());
cudf::test::expect_columns_equal(poly_a, poly_b, verbosity);

auto point_a = fixed_width_column_wrapper<uint32_t>(expected_point_indices.begin(),
expected_point_indices.end());
auto point_b =
fixed_width_column_wrapper<uint32_t>(actual_point_indices.begin(), actual_point_indices.end());
cudf::test::expect_columns_equal(point_a, point_b, verbosity);

auto lengths_a = fixed_width_column_wrapper<uint32_t>(expected_point_lengths.begin(),
expected_point_lengths.end());
auto lengths_b =
fixed_width_column_wrapper<uint32_t>(actual_point_lengths.begin(), actual_point_lengths.end());
cudf::test::expect_columns_equal(lengths_a, lengths_b, verbosity);
}
2 changes: 1 addition & 1 deletion python/cuspatial/cuspatial/core/indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import warnings

from cudf.core import DataFrame, Series
from cudf import DataFrame, Series
from cudf.core.column import as_column

from cuspatial._lib.quadtree import (
Expand Down
2 changes: 1 addition & 1 deletion python/cuspatial/cuspatial/core/trajectory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import numpy as np

from cudf.core import DataFrame, Series
from cudf import DataFrame, Series
from cudf.core.column import as_column

from cuspatial._lib.trajectory import (
Expand Down