Skip to content

Commit 265c695

Browse files
arjkesharjkesh
committed
Merge branch 'master' of https://github.com/aws/sagemaker-python-sdk into tf_2.7
2 parents 733f93d + 0dd0350 commit 265c695

File tree

5 files changed

+75
-3
lines changed

5 files changed

+75
-3
lines changed

‎src/sagemaker/fw_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
"2.6",
7575
"2.6.0",
7676
"2.6.2",
77+
"2.6.3",
7778
"2.7",
78-
"2.7.0",
7979
"2.7.1",
8080
],
8181
"pytorch": [

‎src/sagemaker/image_uri_config/neo-tensorflow.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
"1.12.0": "1.15.3",
1414
"1.13.0": "1.15.3",
1515
"1.14.0": "1.15.3",
16+
"2.4": "2.4.2",
17+
"2.4.0": "2.4.2",
18+
"2.4.1": "2.4.2",
1619
"2.4.2": "2.4.2"
1720
},
1821
"versions": {

‎src/sagemaker/image_uri_config/tensorflow.json

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
"2.3": "2.3.2",
280280
"2.4": "2.4.3",
281281
"2.5": "2.5.1",
282-
"2.6": "2.6.0",
282+
"2.6": "2.6.3",
283283
"2.7": "2.7.0"
284284
},
285285
"versions": {
@@ -1345,6 +1345,36 @@
13451345
},
13461346
"repository": "tensorflow-inference"
13471347
},
1348+
"2.6.3": {
1349+
"registries": {
1350+
"af-south-1": "626614931356",
1351+
"ap-east-1": "871362719292",
1352+
"ap-northeast-1": "763104351884",
1353+
"ap-northeast-2": "763104351884",
1354+
"ap-northeast-3": "364406365360",
1355+
"ap-south-1": "763104351884",
1356+
"ap-southeast-1": "763104351884",
1357+
"ap-southeast-2": "763104351884",
1358+
"ca-central-1": "763104351884",
1359+
"cn-north-1": "727897471807",
1360+
"cn-northwest-1": "727897471807",
1361+
"eu-central-1": "763104351884",
1362+
"eu-north-1": "763104351884",
1363+
"eu-south-1": "692866216735",
1364+
"eu-west-1": "763104351884",
1365+
"eu-west-2": "763104351884",
1366+
"eu-west-3": "763104351884",
1367+
"me-south-1": "217643126080",
1368+
"sa-east-1": "763104351884",
1369+
"us-east-1": "763104351884",
1370+
"us-east-2": "763104351884",
1371+
"us-gov-west-1": "442386744353",
1372+
"us-iso-east-1": "886529160074",
1373+
"us-west-1": "763104351884",
1374+
"us-west-2": "763104351884"
1375+
},
1376+
"repository": "tensorflow-inference",
1377+
},
13481378
"2.7.0": {
13491379
"registries": {
13501380
"af-south-1": "626614931356",
@@ -1401,7 +1431,7 @@
14011431
"2.3": "2.3.2",
14021432
"2.4": "2.4.3",
14031433
"2.5": "2.5.1",
1404-
"2.6": "2.6.2",
1434+
"2.6": "2.6.3",
14051435
"2.7": "2.7.1"
14061436
},
14071437
"versions": {
@@ -2662,6 +2692,39 @@
26622692
},
26632693
"repository": "tensorflow-training"
26642694
},
2695+
"2.6.3": {
2696+
"py_versions": [
2697+
"py38"
2698+
],
2699+
"registries": {
2700+
"af-south-1": "626614931356",
2701+
"ap-east-1": "871362719292",
2702+
"ap-northeast-1": "763104351884",
2703+
"ap-northeast-2": "763104351884",
2704+
"ap-northeast-3": "364406365360",
2705+
"ap-south-1": "763104351884",
2706+
"ap-southeast-1": "763104351884",
2707+
"ap-southeast-2": "763104351884",
2708+
"ca-central-1": "763104351884",
2709+
"cn-north-1": "727897471807",
2710+
"cn-northwest-1": "727897471807",
2711+
"eu-central-1": "763104351884",
2712+
"eu-north-1": "763104351884",
2713+
"eu-south-1": "692866216735",
2714+
"eu-west-1": "763104351884",
2715+
"eu-west-2": "763104351884",
2716+
"eu-west-3": "763104351884",
2717+
"me-south-1": "217643126080",
2718+
"sa-east-1": "763104351884",
2719+
"us-east-1": "763104351884",
2720+
"us-east-2": "763104351884",
2721+
"us-gov-west-1": "442386744353",
2722+
"us-iso-east-1": "886529160074",
2723+
"us-west-1": "763104351884",
2724+
"us-west-2": "763104351884"
2725+
},
2726+
"repository": "tensorflow-training"
2727+
},
26652728
"2.7.1": {
26662729
"py_versions": [
26672730
"py38"

‎src/sagemaker/model.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,8 @@ def _compilation_job_config(
630630

631631
if (
632632
framework.lower() == "pytorch"
633+
or framework.lower() == "tensorflow"
634+
and target_instance_type is not None
633635
and re.match("(?=^ml_)(?!ml_inf)", target_instance_type) is not None
634636
and framework_version is not None
635637
):

‎tests/unit/test_fw_utils.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,8 @@ def test_validate_smdataparallel_args_not_raises():
683683
("ml.p3.16xlarge", "tensorflow", "2.5.1", "py37", smdataparallel_enabled),
684684
("ml.p3.16xlarge", "tensorflow", "2.5", "py37", smdataparallel_enabled),
685685
("ml.p3.16xlarge", "tensorflow", "2.6.0", "py38", smdataparallel_enabled),
686+
("ml.p3.16xlarge", "tensorflow", "2.6.2", "py38", smdataparallel_enabled),
687+
("ml.p3.16xlarge", "tensorflow", "2.6.3", "py38", smdataparallel_enabled),
686688
("ml.p3.16xlarge", "tensorflow", "2.6", "py38", smdataparallel_enabled),
687689
("ml.p3.16xlarge", "tensorflow", "2.7.1", "py38", smdataparallel_enabled),
688690
("ml.p3.16xlarge", "tensorflow", "2.7", "py38", smdataparallel_enabled),
@@ -700,6 +702,8 @@ def test_validate_smdataparallel_args_not_raises():
700702
("ml.p3.16xlarge", "tensorflow", "2.4.1", "py37", smdataparallel_enabled_custom_mpi),
701703
("ml.p3.16xlarge", "tensorflow", "2.5.1", "py37", smdataparallel_enabled_custom_mpi),
702704
("ml.p3.16xlarge", "tensorflow", "2.6.0", "py38", smdataparallel_enabled_custom_mpi),
705+
("ml.p3.16xlarge", "tensorflow", "2.6.2", "py38", smdataparallel_enabled_custom_mpi),
706+
("ml.p3.16xlarge", "tensorflow", "2.6.3", "py38", smdataparallel_enabled_custom_mpi),
703707
("ml.p3.16xlarge", "tensorflow", "2.7.1", "py38", smdataparallel_enabled_custom_mpi),
704708
("ml.p3.16xlarge", "pytorch", "1.8.0", "py3", smdataparallel_enabled_custom_mpi),
705709
("ml.p3.16xlarge", "pytorch", "1.9.1", "py38", smdataparallel_enabled_custom_mpi),

0 commit comments

Comments
 (0)