Merge branch 'master' into feat/inference-instance-type-conditioned-on-training-instance-type

Author: evakravi

CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## v2.195.1 (2023-10-26)
+
+### Bug Fixes and Other Changes
+
+ * Allow either instance_type or instance_group to be defined in…
+ * enhance image_uris unit tests
+
+## v2.195.0 (2023-10-25)
+
+### Features
+
+ * jumpstart gated model artifacts
+ * jumpstart extract generated text from response
+ * jumpstart contruct payload utility
+
+### Bug Fixes and Other Changes
+
+ * relax upper bound on urllib in local mode requirements
+ * bump urllib3 version
+ * allow smdistributed to be enabled with torch_distributed.
+ * fix URL links
+
+### Documentation Changes
+
+ * remove python 2 reference
+ * update framework version links
+
 ## v2.194.0 (2023-10-19)
 
 ### Features

VERSION

@@ -1 +1 @@
-2.194.1.dev0
+2.195.2.dev0

src/sagemaker/estimator.py

@@ -3818,6 +3818,7 @@ def _distribution_configuration(self, distribution):
 
         mpi_enabled = False
         smdataparallel_enabled = False
+        p5_enabled = False
         if "instance_groups" in distribution:
             distribution_config["sagemaker_distribution_instance_groups"] = distribution[
                 "instance_groups"
@@ -3862,10 +3863,11 @@ def _distribution_configuration(self, distribution):
             elif isinstance(self.instance_type, str):
                 p5_enabled = "p5.48xlarge" in self.instance_type
             else:
-                raise ValueError(
-                    "Invalid object type for instance_type argument. Expected "
-                    f"{type(str)} or {type(ParameterString)} but got {type(self.instance_type)}."
-                )
+                for instance in self.instance_groups:
+                    if "p5.48xlarge" in instance._to_request_dict().get("InstanceType", ()):
+                        p5_enabled = True
+                        break
+
             img_uri = "" if self.image_uri is None else self.image_uri
             for unsupported_image in Framework.UNSUPPORTED_DLC_IMAGE_FOR_SM_PARALLELISM:
                 if (

tests/unit/sagemaker/image_uris/conftest.py

@@ -17,18 +17,25 @@
 import pytest
 
 
-@pytest.fixture(scope="module")
-def config_dir():
-    return "src/sagemaker/image_uri_config/"
+CONFIG_DIR = "src/sagemaker/image_uri_config/"
+
+
+def get_config(config_file_name):
+    config_file_path = os.path.join(CONFIG_DIR, config_file_name)
+    with open(config_file_path, "r") as config_file:
+        return json.load(config_file)
 
 
 @pytest.fixture(scope="module")
-def load_config(config_dir, request):
+def load_config(request):
     config_file_name = request.param
-    config_file_path = os.path.join(config_dir, config_file_name)
+    return get_config(config_file_name)
 
-    with open(config_file_path, "r") as config_file:
-        return json.load(config_file)
+
+@pytest.fixture(scope="module")
+def load_config_and_file_name(request):
+    config_file_name = request.param
+    return get_config(config_file_name), config_file_name
 
 
 @pytest.fixture(scope="module")

tests/unit/sagemaker/image_uris/expected_uris.py

@@ -74,9 +74,8 @@ def graviton_framework_uri(
     return IMAGE_URI_FORMAT.format(account, region, domain, repo, tag)
 
 
-def djl_framework_uri(repo, account, djl_version, primary_framework, region=REGION):
+def djl_framework_uri(repo, account, tag, region=REGION):
     domain = ALTERNATE_DOMAINS.get(region, DOMAIN)
-    tag = f"{djl_version}-{primary_framework}"
     return IMAGE_URI_FORMAT.format(account, region, domain, repo, tag)
 
 

tests/unit/sagemaker/image_uris/test_algos.py

@@ -17,187 +17,33 @@
 from sagemaker import image_uris
 from tests.unit.sagemaker.image_uris import expected_uris
 
-ALGO_NAMES = (
-    "blazingtext",
-    "factorization-machines",
-    "forecasting-deepar",
-    "image-classification",
-    "ipinsights",
-    "kmeans",
-    "knn",
-    "linear-learner",
-    "ntm",
-    "object-detection",
-    "object2vec",
-    "pca",
-    "randomcutforest",
-    "semantic-segmentation",
-    "seq2seq",
-    "lda",
-)
-ALGO_REGIONS_AND_ACCOUNTS = (
-    {
-        "algorithms": (
-            "pca",
-            "kmeans",
-            "linear-learner",
-            "factorization-machines",
-            "ntm",
-            "randomcutforest",
-            "knn",
-            "object2vec",
-            "ipinsights",
-        ),
-        "accounts": {
-            "af-south-1": "455444449433",
-            "ap-east-1": "286214385809",
-            "ap-northeast-1": "351501993468",
-            "ap-northeast-2": "835164637446",
-            "ap-northeast-3": "867004704886",
-            "ap-south-1": "991648021394",
-            "ap-south-2": "628508329040",
-            "ap-southeast-1": "475088953585",
-            "ap-southeast-2": "712309505854",
-            "ap-southeast-3": "951798379941",
-            "ap-southeast-4": "106583098589",
-            "ca-central-1": "469771592824",
-            "cn-north-1": "390948362332",
-            "cn-northwest-1": "387376663083",
-            "eu-central-1": "664544806723",
-            "eu-central-2": "680994064768",
-            "eu-north-1": "669576153137",
-            "eu-west-1": "438346466558",
-            "eu-west-2": "644912444149",
-            "eu-west-3": "749696950732",
-            "eu-south-1": "257386234256",
-            "eu-south-2": "104374241257",
-            "il-central-1": "898809789911",
-            "me-south-1": "249704162688",
-            "me-central-1": "272398656194",
-            "sa-east-1": "855470959533",
-            "us-east-1": "382416733822",
-            "us-east-2": "404615174143",
-            "us-gov-west-1": "226302683700",
-            "us-gov-east-1": "237065988967",
-            "us-iso-east-1": "490574956308",
-            "us-isob-east-1": "765400339828",
-            "us-west-1": "632365934929",
-            "us-west-2": "174872318107",
-        },
-    },
-    {
-        "algorithms": ("lda",),
-        "accounts": {
-            "ap-northeast-1": "258307448986",
-            "ap-northeast-2": "293181348795",
-            "ap-south-1": "991648021394",
-            "ap-southeast-1": "475088953585",
-            "ap-southeast-2": "297031611018",
-            "ca-central-1": "469771592824",
-            "eu-central-1": "353608530281",
-            "eu-west-1": "999678624901",
-            "eu-west-2": "644912444149",
-            "us-east-1": "766337827248",
-            "us-east-2": "999911452149",
-            "us-gov-west-1": "226302683700",
-            "us-iso-east-1": "490574956308",
-            "us-isob-east-1": "765400339828",
-            "us-west-1": "632365934929",
-            "us-west-2": "266724342769",
-        },
-    },
-    {
-        "algorithms": ("forecasting-deepar",),
-        "accounts": {
-            "af-south-1": "455444449433",
-            "ap-east-1": "286214385809",
-            "ap-northeast-1": "633353088612",
-            "ap-northeast-2": "204372634319",
-            "ap-northeast-3": "867004704886",
-            "ap-south-1": "991648021394",
-            "ap-southeast-1": "475088953585",
-            "ap-southeast-2": "514117268639",
-            "ca-central-1": "469771592824",
-            "cn-north-1": "390948362332",
-            "cn-northwest-1": "387376663083",
-            "eu-central-1": "495149712605",
-            "eu-north-1": "669576153137",
-            "eu-west-1": "224300973850",
-            "eu-west-2": "644912444149",
-            "eu-west-3": "749696950732",
-            "eu-south-1": "257386234256",
-            "me-south-1": "249704162688",
-            "sa-east-1": "855470959533",
-            "us-east-1": "522234722520",
-            "us-east-2": "566113047672",
-            "us-gov-west-1": "226302683700",
-            "us-iso-east-1": "490574956308",
-            "us-isob-east-1": "765400339828",
-            "us-west-1": "632365934929",
-            "us-west-2": "156387875391",
-        },
-    },
-    {
-        "algorithms": (
-            "seq2seq",
-            "image-classification",
-            "blazingtext",
-            "object-detection",
-            "semantic-segmentation",
-        ),
-        "accounts": {
-            "af-south-1": "455444449433",
-            "ap-east-1": "286214385809",
-            "ap-northeast-1": "501404015308",
-            "ap-northeast-2": "306986355934",
-            "ap-northeast-3": "867004704886",
-            "ap-south-1": "991648021394",
-            "ap-south-2": "628508329040",
-            "ap-southeast-1": "475088953585",
-            "ap-southeast-2": "544295431143",
-            "ap-southeast-3": "951798379941",
-            "ap-southeast-4": "106583098589",
-            "ca-central-1": "469771592824",
-            "cn-north-1": "390948362332",
-            "cn-northwest-1": "387376663083",
-            "eu-central-1": "813361260812",
-            "eu-central-2": "680994064768",
-            "eu-north-1": "669576153137",
-            "eu-west-1": "685385470294",
-            "eu-west-2": "644912444149",
-            "eu-west-3": "749696950732",
-            "eu-south-1": "257386234256",
-            "eu-south-2": "104374241257",
-            "il-central-1": "898809789911",
-            "me-south-1": "249704162688",
-            "me-central-1": "272398656194",
-            "sa-east-1": "855470959533",
-            "us-east-1": "811284229777",
-            "us-east-2": "825641698319",
-            "us-gov-west-1": "226302683700",
-            "us-gov-east-1": "237065988967",
-            "us-iso-east-1": "490574956308",
-            "us-isob-east-1": "765400339828",
-            "us-west-1": "632365934929",
-            "us-west-2": "433757028032",
-        },
-    },
-)
 
-IMAGE_URI_FORMAT = "{}.dkr.ecr.{}.{}/{}:1"
-
-
-def _accounts_for_algo(algo):
-    for algo_account_dict in ALGO_REGIONS_AND_ACCOUNTS:
-        if algo in algo_account_dict["algorithms"]:
-            return algo_account_dict["accounts"]
-
-    return {}
-
-
-@pytest.mark.parametrize("algo", ALGO_NAMES)
-def test_algo_uris(algo):
-    accounts = _accounts_for_algo(algo)
-    for region in accounts:
-        uri = image_uris.retrieve(algo, region)
-        assert expected_uris.algo_uri(algo, accounts[region], region) == uri
+ALGO_NAMES = [
+    "blazingtext.json",
+    "factorization-machines.json",
+    "forecasting-deepar.json",
+    "image-classification.json",
+    "ipinsights.json",
+    "kmeans.json",
+    "knn.json",
+    "linear-learner.json",
+    "ntm.json",
+    "object-detection.json",
+    "object2vec.json",
+    "pca.json",
+    "randomcutforest.json",
+    "semantic-segmentation.json",
+    "seq2seq.json",
+    "lda.json",
+]
+
+
+@pytest.mark.parametrize("load_config", ALGO_NAMES, indirect=True)
+def test_algo_uris(load_config):
+    VERSIONS = load_config["versions"]
+    for version in VERSIONS:
+        ACCOUNTS = load_config["versions"][version]["registries"]
+        algo_name = load_config["versions"][version]["repository"]
+        for region in ACCOUNTS.keys():
+            uri = image_uris.retrieve(algo_name, region)
+            assert expected_uris.algo_uri(algo_name, ACCOUNTS[region], region) == uri