Skip to content

feature: Add support for TF2.7 #2958

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 27 commits into from
Mar 18, 2022
Merged

feature: Add support for TF2.7 #2958

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
6670e30
fix: jumpstart model table (#2954)
bencrabtree Feb 24, 2022
e3f2fb0
feature: Add support for TF2.7
arjkesh Feb 24, 2022
6c13614
Update fw_utils.py
arjkesh Feb 24, 2022
352b2b4
Update fw_utils.py
arjkesh Feb 24, 2022
6db5192
fix test
arjkesh Feb 25, 2022
37fbdcf
Merge branch 'tf_2.7' of https://github.com/arjkesh/sagemaker-python-…
arjkesh Feb 25, 2022
f166b60
change: update code to get commit_id in codepipeline (#2961)
navinsoni Feb 26, 2022
086258d
feature: Data Serializer (#2956)
jeniyat Feb 28, 2022
a39b750
change: reorganize test files for workflow (#2960)
qidewenwhen Mar 3, 2022
28fd737
feature: TensorFlow 2.4 for Neo (#2861)
Qingzi-Lan Mar 3, 2022
20df3d7
fix: Remove sagemaker_job_name from hyperparameters in TrainingStep (…
staubhp Mar 3, 2022
b9f90dc
fix: Style update in DataSerializer (#2962)
jeniyat Mar 3, 2022
6db3774
documentation: smddp doc update (#2968)
mchoi8739 Mar 4, 2022
d610bfb
fix: container env generation for S3 URI and add test for the same (#…
shreyapandit Mar 7, 2022
169dffd
documentation: update sagemaker training compiler docstring (#2969)
mchoi8739 Mar 7, 2022
4325fcd
feat: Python 3.9 for readthedocs (#2973)
ahsan-z-khan Mar 8, 2022
3f0b2b6
Merge branch 'dev' into tf_2.7
ahsan-z-khan Mar 8, 2022
9b99494
Merge branch 'aws:master' into tf_2.7
arjkesh Mar 14, 2022
f37cf8b
test;
arjkesh Mar 16, 2022
612e2f3
Merge branch 'tf_2.7' of https://github.com/arjkesh/sagemaker-python-…
arjkesh Mar 16, 2022
733f93d
Merge branch 'master' into tf_2.7
mufaddal-rohawala Mar 18, 2022
265c695
Merge branch 'master' of https://github.com/aws/sagemaker-python-sdk …
arjkesh Mar 18, 2022
c5b3cc2
resolve flake8 issues
arjkesh Mar 18, 2022
dc32c7c
Update tensorflow.json
arjkesh Mar 18, 2022
dd79bcc
remove unused import
arjkesh Mar 18, 2022
4f69806
Merge branch 'master' of https://github.com/aws/sagemaker-python-sdk …
arjkesh Mar 18, 2022
2b4208a
update
arjkesh Mar 18, 2022
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
3 changes: 3 additions & 0 deletions src/sagemaker/fw_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@
"2.6",
"2.6.0",
"2.6.2",
"2.7",
"2.7.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no TF 2.7.0 SM Training DLCs, so this can be safely removed from this list.

"2.7.1",
],
"pytorch": [
"1.6",
Expand Down
69 changes: 67 additions & 2 deletions src/sagemaker/image_uri_config/tensorflow.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@
"2.3": "2.3.2",
"2.4": "2.4.3",
"2.5": "2.5.1",
"2.6": "2.6.0"
"2.6": "2.6.0",
"2.7": "2.7.0"
},
"versions": {
"1.10.0": {
Expand Down Expand Up @@ -1343,6 +1344,36 @@
"us-west-2": "763104351884"
},
"repository": "tensorflow-inference"
},
"2.7.0": {
"registries": {
"af-south-1": "626614931356",
"ap-east-1": "871362719292",
"ap-northeast-1": "763104351884",
"ap-northeast-2": "763104351884",
"ap-northeast-3": "364406365360",
"ap-south-1": "763104351884",
"ap-southeast-1": "763104351884",
"ap-southeast-2": "763104351884",
"ca-central-1": "763104351884",
"cn-north-1": "727897471807",
"cn-northwest-1": "727897471807",
"eu-central-1": "763104351884",
"eu-north-1": "763104351884",
"eu-south-1": "692866216735",
"eu-west-1": "763104351884",
"eu-west-2": "763104351884",
"eu-west-3": "763104351884",
"me-south-1": "217643126080",
"sa-east-1": "763104351884",
"us-east-1": "763104351884",
"us-east-2": "763104351884",
"us-gov-west-1": "442386744353",
"us-iso-east-1": "886529160074",
"us-west-1": "763104351884",
"us-west-2": "763104351884"
},
"repository": "tensorflow-inference"
}
}
},
Expand Down Expand Up @@ -1370,7 +1401,8 @@
"2.3": "2.3.2",
"2.4": "2.4.3",
"2.5": "2.5.1",
"2.6": "2.6.2"
"2.6": "2.6.2",
"2.7": "2.7.1"
},
"versions": {
"1.10.0": {
Expand Down Expand Up @@ -2629,6 +2661,39 @@
"us-west-2": "763104351884"
},
"repository": "tensorflow-training"
},
"2.7.1": {
"py_versions": [
"py38"
],
"registries": {
"af-south-1": "626614931356",
"ap-east-1": "871362719292",
"ap-northeast-1": "763104351884",
"ap-northeast-2": "763104351884",
"ap-northeast-3": "364406365360",
"ap-south-1": "763104351884",
"ap-southeast-1": "763104351884",
"ap-southeast-2": "763104351884",
"ca-central-1": "763104351884",
"cn-north-1": "727897471807",
"cn-northwest-1": "727897471807",
"eu-central-1": "763104351884",
"eu-north-1": "763104351884",
"eu-south-1": "692866216735",
"eu-west-1": "763104351884",
"eu-west-2": "763104351884",
"eu-west-3": "763104351884",
"me-south-1": "217643126080",
"sa-east-1": "763104351884",
"us-east-1": "763104351884",
"us-east-2": "763104351884",
"us-gov-west-1": "442386744353",
"us-iso-east-1": "886529160074",
"us-west-1": "763104351884",
"us-west-2": "763104351884"
},
"repository": "tensorflow-training"
}
}
}
Expand Down
23 changes: 22 additions & 1 deletion tests/integ/test_tf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import pytest

from packaging.version import Version

from sagemaker.tensorflow import TensorFlow, TensorFlowProcessor
from sagemaker.utils import unique_name_from_base, sagemaker_timestamp

Expand Down Expand Up @@ -206,7 +208,26 @@ def test_mnist_distributed(


@pytest.mark.slow_test
def test_mnist_async(sagemaker_session, cpu_instance_type, tf_full_version, tf_full_py_version):
def test_mnist_async(
sagemaker_session,
cpu_instance_type,
tf_full_version,
tf_full_py_version
):

# Use the latest patch version for training, if available
# tf_full_v = Version(tf_full_version)
# tf_training_latest_v = Version(tensorflow_training_latest_version)
#
# if (tf_full_v.major, tf_full_v.minor) == (tf_training_latest_v.major, tf_training_latest_v.minor):
# tf_fw_version = tensorflow_training_latest_version
# else:
# tf_fw_version = tf_full_version

# test
if tf_full_version == "2.7.0":
tf_full_version = "2.7.1"

estimator = TensorFlow(
entry_point=SCRIPT,
source_dir=MNIST_RESOURCE_PATH,
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/test_fw_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,8 @@ def test_validate_smdataparallel_args_not_raises():
("ml.p3.16xlarge", "tensorflow", "2.5", "py37", smdataparallel_enabled),
("ml.p3.16xlarge", "tensorflow", "2.6.0", "py38", smdataparallel_enabled),
("ml.p3.16xlarge", "tensorflow", "2.6", "py38", smdataparallel_enabled),
("ml.p3.16xlarge", "tensorflow", "2.7.1", "py38", smdataparallel_enabled),
("ml.p3.16xlarge", "tensorflow", "2.7", "py38", smdataparallel_enabled),
("ml.p3.16xlarge", "pytorch", "1.6.0", "py3", smdataparallel_enabled),
("ml.p3.16xlarge", "pytorch", "1.6", "py3", smdataparallel_enabled),
("ml.p3.16xlarge", "pytorch", "1.7.1", "py3", smdataparallel_enabled),
Expand All @@ -698,6 +700,7 @@ def test_validate_smdataparallel_args_not_raises():
("ml.p3.16xlarge", "tensorflow", "2.4.1", "py37", smdataparallel_enabled_custom_mpi),
("ml.p3.16xlarge", "tensorflow", "2.5.1", "py37", smdataparallel_enabled_custom_mpi),
("ml.p3.16xlarge", "tensorflow", "2.6.0", "py38", smdataparallel_enabled_custom_mpi),
("ml.p3.16xlarge", "tensorflow", "2.7.1", "py38", smdataparallel_enabled_custom_mpi),
("ml.p3.16xlarge", "pytorch", "1.8.0", "py3", smdataparallel_enabled_custom_mpi),
("ml.p3.16xlarge", "pytorch", "1.9.1", "py38", smdataparallel_enabled_custom_mpi),
]
Expand Down