Merge branch 'aws:master' into master

Author: rohangujarathi

CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## v2.48.2 (2021-07-12)
+
+### Bug Fixes and Other Changes
+
+ * default time for compilation jobs
+ * skip hf inference test
+
+## v2.48.1 (2021-07-08)
+
+### Bug Fixes and Other Changes
+
+ * skip HF inference test
+ * remove upsert from test_workflow
+
+### Documentation Changes
+
+ * Add Hugging Face docs
+ * add tuning step to doc
+
+## v2.48.0 (2021-07-07)
+
+### Features
+
+ * HuggingFace Inference
+
+### Bug Fixes and Other Changes
+
+ * add support for SageMaker workflow tuning step
+
 ## v2.47.2.post0 (2021-07-01)
 
 ### Documentation Changes

VERSION

@@ -1 +1 @@
-2.47.3.dev0
+2.48.3.dev0

doc/api/inference/model_monitor.rst

@@ -26,3 +26,8 @@ Model Monitor
     :members:
     :undoc-members:
     :show-inheritance:
+
+.. automodule:: sagemaker.model_monitor.clarify_model_monitoring
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/frameworks/huggingface/index.rst

@@ -9,4 +9,5 @@ For general information about using the SageMaker Python SDK, see :ref:`overview
     :maxdepth: 2
 
     sagemaker.huggingface
-    Use Hugging Face with the SageMaker Python SDK <https://huggingface.co/transformers/sagemaker.html>
+    Train Hugging Face models on Amazon SageMaker with the SageMaker Python SDK <https://huggingface.co/docs/sagemaker/train>
+    Deploy Hugging Face models to Amazon SageMaker with the SageMaker Python SDK <https://huggingface.co/docs/sagemaker/inference>

doc/frameworks/huggingface/sagemaker.huggingface.rst

@@ -1,10 +1,26 @@
-HuggingFace
-===========
+Hugging Face
+============
 
-HuggingFace Estimator
----------------------
+Hugging Face Estimator
+----------------------
 
 .. autoclass:: sagemaker.huggingface.estimator.HuggingFace
     :members:
     :undoc-members:
     :show-inheritance:
+
+Hugging Face Model
+------------------
+
+.. autoclass:: sagemaker.huggingface.model.HuggingFaceModel
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+HuggingFace Predictor
+---------------------
+
+.. autoclass:: sagemaker.huggingface.model.HuggingFacePredictor
+    :members:
+    :undoc-members:
+    :show-inheritance:

doc/workflows/pipelines/sagemaker.workflow.pipelines.rst

@@ -109,12 +109,18 @@ Steps
 
 .. autoclass:: sagemaker.workflow.steps.TrainingStep
 
-.. autoclass:: sagemaker.workflow.steps.CreateModelStep
+.. autoclass:: sagemaker.workflow.steps.TuningStep
+
+.. autofunction:: sagemaker.workflow.steps.TuningStep.get_top_model_s3_uri
 
 .. autoclass:: sagemaker.workflow.steps.TransformStep
 
 .. autoclass:: sagemaker.workflow.steps.ProcessingStep
 
+.. autoclass:: sagemaker.workflow.steps.CreateModelStep
+
+.. autoclass:: sagemaker.workflow.callback_step.CallbackStep
+
 Utilities
 ---------
 

src/sagemaker/estimator.py

@@ -718,7 +718,7 @@ def compile_model(
                 'onnx', 'xgboost'
             framework_version (str): The version of the framework
             compile_max_run (int): Timeout in seconds for compilation (default:
-                3 * 60). After this amount of time Amazon SageMaker Neo
+                15 * 60). After this amount of time Amazon SageMaker Neo
                 terminates the compilation job regardless of its current status.
             tags (list[dict]): List of tags for labeling a compilation job. For
                 more, see

src/sagemaker/huggingface/__init__.py

@@ -14,3 +14,4 @@
 from __future__ import absolute_import
 
 from sagemaker.huggingface.estimator import HuggingFace  # noqa: F401
+from sagemaker.huggingface.model import HuggingFaceModel, HuggingFacePredictor  # noqa: F401

src/sagemaker/huggingface/estimator.py

@@ -23,6 +23,7 @@
     warn_if_parameter_server_with_multi_gpu,
     validate_smdistributed,
 )
+from sagemaker.huggingface.model import HuggingFaceModel
 from sagemaker.vpc_utils import VPC_CONFIG_DEFAULT
 
 logger = logging.getLogger("sagemaker")
@@ -233,8 +234,58 @@ def create_model(
         dependencies=None,
         **kwargs
     ):
-        """Placeholder docstring"""
-        raise NotImplementedError("Creating model with HuggingFace training job is not supported.")
+        """Create a SageMaker ``HuggingFaceModel`` object that can be deployed to an ``Endpoint``.
+
+        Args:
+            model_server_workers (int): Optional. The number of worker processes
+                used by the inference server. If None, server will use one
+                worker per vCPU.
+            role (str): The ``ExecutionRoleArn`` IAM Role ARN for the ``Model``,
+                which is also used during transform jobs. If not specified, the
+                role from the Estimator will be used.
+            vpc_config_override (dict[str, list[str]]): Optional override for VpcConfig set on
+                the model. Default: use subnets and security groups from this Estimator.
+                * 'Subnets' (list[str]): List of subnet ids.
+                * 'SecurityGroupIds' (list[str]): List of security group ids.
+            entry_point (str): Path (absolute or relative) to the local Python source file which
+                should be executed as the entry point to training. If ``source_dir`` is specified,
+                then ``entry_point`` must point to a file located at the root of ``source_dir``.
+                Defaults to `None`.
+            source_dir (str): Path (absolute or relative) to a directory with any other serving
+                source code dependencies aside from the entry point file.
+                If not specified, the model source directory from training is used.
+            dependencies (list[str]): A list of paths to directories (absolute or relative) with
+                any additional libraries that will be exported to the container.
+                If not specified, the dependencies from training are used.
+                This is not supported with "local code" in Local Mode.
+            **kwargs: Additional kwargs passed to the :class:`~sagemaker.huggingface.model.HuggingFaceModel`
+                constructor.
+        Returns:
+            sagemaker.huggingface.model.HuggingFaceModel: A SageMaker ``HuggingFaceModel``
+            object. See :func:`~sagemaker.huggingface.model.HuggingFaceModel` for full details.
+        """
+        if "image_uri" not in kwargs:
+            kwargs["image_uri"] = self.image_uri
+
+        kwargs["name"] = self._get_or_create_name(kwargs.get("name"))
+
+        return HuggingFaceModel(
+            role or self.role,
+            model_data=self.model_data,
+            entry_point=entry_point,
+            transformers_version=self.framework_version,
+            tensorflow_version=self.tensorflow_version,
+            pytorch_version=self.pytorch_version,
+            py_version=self.py_version,
+            source_dir=(source_dir or self._model_source_dir()),
+            container_log_level=self.container_log_level,
+            code_location=self.code_location,
+            model_server_workers=model_server_workers,
+            sagemaker_session=self.sagemaker_session,
+            vpc_config=self.get_vpc_config(vpc_config_override),
+            dependencies=(dependencies or self.dependencies),
+            **kwargs
+        )
 
     @classmethod
     def _prepare_init_params_from_job_description(cls, job_details, model_channel_name=None):