Merge branch 'master' into fix-localmode-subprocess-termination

Author: ahsan-z-khan

CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## v2.56.0 (2021-08-26)
+
+### Features
+
+ * Add NEO KIX Configuration
+ * Algorithms region launch on KIX
+
+### Bug Fixes and Other Changes
+
+ * remove dots from CHANGELOG
+
+## v2.55.0 (2021-08-25)
+
+### Features
+
+ * Add information of Amazon-provided analysis image used by Model Monitor
+
+### Bug Fixes and Other Changes
+
+ * Update Changelog to fix release
+ * Fixing the order of populating container list
+ * pass network isolation config to pipelineModel
+ * Deference symbolic link when create tar file
+ * multiprocess issue in feature_group.py
+ * deprecate tag logic on Association
+
+### Documentation Changes
+
+ * add dataset_definition to processing page
+
 ## v2.54.0 (2021-08-16)
 
 ### Features
@@ -8,7 +38,7 @@
 
 ### Bug Fixes and Other Changes
 
- * issue #2253 where Processing job in Local mode would call Describe…
+ * issue #2253 where Processing job in Local mode would call Describe API
 
 ## v2.53.0 (2021-08-12)
 

VERSION

@@ -1 +1 @@
-2.54.1.dev0
+2.56.1.dev0

doc/api/utility/inputs.rst

@@ -5,4 +5,8 @@ Inputs
     :members:
     :undoc-members:
     :show-inheritance:
-    :noindex:
+
+.. automodule:: sagemaker.dataset_definition.inputs
+    :members:
+    :undoc-members:
+    :show-inheritance:

src/sagemaker/dataset_definition/inputs.py

@@ -27,7 +27,7 @@ class RedshiftDatasetDefinition(ApiObject):
 
     With this input, SQL queries will be executed using Redshift to generate datasets to S3.
 
-    Attributes:
+    Parameters:
         cluster_id (str): The Redshift cluster Identifier.
         database (str): The name of the Redshift database used in Redshift query execution.
         db_user (str): The database user name used in Redshift query execution.
@@ -60,7 +60,7 @@ class AthenaDatasetDefinition(ApiObject):
 
     With this input, SQL queries will be executed using Athena to generate datasets to S3.
 
-    Attributes:
+    Parameters:
         catalog (str): The name of the data catalog used in Athena query execution.
         database (str): The name of the database used in the Athena query execution.
         query_string (str): The SQL query statements, to be executed.
@@ -87,7 +87,7 @@ class AthenaDatasetDefinition(ApiObject):
 class DatasetDefinition(ApiObject):
     """DatasetDefinition input.
 
-    Attributes:
+    Parameters:
         data_distribution_type (str): Whether the generated dataset is FullyReplicated or
             ShardedByS3Key (default).
         input_mode (str): Whether to use File or Pipe input mode. In File (default) mode, Amazon
@@ -98,9 +98,8 @@ class DatasetDefinition(ApiObject):
         local_path (str): The local path where you want Amazon SageMaker to download the Dataset
             Definition inputs to run a processing job. LocalPath is an absolute path to the input
             data. This is a required parameter when `AppManaged` is False (default).
-        redshift_dataset_definition
-            (:class:`~sagemaker.dataset_definition.inputs.RedshiftDatasetDefinition`): Redshift
-            dataset definition.
+        redshift_dataset_definition (:class:`~sagemaker.dataset_definition.inputs.RedshiftDatasetDefinition`):
+            Configuration for Redshift Dataset Definition input.
         athena_dataset_definition (:class:`~sagemaker.dataset_definition.inputs.AthenaDatasetDefinition`):
             Configuration for Athena Dataset Definition input.
     """
@@ -126,7 +125,7 @@ class S3Input(ApiObject):
     S3 list operations are not strongly consistent.
     Use ManifestFile if strong consistency is required.
 
-    Attributes:
+    Parameters:
         s3_uri (str): the path to a specific S3 object or a S3 prefix
         local_path (str): the path to a local directory. If not provided, skips data download
             by SageMaker platform.

src/sagemaker/image_uri_config/blazingtext.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "501404015308",
                 "ap-northeast-2": "306986355934",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "544295431143",

src/sagemaker/image_uri_config/clarify.json

@@ -7,6 +7,7 @@
                     "ap-east-1": "098760798382",
                     "ap-northeast-1": "377024640650",
                     "ap-northeast-2": "263625296855",
+                    "ap-northeast-3": "912233562940",
                     "ap-south-1": "452307495513",
                     "ap-southeast-1": "834264404009",
                     "ap-southeast-2": "007051062584",

src/sagemaker/image_uri_config/factorization-machines.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "351501993468",
                 "ap-northeast-2": "835164637446",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "712309505854",

src/sagemaker/image_uri_config/image-classification-neo.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "110948597952",
                 "ap-northeast-1": "941853720454",
                 "ap-northeast-2": "151534178276",
+                "ap-northeast-3": "925152966179",
                 "ap-south-1": "763008648453",
                 "ap-southeast-1": "324986816169",
                 "ap-southeast-2": "355873309152",

src/sagemaker/image_uri_config/image-classification.json

@@ -10,6 +10,7 @@
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "544295431143",
+                "ap-northeast-3": "867004704886",
                 "ca-central-1": "469771592824",
                 "cn-north-1": "390948362332",
                 "cn-northwest-1": "387376663083",

src/sagemaker/image_uri_config/inferentia-mxnet.json

@@ -9,6 +9,7 @@
                 "ap-east-1": "110948597952",
                 "ap-northeast-1": "941853720454",
                 "ap-northeast-2": "151534178276",
+                "ap-northeast-3": "925152966179",
                 "ap-south-1": "763008648453",
                 "ap-southeast-1": "324986816169",
                 "ap-southeast-2": "355873309152",

src/sagemaker/image_uri_config/inferentia-pytorch.json

@@ -9,6 +9,7 @@
                 "ap-east-1": "110948597952",
                 "ap-northeast-1": "941853720454",
                 "ap-northeast-2": "151534178276",
+                "ap-northeast-3": "925152966179",
                 "ap-south-1": "763008648453",
                 "ap-southeast-1": "324986816169",
                 "ap-southeast-2": "355873309152",

src/sagemaker/image_uri_config/inferentia-tensorflow.json

@@ -9,6 +9,7 @@
                 "ap-east-1": "110948597952",
                 "ap-northeast-1": "941853720454",
                 "ap-northeast-2": "151534178276",
+                "ap-northeast-3": "925152966179",
                 "ap-south-1": "763008648453",
                 "ap-southeast-1": "324986816169",
                 "ap-southeast-2": "355873309152",

src/sagemaker/image_uri_config/ipinsights.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "351501993468",
                 "ap-northeast-2": "835164637446",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "712309505854",

src/sagemaker/image_uri_config/kmeans.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "351501993468",
                 "ap-northeast-2": "835164637446",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "712309505854",

src/sagemaker/image_uri_config/knn.json

@@ -3,10 +3,11 @@
     "versions": {
         "1": {
             "registries": {
-               "af-south-1": "455444449433",
+                "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-southeast-1": "475088953585",
                 "ap-southeast-2": "712309505854",

src/sagemaker/image_uri_config/linear-learner.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "351501993468",
                 "ap-northeast-2": "835164637446",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "712309505854",

src/sagemaker/image_uri_config/neo-mxnet.json

@@ -23,6 +23,7 @@
                 "ap-east-1": "110948597952",
                 "ap-northeast-1": "941853720454",
                 "ap-northeast-2": "151534178276",
+                "ap-northeast-3": "925152966179",
                 "ap-south-1": "763008648453",
                 "ap-southeast-1": "324986816169",
                 "ap-southeast-2": "355873309152",

src/sagemaker/image_uri_config/neo-pytorch.json

@@ -17,6 +17,7 @@
                 "ap-east-1": "110948597952",
                 "ap-northeast-1": "941853720454",
                 "ap-northeast-2": "151534178276",
+                "ap-northeast-3": "925152966179",
                 "ap-south-1": "763008648453",
                 "ap-southeast-1": "324986816169",
                 "ap-southeast-2": "355873309152",
@@ -46,6 +47,7 @@
                 "ap-east-1": "110948597952",
                 "ap-northeast-1": "941853720454",
                 "ap-northeast-2": "151534178276",
+                "ap-northeast-3": "925152966179",
                 "ap-south-1": "763008648453",
                 "ap-southeast-1": "324986816169",
                 "ap-southeast-2": "355873309152",
@@ -75,6 +77,7 @@
                 "ap-east-1": "110948597952",
                 "ap-northeast-1": "941853720454",
                 "ap-northeast-2": "151534178276",
+                "ap-northeast-3": "925152966179",
                 "ap-south-1": "763008648453",
                 "ap-southeast-1": "324986816169",
                 "ap-southeast-2": "355873309152",

src/sagemaker/image_uri_config/neo-tensorflow.json

@@ -22,6 +22,7 @@
                 "ap-east-1": "110948597952",
                 "ap-northeast-1": "941853720454",
                 "ap-northeast-2": "151534178276",
+                "ap-northeast-3": "925152966179",
                 "ap-south-1": "763008648453",
                 "ap-southeast-1": "324986816169",
                 "ap-southeast-2": "355873309152",

src/sagemaker/image_uri_config/ntm.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "351501993468",
                 "ap-northeast-2": "835164637446",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "712309505854",

src/sagemaker/image_uri_config/object-detection.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "501404015308",
                 "ap-northeast-2": "306986355934",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "544295431143",

src/sagemaker/image_uri_config/object2vec.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "351501993468",
                 "ap-northeast-2": "835164637446",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "712309505854",

src/sagemaker/image_uri_config/pca.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "351501993468",
                 "ap-northeast-2": "835164637446",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "712309505854",

src/sagemaker/image_uri_config/randomcutforest.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "351501993468",
                 "ap-northeast-2": "835164637446",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "712309505854",

src/sagemaker/image_uri_config/semantic-segmentation.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "501404015308",
                 "ap-northeast-2": "306986355934",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "544295431143",

src/sagemaker/image_uri_config/seq2seq.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "501404015308",
                 "ap-northeast-2": "306986355934",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "544295431143",

src/sagemaker/image_uri_config/sklearn.json

@@ -9,6 +9,7 @@
                 "ap-east-1": "651117190479",
                 "ap-northeast-1": "354813040037",
                 "ap-northeast-2": "366743142698",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "720646828776",
                 "ap-southeast-1": "121021644041",
                 "ap-southeast-2": "783357654285",
@@ -39,6 +40,7 @@
                 "ap-east-1": "651117190479",
                 "ap-northeast-1": "354813040037",
                 "ap-northeast-2": "366743142698",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "720646828776",
                 "ap-southeast-1": "121021644041",
                 "ap-southeast-2": "783357654285",

src/sagemaker/image_uri_config/xgboost-neo.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "110948597952",
                 "ap-northeast-1": "941853720454",
                 "ap-northeast-2": "151534178276",
+                "ap-northeast-3": "925152966179",
                 "ap-south-1": "763008648453",
                 "ap-southeast-1": "324986816169",
                 "ap-southeast-2": "355873309152",

src/sagemaker/image_uri_config/xgboost.json

@@ -10,6 +10,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "501404015308",
                 "ap-northeast-2": "306986355934",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "544295431143",
@@ -41,6 +42,7 @@
                 "ap-east-1": "651117190479",
                 "ap-northeast-1": "354813040037",
                 "ap-northeast-2": "366743142698",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "720646828776",
                 "ap-southeast-1": "121021644041",
                 "ap-southeast-2": "783357654285",
@@ -72,6 +74,7 @@
                 "ap-east-1": "651117190479",
                 "ap-northeast-1": "354813040037",
                 "ap-northeast-2": "366743142698",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "720646828776",
                 "ap-southeast-1": "121021644041",
                 "ap-southeast-2": "783357654285",
@@ -103,6 +106,7 @@
                 "ap-east-1": "651117190479",
                 "ap-northeast-1": "354813040037",
                 "ap-northeast-2": "366743142698",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "720646828776",
                 "ap-southeast-1": "121021644041",
                 "ap-southeast-2": "783357654285",
@@ -132,6 +136,7 @@
                 "ap-east-1": "651117190479",
                 "ap-northeast-1": "354813040037",
                 "ap-northeast-2": "366743142698",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "720646828776",
                 "ap-southeast-1": "121021644041",
                 "ap-southeast-2": "783357654285",

src/sagemaker/inputs.py

@@ -127,7 +127,7 @@ def __init__(self, seed):
 class CreateModelInput(object):
     """A class containing parameters which can be used to create a SageMaker Model
 
-    Attributes:
+    Parameters:
         instance_type (str): type or EC2 instance will be used for model deployment.
         accelerator_type (str): elastic inference accelerator type.
     """

src/sagemaker/model.py

@@ -1097,6 +1097,8 @@ def _upload_code(self, key_prefix, repack=False):
 
     def _framework_env_vars(self):
         """Placeholder docstring"""
+        script_name = None
+        dir_name = None
         if self.uploaded_code:
             script_name = self.uploaded_code.script_name
             if self.enable_network_isolation():
@@ -1105,10 +1107,8 @@ def _framework_env_vars(self):
                 dir_name = self.uploaded_code.s3_prefix
         elif self.entry_point is not None:
             script_name = self.entry_point
-            dir_name = "file://" + self.source_dir
-        else:
-            script_name = None
-            dir_name = None
+            if self.source_dir is not None:
+                dir_name = "file://" + self.source_dir
 
         return {
             SCRIPT_PARAM_NAME.upper(): script_name or str(),