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

Add CUDA 11.8 cross-compilation support #261

Merged

Conversation

jakirkham
Copy link
Member

This adds additional logic to the CUDA 11 cross-compilation case here to support CUDA 11.8.

Needed as part of the CUDA 11.8 migration: conda-forge/conda-forge-pinning-feedstock#4834


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.

@jakirkham jakirkham requested a review from a team as a code owner August 23, 2023 23:13
@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.

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.

It would be nice if this actually turns out this painless (given the struggle to get this right for 11.2)!

I would still suggest to actually let this run through execution here before merging. At the time of #210, I had locally pulled in a (cross-enabled) 11.2 migrator, so that the CI would generate the respective jobs here and actually execute the branches in question.

In your case, this would be a cross-enabled version of conda-forge/conda-forge-pinning-feedstock#4834 (plus local: True).

I don't necessarily expect that nvidia's artefact naming has changed a lot between 11.2 & 11.8, but IMO better to double-check. As one concrete issue, the extra="11-2-" further down will need adaptation as well.

@jakirkham
Copy link
Member Author

Thanks Axel! 🙏

Appreciate the helpful tips. Have tried to push some changes to address those

Please let me know how that looks

@@ -2,6 +2,7 @@ migrator_ts: 1692828152
__migrator:
kind:
version
use_local: true # TODO: Remove this line after completing testing
Copy link
Member

Choose a reason for hiding this comment

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

Not sure that we want to have the cross-compiled jobs for merging. We don't need them from the POV of the CI setup itself, just for testing the branches here in CI. I suggested adding them in #236, but never got a response.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep no strong feelings here. Happy to keep or drop as preferred

@jakirkham
Copy link
Member Author

CI is failing as the nvcc wrapper script package has not been built for CUDA 11.8 cross-compilation

Addressing with PR: conda-forge/nvcc-feedstock#99

@h-vetinari
Copy link
Member

h-vetinari commented Aug 31, 2023

Tried to merge main here after #265, but it seem you've unchecked the box that says "allow edits by maintainers"

@jakirkham
Copy link
Member Author

jakirkham commented Aug 31, 2023

Thanks Axel! 🙏

Unfortunately since this is an org fork (as opposed to a user fork) that check box isn't even available (I couldn't check it if I wanted to)

Have clicked the update branch button. So we should be good to go

Also FWIW closing and reopening PRs has the same effect (it deletes the merge ref for the PR and recreates it using the latest upstream branch), which will also update what CI builds from as a result

@h-vetinari
Copy link
Member

Ah, I had forgotten that this depends on conda-forge/nvcc-feedstock#99. 🙃

@jakirkham
Copy link
Member Author

Yeah no worries. This wound up being a bit of a yak shave (though that was mostly expected)

@h-vetinari
Copy link
Member

It looks like this is going to need

azure:
  free_disk_space: true

in conda-forge.yml to test this.

@h-vetinari
Copy link
Member

I did this in #267 and it's passing! 🥳

If we do not want to keep the cross-compilation jobs (which would be purely for testing purposes), then you could rebase/revert out the migrator and merge this from my POV. 👍

necessary to test cross-compiled CUDA
@jakirkham
Copy link
Member Author

Thanks Axel! 🙏

Went ahead and cherry-picked the last 2 commits. Hope that is ok

@jakirkham jakirkham added the automerge Merge the PR when CI passes label Aug 31, 2023
@github-actions github-actions bot merged commit 469a96f into conda-forge:main Aug 31, 2023
57 checks passed
@github-actions
Copy link
Contributor

Hi! This is the friendly conda-forge automerge bot!

I considered the following status checks when analyzing this PR:

  • linter: passed
  • azure: passed

Thus the PR was passing and merged! Have a great day!

@jakirkham jakirkham deleted the add_cuda118_arch_cross branch August 31, 2023 11:52
@jakirkham
Copy link
Member Author

Forgot to bump version 🤦‍♂️

Fixed with commit: 22b4448

@h-vetinari h-vetinari mentioned this pull request Sep 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge the PR when CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants