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

Fix branch-23.06 forward-merge into branch-23.08 #1175

Merged
merged 5 commits into from
Jun 6, 2023
Merged

Fix branch-23.06 forward-merge into branch-23.08 #1175

merged 5 commits into from
Jun 6, 2023

Conversation

trxcllnt
Copy link
Contributor

@trxcllnt trxcllnt commented Jun 5, 2023

Fixes merge conflicts in #1171.

@trxcllnt
cuSpatial pip packages (rapidsai#1148)
4b76c44 
Initial draft PR to build statically linked cuspatial wheels.

Closes rapidsai#869.

Authors:
  - Paul Taylor (https://github.com/trxcllnt)
  - Michael Wang (https://github.com/isVoid)

Approvers:
  - H. Thomson Comer (https://github.com/thomcom)
  - Bradley Dice (https://github.com/bdice)
  - Ray Douglass (https://github.com/raydouglass)
  - Mark Harris (https://github.com/harrism)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: rapidsai#1148
@trxcllnt trxcllnt requested review from a team as code owners June 5, 2023 19:53
@trxcllnt trxcllnt requested review from thomcom and harrism June 5, 2023 19:53
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

@github-actions github-actions bot added ci cmake Related to CMake code or build configuration libcuspatial Relates to the cuSpatial C++ library Python Related to Python code labels Jun 5, 2023
@trxcllnt trxcllnt added 5 - Ready to Merge Testing and reviews complete, ready to merge improvement Improvement / enhancement to an existing function labels Jun 5, 2023
@trxcllnt trxcllnt force-pushed the branch-23.08-merge-23.06 branch from b067655 to ddf831d Compare June 5, 2023 19:57
@trxcllnt trxcllnt added 3 - Ready for Review Ready for review by team 5 - Ready to Merge Testing and reviews complete, ready to merge non-breaking Non-breaking change and removed 5 - Ready to Merge Testing and reviews complete, ready to merge 3 - Ready for Review Ready for review by team labels Jun 5, 2023
bdice
bdice requested changes Jun 5, 2023
View reviewed changes
python/cuspatial/cuspatial/__init__.py Outdated Show resolved Hide resolved
@bdice
Copy link
Contributor

bdice commented Jun 5, 2023 •
edited
Loading

Changes are needed in GitHub Actions files, Python __init__.py:

.github/workflows/build.yaml:    uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06
.github/workflows/build.yaml:    uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-publish.yml@branch-23.06
.github/workflows/pr.yaml:    uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06
.github/workflows/pr.yaml:    uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.06
.github/workflows/test.yaml:    uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-test.yml@branch-23.06
python/cuspatial/cuspatial/__init__.py:__version__ = "23.06.00"

Changes may be needed in devcontainers files (I'm not familiar with how these are maintained):

.devcontainer/Dockerfile:ARG RAPIDS=23.06
.devcontainer/pip/devcontainer.json:    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
.devcontainer/conda/devcontainer.json:    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
.devcontainer/pip/isolated/.devcontainer/devcontainer.json:    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
.devcontainer/pip/unified/.devcontainer/devcontainer.json:    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
.devcontainer/conda/unified/.devcontainer/devcontainer.json:    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
.devcontainer/devcontainer.json:    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}
.devcontainer/conda/isolated/.devcontainer/devcontainer.json:    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.6": {}

Please ensure all of these cases are handled by ci/release/update-version.sh.

@trxcllnt trxcllnt requested a review from bdice June 5, 2023 22:21
@bdice
Copy link
Contributor

bdice commented Jun 5, 2023 •
edited
Loading

This change is needed: rapidsai/raft#1556 (comment)

This is the diff you need: https://github.com/rapidsai/raft/pull/1556/files#diff-8a0188e09c831b0e6ca8c1c51ab640efd1e519b1d7f94ab6251c9f0b90a82304R64-R69

If you run ci/release/update-version.sh 23.10.00 and then grep for 23.8, you can see the line - &rmm_conda rmm==23.8.* in dependencies.yaml didn't change. (Same for - &cuml_conda cuml==23.8.*)

bdice
bdice approved these changes Jun 5, 2023
View reviewed changes
Copy link
Contributor

@bdice bdice left a comment

Choose a reason for hiding this comment

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

Thanks @trxcllnt for fixing the remaining update-version.sh issues. Looks good to me now.

@raydouglass raydouglass merged commit 39f66d0 into rapidsai:branch-23.08 Jun 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ajschmidt8 ajschmidt8 ajschmidt8 left review comments

@isVoid isVoid isVoid approved these changes

@bdice bdice bdice approved these changes

@raydouglass raydouglass raydouglass approved these changes

@harrism harrism harrism approved these changes

@thomcom thomcom Awaiting requested review from thomcom thomcom is a code owner automatically assigned from rapidsai/cuspatial-cmake-codeowners

Assignees
No one assigned
Labels
5 - Ready to Merge Testing and reviews complete, ready to merge ci cmake Related to CMake code or build configuration improvement Improvement / enhancement to an existing function libcuspatial Relates to the cuSpatial C++ library non-breaking Non-breaking change Python Related to Python code
Projects
cuSpatial
Status: Todo
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@trxcllnt @bdice @harrism @raydouglass @ajschmidt8 @isVoid