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

[RELEASE] cuspatial v24.04 #1369

Merged
merged 27 commits into from
Apr 10, 2024
Merged

[RELEASE] cuspatial v24.04 #1369

merged 27 commits into from
Apr 10, 2024

Conversation

raydouglass
Copy link
Member

❄️ Code freeze for branch-24.04 and v24.04 release

What does this mean?

Only critical/hotfix level issues should be merged into branch-24.04 until release (merging of this PR).

What is the purpose of this PR?

  • Update documentation
  • Allow testing for the new release
  • Enable a means to merge branch-24.04 into main for the release

raydouglass and others added 26 commits January 18, 2024 15:00
@raydouglass
DOC v24.04 Updates [skip ci]
0a321ec
@GPUtester
Merge pull request #1331 from rapidsai/branch-24.02
90d5446 
Forward-merge branch-24.02 to branch-24.04
@jameslamb
fix formatting in developer guide (#1330)
0eadc2d 
Reading through the docs at https://docs.rapids.ai/api/cuspatial/nightly/developer_guide/build/, I noticed what looked like a formatting mistake:

<img width="730" alt="Screenshot 2024-01-23 at 11 40 22 AM" src="https://github.com/rapidsai/cuspatial/assets/7608904/9f8bd675-c694-470d-9adc-1646e704f150">

This fixes it.

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Mark Harris (https://github.com/harrism)

URL: #1330
@jameslamb
handle more RAPIDS version formats in update-version.sh, refactor dep…
5e0cb36 
…endencies.yaml (#1329)

Contributes to rapidsai/build-planning#13.

Updates `update-version.sh` to correctly handle RAPIDS dependencies like `cudf-cu12==24.2.*`.

This also pulls in some dependency refactoring originally added in #1320, which allows greater use of dependencies.yaml globs (and therefore less maintenance effort to support new CUDA versions).

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Jake Awe (https://github.com/AyodeAwe)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #1329
@GPUtester
Merge pull request #1333 from rapidsai/branch-24.02
7d8aa02 
Forward-merge branch-24.02 to branch-24.04
@GPUtester
Merge pull request #1335 from rapidsai/branch-24.02
b6fc63f 
Forward-merge branch-24.02 to branch-24.04
@GPUtester
Merge pull request #1340 from rapidsai/branch-24.02
ad975b3 
Forward-merge branch-24.02 to branch-24.04
@isVoid
Fix Broken CI for 24.04 (#1338)
719c52a 
This PR fixes recent breakage due to pandas 2.2 upgrade.

Fixes #1341.

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

Approvers:
  - Mark Harris (https://github.com/harrism)
  - Paul Taylor (https://github.com/trxcllnt)

URL: #1338
@jameslamb
Support CUDA 12.2 (#1320)
eeab2a5 
* switches to CUDA 12.2.2 for building conda packages and wheels
* adds new tests running against CUDA 12.2.2
* adds some `"12.*"` globs in `dependencies.yaml` missed in #1317

### Notes for Reviewers

This is part of ongoing work to build and test packages against CUDA 12.2.2 across all of RAPIDS.

For more details see:

* rapidsai/build-planning#7
* rapidsai/shared-workflows#166

Planning a second round of PRs to revert these references back to a proper `branch-24.{nn}` release branch of `shared-workflows` once rapidsai/shared-workflows#166 is merged.

*(created with `rapids-reviser`)*

Authors:
  - James Lamb (https://github.com/jameslamb)
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Jake Awe (https://github.com/AyodeAwe)
  - https://github.com/jakirkham

URL: #1320
@GPUtester
Merge pull request #1342 from rapidsai/branch-24.02
598750e 
Forward-merge branch-24.02 to branch-24.04
@jameslamb
target branch-24.04 for GitHub Actions workflows (#1343)
14ef631 
Follow-up to #1320

For all GitHub Actions configs, replaces uses of the `test-cuda-12.2` branch on `shared-workflows`
with `branch-24.04`, now that rapidsai/shared-workflows#166 has been merged.

### Notes for Reviewers

This is part of ongoing work to build and test packages against CUDA 12.2 across all of RAPIDS.

For more details see:

* rapidsai/build-planning#7

*(created with `rapids-reviser`)*

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: #1343
@AyodeAwe
updating ops-bot.yaml (#1337)
a3367da
@bdice
Remove -DNVBench_ENABLE_CUPTI=OFF. (#1325)
e8be972 
The `-DNVBench_ENABLE_CUPTI=OFF` flag is no longer needed because of rapidsai/rapids-cmake#504. NVBench CUPTI support is now disabled by default.

Authors:
  - Bradley Dice (https://github.com/bdice)
  - Paul Taylor (https://github.com/trxcllnt)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Mark Harris (https://github.com/harrism)

URL: #1325
@trxcllnt
write PROJ build dir export rules (#1347)
9268b36 
PROJ doesn't generate export rules in its build dir, so the pip package doesn't find it when using cuPROJ from its build dir.

This PR ensures that configuring the pip package to use `cuPROJ` from its build dir also uses `PROJ` from the `_deps/proj-build` dir.

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

Approvers:
  - Robert Maynard (https://github.com/robertmaynard)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #1347
@trxcllnt
Update devcontainers to CUDA Toolkit 12.2 (#1344)
603d764 
Authors:
  - Paul Taylor (https://github.com/trxcllnt)

Approvers:
  - Jake Awe (https://github.com/AyodeAwe)

URL: #1344
@jameslamb
Add support for Python 3.11, require NumPy 1.23+ (#1348)
59972f6 
Contributes to rapidsai/build-planning#3

This PR adds support for Python 3.11.

It also proposes:

* declaring `numpy` as a runtime dependency, as `cuspatial` does import it directly
* a floor on `NumPy` of `numpy>=1.23` in tests, see rapidsai/build-planning#3 (comment)

## Notes for Reviewers

This is part of ongoing work to add Python 3.11 support across RAPIDS.

The Python 3.11 CI workflows introduced in rapidsai/shared-workflows#176 are *optional*... they are not yet required to run successfully for PRs to be merged.

This PR can be merged once all jobs are running successfully (including the non-required jobs for Python 3.11). The CI logs should be verified that the jobs are building and testing with Python 3.11.

See rapidsai/shared-workflows#176 for more details.

Authors:
  - James Lamb (https://github.com/jameslamb)
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

Approvers:
  - Jake Awe (https://github.com/AyodeAwe)
  - Mark Harris (https://github.com/harrism)
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

URL: #1348
@KyleFromNVIDIA
Fix Python 3.11 test failures (#1351)
54f0430 
This marks a memory test as `xfail`, which was failing on Python 3.11.

xref: #1352
xref: rapidsai/build-planning#3

Authors:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - https://github.com/jakirkham
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #1351
@mroeschke
Replace cudf column.full with cudf.as_column (#1350)
f29e404 
I have a PR in cudf removing `full` in favor of `as_column` which has equivalent functionality (rapidsai/cudf#14698), so replacing the single usage I found here

Authors:
  - Matthew Roeschke (https://github.com/mroeschke)
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Mark Harris (https://github.com/harrism)
  - GALI PREM SAGAR (https://github.com/galipremsagar)
  - Bradley Dice (https://github.com/bdice)

URL: #1350
@harrism
Automate C++ include file grouping and ordering using clang-format (#…
baa1bbb 
…1349)

This uses the IncludeCategories settings in .clang-format to attempt to enforce our documented #include order in libcuspatial. For discussion, see rapidsai/cudf#15063. This PR uses a subset of the header grouping categories used in that PR.

Note that this also updates the pre-commit configuration to check and correct file copyright years. This comes from rapidsai/cudf#14917.  @KyleFromNVIDIA can you confirm whether or not it's OK to do this? It seems to be working fine.

Closes #1345

Authors:
  - Mark Harris (https://github.com/harrism)

Approvers:
  - Michael Wang (https://github.com/isVoid)

URL: #1349
@bdice
Switch pytest-xdist algorithm to worksteal (#1355)
b08f4f7 
This PR uses the `worksteal` algorithm to accelerate parallel pytests. See rapidsai/cudf#15207.

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - GALI PREM SAGAR (https://github.com/galipremsagar)
  - Jake Awe (https://github.com/AyodeAwe)

URL: #1355
@mroeschke
Replace cudf.core imports with public APIs (#1356)
47a7961 
This PR replaces `cudf.core` imports of `Series` and `DataFrame` with their public API equivalents.

Authors:
  - Matthew Roeschke (https://github.com/mroeschke)

Approvers:
  - Mark Harris (https://github.com/harrism)
  - Michael Wang (https://github.com/isVoid)
  - Bradley Dice (https://github.com/bdice)

URL: #1356
@mroeschke
Enable pytest failures on warnings from cudf (Ensure values being set…
6298419 
… are casted to the object's type) (#1358)

In 24.04, cudf issues a `FutureWarning` when setting a value to a column would change the data type of the original column. The fix involves casting the original column to the value's type first or vice versa. Could use a second eye on the correct direction to cast if a data type was used intentionally.

Additionally the test suite will now fail when a warning comes from cudf as apart of rapidsai/build-planning#26

Authors:
  - Matthew Roeschke (https://github.com/mroeschke)

Approvers:
  - Mark Harris (https://github.com/harrism)
  - H. Thomson Comer (https://github.com/thomcom)

URL: #1358
@KyleFromNVIDIA
Remove hard-coding of RAPIDS version where possible (#1357)
f410685 
* Read `VERSION` file in CMake
* Read `cuspatial.__version__` and `cuproj.__version__` in docs build
* Read `VERSION` file in shell scripts
* Use environment variable substitution in Doxygen
* Remove updates from `ci/release/update-version.sh`

Issue: rapidsai/build-planning#15

Authors:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Jake Awe (https://github.com/AyodeAwe)
  - Mark Harris (https://github.com/harrism)

URL: #1357
@bdice
Add upper bound to prevent usage of NumPy 2 (#1359)
faf6d1c 
NumPy 2 is expected to be released in the near future. For the RAPIDS 24.04 release, we will pin to `numpy>=1.23,<2.0a0`. This PR adds an upper bound to affected RAPIDS repositories.

xref: rapidsai/build-planning#29

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Mark Harris (https://github.com/harrism)
  - Ray Douglass (https://github.com/raydouglass)

URL: #1359
@KyleFromNVIDIA
Update pre-commit-hooks to v0.0.3 (#1361)
a248b17 
This fixes an issue with how the `verify-copyright` hook handles multiple merge bases.

Authors:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: #1361
@bdice
Use conda env create --yes instead of --force (#1364)
a6e6fd4 
conda dropped support for the `--force` flag to `conda env create`. This changes that flag name to `--yes`.
See https://github.com/conda/conda/blob/main/CHANGELOG.md#2430-2024-03-12 and rapidsai/miniforge-cuda#63 for more info.

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: #1364
@raydouglass raydouglass requested review from a team as code owners April 4, 2024 20:23
@review-notebook-app 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 conda Related to conda and conda configuration cmake Related to CMake code or build configuration Python Related to Python code libcuspatial Relates to the cuSpatial C++ library Java Related to Java code ci labels Apr 4, 2024
@harrism
Copy link
Member

harrism commented Apr 8, 2024

Failing due to copyright check. Probably PRs merged before the check was in place?

@raydouglass raydouglass merged commit 22c1d4f into main Apr 10, 2024
3 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

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

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

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

Assignees
No one assigned
Labels
ci cmake Related to CMake code or build configuration conda Related to conda and conda configuration Java Related to Java code libcuspatial Relates to the cuSpatial C++ library Python Related to Python code
Projects
cuSpatial
Status: Todo
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@raydouglass @harrism @GPUtester @jameslamb @isVoid @AyodeAwe @bdice @trxcllnt @KyleFromNVIDIA @mroeschke