Merge branch 'master' into tf-script-mode

Author: icywang86rui

CHANGELOG.rst

@@ -3,12 +3,15 @@ CHANGELOG
 =========
 
 1.14.3-dev
-=====
+======
 
+* bug-fix: Changes to use correct S3 bucket and time range for dataframes in TrainingJobAnalytics.
 * bug-fix: Local Mode: correctly handle the case where the model output folder doesn't exist yet
+* doc-fix: Fix typos in tensorflow serving documentation
+* doc-fix: Add estimator base classes to API docs
 
 1.14.2
-=====
+======
 
 * bug-fix: support ``CustomAttributes`` argument in local mode ``invoke_endpoint`` requests
 * enhancement: add ``content_type`` parameter to ``sagemaker.tensorflow.serving.Predictor``
@@ -22,7 +25,7 @@ CHANGELOG
 * enhancement: Session: remove hardcoded 'training' from job status error message
 * bug-fix: Updated Cloudwatch namespace for metrics in TrainingJobsAnalytics
 * bug-fix: Changes to use correct s3 bucket and time range for dataframes in TrainingJobAnalytics.
-
+* enhancement: Remove MetricDefinition lookup via tuning job in TrainingJobAnalytics
 
 1.14.1
 ======

doc/estimators.rst

@@ -1,10 +1,22 @@
 Estimators
---------------------
+----------
 
 A high level interface for SageMaker training
 
+.. autoclass:: sagemaker.estimator.EstimatorBase
+    :members:
+    :undoc-members:
+    :show-inheritance:
+    :inherited-members:
+
 .. autoclass:: sagemaker.estimator.Estimator
     :members:
     :undoc-members:
     :show-inheritance:
     :inherited-members:
+
+.. autoclass:: sagemaker.estimator.Framework
+    :members:
+    :undoc-members:
+    :show-inheritance:
+    :inherited-members:

src/sagemaker/analytics.py

@@ -20,7 +20,7 @@
 from six import with_metaclass
 
 from sagemaker.session import Session
-from sagemaker.utils import DeferredError, extract_name_from_job_arn
+from sagemaker.utils import DeferredError
 
 try:
     import pandas as pd
@@ -310,18 +310,9 @@ def _add_single_metric(self, timestamp, metric_name, value):
     def _metric_names_for_training_job(self):
         """Helper method to discover the metrics defined for a training job.
         """
-        # First look up the tuning job
         training_description = self._sage_client.describe_training_job(TrainingJobName=self._training_job_name)
-        tuning_job_arn = training_description.get('TuningJobArn', None)
-        if not tuning_job_arn:
-            raise ValueError(
-                "No metrics available. Training Job Analytics only available through Hyperparameter Tuning Jobs"
-            )
-        tuning_job_name = extract_name_from_job_arn(tuning_job_arn)
-        tuning_job_description = self._sage_client.describe_hyper_parameter_tuning_job(
-            HyperParameterTuningJobName=tuning_job_name
-        )
-        training_job_definition = tuning_job_description['TrainingJobDefinition']
-        metric_definitions = training_job_definition['AlgorithmSpecification']['MetricDefinitions']
+
+        metric_definitions = training_description['AlgorithmSpecification']['MetricDefinitions']
         metric_names = [md['Name'] for md in metric_definitions]
+
         return metric_names

src/sagemaker/tensorflow/deploying_tensorflow_serving.rst

@@ -289,8 +289,8 @@ First, download the models and extract them:
 
 .. code:: bash
 
-  aws c3 cp s3://mybucket/models/model1/model.tar.gz model1.tar.gz
-  aws c3 cp s3://mybucket/models/model2/model.tar.gz model2.tar.gz
+  aws s3 cp s3://mybucket/models/model1/model.tar.gz model1.tar.gz
+  aws s3 cp s3://mybucket/models/model2/model.tar.gz model2.tar.gz
   mkdir -p multi/model1
   mkdir -p multi/model2
 

tests/unit/test_estimator.py

@@ -824,28 +824,21 @@ def test_generic_training_job_analytics(sagemaker_session):
     sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value={
         'TuningJobArn': 'arn:aws:sagemaker:us-west-2:968277160000:hyper-parameter-tuning-job/mock-tuner',
         'TrainingStartTime': 1530562991.299,
-    })
-    sagemaker_session.sagemaker_client.describe_hyper_parameter_tuning_job = Mock(
-        name='describe_hyper_parameter_tuning_job',
-        return_value={
-            'TrainingJobDefinition': {
-                "AlgorithmSpecification": {
-                    "TrainingImage": "some-image-url",
-                    "TrainingInputMode": "File",
-                    "MetricDefinitions": [
-                        {
-                            "Name": "train:loss",
-                            "Regex": "train_loss=([0-9]+\\.[0-9]+)"
-                        },
-                        {
-                            "Name": "validation:loss",
-                            "Regex": "valid_loss=([0-9]+\\.[0-9]+)"
-                        }
-                    ]
+        "AlgorithmSpecification": {
+            "TrainingImage": "some-image-url",
+            "TrainingInputMode": "File",
+            "MetricDefinitions": [
+                {
+                    "Name": "train:loss",
+                    "Regex": "train_loss=([0-9]+\\.[0-9]+)"
+                },
+                {
+                    "Name": "validation:loss",
+                    "Regex": "valid_loss=([0-9]+\\.[0-9]+)"
                 }
-            }
-        }
-    )
+            ]
+        },
+    })
 
     e = Estimator(IMAGE_NAME, ROLE, INSTANCE_COUNT, INSTANCE_TYPE, output_path=OUTPUT_PATH,
                   sagemaker_session=sagemaker_session)