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

Forward-merge branch-24.02 to branch-24.04 #637

Merged
merged 4 commits into from
Mar 7, 2024

Conversation

jakirkham
Copy link
Member

@jakirkham jakirkham commented Mar 5, 2024

Had tried to fix this yesterday with PR ( #636 ), but that was squashed merged. Adding a new forward merger PR so this can be merged in a commit instead

raydouglass and others added 4 commits February 1, 2024 14:55
Fixes attempted in rapidsai/integration#695 & rapidsai/integration#697 don't play well with CEC at large, but this repo can pin `cuda-python` more restrictively.

This PR pins `cuda-python` to the CUDA `major.minor.*` version.

See also conda-forge/cuda-python-feedstock#66

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

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

URL: rapidsai#624
Looks like all occurences of `DASK_SQL_VER` use the full version tag - should we modify [the logic in the version updating workflow](https://github.com/charlesbluca/docker/blob/12323a46f1a05f80d1e9354b3dbc0e3937227cc4/.github/workflows/update-dask-sql.yml#L49-L53) to reflect this?

Authors:
  - Charles Blackmon-Luca (https://github.com/charlesbluca)

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

URL: rapidsai#623
Now that `cuda-python` packaging has been fixed to enable CUDA Enhanced Compatibility in conda-forge/cuda-python-feedstock#67, we can unpin `cuda-python` in our Docker builds. This reverts commit 7c808e7.

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

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

URL: rapidsai#628
@jakirkham
Copy link
Member Author

Seeing some CI failures with cuSpatial, which should be fixed by PR: rapidsai/cuspatial#1350

Going to try restarting CI

@jakirkham
Copy link
Member Author

jakirkham commented Mar 6, 2024

Seeing the following error on CI

#11 28.02 Looking for: ['rapids=24.04', 'dask-sql=2024.1', 'python=3.9', 'cuda-version=12.0', 'ipython']
#11 28.02 
#11 28.02 Could not solve for environment specs
#11 28.02 The following packages are incompatible
#11 28.02 ├─ python 3.9**  is requested and can be installed;
#11 28.02 └─ truststore is not installable because it requires
#11 28.02    └─ python >=3.10  but there are no viable options
#11 28.02       ├─ python [3.10.0|3.10.1|...|3.12.2] conflicts with any installable versions previously reported;
#11 28.02       └─ python 3.12.0rc3 would require
#11 28.02          └─ _python_rc, which does not exist (perhaps a missing channel).

Edit: Looks similar to issue ( conda-forge/miniforge#545 )

Edit 2: Seeing the same issue in miniforge-cuda's CI builds

@jakirkham
Copy link
Member Author

Have reproduced this in the miniforge-cuda builds: rapidsai/miniforge-cuda#60 (comment)

@jakirkham
Copy link
Member Author

Rerunning CI now that PR ( rapidsai/miniforge-cuda#54 ) is merged

@AyodeAwe AyodeAwe merged commit 3bf417d into rapidsai:branch-24.04 Mar 7, 2024
33 of 34 checks passed
@jakirkham jakirkham deleted the branch-24.04-merge-24.02 branch March 7, 2024 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants