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

Remove proj and sqlite from libcuspatial recipe. #1308

Closed

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Dec 6, 2023

Description

This cleans up some packaging. We no longer need proj or sqlite in libcuspatial.

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

@bdice bdice requested a review from a team as a code owner December 6, 2023 23:29
@github-actions github-actions bot added the conda Related to conda and conda configuration label Dec 6, 2023
@bdice bdice added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change conda Related to conda and conda configuration and removed conda Related to conda and conda configuration labels Dec 6, 2023
@bdice bdice requested a review from a team as a code owner December 7, 2023 00:50
@bdice bdice requested review from thomcom and removed request for a team December 7, 2023 00:50
@github-actions github-actions bot added cmake Related to CMake code or build configuration libcuspatial Relates to the cuSpatial C++ library labels Dec 7, 2023
@bdice bdice changed the base branch from branch-23.12 to branch-24.02 December 7, 2023 00:54
Copy link
Contributor

@vyasr vyasr left a comment

Choose a reason for hiding this comment

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

@vyasr
Copy link
Contributor

vyasr commented Dec 8, 2023

Also while doing that, we should consider pinning proj in dependencies.yaml (unless the migration is completed on cf prior to this PR merging, in which case we can remove the pinnings in this PR).

@bdice bdice force-pushed the remove-proj-sqlite-from-libcuspatial branch from e4adb37 to 7340b69 Compare December 9, 2023 20:30
@bdice bdice requested a review from vyasr December 9, 2023 20:30
@harrism
Copy link
Member

harrism commented Dec 9, 2023

My concern with removing the add_subdirectory(cuproj) line is that libcuproj will not be built. THe source structure is:

cpp
 | - CMakeLists.txt (builds libcuspatial, includes proj)
 |--> cuproj
           | - CMakeLists.txt

This is a bit confusing if the build process is separate. Perhaps we should change it to:

 |--> cuspatial
         | - CMakeLists.txt
 |--> proj
           | - CMakeLists.txt

But that's a pretty big change. Thoughts?

@bdice
Copy link
Contributor Author

bdice commented Dec 9, 2023

@harrism I agree that there are varying degrees of scope that this could take. Let's limit the scope in this PR and restructure parts of dependencies.yaml but leave the rest of the refactor for another PR.

I think what I would propose for the second PR is:

  • Organize the C++ code to something like
cpp
 |--> cuspatial
         | - CMakeLists.txt
 |--> cuproj
         | - CMakeLists.txt
  • Consider adding a separate libcuproj package (with changes to build.sh, ci/build_cpp.sh, ci/build_python.sh, a new conda recipe, etc.)

libcuproj is header-only, so the conda package contents would be just headers (and it would define the build dependencies for those headers), like for rmm. It's also fine for us to just not have a libcuproj package and instead build the C++ code in the cuproj Python build steps, but the problem is really that libcuproj tests/benchmarks are being lumped with libcuspatial's build process, as far as I can tell. The need to isolate tests/benchmarks are enough for me to vote in favor of a separate conda package. I would still advocate for the C++ file organization above, either way.

@github-actions github-actions bot removed the libcuspatial Relates to the cuSpatial C++ library label Dec 9, 2023
@vyasr
Copy link
Contributor

vyasr commented Dec 12, 2023

I don't think this PR is going to work until the packages are restructured as discussed in the above threads. Right now cuproj is build as part of cuspatial, so the cuproj requirements are needed for the cuspatial build. You may have to do the package restructuring in order to simplify dependencies the way that you want.

@bdice
Copy link
Contributor Author

bdice commented Aug 5, 2024

Closing as stale. I do not plan to refactor the packages as described above in the near term.

@bdice bdice closed this Aug 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cmake Related to CMake code or build configuration conda Related to conda and conda configuration improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants