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.

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

Update CMake, fix testing use of assert_eq, and correct metadata copying #430

Merged
merged 4 commits into from
Jul 2, 2021

Conversation

vyasr
Copy link
Contributor

@vyasr vyasr commented Jul 2, 2021

This PR contains three distinct changes required to get cuspatial builds working and tests passing again:

  1. RMM switched to rapids-cmake (RMM now leverages rapids-cmake to reduce CMake boilerplate rmm#800), which requires CMake 3.20.1, so this PR includes the required updates for that.
  2. The Arrow upgrade in cudf also moved the location of testing utilities ([REVIEW] Upgrade arrow to 4.0.1 cudf#7495). Long term cuspatial needs to move away from use of the testing utilities, which are not part of cudf's public API, but we are currently blocked by [BUG] cudf.testing methods do not respect tolerances cudf#8646, so this PR just imports the internal assert_eq method as a stopgap to get tests passing.
  3. The changes in Add functionality to apply Dtype metadata to ColumnBase cudf#8373 altered the way that metadata was propagated to libcudf outputs from previously existing cuDF Python objects. The new code paths require cuspatial to override metadata copying at the GeoDataFrame rather than the GeoColumn level in order to ensure that information about column types is lost in the libcudf round trip and the metadata copying functions are now called on the output DataFrame rather than the input one.

This PR supersedes #427, #428, and #429, all of which can now be closed.

@vyasr vyasr requested a review from a team as a code owner July 2, 2021 19:19
@github-actions github-actions bot added the Python Related to Python code label Jul 2, 2021
@vyasr vyasr requested a review from a team as a code owner July 2, 2021 19:24
@github-actions github-actions bot added the conda Related to conda and conda configuration label Jul 2, 2021
@vyasr vyasr changed the title Fix metadata copying Update CMake, fix testing use of assert_eq, and correct metadata copying Jul 2, 2021
@cwharris cwharris added bug Something isn't working non-breaking Non-breaking change labels Jul 2, 2021
Copy link
Member

@ajschmidt8 ajschmidt8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving ops-codeowner file changes

Copy link
Contributor

@cwharris cwharris left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! 🎉

@cwharris
Copy link
Contributor

cwharris commented Jul 2, 2021

@gpucibot merge

@rapids-bot rapids-bot bot merged commit 934015b into rapidsai:branch-21.08 Jul 2, 2021
rapids-bot bot pushed a commit that referenced this pull request Jul 21, 2021
As of rapidsai/cudf#7495 the `cudf.tests.utils` module (and in particular the `assert_eq` function) are no longer part of the public API. This PR switches tests to use the public testing functions in the `cudf.testing` subpackage.

This PR is currently blocked by #430 and rapidsai/cudf#8646.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Christopher Harris (https://github.com/cwharris)
  - Paul Taylor (https://github.com/trxcllnt)

URL: #431
@vyasr vyasr deleted the fix/copy_type_metadata branch July 26, 2021 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working conda Related to conda and conda configuration non-breaking Non-breaking change Python Related to Python code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants