Skip to content

Conversation

@peterbell10
Copy link
Collaborator

@peterbell10 peterbell10 commented Jan 10, 2023

This macro was made a no-op in #61903 and so we should clean up the surrounding
boiler-plate which used it.

[ghstack-poisoned]
@pytorch-bot
Copy link

pytorch-bot bot commented Jan 10, 2023

🔗 Helpful Links

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

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

❗ 1 Active SEVs

There are 1 currently active SEVs. If your PR is affected, please view them below:

❌ 1 Failures

As of commit 6c2f826:

FLAKY - The following jobs failed but were likely due to flakiness present on master:

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

@github-actions github-actions bot added the module: cpu CPU specific problem (e.g., perf, algorithm) label Jan 10, 2023
@peterbell10 peterbell10 added the topic: not user facing topic category label Jan 10, 2023
peterbell10 added a commit to peterbell10/pytorch that referenced this pull request Jan 10, 2023
This macro was made a no-op in pytorch#61903 and so we should clean up the surrounding
boiler-plate which used it.

ghstack-source-id: f159656
Pull Request resolved: pytorch#91960
@peterbell10 peterbell10 marked this pull request as ready for review January 10, 2023 17:32
@peterbell10 peterbell10 requested a review from lezcano January 10, 2023 17:33
Copy link
Collaborator

@lezcano lezcano left a comment

Choose a reason for hiding this comment

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

Manual dead code elimination, cool.

@lezcano lezcano added the ciflow/trunk Trigger trunk jobs on your pull request label Jan 11, 2023
@lezcano
Copy link
Collaborator

lezcano commented Jan 11, 2023

@pytorchbot merge -f "The macro is not used anywhere, it's safe to skip the CI"

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged immediately since you used the force (-f) flag, bypassing any CI checks (ETA: 1-5 minutes).

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: Command git -C /home/runner/work/pytorch/pytorch cherry-pick -x 5e1ba2874ae74378f737e05e9da8374545924084 returned non-zero exit code 1

Auto-merging aten/src/ATen/cpu/vml.h
CONFLICT (content): Merge conflict in aten/src/ATen/cpu/vml.h
error: could not apply 5e1ba2874a... Remove DL_RUNTIME_BUG
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
Details for Dev Infra team Raised by workflow job

This macro was made a no-op in #61903 and so we should clean up the surrounding
boiler-plate which used it.

[ghstack-poisoned]
@lezcano
Copy link
Collaborator

lezcano commented Jan 11, 2023

@pytorchbot 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: Command git -C /home/runner/work/pytorch/pytorch cherry-pick -x faecfeee027fd8a2af7c3c831e2dfa14f176bd93 returned non-zero exit code 1

Auto-merging aten/src/ATen/cpu/vml.h
CONFLICT (content): Merge conflict in aten/src/ATen/cpu/vml.h
error: could not apply faecfeee02... Remove DL_RUNTIME_BUG
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
Details for Dev Infra team Raised by workflow job

@lezcano
Copy link
Collaborator

lezcano commented Jan 11, 2023

ok, this is just odd, no idea what's going on here.

@lezcano
Copy link
Collaborator

lezcano commented Jan 11, 2023

Nevermind, this was a landrace with #91086. rebase on top of master and do a merge -f without waiting for CI

This macro was made a no-op in #61903 and so we should clean up the surrounding
boiler-plate which used it.

[ghstack-poisoned]
@peterbell10
Copy link
Collaborator Author

@pytorchbot merge -f "The macro is not used anywhere, it's safe to skip CI"

@pytorchmergebot
Copy link
Collaborator

Merge started

Your change will be merged immediately since you used the force (-f) flag, bypassing any CI checks (ETA: 1-5 minutes).

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

@facebook-github-bot facebook-github-bot deleted the gh/peterbell10/490/head branch June 8, 2023 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ciflow/trunk Trigger trunk jobs on your pull request Merged module: cpu CPU specific problem (e.g., perf, algorithm) open source topic: not user facing topic category

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants