Skip to content

Commit 777d0d0

Browse files
jeniyatjeniyat
authored
Merge branch 'master' into training-inputs-doc-fix
2 parents 7e85bf6 + 4fe5ea4 commit 777d0d0

File tree

8 files changed

+382
-17
lines changed

8 files changed

+382
-17
lines changed

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Changelog
22

3+
## v2.61.0 (2021-10-11)
4+
5+
### Features
6+
7+
* add support for PyTorch 1.9.0
8+
9+
### Bug Fixes and Other Changes
10+
11+
* Update TRAINING_DEFAULT_TIMEOUT_MINUTES to 40 min
12+
* notebook test for parallel PRs
13+
314
## v2.60.0 (2021-10-08)
415

516
### Features

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.60.1.dev0
1+
2.61.1.dev0

‎src/sagemaker/fw_utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
)
6161
SM_DATAPARALLEL_SUPPORTED_FRAMEWORK_VERSIONS = {
6262
"tensorflow": ["2.3", "2.3.1", "2.3.2", "2.4", "2.4.1"],
63-
"pytorch": ["1.6", "1.6.0", "1.7", "1.7.1", "1.8", "1.8.0", "1.8.1"],
63+
"pytorch": ["1.6", "1.6.0", "1.7", "1.7.1", "1.8", "1.8.0", "1.8.1", "1.9", "1.9.0"],
6464
}
6565
SMDISTRIBUTED_SUPPORTED_STRATEGIES = ["dataparallel", "modelparallel"]
6666

@@ -298,7 +298,7 @@ def framework_name_from_image(image_uri):
298298
(tensorflow|mxnet|chainer|pytorch|scikit-learn|xgboost
299299
|huggingface-tensorflow|huggingface-pytorch)(?:-)?
300300
(scriptmode|training)?
301-
:(.*)-(.*?)-(py2|py3[67]?)(?:.*)$""",
301+
:(.*)-(.*?)-(py2|py3\d*)(?:.*)$""",
302302
re.VERBOSE,
303303
)
304304
name_match = name_pattern.match(sagemaker_match.group(9))
@@ -329,7 +329,7 @@ def framework_version_from_tag(image_tag):
329329
Returns:
330330
str: The framework version.
331331
"""
332-
tag_pattern = re.compile("^(.*)-(cpu|gpu)-(py2|py3[67]?)$")
332+
tag_pattern = re.compile(r"^(.*)-(cpu|gpu)-(py2|py3\d*)$")
333333
tag_match = tag_pattern.match(image_tag)
334334
return None if tag_match is None else tag_match.group(1)
335335

‎src/sagemaker/image_uri_config/huggingface.json

Lines changed: 277 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"4.4": "4.4.2",
66
"4.5": "4.5.0",
77
"4.6": "4.6.1",
8-
"4.10": "4.10.2"
8+
"4.10": "4.10.2",
9+
"4.11": "4.11.0"
910
},
1011
"versions": {
1112
"4.4.2": {
@@ -281,6 +282,143 @@
281282
}
282283
},
283284
"4.10.2": {
285+
"version_aliases": {
286+
"pytorch1.8": "pytorch1.8.1",
287+
"pytorch1.9": "pytorch1.9.0",
288+
"tensorflow2.4": "tensorflow2.4.1",
289+
"tensorflow2.5": "tensorflow2.5.1"
290+
},
291+
"pytorch1.8.1": {
292+
"py_versions": ["py36"],
293+
"registries": {
294+
"af-south-1": "626614931356",
295+
"ap-east-1": "871362719292",
296+
"ap-northeast-1": "763104351884",
297+
"ap-northeast-2": "763104351884",
298+
"ap-northeast-3": "364406365360",
299+
"ap-south-1": "763104351884",
300+
"ap-southeast-1": "763104351884",
301+
"ap-southeast-2": "763104351884",
302+
"ca-central-1": "763104351884",
303+
"cn-north-1": "727897471807",
304+
"cn-northwest-1": "727897471807",
305+
"eu-central-1": "763104351884",
306+
"eu-north-1": "763104351884",
307+
"eu-west-1": "763104351884",
308+
"eu-west-2": "763104351884",
309+
"eu-west-3": "763104351884",
310+
"eu-south-1": "692866216735",
311+
"me-south-1": "217643126080",
312+
"sa-east-1": "763104351884",
313+
"us-east-1": "763104351884",
314+
"us-east-2": "763104351884",
315+
"us-gov-west-1": "442386744353",
316+
"us-iso-east-1": "886529160074",
317+
"us-west-1": "763104351884",
318+
"us-west-2": "763104351884"
319+
},
320+
"repository": "huggingface-pytorch-training",
321+
"container_version": {"gpu":"cu110-ubuntu18.04"}
322+
},
323+
"pytorch1.9.0": {
324+
"py_versions": ["py38"],
325+
"registries": {
326+
"af-south-1": "626614931356",
327+
"ap-east-1": "871362719292",
328+
"ap-northeast-1": "763104351884",
329+
"ap-northeast-2": "763104351884",
330+
"ap-northeast-3": "364406365360",
331+
"ap-south-1": "763104351884",
332+
"ap-southeast-1": "763104351884",
333+
"ap-southeast-2": "763104351884",
334+
"ca-central-1": "763104351884",
335+
"cn-north-1": "727897471807",
336+
"cn-northwest-1": "727897471807",
337+
"eu-central-1": "763104351884",
338+
"eu-north-1": "763104351884",
339+
"eu-west-1": "763104351884",
340+
"eu-west-2": "763104351884",
341+
"eu-west-3": "763104351884",
342+
"eu-south-1": "692866216735",
343+
"me-south-1": "217643126080",
344+
"sa-east-1": "763104351884",
345+
"us-east-1": "763104351884",
346+
"us-east-2": "763104351884",
347+
"us-gov-west-1": "442386744353",
348+
"us-iso-east-1": "886529160074",
349+
"us-west-1": "763104351884",
350+
"us-west-2": "763104351884"
351+
},
352+
"repository": "huggingface-pytorch-training",
353+
"container_version": {"gpu": "cu111-ubuntu20.04"}
354+
},
355+
"tensorflow2.4.1": {
356+
"py_versions": ["py37"],
357+
"registries": {
358+
"af-south-1": "626614931356",
359+
"ap-east-1": "871362719292",
360+
"ap-northeast-1": "763104351884",
361+
"ap-northeast-2": "763104351884",
362+
"ap-northeast-3": "364406365360",
363+
"ap-south-1": "763104351884",
364+
"ap-southeast-1": "763104351884",
365+
"ap-southeast-2": "763104351884",
366+
"ca-central-1": "763104351884",
367+
"cn-north-1": "727897471807",
368+
"cn-northwest-1": "727897471807",
369+
"eu-central-1": "763104351884",
370+
"eu-north-1": "763104351884",
371+
"eu-south-1": "692866216735",
372+
"eu-west-1": "763104351884",
373+
"eu-west-2": "763104351884",
374+
"eu-west-3": "763104351884",
375+
"me-south-1": "217643126080",
376+
"sa-east-1": "763104351884",
377+
"us-east-1": "763104351884",
378+
"us-east-2": "763104351884",
379+
"us-gov-west-1": "442386744353",
380+
"us-iso-east-1": "886529160074",
381+
"us-west-1": "763104351884",
382+
"us-west-2": "763104351884"
383+
},
384+
"repository": "huggingface-tensorflow-training",
385+
"container_version": {"gpu":"cu110-ubuntu18.04"}
386+
},
387+
"tensorflow2.5.1": {
388+
"py_versions": ["py37"],
389+
"registries": {
390+
"af-south-1": "626614931356",
391+
"ap-east-1": "871362719292",
392+
"ap-northeast-1": "763104351884",
393+
"ap-northeast-2": "763104351884",
394+
"ap-northeast-3": "364406365360",
395+
"ap-south-1": "763104351884",
396+
"ap-southeast-1": "763104351884",
397+
"ap-southeast-2": "763104351884",
398+
"ca-central-1": "763104351884",
399+
"cn-north-1": "727897471807",
400+
"cn-northwest-1": "727897471807",
401+
"eu-central-1": "763104351884",
402+
"eu-north-1": "763104351884",
403+
"eu-south-1": "692866216735",
404+
"eu-west-1": "763104351884",
405+
"eu-west-2": "763104351884",
406+
"eu-west-3": "763104351884",
407+
"me-south-1": "217643126080",
408+
"sa-east-1": "763104351884",
409+
"us-east-1": "763104351884",
410+
"us-east-2": "763104351884",
411+
"us-gov-west-1": "442386744353",
412+
"us-iso-east-1": "886529160074",
413+
"us-west-1": "763104351884",
414+
"us-west-2": "763104351884"
415+
},
416+
"repository": "huggingface-tensorflow-training",
417+
"container_version": {"gpu": "cu112-ubuntu18.04"}
418+
}
419+
}
420+
,
421+
"4.11.0": {
284422
"version_aliases": {
285423
"pytorch1.9": "pytorch1.9.0",
286424
"tensorflow2.5": "tensorflow2.5.1"
@@ -357,7 +495,8 @@
357495
"processors": ["gpu", "cpu"],
358496
"version_aliases": {
359497
"4.6": "4.6.1",
360-
"4.10": "4.10.2"
498+
"4.10": "4.10.2",
499+
"4.11": "4.11.0"
361500
},
362501
"versions": {
363502
"4.6.1": {
@@ -463,6 +602,142 @@
463602
}
464603
},
465604
"4.10.2": {
605+
"version_aliases": {
606+
"pytorch1.8": "pytorch1.8.1",
607+
"pytorch1.9": "pytorch1.9.0",
608+
"tensorflow2.4": "tensorflow2.4.1",
609+
"tensorflow2.5": "tensorflow2.5.1"
610+
},
611+
"pytorch1.8.1": {
612+
"py_versions": ["py36"],
613+
"registries": {
614+
"af-south-1": "626614931356",
615+
"ap-east-1": "871362719292",
616+
"ap-northeast-1": "763104351884",
617+
"ap-northeast-2": "763104351884",
618+
"ap-northeast-3": "364406365360",
619+
"ap-south-1": "763104351884",
620+
"ap-southeast-1": "763104351884",
621+
"ap-southeast-2": "763104351884",
622+
"ca-central-1": "763104351884",
623+
"cn-north-1": "727897471807",
624+
"cn-northwest-1": "727897471807",
625+
"eu-central-1": "763104351884",
626+
"eu-north-1": "763104351884",
627+
"eu-west-1": "763104351884",
628+
"eu-west-2": "763104351884",
629+
"eu-west-3": "763104351884",
630+
"eu-south-1": "692866216735",
631+
"me-south-1": "217643126080",
632+
"sa-east-1": "763104351884",
633+
"us-east-1": "763104351884",
634+
"us-east-2": "763104351884",
635+
"us-gov-west-1": "442386744353",
636+
"us-iso-east-1": "886529160074",
637+
"us-west-1": "763104351884",
638+
"us-west-2": "763104351884"
639+
},
640+
"repository": "huggingface-pytorch-inference",
641+
"container_version": {"gpu":"cu111-ubuntu18.04", "cpu":"ubuntu18.04" }
642+
},
643+
"pytorch1.9.0": {
644+
"py_versions": ["py38"],
645+
"registries": {
646+
"af-south-1": "626614931356",
647+
"ap-east-1": "871362719292",
648+
"ap-northeast-1": "763104351884",
649+
"ap-northeast-2": "763104351884",
650+
"ap-northeast-3": "364406365360",
651+
"ap-south-1": "763104351884",
652+
"ap-southeast-1": "763104351884",
653+
"ap-southeast-2": "763104351884",
654+
"ca-central-1": "763104351884",
655+
"cn-north-1": "727897471807",
656+
"cn-northwest-1": "727897471807",
657+
"eu-central-1": "763104351884",
658+
"eu-north-1": "763104351884",
659+
"eu-west-1": "763104351884",
660+
"eu-west-2": "763104351884",
661+
"eu-west-3": "763104351884",
662+
"eu-south-1": "692866216735",
663+
"me-south-1": "217643126080",
664+
"sa-east-1": "763104351884",
665+
"us-east-1": "763104351884",
666+
"us-east-2": "763104351884",
667+
"us-gov-west-1": "442386744353",
668+
"us-iso-east-1": "886529160074",
669+
"us-west-1": "763104351884",
670+
"us-west-2": "763104351884"
671+
},
672+
"repository": "huggingface-pytorch-inference",
673+
"container_version": {"gpu": "cu111-ubuntu20.04", "cpu": "ubuntu20.04" }
674+
},
675+
"tensorflow2.4.1": {
676+
"py_versions": ["py37"],
677+
"registries": {
678+
"af-south-1": "626614931356",
679+
"ap-east-1": "871362719292",
680+
"ap-northeast-1": "763104351884",
681+
"ap-northeast-2": "763104351884",
682+
"ap-northeast-3": "364406365360",
683+
"ap-south-1": "763104351884",
684+
"ap-southeast-1": "763104351884",
685+
"ap-southeast-2": "763104351884",
686+
"ca-central-1": "763104351884",
687+
"cn-north-1": "727897471807",
688+
"cn-northwest-1": "727897471807",
689+
"eu-central-1": "763104351884",
690+
"eu-north-1": "763104351884",
691+
"eu-south-1": "692866216735",
692+
"eu-west-1": "763104351884",
693+
"eu-west-2": "763104351884",
694+
"eu-west-3": "763104351884",
695+
"me-south-1": "217643126080",
696+
"sa-east-1": "763104351884",
697+
"us-east-1": "763104351884",
698+
"us-east-2": "763104351884",
699+
"us-gov-west-1": "442386744353",
700+
"us-iso-east-1": "886529160074",
701+
"us-west-1": "763104351884",
702+
"us-west-2": "763104351884"
703+
},
704+
"repository": "huggingface-tensorflow-inference",
705+
"container_version": {"gpu":"cu110-ubuntu18.04", "cpu":"ubuntu18.04" }
706+
},
707+
"tensorflow2.5.1": {
708+
"py_versions": ["py37"],
709+
"registries": {
710+
"af-south-1": "626614931356",
711+
"ap-east-1": "871362719292",
712+
"ap-northeast-1": "763104351884",
713+
"ap-northeast-2": "763104351884",
714+
"ap-northeast-3": "364406365360",
715+
"ap-south-1": "763104351884",
716+
"ap-southeast-1": "763104351884",
717+
"ap-southeast-2": "763104351884",
718+
"ca-central-1": "763104351884",
719+
"cn-north-1": "727897471807",
720+
"cn-northwest-1": "727897471807",
721+
"eu-central-1": "763104351884",
722+
"eu-north-1": "763104351884",
723+
"eu-south-1": "692866216735",
724+
"eu-west-1": "763104351884",
725+
"eu-west-2": "763104351884",
726+
"eu-west-3": "763104351884",
727+
"me-south-1": "217643126080",
728+
"sa-east-1": "763104351884",
729+
"us-east-1": "763104351884",
730+
"us-east-2": "763104351884",
731+
"us-gov-west-1": "442386744353",
732+
"us-iso-east-1": "886529160074",
733+
"us-west-1": "763104351884",
734+
"us-west-2": "763104351884"
735+
},
736+
"repository": "huggingface-tensorflow-inference",
737+
"container_version": {"gpu": "cu112-ubuntu18.04", "cpu": "ubuntu18.04" }
738+
}
739+
},
740+
"4.11.0": {
466741
"version_aliases": {
467742
"pytorch1.9": "pytorch1.9.0",
468743
"tensorflow2.5": "tensorflow2.5.1"

0 commit comments

Comments
 (0)