Skip to content

Conversation

@cyyever
Copy link
Collaborator

@cyyever cyyever commented May 25, 2025

Fixes #ISSUE_NUMBER

cc @EikanWang @jgong5

@cyyever cyyever requested review from eqy and syed-ahmed as code owners May 25, 2025 02:10
@pytorch-bot pytorch-bot bot added the release notes: sparse release notes category label May 25, 2025
@pytorch-bot
Copy link

pytorch-bot bot commented May 25, 2025

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/154313

Note: Links to docs will display an error until the docs builds have been completed.

✅ No Failures

As of commit 75ac1ac with merge base e79790e (image):
💚 Looks good so far! There are no failures yet. 💚

This comment was automatically generated by Dr. CI and updates every 15 minutes.

@eqy eqy added ciflow/trunk Trigger trunk jobs on your pull request topic: not user facing topic category and removed release notes: sparse release notes category labels May 25, 2025
@cyyever
Copy link
Collaborator Author

cyyever commented May 25, 2025

@pytorchmergebot merge

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged once all checks pass (ETA 0-4 Hours).

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

@pytorchmergebot
Copy link
Collaborator

Merge failed

Reason: New commits were pushed while merging. Please rerun the merge command.

Details for Dev Infra team Raised by workflow job

@cyyever
Copy link
Collaborator Author

cyyever commented May 26, 2025

@pytorchmergebot rebase -b main

@pytorchmergebot
Copy link
Collaborator

@pytorchbot started a rebase job onto refs/remotes/origin/main. Check the current status here

@pytorchmergebot
Copy link
Collaborator

Rebase failed due to Command git -C /home/runner/work/pytorch/pytorch rebase refs/remotes/origin/main pull/154313/head returned non-zero exit code 1

Rebasing (1/1)
Auto-merging aten/src/ATen/native/cuda/Indexing.cu
CONFLICT (content): Merge conflict in aten/src/ATen/native/cuda/Indexing.cu
error: could not apply 3606422f40c... Remove CUDA 11 conditions
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 3606422f40c... Remove CUDA 11 conditions

Raised by https://github.com/pytorch/pytorch/actions/runs/15244735708

@pytorch-bot pytorch-bot bot added the NNC label May 26, 2025
@cyyever cyyever force-pushed the cuda11 branch 3 times, most recently from 0bf55fa to 9b3280e Compare May 26, 2025 10:32
@cyyever
Copy link
Collaborator Author

cyyever commented May 27, 2025

@pytorchmergebot merge -i

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged while ignoring the following 1 checks: pull / linux-jammy-py3-clang12-executorch / build

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

@izaitsevfb
Copy link
Contributor

@pytorchbot revert -m "breaks internal builds" -c ghfirst

seeing a lot of

Stderr:
In file included from buck-out/v2/gen/fbcode/16889b3e08fd8b25/caffe2/__fb_aten_hipify_gen_eqsb_ATen/hip/HIPSparseDescriptors.cpp__/out/ATen/hip/HIPSparseDescriptors.cpp:3:
buck-out/v2/gen/fbcode/16889b3e08fd8b25/caffe2/__ATen-hip__/buck-headers/ATen/hip/HIPDataType.h:84:14: error: use of undeclared identifier 'HIP_R_8F_E4M3'
   84 |       return HIP_R_8F_E4M3;
      |              ^
buck-out/v2/gen/fbcode/16889b3e08fd8b25/caffe2/__ATen-hip__/buck-headers/ATen/hip/HIPDataType.h:86:14: error: use of undeclared identifier 'HIP_R_8F_E5M2'
   86 |       return HIP_R_8F_E5M2;
      |              ^
2 errors generated.

Action sub-errors produced by error handlers:
- [cxx_undeclared_identifier]

failures internally;

Meta still uses the older ROCm version (6.2.1), we'd need to postpone merging this cleanup until it is upgraded

@pytorchmergebot
Copy link
Collaborator

@pytorchbot successfully started a revert job. Check the current status here.
Questions? Feedback? Please reach out to the PyTorch DevX Team

pytorchmergebot added a commit that referenced this pull request May 27, 2025
This reverts commit 3936e61.

Reverted #154313 on behalf of https://github.com/izaitsevfb due to breaks internal builds ([comment](#154313 (comment)))
@pytorchmergebot
Copy link
Collaborator

@cyyever your PR has been successfully reverted.

@pytorchmergebot pytorchmergebot added Reverted ci-no-td Do not run TD on this PR labels May 27, 2025
@cyyever
Copy link
Collaborator Author

cyyever commented May 27, 2025

@pytorchbot revert -m "breaks internal builds" -c ghfirst

seeing a lot of

Stderr:
In file included from buck-out/v2/gen/fbcode/16889b3e08fd8b25/caffe2/__fb_aten_hipify_gen_eqsb_ATen/hip/HIPSparseDescriptors.cpp__/out/ATen/hip/HIPSparseDescriptors.cpp:3:
buck-out/v2/gen/fbcode/16889b3e08fd8b25/caffe2/__ATen-hip__/buck-headers/ATen/hip/HIPDataType.h:84:14: error: use of undeclared identifier 'HIP_R_8F_E4M3'
   84 |       return HIP_R_8F_E4M3;
      |              ^
buck-out/v2/gen/fbcode/16889b3e08fd8b25/caffe2/__ATen-hip__/buck-headers/ATen/hip/HIPDataType.h:86:14: error: use of undeclared identifier 'HIP_R_8F_E5M2'
   86 |       return HIP_R_8F_E5M2;
      |              ^
2 errors generated.

Action sub-errors produced by error handlers:
- [cxx_undeclared_identifier]

failures internally;

Meta still uses the older ROCm version (6.2.1), we'd need to postpone merging this cleanup until it is upgraded

The root cause is that (defined(USE_ROCM) && ROCM_VERSION >= 60300) is wrong, should we set it to 6.3.0?

@cyyever cyyever added the ciflow/rocm Trigger "default" config CI on ROCm label May 28, 2025
@cyyever
Copy link
Collaborator Author

cyyever commented May 28, 2025

@pytorchbot rebase -b main

@pytorchmergebot
Copy link
Collaborator

@pytorchbot started a rebase job onto refs/remotes/origin/main. Check the current status here

@pytorchmergebot
Copy link
Collaborator

Successfully rebased cuda11 onto refs/remotes/origin/main, please pull locally before adding more changes (for example, via git checkout cuda11 && git pull --rebase)

@cyyever
Copy link
Collaborator Author

cyyever commented May 28, 2025

@pytorchmergebot merge -i

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged while ignoring the following 0 checks:

Learn more about merging in the wiki.

Questions? Feedback? Please reach out to the PyTorch DevX Team

Advanced Debugging
Check the merge workflow status
here

nWEIdia pushed a commit to nWEIdia/pytorch that referenced this pull request Jun 2, 2025
nWEIdia pushed a commit to nWEIdia/pytorch that referenced this pull request Jun 2, 2025
@cyyever cyyever deleted the cuda11 branch October 4, 2025 01:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-no-td Do not run TD on this PR ciflow/rocm Trigger "default" config CI on ROCm ciflow/trunk Trigger trunk jobs on your pull request Merged NNC open source Reverted topic: not user facing topic category

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants