Merge branch 'master' into feat/local-download-dir

Author: evakravi

.pylintrc

@@ -94,6 +94,7 @@ disable=
     useless-object-inheritance, # TODO: Enable this check and fix code once Python 2 is no longer supported.
     super-with-arguments,
     raise-missing-from,
+    E1136,
 
 [REPORTS]
 # Set the output format. Available formats are text, parseable, colorized, msvs

src/sagemaker/fw_utils.py

@@ -106,7 +106,9 @@
         "2.9.1",
         "2.9.2",
         "2.10",
-        "2.10.0",
+        "2.10.1",
+        "2.11",
+        "2.11.0",
     ],
     "pytorch": [
         "1.6",

src/sagemaker/image_uri_config/tensorflow.json

@@ -1927,7 +1927,8 @@
             "2.7": "2.7.1",
             "2.8": "2.8.0",
             "2.9": "2.9.2",
-            "2.10": "2.10.0"
+            "2.10": "2.10.1",
+            "2.11": "2.11.0"
         },
         "versions": {
             "1.10.0": {
@@ -3415,7 +3416,42 @@
                 },
                 "repository": "tensorflow-training"
             },
-            "2.10.0": {
+            "2.10.1": {
+                "py_versions": [
+                    "py39"
+                ],
+                "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",
+                    "ap-southeast-3": "907027046896",
+                    "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-west-1": "763104351884",
+                    "us-west-2": "763104351884"
+                },
+                "repository": "tensorflow-training"
+            },
+            "2.11.0": {
                 "py_versions": [
                     "py39"
                 ],
@@ -3453,4 +3489,3 @@
         }
     }
 }
-

src/sagemaker/image_uris.py

@@ -18,6 +18,7 @@
 import os
 import re
 from typing import Optional
+from packaging.version import Version
 
 from sagemaker import utils
 from sagemaker.jumpstart.utils import is_jumpstart_model_input
@@ -232,6 +233,7 @@ def retrieve(
 
     if repo == f"{framework}-inference-graviton":
         container_version = f"{container_version}-sagemaker"
+    _validate_instance_deprecation(framework, instance_type, version)
 
     tag = _get_image_tag(
         container_version,
@@ -365,6 +367,20 @@ def _config_for_framework_and_scope(framework, image_scope, accelerator_type=Non
     return config if "scope" in config else config[image_scope]
 
 
+def _validate_instance_deprecation(framework, instance_type, version):
+    """Check if instance type is deprecated for a certain framework with a certain version"""
+    if (
+        framework == "pytorch"
+        and _get_instance_type_family(instance_type) == "p2"
+        and Version(version) >= Version("1.13")
+    ):
+        raise ValueError(
+            "P2 instances have been deprecated for sagemaker jobs with PyTorch 1.13 and above. "
+            "For information about supported instance types please refer to "
+            "https://aws.amazon.com/sagemaker/pricing/"
+        )
+
+
 def _validate_for_suppported_frameworks_and_instance_type(framework, instace_type):
     """Validate if framework is supported for the instance_type"""
     if (

tests/unit/test_fw_utils.py

@@ -890,8 +890,10 @@ def test_validate_smdataparallel_args_not_raises():
         ("ml.p3.16xlarge", "tensorflow", "2.9.2", "py39", smdataparallel_enabled),
         ("ml.p3.16xlarge", "tensorflow", "2.9.1", "py39", smdataparallel_enabled),
         ("ml.p3.16xlarge", "tensorflow", "2.9", "py39", smdataparallel_enabled),
-        ("ml.p3.16xlarge", "tensorflow", "2.10.0", "py39", smdataparallel_enabled),
+        ("ml.p3.16xlarge", "tensorflow", "2.10.1", "py39", smdataparallel_enabled),
         ("ml.p3.16xlarge", "tensorflow", "2.10", "py39", smdataparallel_enabled),
+        ("ml.p3.16xlarge", "tensorflow", "2.11.0", "py39", smdataparallel_enabled),
+        ("ml.p3.16xlarge", "tensorflow", "2.11", "py39", 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),
@@ -921,7 +923,8 @@ def test_validate_smdataparallel_args_not_raises():
         ("ml.p3.16xlarge", "tensorflow", "2.8.0", "py39", smdataparallel_enabled_custom_mpi),
         ("ml.p3.16xlarge", "tensorflow", "2.9.1", "py39", smdataparallel_enabled_custom_mpi),
         ("ml.p3.16xlarge", "tensorflow", "2.9.2", "py39", smdataparallel_enabled_custom_mpi),
-        ("ml.p3.16xlarge", "tensorflow", "2.10.0", "py39", smdataparallel_enabled_custom_mpi),
+        ("ml.p3.16xlarge", "tensorflow", "2.10.1", "py39", smdataparallel_enabled_custom_mpi),
+        ("ml.p3.16xlarge", "tensorflow", "2.11.0", "py39", 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),
         ("ml.p3.16xlarge", "pytorch", "1.10.2", "py38", smdataparallel_enabled_custom_mpi),