Merge branch 'master' into MLFW-2344

Author: chuyang-deng

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v1.23.0 (2019-05-27)
+
+### Features
+
+ * support MXNet 1.4 with MMS
+
+### Documentation changes
+
+ * update using_sklearn.rst parameter name
+
 ## v1.22.0 (2019-05-23)
 
 ### Features

VERSION

@@ -1 +1 @@
-1.22.1.dev0
+1.23.1.dev0

src/sagemaker/model.py

@@ -151,6 +151,19 @@ def _compilation_job_config(self, target_instance_type, input_shape, output_path
                 'tags': tags,
                 'job_name': job_name}
 
+    def check_neo_region(self, region):
+        """Check if this ``Model`` in the available region where neo support.
+
+        Args:
+            region (str): Specifies the region where want to execute compilation
+        Returns:
+            bool: boolean value whether if neo is available in the specified region
+        """
+        if region in NEO_IMAGE_ACCOUNT:
+            return True
+        else:
+            return False
+
     def _neo_image_account(self, region):
         if region not in NEO_IMAGE_ACCOUNT:
             raise ValueError("Neo is not currently supported in {}, "

tests/unit/test_model.py

@@ -400,3 +400,19 @@ def test_compile_model_for_cloud(sagemaker_session, tmpdir):
     model.compile(target_instance_family='ml_c4', input_shape={'data': [1, 3, 1024, 1024]},
                   output_path='s3://output', role='role', framework='tensorflow', job_name="compile-model")
     assert model._is_compiled_model is True
+
+
+def test_check_neo_region(sagemaker_session, tmpdir):
+    sagemaker_session.wait_for_compilation_job = Mock(
+        return_value=DESCRIBE_COMPILATION_JOB_RESPONSE)
+    model = DummyFrameworkModel(sagemaker_session, source_dir=str(tmpdir))
+    ec2_region_list = ['us-east-2', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-east-1', 'ap-south-1',
+                       'ap-northeast-3', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1',
+                       'ca-central-1', 'cn-north-1', 'cn-northwest-1', 'eu-central-1', ' eu-west-1', 'eu-west-2',
+                       'eu-west-3', 'eu-north-1', 'sa-east-1', 'us-gov-east-1', 'us-gov-west-1']
+    neo_support_region = ['us-west-2', 'eu-west-1', 'us-east-1', 'us-east-2']
+    for region_name in ec2_region_list:
+        if region_name in neo_support_region:
+            assert model.check_neo_region(region_name) is True
+        else:
+            assert model.check_neo_region(region_name) is False