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

UFMT formatting on test/export #123520

Closed
wants to merge 5 commits into from
Closed

Conversation

FFFrog
Copy link
Collaborator

@FFFrog FFFrog commented Apr 7, 2024

Partially addresses #123062

Ran lintrunner on:
test/export

Detail:

$ lintrunner -a --take UFMT --all-files
ok No lint issues.
Successfully applied all patches.

Copy link

pytorch-bot bot commented Apr 7, 2024

🔗 Helpful Links

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

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

✅ You can merge normally! (1 Unrelated Failure)

As of commit 3e2d5f5 with merge base 82e0153 (image):

FLAKY - The following job failed but was likely due to flakiness present on trunk:

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

shink
shink previously approved these changes Apr 8, 2024
@ezyang
Copy link
Contributor

ezyang commented Apr 9, 2024

needs rebase now

lintcheck.sh reveals this diff which is OK

diff --git a/test/export/test_passes.py b/test/export/test_passes.py
index c7240ec0ee2..79cfbd68086 100644
--- a/test/export/test_passes.py
+++ b/test/export/test_passes.py
@@ -657,8 +657,8 @@ def forward(self, arg_0):
     sub = torch.ops.aten.sub.Tensor(add_1, 1)
     sub_1 = torch.ops.aten.sub.Tensor(add_2, 1)
     return pytree.tree_unflatten((add_1, add_2, sub, sub_1), self._out_spec)
-    """,  # noqa: B950
-        )
+    """,
+        )  # noqa: B950
         mod, args = self.SET_GRAD_ENABLED_TESTS["ctx_manager_multi_dep_no_grad"]
         self.assertExpectedInline(
             mod.code.strip("\n"),
@@ -677,8 +677,8 @@ def forward(self, arg_0):
     sub = wrap_with_set_grad_enabled_1[0]
     sub_1 = wrap_with_set_grad_enabled_1[1];  wrap_with_set_grad_enabled_1 = None
     return pytree.tree_unflatten((add_1, add_2, sub, sub_1), self._out_spec)
-    """,  # noqa: B950
-        )
+    """,
+        )  # noqa: B950
 
     def test_sequential_split(self):
         for gm, args in self.SEQUENTIAL_SPLIT_INLINE_TESTS.values():

@FFFrog
Copy link
Collaborator Author

FFFrog commented Apr 9, 2024

lintcheck.sh

Done.
In the future, I will complete the preparation work first and then submit the PR.

@ezyang
Copy link
Contributor

ezyang commented Apr 9, 2024

@FFFrog actually it's fine, I need to run lintcheck.sh anyway so it's not a big deal

@ezyang
Copy link
Contributor

ezyang commented Apr 9, 2024

diff is fine although this got swizzled and will probably fail lol

index 4ca38fcf76c..16fc029f1df 100644
--- b/test/export/test_export.py
+++ a/test/export/test_export.py
@@ -3,8 +3,8 @@
 import copy
 import dataclasses
 import io
-import logging
 import re
+import logging
 import unittest
 import warnings
 from contextlib import contextmanager

@ezyang
Copy link
Contributor

ezyang commented Apr 9, 2024

@pytorchbot merge

@pytorch-bot pytorch-bot bot added the ciflow/trunk Trigger trunk jobs on your pull request label Apr 9, 2024
@pytorchmergebot
Copy link
Collaborator

Merge failed

Reason: Approvers from one of the following sets are needed:

  • superuser (pytorch/metamates)
  • Core Reviewers (mruberry, lezcano, Skylion007, ngimel, peterbell10)
  • Core Maintainers (soumith, gchanan, ezyang, dzhulgakov, malfet)
Details for Dev Infra team Raised by workflow job

Failing merge rule: Core Maintainers

ezyang
ezyang previously approved these changes Apr 9, 2024
@ezyang
Copy link
Contributor

ezyang commented Apr 9, 2024

@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: 1 jobs have failed, first few of them are: docker-builds / docker-build (linux.12xlarge, pytorch-linux-focal-rocm-n-1-py3)

Details for Dev Infra team Raised by workflow job

@ezyang
Copy link
Contributor

ezyang commented Apr 9, 2024

@pytorchbot merge -i

@PaliC
Copy link
Contributor

PaliC commented Apr 10, 2024

@pytorchbot revert -m "lint is still broken" -c nosignal

https://hud.pytorch.org/pytorch/pytorch/commit/ec7551d1b783e284cedddeb9aeabb285e653c480
Try running lintrunner -a -m origin/main

@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 Apr 10, 2024
This reverts commit ec7551d.

Reverted #123520 on behalf of https://github.com/PaliC due to lint is still broken ([comment](#123520 (comment)))
@pytorchmergebot
Copy link
Collaborator

@FFFrog your PR has been successfully reverted.

@pytorch-bot pytorch-bot bot dismissed stale reviews from shink and ezyang April 10, 2024 00:06

This PR was reopened (likely due to being reverted), so your approval was removed. Please request another review.

@ezyang
Copy link
Contributor

ezyang commented Apr 10, 2024

@pytorchbot merge

Copy link

pytorch-bot bot commented Apr 10, 2024

This PR needs to be approved by an authorized maintainer before merge.

@ezyang
Copy link
Contributor

ezyang commented Apr 10, 2024

@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

@FFFrog FFFrog deleted the mrl_ufmt_export branch April 10, 2024 07:15
sanketpurandare pushed a commit to sanketpurandare/pytorch that referenced this pull request Apr 22, 2024
Partially addresses pytorch#123062

Ran lintrunner on:
test/export

Detail:
```Shell
$ lintrunner -a --take UFMT --all-files
ok No lint issues.
Successfully applied all patches.
```

Co-authored-by: Edward Z. Yang <ezyang@meta.com>
Pull Request resolved: pytorch#123520
Approved by: https://github.com/shink, https://github.com/ezyang
sanketpurandare pushed a commit to sanketpurandare/pytorch that referenced this pull request Apr 22, 2024
This reverts commit ec7551d.

Reverted pytorch#123520 on behalf of https://github.com/PaliC due to lint is still broken ([comment](pytorch#123520 (comment)))
sanketpurandare pushed a commit to sanketpurandare/pytorch that referenced this pull request Apr 22, 2024
Partially addresses pytorch#123062

Ran lintrunner on:
test/export

Detail:
```Shell
$ lintrunner -a --take UFMT --all-files
ok No lint issues.
Successfully applied all patches.
```

Co-authored-by: Edward Z. Yang <ezyang@meta.com>
Pull Request resolved: pytorch#123520
Approved by: https://github.com/ezyang
@kit1980 kit1980 removed the Reverted label Apr 29, 2024
petrex pushed a commit to petrex/pytorch that referenced this pull request May 3, 2024
Partially addresses pytorch#123062

Ran lintrunner on:
test/export

Detail:
```Shell
$ lintrunner -a --take UFMT --all-files
ok No lint issues.
Successfully applied all patches.
```

Co-authored-by: Edward Z. Yang <ezyang@meta.com>
Pull Request resolved: pytorch#123520
Approved by: https://github.com/ezyang
pytorch-bot bot pushed a commit that referenced this pull request May 3, 2024
Partially addresses #123062

Ran lintrunner on:
test/export

Detail:
```Shell
$ lintrunner -a --take UFMT --all-files
ok No lint issues.
Successfully applied all patches.
```

Co-authored-by: Edward Z. Yang <ezyang@meta.com>
Pull Request resolved: #123520
Approved by: https://github.com/shink, https://github.com/ezyang
pytorch-bot bot pushed a commit that referenced this pull request May 3, 2024
This reverts commit ec7551d.

Reverted #123520 on behalf of https://github.com/PaliC due to lint is still broken ([comment](#123520 (comment)))
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 open source topic: not user facing topic category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants