Skip to content

[release/2.15] Fix hipify skipping sources under Windows subst drives (#3561) - #3832

Merged
jithunnair-amd merged 1 commit into
release/2.15from
pablo-garay/release-2.15-hipify-subst-fix
Oct 16, 2026
Merged

jithunnair-amd merged 1 commit into
release/2.15from
pablo-garay/release-2.15-hipify-subst-fix

Conversation

@pablo-garay

Copy link
Copy Markdown

Summary

Cherry-pick the hipify subst-drive fix into release/2.15. It's the same change as release/2.13 (#3561) and release/2.14 (f11950f); upstream nightly has it via pytorch#194641.

Windows CI builds under a subst drive (B: aliasing C:\scratch-b), so CUDAExtension compares B:\... with C:\... and hipify silently skips torchaudio's GPU sources. Resolving both sides with os.path.realpath fixes the match. No effect on Linux.

Test plan

  • Failing without this: Windows py3.12 build of release/2.15 (run 38716492477) fails in torchaudio rnnt/gpu/compute.cu and forced_align/gpu/compute.cu with 'cuda_runtime_api.h' file not found.
  • The diff is identical to the 2.14 fix, which builds torchaudio on Windows.
  • Re-running the Windows build on pablo-garay/release-2.15-integration with this commit for ci(pytorch): enable release/2.15 build matrices TheRock#9031.

…#3561)

Resolve the build directory and source paths with os.path.realpath in CUDAExtension so hipify matches sources when Windows CI builds under a subst drive (B: aliasing C:). Without this, torchaudio GPU sources are left unhipified and fail on cuda_runtime_api.h. Same fix as release/2.13 (#3561) and release/2.14 (f11950f); nightly has it via pytorch#194641.

(cherry picked from commit f11950f)
Signed-off-by: pablo-garay <pgarayfe@amd.com>
@jithunnair-amd
jithunnair-amd merged commit e326e9a into release/2.15 Oct 16, 2026
7 checks passed
@jithunnair-amd
jithunnair-amd deleted the pablo-garay/release-2.15-hipify-subst-fix branch October 16, 2026 05:42
ethanwee1 pushed a commit to ROCm/TheRock that referenced this pull request Oct 16, 2026
JIRA ID: AIPYTORCH-1326

## Motivation

PyTorch `release/2.15` exists in ROCm/pytorch but is absent from
TheRock's release matrices and source manifests, so nightly, prerelease
and dev release builds never pick it up. This follows the 2.14
enablement in #7525.

## Technical Details

- Add `release/2.15` to the Linux and Windows release matrices
(`RELEASE_STABLE_PYTORCH_REFS`), the unsupported AMDGPU family filters
(`gfx90c`, same as 2.13/2.14), `PYTORCH_PRIMARY_TEST_PYTHON_VERSIONS`
(`3.11`), the source manifest defaults, and the support table in
`external-builds/pytorch/README.md`. The README row points torchaudio at
ROCm/audio, since 2.15's `related_commits` pins ROCm/audio
`release/2.11.1`.
- CI defaults (`CI_PYTORCH_REFS`) are unchanged.
- Python 3.15 for 2.15 is left to #8394.

Merge order: these ROCm/pytorch `release/2.15` PRs should land first, so
scheduled builds of the branch pick them up:

- ROCm/pytorch#3816 (`related_commits`: apex `release/1.15.0`, vision
`release/0.29`, ROCm/audio `release/2.11.1`)
- ROCm/pytorch#3818 (requirements pins)
- ROCm/pytorch#3832 (Windows hipify fix for subst drives, backport of
ROCm/pytorch#3561 from `release/2.14`)

## Test Plan

- `python
build_tools/github_actions/tests/configure_pytorch_release_matrix_test.py`
- `python
build_tools/github_actions/tests/configure_multi_arch_ci_test.py`
- `python
build_tools/github_actions/tests/generate_pytorch_source_manifest_test.py`
- `git diff --check`
- Wheel builds of `pablo-garay/release-2.15-integration` (`release/2.15`
+ ROCm/pytorch#3816 + ROCm/pytorch#3818 + ROCm/pytorch#3832),
gfx94X-dcgpu on Linux, gfx1151 on Windows, ROCm 10.2.0a20261013.

## Test Result

- Unit tests: 10 passed; 152 passed, 1 skipped; 13 passed, 1 skipped.
`git diff --check` clean.
- Linux builds passed on Python
[3.11](https://github.com/ROCm/TheRock/actions/runs/38705512288),
[3.12](https://github.com/ROCm/TheRock/actions/runs/38705525582),
[3.13](https://github.com/ROCm/TheRock/actions/runs/38705535781) and
[3.14](https://github.com/ROCm/TheRock/actions/runs/38705545732).
- Windows Python 3.12 build passed: [run
38848244359](https://github.com/ROCm/TheRock/actions/runs/38848244359).
The earlier [run
38716492477](https://github.com/ROCm/TheRock/actions/runs/38716492477),
without ROCm/pytorch#3832, failed building torchaudio.

## Submission Checklist

- [x] Look over the contributing guidelines at
https://github.com/ROCm/TheRock/blob/main/CONTRIBUTING.md.

---------

Signed-off-by: pablo-garay <pgarayfe@amd.com>
jithunnair-amd pushed a commit that referenced this pull request Nov 4, 2026
…#3561) (#3832)

## Summary

Cherry-pick the hipify `subst`-drive fix into `release/2.15`. It's the
same change as `release/2.13` (#3561) and `release/2.14` (f11950f);
upstream nightly has it via pytorch#194641.

Windows CI builds under a `subst` drive (`B:` aliasing `C:\scratch-b`),
so `CUDAExtension` compares `B:\...` with `C:\...` and hipify silently
skips torchaudio's GPU sources. Resolving both sides with
`os.path.realpath` fixes the match. No effect on Linux.

## Test plan

- Failing without this: Windows py3.12 build of `release/2.15` ([run
38716492477](https://github.com/ROCm/TheRock/actions/runs/38716492477))
fails in torchaudio `rnnt/gpu/compute.cu` and
`forced_align/gpu/compute.cu` with `'cuda_runtime_api.h' file not
found`.
- The diff is identical to the 2.14 fix, which builds torchaudio on
Windows.
- Re-running the Windows build on `pablo-garay/release-2.15-integration`
with this commit for ROCm/TheRock#9031.

Signed-off-by: pablo-garay <pgarayfe@amd.com>
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.

2 participants