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

Only zip c_stdlib_version with compilers for CUDA #5672

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Only zip c_stdlib_version with compilers for CUDA #5672

merged 1 commit into from
Mar 25, 2024

Conversation

mbargull
Copy link
Member

Checklist

  • Used a personal fork of the feedstock to propose changes
  • Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

There's no need to put the c_stdlib_version (and related keys) into the compiler-version zip key.
This tight coupling is only needed for the CUDA stuff.

@mbargull mbargull requested a review from a team as a code owner March 24, 2024 19:46
@conda-forge-webservices
Copy link
Contributor

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@mbargull mbargull requested review from beckermr and h-vetinari March 24, 2024 19:46
@mbargull mbargull mentioned this pull request Mar 24, 2024
Merged
@mbargull mbargull force-pushed the fix-non-cuda-c_stdlib_version-zip branch from cd0ee25 to 6420875 Compare March 24, 2024 19:57
h-vetinari
h-vetinari approved these changes Mar 24, 2024
View reviewed changes
Copy link
Member

@h-vetinari h-vetinari left a comment

Choose a reason for hiding this comment

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

Fine by me, though I'd like to see it tested (like #5607; instructions therein) against some relevant feedstocks, e.g. https://github.com/conda-forge/ucx-split-feedstock.

@h-vetinari h-vetinari mentioned this pull request Mar 24, 2024
Merged
@h-vetinari
Copy link
Member

I'd like to see it tested (like #5607; instructions therein) against some relevant feedstocks, e.g. https://github.com/conda-forge/ucx-split-feedstock.

I did this now (both with and without conda-forge/conda-smithy#1889), and ucx-split, cupy, abseil-cpp, numpy all worked fine.

It's important to note that we cannot remove (from #5607)

conda-forge-pinning-feedstock/recipe/migrations/cuda120.yaml

Lines 93 to 94 in e29dc0a

c_stdlib_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 2.17 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

as the CUDA 12 builds still need that for the zip to work (though the effect is somewhat surprising - not an error, but the CUDA 12 builds simply getting dropped); I experienced that because

conda-smithy rerender --no-check-uptodate -e conda_forge_pinning.yaml

ends up not pulling in the newest migrator versions, and so this happened for ucx-split & cupy.

@h-vetinari h-vetinari merged commit e38c766 into conda-forge:main Mar 25, 2024
4 checks passed
@h-vetinari h-vetinari mentioned this pull request Mar 25, 2024
Open
57 tasks
@mbargull
Copy link
Member Author

FYI, AFAICT, there's only one feedstock for which the new cdt_name zipping would caused issues; I've address that in the feedstock at conda-forge/libusb-feedstock#22 .
(And we only needed to add c_stdlib_version there without any of the compiler versions due to this PR, of course.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@h-vetinari h-vetinari h-vetinari approved these changes

@beckermr beckermr beckermr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mbargull @h-vetinari @beckermr