Merge branch 'master' into master

Author: knakad

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v1.51.1 (2020-03-10)
+
+### Bug Fixes and Other Changes
+
+ * skip pytorch ei test in unsupported regions
+
+### Documentation Changes
+
+ * correct MultiString/MULTI_STRING docstring
+
 ## v1.51.0 (2020-03-09)
 
 ### Features

VERSION

@@ -1 +1 @@
-1.51.1.dev0
+1.51.2.dev0

src/sagemaker/fw_utils.py

@@ -62,7 +62,7 @@
 ]
 PY2_RESTRICTED_EIA_FRAMEWORKS = ["pytorch-serving"]
 VALID_ACCOUNTS_BY_REGION = {"us-gov-west-1": "246785580436", "us-iso-east-1": "744548109606"}
-ASIMOV_VALID_ACCOUNTS_BY_REGION = {"us-iso-east-1": "886529160074"}
+ASIMOV_VALID_ACCOUNTS_BY_REGION = {"us-gov-west-1": "442386744353", "us-iso-east-1": "886529160074"}
 OPT_IN_ACCOUNTS_BY_REGION = {"ap-east-1": "057415533634", "me-south-1": "724002660598"}
 ASIMOV_OPT_IN_ACCOUNTS_BY_REGION = {"ap-east-1": "871362719292", "me-south-1": "217643126080"}
 DEFAULT_ACCOUNT = "520713654638"
@@ -133,25 +133,6 @@ def _is_dlc_version(framework, framework_version, py_version):
     return False
 
 
-def _use_dlc_image(region, framework, py_version, framework_version):
-    """Return if the DLC image should be used for the given framework,
-    framework version, Python version, and region.
-
-    Args:
-        region (str): The AWS region.
-        framework (str): The framework name, e.g. "tensorflow-scriptmode".
-        py_version (str): The Python version, e.g. "py3".
-        framework_version (str): The framework version.
-
-    Returns:
-        bool: Whether or not to use the corresponding DLC image.
-    """
-    is_gov_region = region in VALID_ACCOUNTS_BY_REGION
-    is_dlc_version = _is_dlc_version(framework, framework_version, py_version)
-
-    return ((not is_gov_region) or region in ASIMOV_VALID_ACCOUNTS_BY_REGION) and is_dlc_version
-
-
 def _registry_id(region, framework, py_version, account, framework_version):
     """Return the Amazon ECR registry number (or AWS account ID) for
     the given framework, framework version, Python version, and region.
@@ -168,7 +149,7 @@ def _registry_id(region, framework, py_version, account, framework_version):
             specific one for the framework, framework version, Python version,
             and region, then ``account`` is returned.
     """
-    if _use_dlc_image(region, framework, py_version, framework_version):
+    if _is_dlc_version(framework, framework_version, py_version):
         if region in ASIMOV_OPT_IN_ACCOUNTS_BY_REGION:
             return ASIMOV_OPT_IN_ACCOUNTS_BY_REGION.get(region)
         if region in ASIMOV_VALID_ACCOUNTS_BY_REGION:
@@ -253,7 +234,7 @@ def create_image_uri(
         else:
             device_type = "cpu"
 
-    use_dlc_image = _use_dlc_image(region, framework, py_version, framework_version)
+    use_dlc_image = _is_dlc_version(framework, framework_version, py_version)
 
     if not py_version or (use_dlc_image and framework == "tensorflow-serving-eia"):
         tag = "{}-{}".format(framework_version, device_type)

src/sagemaker/processing.py

@@ -648,10 +648,9 @@ def from_processing_name(cls, sagemaker_session, processing_job_name):
         """
         job_desc = sagemaker_session.describe_processing_job(job_name=processing_job_name)
 
-        return cls(
-            sagemaker_session=sagemaker_session,
-            job_name=processing_job_name,
-            inputs=[
+        inputs = None
+        if job_desc.get("ProcessingInputs"):
+            inputs = [
                 ProcessingInput(
                     source=processing_input["S3Input"]["S3Uri"],
                     destination=processing_input["S3Input"]["LocalPath"],
@@ -664,19 +663,31 @@ def from_processing_name(cls, sagemaker_session, processing_job_name):
                     s3_compression_type=processing_input["S3Input"].get("S3CompressionType"),
                 )
                 for processing_input in job_desc["ProcessingInputs"]
-            ],
-            outputs=[
+            ]
+
+        outputs = None
+        if job_desc.get("ProcessingOutputConfig") and job_desc["ProcessingOutputConfig"].get(
+            "Outputs"
+        ):
+            outputs = [
                 ProcessingOutput(
-                    source=job_desc["ProcessingOutputConfig"]["Outputs"][0]["S3Output"][
-                        "LocalPath"
-                    ],
-                    destination=job_desc["ProcessingOutputConfig"]["Outputs"][0]["S3Output"][
-                        "S3Uri"
-                    ],
-                    output_name=job_desc["ProcessingOutputConfig"]["Outputs"][0]["OutputName"],
+                    source=processing_output["S3Output"]["LocalPath"],
+                    destination=processing_output["S3Output"]["S3Uri"],
+                    output_name=processing_output["OutputName"],
                 )
-            ],
-            output_kms_key=job_desc["ProcessingOutputConfig"].get("KmsKeyId"),
+                for processing_output in job_desc["ProcessingOutputConfig"]["Outputs"]
+            ]
+
+        output_kms_key = None
+        if job_desc.get("ProcessingOutputConfig"):
+            output_kms_key = job_desc["ProcessingOutputConfig"].get("KmsKeyId")
+
+        return cls(
+            sagemaker_session=sagemaker_session,
+            job_name=processing_job_name,
+            inputs=inputs,
+            outputs=outputs,
+            output_kms_key=output_kms_key,
         )
 
     @classmethod

tests/integ/test_auto_ml.py

@@ -13,7 +13,6 @@
 from __future__ import absolute_import
 
 import os
-import time
 
 import pytest
 import tests.integ
@@ -34,7 +33,7 @@
 TRAINING_DATA = os.path.join(DATA_DIR, "iris_training.csv")
 TEST_DATA = os.path.join(DATA_DIR, "iris_test.csv")
 PROBLEM_TYPE = "MultiClassClassification"
-JOB_NAME = "auto-ml-{}".format(time.strftime("%y%m%d-%H%M%S"))
+BASE_JOB_NAME = "auto-ml"
 
 # use a succeeded AutoML job to test describe and list candidates method, otherwise tests will run too long
 AUTO_ML_JOB_NAME = "python-sdk-integ-test-base-job"
@@ -119,11 +118,11 @@ def test_auto_ml_fit_optional_args(sagemaker_session):
     )
     inputs = TRAINING_DATA
     with timeout(minutes=AUTO_ML_DEFAULT_TIMEMOUT_MINUTES):
-        auto_ml.fit(inputs, job_name=JOB_NAME)
+        auto_ml.fit(inputs, job_name=unique_name_from_base(BASE_JOB_NAME))
 
-    auto_ml_desc = auto_ml.describe_auto_ml_job(job_name=JOB_NAME)
+    auto_ml_desc = auto_ml.describe_auto_ml_job(job_name=auto_ml.latest_auto_ml_job.job_name)
     assert auto_ml_desc["AutoMLJobStatus"] == "Completed"
-    assert auto_ml_desc["AutoMLJobName"] == JOB_NAME
+    assert auto_ml_desc["AutoMLJobName"] == auto_ml.latest_auto_ml_job.job_name
     assert auto_ml_desc["AutoMLJobObjective"] == job_objective
     assert auto_ml_desc["ProblemType"] == problem_type
     assert auto_ml_desc["OutputDataConfig"]["S3OutputPath"] == output_path

tests/integ/test_processing.py

@@ -20,7 +20,13 @@
 from sagemaker import Session
 from sagemaker.fw_registry import default_framework_uri
 
-from sagemaker.processing import ProcessingInput, ProcessingOutput, ScriptProcessor, Processor
+from sagemaker.processing import (
+    ProcessingInput,
+    ProcessingOutput,
+    ScriptProcessor,
+    Processor,
+    ProcessingJob,
+)
 from sagemaker.sklearn.processing import SKLearnProcessor
 from sagemaker.utils import sts_regional_endpoint
 from tests.integ import DATA_DIR
@@ -475,6 +481,37 @@ def test_script_processor_with_no_inputs_or_outputs(
 
     assert job_description["StoppingCondition"] == {"MaxRuntimeInSeconds": 3600}
 
+    job_from_name = ProcessingJob.from_processing_name(
+        sagemaker_session=sagemaker_session,
+        processing_job_name=job_description["ProcessingJobName"],
+    )
+    job_description = job_from_name.describe()
+
+    assert job_description["ProcessingInputs"][0]["InputName"] == "code"
+
+    assert job_description["ProcessingJobName"].startswith("test-script-processor-with-no-inputs")
+
+    assert job_description["ProcessingJobStatus"] == "Completed"
+
+    assert job_description["ProcessingResources"]["ClusterConfig"]["InstanceCount"] == 1
+    assert (
+        job_description["ProcessingResources"]["ClusterConfig"]["InstanceType"] == cpu_instance_type
+    )
+    assert job_description["ProcessingResources"]["ClusterConfig"]["VolumeSizeInGB"] == 100
+
+    assert job_description["AppSpecification"]["ContainerArguments"] == ["-v"]
+    assert job_description["AppSpecification"]["ContainerEntrypoint"] == [
+        "python3",
+        "/opt/ml/processing/input/code/dummy_script.py",
+    ]
+    assert job_description["AppSpecification"]["ImageUri"] == image_uri
+
+    assert job_description["Environment"] == {"DUMMY_ENVIRONMENT_VARIABLE": "dummy-value"}
+
+    assert ROLE in job_description["RoleArn"]
+
+    assert job_description["StoppingCondition"] == {"MaxRuntimeInSeconds": 3600}
+
 
 @pytest.mark.canary_quick
 def test_processor(sagemaker_session, image_uri, cpu_instance_type, output_kms_key):

tests/unit/test_fw_utils.py

@@ -363,7 +363,7 @@ def test_create_image_uri_hkg_override_account():
     assert {image_uri == "fake.dkr.ecr.ap-east-1.amazonaws.com/sagemaker-mlfw:1.0rc-gpu-py3"}
 
 
-def test_create_image_uri_merged():
+def test_create_dlc_image_uri():
     image_uri = fw_utils.create_image_uri(
         "us-west-2", "tensorflow-scriptmode", "ml.p3.2xlarge", "1.14", "py3"
     )
@@ -419,7 +419,7 @@ def test_create_image_uri_merged():
     )
 
 
-def test_create_image_uri_merged_py2():
+def test_create_dlc_image_uri_py2():
     image_uri = fw_utils.create_image_uri(
         "us-west-2", "tensorflow-scriptmode", "ml.p3.2xlarge", "1.13.1", "py2"
     )
@@ -450,7 +450,7 @@ def test_create_image_uri_merged_py2():
     )
 
 
-def test_create_image_uri_merged_gov_regions():
+def test_create_dlc_image_uri_iso_east_1():
     image_uri = fw_utils.create_image_uri(
         "us-iso-east-1", "tensorflow-scriptmode", "ml.m4.xlarge", "1.13.1", "py3"
     )
@@ -493,6 +493,61 @@ def test_create_image_uri_merged_gov_regions():
     )
 
 
+def test_create_dlc_image_uri_gov_west_1():
+    image_uri = fw_utils.create_image_uri(
+        "us-gov-west-1", "tensorflow-scriptmode", "ml.m4.xlarge", "1.13.1", "py3"
+    )
+    assert (
+        image_uri
+        == "442386744353.dkr.ecr.us-gov-west-1.amazonaws.com/tensorflow-training:1.13.1-cpu-py3"
+    )
+
+    image_uri = fw_utils.create_image_uri(
+        "us-gov-west-1", "tensorflow-scriptmode", "ml.p3.2xlarge", "1.14", "py2"
+    )
+    assert (
+        image_uri
+        == "442386744353.dkr.ecr.us-gov-west-1.amazonaws.com/tensorflow-training:1.14-gpu-py2"
+    )
+
+    image_uri = fw_utils.create_image_uri(
+        "us-gov-west-1", "tensorflow-serving", "ml.m4.xlarge", "1.13.0"
+    )
+    assert (
+        image_uri
+        == "442386744353.dkr.ecr.us-gov-west-1.amazonaws.com/tensorflow-inference:1.13.0-cpu"
+    )
+
+    image_uri = fw_utils.create_image_uri("us-gov-west-1", "mxnet", "ml.p3.2xlarge", "1.4.1", "py3")
+    assert (
+        image_uri == "442386744353.dkr.ecr.us-gov-west-1.amazonaws.com/mxnet-training:1.4.1-gpu-py3"
+    )
+
+    image_uri = fw_utils.create_image_uri(
+        "us-gov-west-1", "mxnet-serving", "ml.c4.2xlarge", "1.4.1", "py3"
+    )
+    assert (
+        image_uri
+        == "442386744353.dkr.ecr.us-gov-west-1.amazonaws.com/mxnet-inference:1.4.1-cpu-py3"
+    )
+
+    image_uri = fw_utils.create_image_uri(
+        "us-gov-west-1", "pytorch", "ml.p3.2xlarge", "1.2.0", "py3"
+    )
+    assert (
+        image_uri
+        == "442386744353.dkr.ecr.us-gov-west-1.amazonaws.com/pytorch-training:1.2.0-gpu-py3"
+    )
+
+    image_uri = fw_utils.create_image_uri(
+        "us-gov-west-1", "pytorch-serving", "ml.c4.2xlarge", "1.2.0", "py3"
+    )
+    assert (
+        image_uri
+        == "442386744353.dkr.ecr.us-gov-west-1.amazonaws.com/pytorch-inference:1.2.0-cpu-py3"
+    )
+
+
 def test_create_image_uri_pytorch(pytorch_version):
     image_uri = fw_utils.create_image_uri(
         "us-west-2", "pytorch", "ml.p3.2xlarge", pytorch_version, "py3"