Merge branch 'master' into fix-issue-2426

Author: ahsan-z-khan

CHANGELOG.md

@@ -1,5 +1,24 @@
 # 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

VERSION

@@ -1 +1 @@
-2.48.1.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

@@ -111,13 +111,17 @@ 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.TuningStep
+.. 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/model.py

@@ -30,10 +30,10 @@
 
 
 class HuggingFacePredictor(Predictor):
-    """A Predictor for inference against HuggingFace Endpoints.
+    """A Predictor for inference against Hugging Face Endpoints.
 
     This is able to serialize Python lists, dictionaries, and numpy arrays to
-    multidimensional tensors for HuggingFace inference.
+    multidimensional tensors for Hugging Face inference.
     """
 
     def __init__(
@@ -48,7 +48,7 @@ def __init__(
         Args:
             endpoint_name (str): The name of the endpoint to perform inference
                 on.
-            sagemaker_session (sagemaker.session.Session): Session object which
+            sagemaker_session (sagemaker.session.Session): Session object that
                 manages interactions with Amazon SageMaker APIs and any other
                 AWS services needed. If not specified, the estimator creates one
                 using the default AWS configuration chain.
@@ -85,7 +85,7 @@ def _validate_pt_tf_versions(pytorch_version, tensorflow_version, image_uri):
 
 
 class HuggingFaceModel(FrameworkModel):
-    """An HuggingFace SageMaker ``Model`` that can be deployed to a SageMaker ``Endpoint``."""
+    """A Hugging Face SageMaker ``Model`` that can be deployed to a SageMaker ``Endpoint``."""
 
     _framework_name = "huggingface"
 
@@ -106,19 +106,19 @@ def __init__(
         """Initialize a HuggingFaceModel.
 
         Args:
-            model_data (str): The S3 location of a SageMaker model data
+            model_data (str): The Amazon S3 location of a SageMaker model data
                 ``.tar.gz`` file.
-            role (str): An AWS IAM role (either name or full ARN). The Amazon
+            role (str): An AWS IAM role specified with either the name or full ARN. The Amazon
                 SageMaker training jobs and APIs that create Amazon SageMaker
                 endpoints use this role to access training data and model
                 artifacts. After the endpoint is created, the inference code
                 might use the IAM role, if it needs to access an AWS resource.
-            entry_point (str): Path (absolute or relative) to the Python source
-                file which should be executed as the entry point to model
+            entry_point (str): The absolute or relative path to the Python source
+                file that should be executed as the entry point to model
                 hosting. If ``source_dir`` is specified, then ``entry_point``
                 must point to a file located at the root of ``source_dir``.
                 Defaults to None.
-            transformers_version (str): transformers version you want to use for
+            transformers_version (str): Transformers version you want to use for
                 executing your model training code. Defaults to None. Required
                 unless ``image_uri`` is provided.
             tensorflow_version (str): TensorFlow version you want to use for
@@ -132,7 +132,7 @@ def __init__(
             py_version (str): Python version you want to use for executing your
                 model training code. Defaults to ``None``. Required unless
                 ``image_uri`` is provided.
-            image_uri (str): A Docker image URI (default: None). If not specified, a
+            image_uri (str): A Docker image URI. Defaults to None. If not specified, a
                 default image for PyTorch will be used. If ``framework_version``
                 or ``py_version`` are ``None``, then ``image_uri`` is required. If
                 also ``None``, then a ``ValueError`` will be raised.
@@ -197,19 +197,21 @@ def register(
             transform_instances (list): A list of the instance types on which a transformation
                 job can be run or on which an endpoint can be deployed.
             model_package_name (str): Model Package name, exclusive to `model_package_group_name`,
-                using `model_package_name` makes the Model Package un-versioned (default: None).
+                using `model_package_name` makes the Model Package un-versioned.
+                Defaults to ``None``.
             model_package_group_name (str): Model Package Group name, exclusive to
                 `model_package_name`, using `model_package_group_name` makes the Model Package
-                versioned (default: None).
-            image_uri (str): Inference image uri for the container. Model class' self.image will
-                be used if it is None (default: None).
-            model_metrics (ModelMetrics): ModelMetrics object (default: None).
-            metadata_properties (MetadataProperties): MetadataProperties object (default: None).
+                versioned. Defaults to ``None``.
+            image_uri (str): Inference image URI for the container. Model class' self.image will
+                be used if it is None. Defaults to ``None``.
+            model_metrics (ModelMetrics): ModelMetrics object. Defaults to ``None``.
+            metadata_properties (MetadataProperties): MetadataProperties object.
+                Defaults to ``None``.
             marketplace_cert (bool): A boolean value indicating if the Model Package is certified
-                for AWS Marketplace (default: False).
+                for AWS Marketplace. Defaults to ``False``.
             approval_status (str): Model Approval Status, values can be "Approved", "Rejected",
-                or "PendingManualApproval" (default: "PendingManualApproval").
-            description (str): Model Package description (default: None).
+                or "PendingManualApproval". Defaults to ``PendingManualApproval``.
+            description (str): Model Package description. Defaults to ``None``.
 
         Returns:
             A `sagemaker.model.ModelPackage` instance.

src/sagemaker/model.py

@@ -559,7 +559,7 @@ def compile(
         role,
         tags=None,
         job_name=None,
-        compile_max_run=5 * 60,
+        compile_max_run=15 * 60,
         framework=None,
         framework_version=None,
         target_platform_os=None,
@@ -588,7 +588,7 @@ def compile(
                 https://docs.aws.amazon.com/sagemaker/latest/dg/API_Tag.html.
             job_name (str): The name of the compilation job
             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.
             framework (str): The framework that is used to train the original
                 model. Allowed values: 'mxnet', 'tensorflow', 'keras', 'pytorch',

src/sagemaker/model_monitor/clarify_model_monitoring.py

@@ -1248,6 +1248,7 @@ def suggested_constraints(self, file_name=None, kms_key=None):
         """Returns a sagemaker.model_monitor.
 
         Constraints object representing the constraints JSON file generated by this baselining job.
+
         Args:
             file_name (str): Keep this parameter to align with method signature in super class,
                 but it will be ignored.

tests/integ/test_huggingface.py

@@ -108,9 +108,8 @@ def test_huggingface_training_tf(
         hf.fit(train_input)
 
 
-@pytest.mark.release
-@pytest.mark.skipif(
-    integ.test_region() in integ.TRAINING_NO_P2_REGIONS, reason="no ml.p2 instances in this region"
+@pytest.mark.skip(
+    reason="need to re enable it later",
 )
 def test_huggingface_inference(
     sagemaker_session,