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

fixup ___CUDA_VPTX -> _CUDA_VPTX #664

Merged
merged 2 commits into from
Nov 7, 2023
Merged

fixup ___CUDA_VPTX -> _CUDA_VPTX #664

merged 2 commits into from
Nov 7, 2023

Conversation

wmaxey
Copy link
Member

@wmaxey wmaxey commented Nov 6, 2023

Description

Fixes a mixup in the mbarrier PTX. This was caused by a lack of exclusive SM80 coverage in CI.

Checklist

  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

@wmaxey wmaxey requested review from a team as code owners November 6, 2023 19:51
@wmaxey wmaxey requested review from miscco and gevtushenko and removed request for a team November 6, 2023 19:51
@miscco
Copy link
Collaborator

miscco commented Nov 7, 2023

Urgh, the cub linker issue strikes again :(

@jrhemstad jrhemstad added the backport branch/2.3.x For backporting to the 2.3.x release branch label Nov 7, 2023
@jrhemstad jrhemstad merged commit d57851e into main Nov 7, 2023
514 of 517 checks passed
Copy link
Contributor

github-actions bot commented Nov 7, 2023

Backport failed for branch/2.3.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin branch/2.3.x
git worktree add -d .worktree/backport-664-to-branch/2.3.x origin/branch/2.3.x
cd .worktree/backport-664-to-branch/2.3.x
git checkout -b backport-664-to-branch/2.3.x
ancref=$(git merge-base bd58bb5c4c883c81e878def3502d47593daebe8b 831521892c704d142ef284ff3e8a62c0a02573cd)
git cherry-pick -x $ancref..831521892c704d142ef284ff3e8a62c0a02573cd

@jrhemstad
Copy link
Collaborator

We'll need to rerun the backport after #663 is merged.

miscco pushed a commit to miscco/cccl that referenced this pull request Nov 8, 2023
* fixup `___CUDA_VPTX` -> `_CUDA_VPTX`

* Fix warning for unused variable in branches that are constexpr disabled.
jrhemstad pushed a commit that referenced this pull request Nov 8, 2023
* Add `cuda::ptx::*` namespace (#574)

* fixup `___CUDA_VPTX` -> `_CUDA_VPTX` (#664)

* fixup `___CUDA_VPTX` -> `_CUDA_VPTX`

* Fix warning for unused variable in branches that are constexpr disabled.

---------

Co-authored-by: Allard Hendriksen <ahendriksen@nvidia.com>
Co-authored-by: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
@jrhemstad jrhemstad removed the backport branch/2.3.x For backporting to the 2.3.x release branch label Nov 8, 2023
@wmaxey wmaxey added backport branch/2.3.x For backporting to the 2.3.x release branch and removed backport branch/2.3.x For backporting to the 2.3.x release branch labels Nov 14, 2023
@miscco miscco deleted the bugfix/cuda_vptx_mixup branch March 7, 2024 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants