Fix merge conflicts [skip ci] #408
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rewrites `quadtree_point_to_nearest_polyline` via thrust in the style of `quadtree_point_in_polygon` to get a 5x speed boost. Benchmarked locally with NYC taxi 169M float32 points (RMM pool mode enabled): ``` quadtree_point_to_nearest_polyline (before) 1min ± 10.4 ms per loop (mean ± std. dev. of 7 runs, 10 loops each) quadtree_point_to_nearest_polyline (after) 9.49 s ± 15 ms per loop (mean ± std. dev. of 7 runs, 1 loop each) ``` Timings for every routine in the benchmark after these changes: ``` quadtree_on_points 66.2 ms ± 64.3 µs per loop (mean ± std. dev. of 7 runs, 10 loops each) polygon_bounding_boxes 322 µs ± 375 ns per loop (mean ± std. dev. of 7 runs, 1000 loops each) join_quadtree_and_bounding_boxes 11.4 ms ± 8.19 µs per loop (mean ± std. dev. of 7 runs, 100 loops each) quadtree_point_in_polygon 5.48 s ± 54.4 ms per loop (mean ± std. dev. of 7 runs, 1 loop each) polyline_bounding_boxes 258 µs ± 2.37 µs per loop (mean ± std. dev. of 7 runs, 1000 loops each) join_quadtree_and_bounding_boxes 11.5 ms ± 17.5 µs per loop (mean ± std. dev. of 7 runs, 100 loops each) quadtree_point_to_nearest_polyline 9.49 s ± 15 ms per loop (mean ± std. dev. of 7 runs, 1 loop each) ``` Authors: - Paul Taylor (https://github.com/trxcllnt) Approvers: - Mark Harris (https://github.com/harrism) - Christopher Harris (https://github.com/cwharris) URL: #362
This PR updates the `0.20` references in `CHANGELOG.md` to be `21.06`. Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Dillon Cullinan (https://github.com/dillon-cullinan) URL: #404
Simple PR that adds a `std::move` around passing a device_buffer into a column factory. This will be necessary once rapidsai/rmm/#775 is merged. Authors: - Mark Harris (https://github.com/harrism) Approvers: - Paul Taylor (https://github.com/trxcllnt) - Christopher Harris (https://github.com/cwharris) URL: #403
…GeoArrow form. (#300) This PR adds the `from_geopandas` feature, creating a `GeoSeries` object backed by GPU memory and GeoArrow format as discussed with GeoPandas team members. This PR also provides `to_geopandas`, putting cuspatial GPU memory back into a GeoPandas `GeoSeries` object. Authors: - H. Thomson Comer (https://github.com/thomcom) - Ray Douglass (https://github.com/raydouglass) Approvers: - Christopher Harris (https://github.com/cwharris) - Keith Kraus (https://github.com/kkraus14) - AJ Schmidt (https://github.com/ajschmidt8) URL: #300
This PR updates the environment variable thats used to determine the `cuda_version` varaible in our conda recipes. The `CUDA` environment variable is explicitly set by the Ops team in our Jenkins jobs, whereas `CUDA_VERSION` comes from the `nvidia/cuda` Docker images that we base our images from. Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Ray Douglass (https://github.com/raydouglass) URL: #407
ajschmidt8
added
improvement
github-actions
bot
added
conda
kkraus14
approved these changes
May 24, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the merge conflicts in #406.