Skip to content

Commit 42f8088

Browse files
tosterbergtosterberg
authored
Merge branch 'master' into lmi-bumps
2 parents 7b4f80d + dc0860d commit 42f8088

File tree

9 files changed

+122
-9
lines changed

9 files changed

+122
-9
lines changed

‎requirements/extras/feature-processor_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
pyspark==3.3.1
1+
pyspark==3.3.2
22
sagemaker-feature-store-pyspark-3.3

‎requirements/extras/test_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Jinja2==3.1.4
2424
pyvis==0.2.1
2525
pandas>=1.3.5,<1.5
2626
scikit-learn==1.3.0
27-
cloudpickle==2.2.1
27+
cloudpickle>=2.2.1
2828
PyYAML==6.0
2929
# TODO find workaround
3030
xgboost>=1.6.2,<=1.7.6

‎src/sagemaker/fw_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
"2.1.2",
154154
"2.2.0",
155155
"2.3.1",
156+
"2.4.1",
156157
]
157158

158159
TRAINIUM_SUPPORTED_DISTRIBUTION_STRATEGIES = ["torch_distributed"]

‎src/sagemaker/image_uri_config/huggingface-llm-neuronx.json

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"inf2"
55
],
66
"version_aliases": {
7-
"0.0": "0.0.24"
7+
"0.0": "0.0.25"
88
},
99
"versions": {
1010
"0.0.16": {
@@ -301,6 +301,39 @@
301301
"container_version": {
302302
"inf2": "ubuntu22.04"
303303
}
304+
},
305+
"0.0.25": {
306+
"py_versions": [
307+
"py310"
308+
],
309+
"registries": {
310+
"ap-northeast-1": "763104351884",
311+
"ap-south-1": "763104351884",
312+
"ap-south-2": "772153158452",
313+
"ap-southeast-1": "763104351884",
314+
"ap-southeast-2": "763104351884",
315+
"ap-southeast-4": "457447274322",
316+
"cn-north-1": "727897471807",
317+
"cn-northwest-1": "727897471807",
318+
"eu-central-1": "763104351884",
319+
"eu-central-2": "380420809688",
320+
"eu-south-2": "503227376785",
321+
"eu-west-1": "763104351884",
322+
"eu-west-3": "763104351884",
323+
"il-central-1": "780543022126",
324+
"sa-east-1": "763104351884",
325+
"us-east-1": "763104351884",
326+
"us-east-2": "763104351884",
327+
"us-gov-east-1": "446045086412",
328+
"us-gov-west-1": "442386744353",
329+
"us-west-2": "763104351884",
330+
"ca-west-1": "204538143572"
331+
},
332+
"tag_prefix": "2.1.2-optimum0.0.25",
333+
"repository": "huggingface-pytorch-tgi-inference",
334+
"container_version": {
335+
"inf2": "ubuntu22.04"
336+
}
304337
}
305338
}
306339
}

‎src/sagemaker/image_uri_config/huggingface-llm.json

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"1.2": "1.2.0",
1313
"1.3": "1.3.3",
1414
"1.4": "1.4.5",
15-
"2.0": "2.2.0"
15+
"2.0": "2.3.1"
1616
},
1717
"versions": {
1818
"0.6.0": {
@@ -719,6 +719,53 @@
719719
"container_version": {
720720
"gpu": "cu121-ubuntu22.04-v2.0"
721721
}
722+
},
723+
"2.3.1": {
724+
"py_versions": [
725+
"py311"
726+
],
727+
"registries": {
728+
"af-south-1": "626614931356",
729+
"il-central-1": "780543022126",
730+
"ap-east-1": "871362719292",
731+
"ap-northeast-1": "763104351884",
732+
"ap-northeast-2": "763104351884",
733+
"ap-northeast-3": "364406365360",
734+
"ap-south-1": "763104351884",
735+
"ap-south-2": "772153158452",
736+
"ap-southeast-1": "763104351884",
737+
"ap-southeast-2": "763104351884",
738+
"ap-southeast-3": "907027046896",
739+
"ap-southeast-4": "457447274322",
740+
"ca-central-1": "763104351884",
741+
"cn-north-1": "727897471807",
742+
"cn-northwest-1": "727897471807",
743+
"eu-central-1": "763104351884",
744+
"eu-central-2": "380420809688",
745+
"eu-north-1": "763104351884",
746+
"eu-west-1": "763104351884",
747+
"eu-west-2": "763104351884",
748+
"eu-west-3": "763104351884",
749+
"eu-south-1": "692866216735",
750+
"eu-south-2": "503227376785",
751+
"me-south-1": "217643126080",
752+
"me-central-1": "914824155844",
753+
"sa-east-1": "763104351884",
754+
"us-east-1": "763104351884",
755+
"us-east-2": "763104351884",
756+
"us-gov-east-1": "446045086412",
757+
"us-gov-west-1": "442386744353",
758+
"us-iso-east-1": "886529160074",
759+
"us-isob-east-1": "094389454867",
760+
"us-west-1": "763104351884",
761+
"us-west-2": "763104351884",
762+
"ca-west-1": "204538143572"
763+
},
764+
"tag_prefix": "2.4.0-tgi2.3.1",
765+
"repository": "huggingface-pytorch-tgi-inference",
766+
"container_version": {
767+
"gpu": "cu124-ubuntu22.04"
768+
}
722769
}
723770
}
724771
}

‎src/sagemaker/image_uri_config/pytorch-smp.json

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"2.1": "2.1.2",
99
"2.2": "2.3.1",
1010
"2.2.0": "2.3.1",
11-
"2.3.1": "2.5.0"
11+
"2.3.1": "2.5.0",
12+
"2.4.1": "2.6.0"
1213
},
1314
"versions": {
1415
"2.0.1": {
@@ -160,6 +161,31 @@
160161
"us-west-2": "658645717510"
161162
},
162163
"repository": "smdistributed-modelparallel"
164+
},
165+
"2.6.0": {
166+
"py_versions": [
167+
"py311"
168+
],
169+
"registries": {
170+
"ap-northeast-1": "658645717510",
171+
"ap-northeast-2": "658645717510",
172+
"ap-northeast-3": "658645717510",
173+
"ap-south-1": "658645717510",
174+
"ap-southeast-1": "658645717510",
175+
"ap-southeast-2": "658645717510",
176+
"ca-central-1": "658645717510",
177+
"eu-central-1": "658645717510",
178+
"eu-north-1": "658645717510",
179+
"eu-west-1": "658645717510",
180+
"eu-west-2": "658645717510",
181+
"eu-west-3": "658645717510",
182+
"sa-east-1": "658645717510",
183+
"us-east-1": "658645717510",
184+
"us-east-2": "658645717510",
185+
"us-west-1": "658645717510",
186+
"us-west-2": "658645717510"
187+
},
188+
"repository": "smdistributed-modelparallel"
163189
}
164190
}
165191
}

‎src/sagemaker/image_uris.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,7 @@ def get_training_image_uri(
699699
or "2.1" in framework_version
700700
or "2.2" in framework_version
701701
or "2.3" in framework_version
702+
or "2.4" in framework_version
702703
):
703704
container_version = "cu121"
704705
else:

‎tests/unit/sagemaker/image_uris/test_huggingface_llm.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"2.0.1": "2.1.1-tgi2.0.1-gpu-py310-cu121-ubuntu22.04",
4646
"2.0.2": "2.3.0-tgi2.0.2-gpu-py310-cu121-ubuntu22.04",
4747
"2.2.0": "2.3.0-tgi2.2.0-gpu-py310-cu121-ubuntu22.04-v2.0",
48+
"2.3.1": "2.4.0-tgi2.3.1-gpu-py311-cu124-ubuntu22.04",
4849
},
4950
"inf2": {
5051
"0.0.16": "1.13.1-optimum0.0.16-neuronx-py310-ubuntu22.04",
@@ -56,6 +57,7 @@
5657
"0.0.22": "2.1.2-optimum0.0.22-neuronx-py310-ubuntu22.04",
5758
"0.0.23": "2.1.2-optimum0.0.23-neuronx-py310-ubuntu22.04",
5859
"0.0.24": "2.1.2-optimum0.0.24-neuronx-py310-ubuntu22.04",
60+
"0.0.25": "2.1.2-optimum0.0.25-neuronx-py310-ubuntu22.04",
5961
},
6062
}
6163

‎tests/unit/sagemaker/image_uris/test_smp_v2.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,17 @@ def test_smp_v2(load_config):
3636
for region in ACCOUNTS.keys():
3737
for instance_type in CONTAINER_VERSIONS.keys():
3838
cuda_vers = CONTAINER_VERSIONS[instance_type]
39-
if "2.1" in version or "2.2" in version or "2.3" in version:
39+
if (
40+
"2.1" in version
41+
or "2.2" in version
42+
or "2.3" in version
43+
or "2.4" in version
44+
):
4045
cuda_vers = "cu121"
4146

42-
if "2.3.1" == version:
47+
if "2.3.1" == version or "2.4.1" == version:
4348
py_version = "py311"
4449

45-
print(version, py_version)
46-
4750
uri = image_uris.get_training_image_uri(
4851
region,
4952
framework="pytorch",

0 commit comments

Comments
 (0)