Merge branch 'master' into chore/excessive-jumpstart-bucket-logging

Author: evakravi

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v2.176.0 (2023-08-10)
+
+### Features
+
+ * Add TF 2.13 Training and Inference SM images
+
+### Bug Fixes and Other Changes
+
+ * revert-PR_3903
+ * skip tensorflow local mode notebook test
+ * change instance type for huggingface test to ml.g5.8xlarge
+
 ## v2.175.0 (2023-08-05)
 
 ### Features

VERSION

@@ -1 +1 @@
-2.175.1.dev0
+2.176.1.dev0

src/sagemaker/image_uri_config/tensorflow.json

@@ -325,7 +325,8 @@
             "2.9": "2.9.3",
             "2.10": "2.10.1",
             "2.11": "2.11.1",
-            "2.12": "2.12.1"
+            "2.12": "2.12.1",
+            "2.13": "2.13.0"
         },
         "versions": {
             "1.10.0": {
@@ -2054,6 +2055,44 @@
                     "us-west-2": "763104351884"
                 },
                 "repository": "tensorflow-inference"
+            },
+            "2.13.0": {
+                "registries": {
+                    "af-south-1": "626614931356",
+                    "il-central-1": "780543022126",
+                    "ap-east-1": "871362719292",
+                    "ap-northeast-1": "763104351884",
+                    "ap-northeast-2": "763104351884",
+                    "ap-northeast-3": "364406365360",
+                    "ap-south-1": "763104351884",
+                    "ap-south-2": "772153158452",
+                    "ap-southeast-1": "763104351884",
+                    "ap-southeast-2": "763104351884",
+                    "ap-southeast-3": "907027046896",
+                    "ap-southeast-4": "457447274322",
+                    "ca-central-1": "763104351884",
+                    "cn-north-1": "727897471807",
+                    "cn-northwest-1": "727897471807",
+                    "eu-central-1": "763104351884",
+                    "eu-central-2": "380420809688",
+                    "eu-north-1": "763104351884",
+                    "eu-south-1": "692866216735",
+                    "eu-south-2": "503227376785",
+                    "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-iso-east-1": "886529160074",
+                    "us-isob-east-1": "094389454867",
+                    "us-gov-east-1": "446045086412",
+                    "us-gov-west-1": "442386744353",
+                    "us-west-1": "763104351884",
+                    "us-west-2": "763104351884"
+                },
+                "repository": "tensorflow-inference"
             }
         }
     },
@@ -2182,7 +2221,8 @@
             "2.9": "2.9.2",
             "2.10": "2.10.1",
             "2.11": "2.11.0",
-            "2.12": "2.12.0"
+            "2.12": "2.12.0",
+            "2.13": "2.13.0"
         },
         "versions": {
             "1.10.0": {
@@ -3982,6 +4022,44 @@
                     "us-west-2": "763104351884"
                 },
                 "repository": "tensorflow-training"
+            },
+            "2.13.0": {
+                "py_versions": [
+                    "py310"
+                ],
+                "registries": {
+                    "af-south-1": "626614931356",
+                    "il-central-1": "780543022126",
+                    "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",
+                    "ap-southeast-3": "907027046896",
+                    "ap-southeast-4": "457447274322",
+                    "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-east-1": "446045086412",
+                    "us-gov-west-1": "442386744353",
+                    "us-iso-east-1": "886529160074",
+                    "us-isob-east-1": "094389454867",
+                    "us-west-1": "763104351884",
+                    "us-west-2": "763104351884"
+                },
+                "repository": "tensorflow-training"
             }
         }
     }

tests/data/tensorflow_mnist/mnist_v2.py

@@ -126,8 +126,8 @@ def load_data(data_dir):
     print(vx.shape, vy.shape)
     # x.shape = (1000, 784), y.shape = (1000, )
 
-    x, y = x.astype(np.float32), y.astype(np.int)
-    vx, vy = vx.astype(np.float32), vy.astype(np.int)
+    x, y = x.astype(np.float32), y.astype(np.int32)
+    vx, vy = vx.astype(np.float32), vy.astype(np.int32)
     x /= 255.0
     vx /= 255.0
 

tests/data/tensorflow_mnist/tensorflow_mnist_source_code.tar.gz

@@ -37,6 +37,8 @@ def test_hvd_cpu(
     cpu_instance_type,
     tmpdir,
 ):
+    if Version(tensorflow_training_latest_version) >= Version("2.13"):
+        pytest.skip("Horovod is deprecated in TensorFlow 2.13 and above")
     _create_and_fit_estimator(
         sagemaker_session,
         tensorflow_training_latest_version,
@@ -65,6 +67,8 @@ def test_hvd_gpu(
         and kwargs["instance_type"] == "ml.p2.xlarge"
     ):
         pytest.skip("P2 instances have been deprecated for sagemaker jobs starting TensorFlow 2.12")
+    if Version(tensorflow_training_latest_version) >= Version("2.13"):
+        pytest.skip("Horovod is deprecated in TensorFlow 2.13 and above")
 
     _create_and_fit_estimator(
         sagemaker_session,

tests/integ/test_horovod.py

@@ -127,6 +127,7 @@ echo "set SAGEMAKER_ROLE_ARN=$SAGEMAKER_ROLE_ARN"
 ./amazon-sagemaker-examples/advanced_functionality/tensorflow_iris_byom/tensorflow_BYOM_iris.ipynb \
 ./amazon-sagemaker-examples/sagemaker-python-sdk/1P_kmeans_highlevel/kmeans_mnist.ipynb \
 ./amazon-sagemaker-examples/sagemaker-python-sdk/scikit_learn_randomforest/Sklearn_on_SageMaker_end2end.ipynb \
+./amazon-sagemaker-examples/sagemaker-pipelines/tabular/abalone_build_train_deploy/sagemaker-pipelines-preprocess-train-evaluate-batch-transform.ipynb \
 
 # Skipping test until fix in example notebook to install docker-compose is complete
 #./amazon-sagemaker-examples/sagemaker-python-sdk/tensorflow_moving_from_framework_mode_to_script_mode/tensorflow_moving_from_framework_mode_to_script_mode.ipynb \