dedupe test skipping in common_distributed and test_distributed #38078
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`common_distributed` and `test_distributed` have some error codes that overlap but are for different reasons, for example, code 75 in `test_distributed` is "no cuda available" but in common_distributed it is "need at least 2 CUDA devices". This is an issue because the tests in `test_distributed` now use the utils in `common_distributed`, so we could get the wrong reason for skipping tests. It is also the source of test failures in #37990. This diff makes it so that the test skipping logic is deduped and put into `common_distributed.py`, where it can be reused and then imported into `test_distributed` Differential Revision: [D21466768](https://our.internmc.facebook.com/intern/diff/D21466768/) [ghstack-poisoned]
rohan-varma
requested review from
mrshenli,
pritamdamania87 and
zhaojuanmao
as code owners
…buted" `common_distributed` and `test_distributed` have some error codes that overlap but are for different reasons, for example, code 75 in `test_distributed` is "no cuda available" but in common_distributed it is "need at least 2 CUDA devices". This is an issue because the tests in `test_distributed` now use the utils in `common_distributed`, so we could get the wrong reason for skipping tests. It is also the source of test failures in #37990. This diff makes it so that the test skipping logic is deduped and put into `common_distributed.py`, where it can be reused and then imported into `test_distributed` Differential Revision: [D21466768](https://our.internmc.facebook.com/intern/diff/D21466768/) [ghstack-poisoned]
rohan-varma
added a commit
that referenced
this pull request
May 7, 2020
Pull Request resolved: #38078 `common_distributed` and `test_distributed` have some error codes that overlap but are for different reasons, for example, code 75 in `test_distributed` is "no cuda available" but in common_distributed it is "need at least 2 CUDA devices". This is an issue because the tests in `test_distributed` now use the utils in `common_distributed`, so we could get the wrong reason for skipping tests. It is also the source of test failures in #37990. This diff makes it so that the test skipping logic is deduped and put into `common_distributed.py`, where it can be reused and then imported into `test_distributed` ghstack-source-id: 103713465 Differential Revision: [D21466768](https://our.internmc.facebook.com/intern/diff/D21466768/)
💊 CI failures summary and remediationsAs of commit dc6608a (more details on the Dr. CI page): 💚 💚 Looks good so far! There are no failures yet. 💚 💚 This comment was automatically generated by Dr. CI (expand for details).Follow this link to opt-out of these comments for your Pull Requests.Please report bugs/suggestions on the GitHub issue tracker. This comment has been revised 5 times. |
mrshenli
approved these changes
May 8, 2020
| } | ||
|
|
||
| def skip_if_no_gpu(func): | ||
| """ Nccl multigpu tests requires at least 2 GPUS. Skip if this is not met""" |
Contributor
There was a problem hiding this comment.
(this is prior to this PR)
tests requires -> tests require
| return wrapper | ||
|
|
||
|
|
||
| def skip_if_no_cuda_distributed(func): |
Contributor
There was a problem hiding this comment.
Looks like this is always used together with skip_if_no_gpu, so we can get rid of this as well?
…buted" `common_distributed` and `test_distributed` have some error codes that overlap but are for different reasons, for example, code 75 in `test_distributed` is "no cuda available" but in common_distributed it is "need at least 2 CUDA devices". This is an issue because the tests in `test_distributed` now use the utils in `common_distributed`, so we could get the wrong reason for skipping tests. It is also the source of test failures in #37990. This diff makes it so that the test skipping logic is deduped and put into `common_distributed.py`, where it can be reused and then imported into `test_distributed` Differential Revision: [D21466768](https://our.internmc.facebook.com/intern/diff/D21466768/) [ghstack-poisoned]
…buted" `common_distributed` and `test_distributed` have some error codes that overlap but are for different reasons, for example, code 75 in `test_distributed` is "no cuda available" but in common_distributed it is "need at least 2 CUDA devices". This is an issue because the tests in `test_distributed` now use the utils in `common_distributed`, so we could get the wrong reason for skipping tests. It is also the source of test failures in #37990. This diff makes it so that the test skipping logic is deduped and put into `common_distributed.py`, where it can be reused and then imported into `test_distributed` Differential Revision: [D21466768](https://our.internmc.facebook.com/intern/diff/D21466768/) [ghstack-poisoned]
rohan-varma
added a commit
that referenced
this pull request
May 8, 2020
Pull Request resolved: #38078 `common_distributed` and `test_distributed` have some error codes that overlap but are for different reasons, for example, code 75 in `test_distributed` is "no cuda available" but in common_distributed it is "need at least 2 CUDA devices". This is an issue because the tests in `test_distributed` now use the utils in `common_distributed`, so we could get the wrong reason for skipping tests. It is also the source of test failures in #37990. This diff makes it so that the test skipping logic is deduped and put into `common_distributed.py`, where it can be reused and then imported into `test_distributed` ghstack-source-id: 103782583 Differential Revision: [D21466768](https://our.internmc.facebook.com/intern/diff/D21466768/)
Contributor
|
This pull request has been merged in 4501083. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Stack from ghstack:
common_distributedandtest_distributedhave some error codes that overlap but are for different reasons, for example, code 75 intest_distributedis "no cuda available" but in common_distributed it is "need at least 2 CUDA devices".This is an issue because the tests in
test_distributednow use the utils incommon_distributed, so we could get the wrong reason for skipping tests.It is also the source of test failures in #37990.
This diff makes it so that the test skipping logic is deduped and put into
common_distributed.py, where it can be reused and then imported intotest_distributedDifferential Revision: D21466768