Merge branch 'master' into master

Author: ahsan-z-khan

src/sagemaker/image_uri_config/pytorch.json

@@ -4,16 +4,15 @@
             "cpu"
         ],
         "version_aliases": {
-            "1.3": "1.3.1"
+            "1.3": "1.3.1",
+            "1.5": "1.5.1"
         },
         "versions": {
             "1.3.1": {
                 "py_versions": [
                     "py3"
                 ],
                 "registries": {
-                    "af-south-1": "626614931356",
-                    "ap-east-1": "871362719292",
                     "ap-northeast-1": "763104351884",
                     "ap-northeast-2": "763104351884",
                     "ap-northeast-3": "364406365360",
@@ -26,16 +25,22 @@
                     "eu-central-1": "763104351884",
                     "eu-north-1": "763104351884",
                     "eu-west-1": "763104351884",
-                    "eu-west-2": "763104351884",
-                    "eu-west-3": "763104351884",
-                    "eu-south-1": "692866216735",
-                    "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": "pytorch-inference-eia"
+            },
+            "1.5.1": {
+                "py_versions": [
+                    "py3"
+                ],
+                "registries": {
+                    "ap-northeast-1": "763104351884",
+                    "ap-northeast-2": "763104351884",
+                    "eu-west-1": "763104351884",
+                    "us-east-1": "763104351884",
+                    "us-east-2": "763104351884",
                     "us-west-2": "763104351884"
                 },
                 "repository": "pytorch-inference-eia"

src/sagemaker/local/local_session.py

@@ -571,6 +571,21 @@ def logs_for_job(self, job_name, wait=False, poll=5, log_type="All"):
         # on local mode.
         pass  # pylint: disable=unnecessary-pass
 
+    def logs_for_processing_job(self, job_name, wait=False, poll=10):
+        """A no-op method meant to override the sagemaker client.
+
+        Args:
+          job_name:
+          wait:  (Default value = False)
+          poll:  (Default value = 10)
+
+        Returns:
+
+        """
+        # override logs_for_job() as it doesn't need to perform any action
+        # on local mode.
+        pass  # pylint: disable=unnecessary-pass
+
 
 class file_input(object):
     """Amazon SageMaker channel configuration for FILE data sources, used in local mode."""

tests/unit/sagemaker/image_uris/test_dlc_frameworks.py

@@ -42,6 +42,14 @@
     "us-gov-west-1": "246785580436",
     "us-iso-east-1": "744548109606",
 }
+ELASTIC_INFERENCE_REGIONS = [
+    "ap-northeast-1",
+    "ap-northeast-2",
+    "eu-west-1",
+    "us-east-1",
+    "us-east-2",
+    "us-west-2",
+]
 
 
 def _test_image_uris(
@@ -385,8 +393,9 @@ def test_pytorch_eia(pytorch_eia_version, pytorch_eia_py_version):
     )
     assert expected == uri
 
-    for region, account in DLC_ALTERNATE_REGION_ACCOUNTS.items():
+    for region in ELASTIC_INFERENCE_REGIONS:
         uri = image_uris.retrieve(region=region, **base_args)
+        account = DLC_ALTERNATE_REGION_ACCOUNTS.get(region, DLC_ACCOUNT)
 
         expected = expected_uris.framework_uri(
             "pytorch-inference-eia",

tests/unit/test_local_session.py

@@ -551,6 +551,20 @@ def test_describe_transform_job_does_not_exist(LocalSession, _LocalTransformJob)
         local_sagemaker_client.describe_transform_job("transform-job-does-not-exist")
 
 
+@patch("sagemaker.local.image._SageMakerContainer.process")
+@patch("sagemaker.local.local_session.LocalSession")
+def test_logs_for_job(process, LocalSession):
+    local_job_logs = LocalSession.logs_for_job("my-processing-job")
+    assert local_job_logs is not None
+
+
+@patch("sagemaker.local.image._SageMakerContainer.process")
+@patch("sagemaker.local.local_session.LocalSession")
+def test_logs_for_processing_job(process, LocalSession):
+    local_processing_job_logs = LocalSession.logs_for_processing_job("my-processing-job")
+    assert local_processing_job_logs is not None
+
+
 @patch("sagemaker.local.local_session.LocalSession")
 def test_describe_endpoint_config(LocalSession):
     local_sagemaker_client = sagemaker.local.local_session.LocalSagemakerClient()