Addition unit test fixups to remove cloudwtch metrics, add training_steps, fix Rule evaluator image, and instance count/type

Author: brightsparc

tests/integ/test_training_pipeline_estimators.py

@@ -115,7 +115,9 @@ def test_pca_estimator(sfn_client, sagemaker_session, sagemaker_role_arn, sfn_ro
         s3_output_path = 's3://{bucket_name}/{workflow_name}/models'.format(bucket_name=bucket_name, workflow_name=unique_name)
         expected_execution_info = {'executionArn': execution_arn,
          'stateMachineArn': state_machine_arn,
+         'inputDetails': {'included': True},
          'name': job_name,
+         'outputDetails': {'included': True},
          'status': status,
          'startDate': execution_info['startDate'],
          'stopDate': execution_info['stopDate'],

tests/unit/test_pipeline.py

@@ -66,6 +66,7 @@ def sklearn_preprocessor():
         role=SAGEMAKER_EXECUTION_ROLE,
         instance_type="ml.c4.xlarge",
         source_dir=source_dir,
+        sagemaker_session = sagemaker_session
     )
 
     sklearn_preprocessor.debugger_hook_config = DebuggerHookConfig(
@@ -334,11 +335,10 @@ def test_inference_pipeline(sklearn_preprocessor, linear_learner_estimator):
             },
             'HyperParameters': {
                 'sagemaker_container_log_level': '20',
-                'sagemaker_enable_cloudwatch_metrics': 'false',
                 'sagemaker_job_name': '"preprocessor-linear_learner"',
                 'sagemaker_program': '"sklearn_abalone_featurizer.py"',
                 'sagemaker_region': '"us-east-1"',
-                'sagemaker_submit_directory': '"s3://sagemaker/source"'
+                'sagemaker_submit_directory': '"s3://sagemaker/source"',
             },
             'InputDataConfig': [{
                 'ChannelName': 'train',
@@ -371,7 +371,6 @@ def test_inference_pipeline(sklearn_preprocessor, linear_learner_estimator):
             'PrimaryContainer': {
                 'Environment': {
                     'SAGEMAKER_CONTAINER_LOG_LEVEL': '20',
-                    'SAGEMAKER_ENABLE_CLOUDWATCH_METRICS': 'false',
                     'SAGEMAKER_PROGRAM': 'sklearn_abalone_featurizer.py',
                     'SAGEMAKER_REGION': 'us-east-1',
                     'SAGEMAKER_SUBMIT_DIRECTORY': 's3://sagemaker/source'
@@ -435,7 +434,6 @@ def test_inference_pipeline(sklearn_preprocessor, linear_learner_estimator):
                 {
                     'Environment': {
                         'SAGEMAKER_CONTAINER_LOG_LEVEL': '20',
-                        'SAGEMAKER_ENABLE_CLOUDWATCH_METRICS': 'false',
                         'SAGEMAKER_PROGRAM': 'sklearn_abalone_featurizer.py',
                         'SAGEMAKER_REGION': 'us-east-1',
                         'SAGEMAKER_SUBMIT_DIRECTORY': 's3://sagemaker/source'

tests/unit/test_sagemaker_steps.py

@@ -119,8 +119,8 @@ def pca_estimator_with_falsy_debug_hook():
     pca = sagemaker.estimator.Estimator(
         PCA_IMAGE,
         role=EXECUTION_ROLE,
-        train_instance_count=1,
-        train_instance_type='ml.c4.xlarge',
+        instance_count=1,
+        instance_type='ml.c4.xlarge',
         output_path=s3_output_location,
         debugger_hook_config = False
     )
@@ -298,7 +298,7 @@ def test_training_step_creation_with_debug_hook(pca_estimator_with_debug_hook):
             'DebugRuleConfigurations': [
                 {
                     'RuleConfigurationName': 'Confusion',
-                    'RuleEvaluatorImage': '199566480951.dkr.ecr.us-east-1.amazonaws.com/sagemaker-debugger-rules:latest',
+                    'RuleEvaluatorImage': '503895931360.dkr.ecr.us-east-1.amazonaws.com/sagemaker-debugger-rules:latest',
                     'RuleParameters': {
                         'rule_to_invoke': 'Confusion',
                         'category_no': '15',
@@ -449,13 +449,14 @@ def test_training_step_creation_with_framework(tensorflow_estimator):
             },
             'RoleArn': EXECUTION_ROLE,
             'HyperParameters': {
-                'model_dir': '"s3://sagemaker/models/tensorflow-job/model"',
+                'checkpoint_path': '"s3://sagemaker/models/sagemaker-tensorflow/checkpoints"',
+                'evaluation_steps': '100',
                 'sagemaker_container_log_level': '20',
-                'sagemaker_enable_cloudwatch_metrics': 'false',
                 'sagemaker_job_name': '"tensorflow-job"',
                 'sagemaker_program': '"tf_train.py"',
                 'sagemaker_region': '"us-east-1"',
-                'sagemaker_submit_directory': '"s3://sagemaker/source"'
+                'sagemaker_submit_directory': '"s3://sagemaker/source"',
+                'training_steps': '1000',
             },
             'TrainingJobName': 'tensorflow-job',
             'Tags': DEFAULT_TAGS_LIST
@@ -557,7 +558,6 @@ def test_get_expected_model_with_framework_estimator(tensorflow_estimator):
                 'Environment': {
                     'SAGEMAKER_PROGRAM': 'tf_train.py',
                     'SAGEMAKER_SUBMIT_DIRECTORY': 's3://sagemaker/tensorflow-job/source/sourcedir.tar.gz',
-                    'SAGEMAKER_ENABLE_CLOUDWATCH_METRICS': 'false',
                     'SAGEMAKER_CONTAINER_LOG_LEVEL': '20',
                     'SAGEMAKER_REGION': 'us-east-1',
                 },