Skip to content

Commit 40ada5f

Browse files
saimidusaimidu
committed
Remove TF 2.6
1 parent dc8536c commit 40ada5f

File tree

3 files changed

+7
-92
lines changed

3 files changed

+7
-92
lines changed

‎src/sagemaker/fw_utils.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,7 @@
5959
"local_gpu",
6060
)
6161
SM_DATAPARALLEL_SUPPORTED_FRAMEWORK_VERSIONS = {
62-
"tensorflow": [
63-
"2.3",
64-
"2.3.1",
65-
"2.3.2",
66-
"2.4",
67-
"2.4.1",
68-
"2.4.3",
69-
"2.5",
70-
"2.5.0",
71-
"2.5.1",
72-
"2.6",
73-
"2.6.0",
74-
],
62+
"tensorflow": ["2.3", "2.3.1", "2.3.2", "2.4", "2.4.1", "2.4.3", "2.5", "2.5.0", "2.5.1"],
7563
"pytorch": ["1.6", "1.6.0", "1.7", "1.7.1", "1.8", "1.8.0", "1.8.1", "1.9", "1.9.0"],
7664
}
7765
SMDISTRIBUTED_SUPPORTED_STRATEGIES = ["dataparallel", "modelparallel"]

‎src/sagemaker/image_uri_config/tensorflow.json

Lines changed: 2 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,7 @@
278278
"2.2": "2.2.2",
279279
"2.3": "2.3.2",
280280
"2.4": "2.4.3",
281-
"2.5": "2.5.1",
282-
"2.6": "2.6.0"
281+
"2.5": "2.5.1"
283282
},
284283
"versions": {
285284
"1.10.0": {
@@ -1313,36 +1312,6 @@
13131312
"us-west-2": "763104351884"
13141313
},
13151314
"repository": "tensorflow-inference"
1316-
},
1317-
"2.6.0": {
1318-
"registries": {
1319-
"af-south-1": "626614931356",
1320-
"ap-east-1": "871362719292",
1321-
"ap-northeast-1": "763104351884",
1322-
"ap-northeast-2": "763104351884",
1323-
"ap-northeast-3": "364406365360",
1324-
"ap-south-1": "763104351884",
1325-
"ap-southeast-1": "763104351884",
1326-
"ap-southeast-2": "763104351884",
1327-
"ca-central-1": "763104351884",
1328-
"cn-north-1": "727897471807",
1329-
"cn-northwest-1": "727897471807",
1330-
"eu-central-1": "763104351884",
1331-
"eu-north-1": "763104351884",
1332-
"eu-south-1": "692866216735",
1333-
"eu-west-1": "763104351884",
1334-
"eu-west-2": "763104351884",
1335-
"eu-west-3": "763104351884",
1336-
"me-south-1": "217643126080",
1337-
"sa-east-1": "763104351884",
1338-
"us-east-1": "763104351884",
1339-
"us-east-2": "763104351884",
1340-
"us-gov-west-1": "442386744353",
1341-
"us-iso-east-1": "886529160074",
1342-
"us-west-1": "763104351884",
1343-
"us-west-2": "763104351884"
1344-
},
1345-
"repository": "tensorflow-inference"
13461315
}
13471316
}
13481317
},
@@ -1369,8 +1338,7 @@
13691338
"2.2": "2.2.2",
13701339
"2.3": "2.3.2",
13711340
"2.4": "2.4.3",
1372-
"2.5": "2.5.1",
1373-
"2.6": "2.6.0"
1341+
"2.5": "2.5.1"
13741342
},
13751343
"versions": {
13761344
"1.10.0": {
@@ -2563,39 +2531,6 @@
25632531
"us-west-2": "763104351884"
25642532
},
25652533
"repository": "tensorflow-training"
2566-
},
2567-
"2.6.0": {
2568-
"py_versions": [
2569-
"py38"
2570-
],
2571-
"registries": {
2572-
"af-south-1": "626614931356",
2573-
"ap-east-1": "871362719292",
2574-
"ap-northeast-1": "763104351884",
2575-
"ap-northeast-2": "763104351884",
2576-
"ap-northeast-3": "364406365360",
2577-
"ap-south-1": "763104351884",
2578-
"ap-southeast-1": "763104351884",
2579-
"ap-southeast-2": "763104351884",
2580-
"ca-central-1": "763104351884",
2581-
"cn-north-1": "727897471807",
2582-
"cn-northwest-1": "727897471807",
2583-
"eu-central-1": "763104351884",
2584-
"eu-north-1": "763104351884",
2585-
"eu-south-1": "692866216735",
2586-
"eu-west-1": "763104351884",
2587-
"eu-west-2": "763104351884",
2588-
"eu-west-3": "763104351884",
2589-
"me-south-1": "217643126080",
2590-
"sa-east-1": "763104351884",
2591-
"us-east-1": "763104351884",
2592-
"us-east-2": "763104351884",
2593-
"us-gov-west-1": "442386744353",
2594-
"us-iso-east-1": "886529160074",
2595-
"us-west-1": "763104351884",
2596-
"us-west-2": "763104351884"
2597-
},
2598-
"repository": "tensorflow-training"
25992534
}
26002535
}
26012536
}

‎tests/conftest.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -289,23 +289,17 @@ def tensorflow_inference_py_version(tensorflow_inference_version, request):
289289

290290
def _tf_py_version(tf_version, request):
291291
version = Version(tf_version)
292-
if version < Version("1.11"):
293-
return "py2"
294-
# Some versions of TF 1.15.x, TF 2.0.x, TF 2.1.x do not support py2, while others do.
295292
if version == Version("1.15") or Version("1.15.4") <= version < Version("1.16"):
296293
return "py3"
294+
if version < Version("1.11"):
295+
return "py2"
297296
if version == Version("2.0") or Version("2.0.3") <= version < Version("2.1"):
298297
return "py3"
299298
if version == Version("2.1") or Version("2.1.2") <= version < Version("2.2"):
300299
return "py3"
301-
# Test both py2 and py3 for TF 2.1 and below
302300
if version < Version("2.2"):
303301
return request.param
304-
# Test py37 for TF 2.2 to TF 2.5
305-
if Version("2.2") <= version < Version("2.6"):
306-
return "py37"
307-
# Test py38 for TF 2.6 and above
308-
return "py38"
302+
return "py37"
309303

310304

311305
@pytest.fixture(scope="module")
@@ -335,9 +329,7 @@ def tf_full_py_version(tf_full_version):
335329
return "py2"
336330
if version < Version("2.2"):
337331
return "py3"
338-
if version < Version("2.6"):
339-
return "py37"
340-
return "py38"
332+
return "py37"
341333

342334

343335
@pytest.fixture(scope="session")

0 commit comments

Comments
 (0)