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

Set num_nodes and sync_batchnorm From Trainer for Manually Passed Training Type Plugin #7026

Merged
Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
89f284d
Fix some test errors
Mar 23, 2021
80cfbff
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
Mar 23, 2021
536c132
checkpoint consolidation
Mar 24, 2021
f172101
Update ddp_spawn.py
shuyingsunshine21 Mar 24, 2021
bf70e43
Update test_metric_result_integration.py
shuyingsunshine21 Mar 24, 2021
ea74906
Update test_results.py
shuyingsunshine21 Mar 24, 2021
a9aae99
Update utils.py
shuyingsunshine21 Mar 24, 2021
70fe5da
Update utils.py
shuyingsunshine21 Mar 24, 2021
0d23d75
Update test_all_gather_grad.py
shuyingsunshine21 Mar 24, 2021
ca6f98b
Update test_all_gather_grad.py
shuyingsunshine21 Mar 24, 2021
c5053da
Merge pull request #1 from shuyingsunshine21/shuyingsunshine21-checkp…
shuyingsunshine21 Mar 24, 2021
9d4a2b8
Update test_results.py
shuyingsunshine21 Mar 24, 2021
7635b4f
Revert "Update test_results.py"
shuyingsunshine21 Mar 24, 2021
d64f90c
Revert "Merge pull request #1 from shuyingsunshine21/shuyingsunshine2…
shuyingsunshine21 Mar 24, 2021
dcdcd29
Revert "Update test_all_gather_grad.py"
shuyingsunshine21 Mar 24, 2021
8651d54
Revert "Update utils.py"
shuyingsunshine21 Mar 24, 2021
15f4b9e
Revert "Update utils.py"
shuyingsunshine21 Mar 24, 2021
250d0aa
Revert "Update test_results.py"
shuyingsunshine21 Mar 24, 2021
6c095b2
Revert "Update test_metric_result_integration.py"
shuyingsunshine21 Mar 24, 2021
8222dc9
Revert "Update ddp_spawn.py"
shuyingsunshine21 Mar 24, 2021
3a9fde9
Revert "checkpoint consolidation"
shuyingsunshine21 Mar 24, 2021
7a369f4
Revert "Revert "checkpoint consolidation""
shuyingsunshine21 Mar 24, 2021
b4a0b9e
Revert "Revert "Revert "checkpoint consolidation"""
shuyingsunshine21 Mar 24, 2021
5cf1db1
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
Mar 24, 2021
0ce7e05
Revert "Revert "Update ddp_spawn.py""
shuyingsunshine21 Mar 24, 2021
fe9736d
Revert "Revert "Update test_metric_result_integration.py""
shuyingsunshine21 Mar 24, 2021
c314ef6
Revert "Revert "Update test_results.py""
shuyingsunshine21 Mar 24, 2021
c3feda0
Revert "Revert "Update utils.py""
shuyingsunshine21 Mar 24, 2021
c759477
Revert "Revert "Update test_all_gather_grad.py""
shuyingsunshine21 Mar 24, 2021
7a8e540
Merge branch 'master' of https://github.com/shuyingsunshine21/pytorch…
Mar 24, 2021
ab8b849
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
Mar 24, 2021
4e67db2
modify distributed environment to make test pass
Mar 24, 2021
67b6188
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
Mar 25, 2021
f9afa07
rebase to upstream master
Apr 8, 2021
f337156
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
Apr 14, 2021
fffecb8
rfc
Apr 15, 2021
a74e712
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
Apr 15, 2021
089e566
rebase
Apr 15, 2021
bb8ed77
formatting
Apr 15, 2021
6b7fe6f
more nits
Apr 15, 2021
90fa8e0
nit
Apr 15, 2021
ba4f9c4
split, setting num_nodes and sync batchnorm only
Apr 15, 2021
1eed6c9
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
Apr 15, 2021
7c88c70
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
Apr 15, 2021
bdb66ab
fix test
Apr 15, 2021
552f445
add changlog
Apr 15, 2021
1655f1e
retrigger checkes
Apr 16, 2021
76853ef
Merge branch 'master' into training_type_plugin_consolidate
tchaton Apr 19, 2021
ad77ad4
comments
Apr 20, 2021
de24614
rebase
Apr 20, 2021
c9ded5b
rebase
Apr 20, 2021
77ef90a
change accelerator_connector training_type_plugin to resolve only once
Apr 20, 2021
36427ca
nits
Apr 20, 2021
eae6dc7
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
Apr 21, 2021
824fb25
make num_nodes and sync_batchnorm as optional argument for plugin and…
Apr 21, 2021
66fab62
format
Apr 21, 2021
63e4a4e
change warn to deprecation
Apr 21, 2021
2b8c772
fix
Apr 21, 2021
4feded8
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
Apr 22, 2021
6aa1cf1
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
Apr 23, 2021
76016de
minor
Apr 23, 2021
0996a5d
remove unnecessary assert
Apr 23, 2021
afa3bbd
Merge branch 'master' into training_type_plugin_consolidate
kaushikb11 Apr 26, 2021
c3b63a2
rebase
May 4, 2021
16858be
comments
May 4, 2021
e8a110b
pull rebase
May 4, 2021
60580be
remove extra in change.md
May 4, 2021
20d59a4
correct in change.md
May 4, 2021
0ab7147
fix test and flake8
May 4, 2021
9381117
Merge branch 'master' of https://github.com/PyTorchLightning/pytorch-…
May 4, 2021
a35fdc3
Merge branch 'master' into training_type_plugin_consolidate
carmocca May 4, 2021
9fdde94
pre-commit
carmocca May 4, 2021
6680b0d
Merge branch 'master' into training_type_plugin_consolidate
awaelchli May 8, 2021
621bfc8
whitespace standardization
awaelchli May 8, 2021
29f720b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 8, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Revert "Update utils.py""
This reverts commit 8651d54.
shuyingsunshine21 committed Mar 24, 2021
commit c3feda03d7fbb25dcf1917e718209f98d0503327
2 changes: 1 addition & 1 deletion tests/metrics/utils.py
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
def setup_ddp(rank, world_size):
""" Setup ddp enviroment """
os.environ["MASTER_ADDR"] = "localhost"
os.environ["MASTER_PORT"] = "29501"
os.environ["MASTER_PORT"] = "8088"

if torch.distributed.is_available() and sys.platform not in ("win32", "cygwin"):
torch.distributed.init_process_group("gloo", rank=rank, world_size=world_size)