Skip to content

change: Upgrade smp to version 2.2 #4479

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Mar 6, 2024
Merged

change: Upgrade smp to version 2.2 #4479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
32baa78
upgrading smp to version 2.2
adtian2 Mar 5, 2024
3bf2a88
fixing linting issue
adtian2 Mar 6, 2024
1f0ba5c
fixing syntax error with multiline if statement
adtian2 Mar 6, 2024
65b1aca
upgrading smp to version 2.2
adtian2 Mar 5, 2024
967c8d4
fixing linting issue
adtian2 Mar 6, 2024
331c7a1
fixing syntax error with multiline if statement
adtian2 Mar 6, 2024
a0bb500
fixing formatting
adtian2 Mar 6, 2024
a1059af
Merge branch 'smp-pt-2.2' of https://github.com/adtian2/sagemaker-pyt…
adtian2 Mar 6, 2024
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
10 changes: 9 additions & 1 deletion src/sagemaker/fw_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
"2.0.1",
"2.1.0",
"2.1.2",
"2.2.0",
],
}

Expand All @@ -160,7 +161,14 @@
]


TORCH_DISTRIBUTED_GPU_SUPPORTED_FRAMEWORK_VERSIONS = ["1.13.1", "2.0.0", "2.0.1", "2.1.0", "2.1.2"]
TORCH_DISTRIBUTED_GPU_SUPPORTED_FRAMEWORK_VERSIONS = [
"1.13.1",
"2.0.0",
"2.0.1",
"2.1.0",
"2.1.2",
"2.2.0",
]

TRAINIUM_SUPPORTED_DISTRIBUTION_STRATEGIES = ["torch_distributed"]
TRAINIUM_SUPPORTED_TORCH_DISTRIBUTED_FRAMEWORK_VERSIONS = [
Expand Down
28 changes: 27 additions & 1 deletion src/sagemaker/image_uri_config/pytorch-smp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
],
"version_aliases": {
"2.0": "2.0.1",
"2.1": "2.1.2"
"2.1": "2.1.2",
"2.2": "2.2.0"
},
"versions": {
"2.0.1": {
Expand Down Expand Up @@ -57,6 +58,31 @@
"us-west-2": "658645717510"
},
"repository": "smdistributed-modelparallel"
},
"2.2.0": {
"py_versions": [
"py310"
],
"registries": {
"ap-northeast-1": "658645717510",
"ap-northeast-2": "658645717510",
"ap-northeast-3": "658645717510",
"ap-south-1": "658645717510",
"ap-southeast-1": "658645717510",
"ap-southeast-2": "658645717510",
"ca-central-1": "658645717510",
"eu-central-1": "658645717510",
"eu-north-1": "658645717510",
"eu-west-1": "658645717510",
"eu-west-2": "658645717510",
"eu-west-3": "658645717510",
"sa-east-1": "658645717510",
"us-east-1": "658645717510",
"us-east-2": "658645717510",
"us-west-1": "658645717510",
"us-west-2": "658645717510"
},
"repository": "smdistributed-modelparallel"
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion src/sagemaker/image_uris.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,11 @@ def get_training_image_uri(
if "modelparallel" in distribution["smdistributed"]:
if distribution["smdistributed"]["modelparallel"].get("enabled", True):
framework = "pytorch-smp"
if "p5" in instance_type or "2.1" in framework_version:
if (
"p5" in instance_type
or "2.1" in framework_version
or "2.2" in framework_version
):
container_version = "cu121"
else:
container_version = "cu118"
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/sagemaker/image_uris/test_smp_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def test_smp_v2(load_config):
for region in ACCOUNTS.keys():
for instance_type in CONTAINER_VERSIONS.keys():
cuda_vers = CONTAINER_VERSIONS[instance_type]
if "2.1" in version:
if "2.1" in version or "2.2" in version:
cuda_vers = "cu121"

uri = image_uris.get_training_image_uri(
Expand Down