fix: emit HyperparameterTuner tags to model and endpoint#803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jesterhazy merged 2 commits into from
May 21, 2019
Merged

fix: emit HyperparameterTuner tags to model and endpoint #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81fb7b1
feature: emit training jobs tags to estimator
imujjwal96 May 20, 2019
b0192b7
Merge branch 'master' into pulkit
jesterhazy May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/sagemaker/estimator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,8 @@ def attach(cls, training_job_name, sagemaker_session=None, model_channel_name='m

job_details = sagemaker_session.sagemaker_client.describe_training_job(TrainingJobName=training_job_name)
init_params = cls._prepare_init_params_from_job_description(job_details, model_channel_name)
tags = sagemaker_session.sagemaker_client.list_tags(ResourceArn=job_details['TrainingJobArn'])['Tags']
init_params.update(tags=tags)

estimator = cls(sagemaker_session=sagemaker_session, **init_params)
estimator.latest_training_job = _TrainingJob(sagemaker_session=sagemaker_session,
Expand Down
9 changes: 9 additions & 0 deletions tests/unit/test_chainer.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
{'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -65,6 +69,7 @@ def sagemaker_session():
session.sagemaker_client.describe_training_job = Mock(return_value=describe)
session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
session.expand_role = Mock(name="expand_role", return_value=ROLE)
return session
Expand DownExpand Up@@ -222,6 +227,7 @@ def test_attach_with_additional_hyperparameters(sagemaker_session, chainer_versi
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -404,6 +410,7 @@ def test_attach(sagemaker_session, chainer_version):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -446,6 +453,7 @@ def test_attach_wrong_framework(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -478,6 +486,7 @@ def test_attach_custom_image(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down
7 changes: 7 additions & 0 deletions tests/unit/test_estimator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {
'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -111,6 +112,10 @@
{'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


class DummyFramework(Framework):
__framework_name__ = 'dummy'
Expand DownExpand Up@@ -157,6 +162,7 @@ def sagemaker_session():
return_value=DESCRIBE_TRAINING_JOB_RESULT)
sms.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
sms.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
sms.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)

@jesterhazyjesterhazyMay 21, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the mock call is set up here, but there's no test that shows estimator uses the result of the call. adding an assert for this to test_attach_framework would cover this.

return sms


Expand DownExpand Up@@ -460,6 +466,7 @@ def test_attach_framework(sagemaker_session):
assert framework_estimator.subnets == ['foo']
assert framework_estimator.security_group_ids == ['bar']
assert framework_estimator.encrypt_inter_container_traffic is False
assert framework_estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_without_hyperparameters(sagemaker_session):
Expand Down
10 changes: 10 additions & 0 deletions tests/unit/test_mxnet.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
{'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -66,6 +70,7 @@ def sagemaker_session():
session.sagemaker_client.describe_training_job = Mock(return_value=describe)
session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)

@jesterhazyjesterhazyMay 21, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, there is no test that the tags actually get added to the estimator. adding an assert in test_attach would cover this. since we are testing parent class behavior, we don't need to add this for every framework, but it would be nice to test it in one of them.

session.wait_for_compilation_job = Mock(return_value=describe_compilation)
session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
session.expand_role = Mock(name="expand_role", return_value=ROLE)
Expand DownExpand Up@@ -346,6 +351,7 @@ def test_attach(sagemaker_session, mxnet_version):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {
'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'
Expand All@@ -369,6 +375,7 @@ def test_attach(sagemaker_session, mxnet_version):
assert estimator.hyperparameters()['training_steps'] == '100'
assert estimator.source_dir == 's3://some/sourcedir.tar.gz'
assert estimator.entry_point == 'iris-dnn-classifier.py'
assert estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_old_container(sagemaker_session):
Expand All@@ -392,6 +399,7 @@ def test_attach_old_container(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand DownExpand Up@@ -434,6 +442,7 @@ def test_attach_wrong_framework(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -465,6 +474,7 @@ def test_attach_custom_image(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand Down
8 changes: 8 additions & 0 deletions tests/unit/test_pytorch.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
{'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def fixture_sagemaker_session():
session.sagemaker_client.describe_training_job = Mock(return_value=describe)
session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
session.expand_role = Mock(name="expand_role", return_value=ROLE)
return session
Expand DownExpand Up@@ -306,6 +311,7 @@ def test_attach(sagemaker_session, pytorch_version):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -348,6 +354,7 @@ def test_attach_wrong_framework(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -380,6 +387,7 @@ def test_attach_custom_image(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down
8 changes: 8 additions & 0 deletions tests/unit/test_rl.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,10 @@
{'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -60,6 +64,7 @@ def fixture_sagemaker_session():
session.sagemaker_client.describe_training_job = Mock(return_value=describe)
session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
session.expand_role = Mock(name="expand_role", return_value=ROLE)
return session
Expand DownExpand Up@@ -360,6 +365,7 @@ def test_attach(sagemaker_session, rl_coach_mxnet_version):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {
Expand DownExpand Up@@ -406,6 +412,7 @@ def test_attach_wrong_framework(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -438,6 +445,7 @@ def test_attach_custom_image(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig':
{'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
Expand Down
8 changes: 8 additions & 0 deletions tests/unit/test_sklearn.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
{'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def sagemaker_session():
session.sagemaker_client.describe_training_job = Mock(return_value=describe)
session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
session.expand_role = Mock(name="expand_role", return_value=ROLE)
return session
Expand DownExpand Up@@ -311,6 +316,7 @@ def test_attach(sagemaker_session, sklearn_version):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -353,6 +359,7 @@ def test_attach_wrong_framework(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -385,6 +392,7 @@ def test_attach_custom_image(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down
11 changes: 11 additions & 0 deletions tests/unit/test_tf_estimator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,10 @@
{'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -69,6 +73,7 @@ def sagemaker_session():
session.sagemaker_client.describe_training_job = Mock(return_value=describe)
session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
return session


Expand DownExpand Up@@ -496,6 +501,7 @@ def test_attach(sagemaker_session, tf_version):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -544,6 +550,7 @@ def test_attach_new_repo_name(sagemaker_session, tf_version):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -593,6 +600,7 @@ def test_attach_old_container(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -642,6 +650,7 @@ def test_attach_wrong_framework(sagemaker_session):
},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {
'KmsKeyId': '',
'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -681,6 +690,7 @@ def test_attach_custom_image(sagemaker_session):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -856,6 +866,7 @@ def test_tf_script_mode_attach(sagemaker_session, tf_version):
'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
'TrainingJobName': 'neo',
'TrainingJobStatus': 'Completed',
'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: emit HyperparameterTuner tags to model and endpoint#803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jesterhazy
merged 2 commits into

from

May 21, 2019
 Merged


fix: emit HyperparameterTuner tags to model and endpoint
#803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81fb7b1

feature: emit training jobs tags to estimator


imujjwal96 May 20, 2019
b0192b7

Merge branch 'master' into pulkit


jesterhazy May 21, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,8 @@ def attach(cls, training_job_name, sagemaker_session=None, model_channel_name='m

 job_details = sagemaker_session.sagemaker_client.describe_training_job(TrainingJobName=training_job_name)
 init_params = cls._prepare_init_params_from_job_description(job_details, model_channel_name)
 tags = sagemaker_session.sagemaker_client.list_tags(ResourceArn=job_details['TrainingJobArn'])['Tags']
 init_params.update(tags=tags)

 estimator = cls(sagemaker_session=sagemaker_session, **init_params)
 estimator.latest_training_job = _TrainingJob(sagemaker_session=sagemaker_session,
Expand Down

9 changes: 9 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -65,6 +69,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -222,6 +227,7 @@ def test_attach_with_additional_hyperparameters(sagemaker_session, chainer_versi
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -404,6 +410,7 @@ def test_attach(sagemaker_session, chainer_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -446,6 +453,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -478,6 +486,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

7 changes: 7 additions & 0 deletions
tests/unit/test_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -111,6 +112,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


class DummyFramework(Framework):
 __framework_name__ = 'dummy'
Expand DownExpand Up@@ -157,6 +162,7 @@ def sagemaker_session():
 return_value=DESCRIBE_TRAINING_JOB_RESULT)
 sms.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 sms.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 sms.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the mock call is set up here, but there's no test that shows estimator uses the result of the call. adding an assert for this to test_attach_framework would cover this.
 return sms


Expand DownExpand Up@@ -460,6 +466,7 @@ def test_attach_framework(sagemaker_session):
 assert framework_estimator.subnets == ['foo']
 assert framework_estimator.security_group_ids == ['bar']
 assert framework_estimator.encrypt_inter_container_traffic is False
 assert framework_estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_without_hyperparameters(sagemaker_session):
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -66,6 +70,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, there is no test that the tags actually get added to the estimator. adding an assert in test_attach would cover this. since we are testing parent class behavior, we don't need to add this for every framework, but it would be nice to test it in one of them.
 session.wait_for_compilation_job = Mock(return_value=describe_compilation)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
Expand DownExpand Up@@ -346,6 +351,7 @@ def test_attach(sagemaker_session, mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand All@@ -369,6 +375,7 @@ def test_attach(sagemaker_session, mxnet_version):
 assert estimator.hyperparameters()['training_steps'] == '100'
 assert estimator.source_dir == 's3://some/sourcedir.tar.gz'
 assert estimator.entry_point == 'iris-dnn-classifier.py'
 assert estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_old_container(sagemaker_session):
Expand All@@ -392,6 +399,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand DownExpand Up@@ -434,6 +442,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -465,6 +474,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -306,6 +311,7 @@ def test_attach(sagemaker_session, pytorch_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -348,6 +354,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -380,6 +387,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -60,6 +64,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -360,6 +365,7 @@ def test_attach(sagemaker_session, rl_coach_mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {
Expand DownExpand Up@@ -406,6 +412,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -438,6 +445,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig':
 {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_sklearn.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -311,6 +316,7 @@ def test_attach(sagemaker_session, sklearn_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -353,6 +359,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -385,6 +392,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

11 changes: 11 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -69,6 +73,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 return session


Expand DownExpand Up@@ -496,6 +501,7 @@ def test_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -544,6 +550,7 @@ def test_attach_new_repo_name(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -593,6 +600,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -642,6 +650,7 @@ def test_attach_wrong_framework(sagemaker_session):
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -681,6 +690,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -856,6 +866,7 @@ def test_tf_script_mode_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: emit HyperparameterTuner tags to model and endpoint#803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jesterhazy
merged 2 commits into

from

May 21, 2019
 Merged


fix: emit HyperparameterTuner tags to model and endpoint
#803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81fb7b1

feature: emit training jobs tags to estimator


imujjwal96 May 20, 2019
b0192b7

Merge branch 'master' into pulkit


jesterhazy May 21, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,8 @@ def attach(cls, training_job_name, sagemaker_session=None, model_channel_name='m

 job_details = sagemaker_session.sagemaker_client.describe_training_job(TrainingJobName=training_job_name)
 init_params = cls._prepare_init_params_from_job_description(job_details, model_channel_name)
 tags = sagemaker_session.sagemaker_client.list_tags(ResourceArn=job_details['TrainingJobArn'])['Tags']
 init_params.update(tags=tags)

 estimator = cls(sagemaker_session=sagemaker_session, **init_params)
 estimator.latest_training_job = _TrainingJob(sagemaker_session=sagemaker_session,
Expand Down

9 changes: 9 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -65,6 +69,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -222,6 +227,7 @@ def test_attach_with_additional_hyperparameters(sagemaker_session, chainer_versi
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -404,6 +410,7 @@ def test_attach(sagemaker_session, chainer_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -446,6 +453,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -478,6 +486,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

7 changes: 7 additions & 0 deletions
tests/unit/test_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -111,6 +112,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


class DummyFramework(Framework):
 __framework_name__ = 'dummy'
Expand DownExpand Up@@ -157,6 +162,7 @@ def sagemaker_session():
 return_value=DESCRIBE_TRAINING_JOB_RESULT)
 sms.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 sms.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 sms.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the mock call is set up here, but there's no test that shows estimator uses the result of the call. adding an assert for this to test_attach_framework would cover this.
 return sms


Expand DownExpand Up@@ -460,6 +466,7 @@ def test_attach_framework(sagemaker_session):
 assert framework_estimator.subnets == ['foo']
 assert framework_estimator.security_group_ids == ['bar']
 assert framework_estimator.encrypt_inter_container_traffic is False
 assert framework_estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_without_hyperparameters(sagemaker_session):
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -66,6 +70,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, there is no test that the tags actually get added to the estimator. adding an assert in test_attach would cover this. since we are testing parent class behavior, we don't need to add this for every framework, but it would be nice to test it in one of them.
 session.wait_for_compilation_job = Mock(return_value=describe_compilation)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
Expand DownExpand Up@@ -346,6 +351,7 @@ def test_attach(sagemaker_session, mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand All@@ -369,6 +375,7 @@ def test_attach(sagemaker_session, mxnet_version):
 assert estimator.hyperparameters()['training_steps'] == '100'
 assert estimator.source_dir == 's3://some/sourcedir.tar.gz'
 assert estimator.entry_point == 'iris-dnn-classifier.py'
 assert estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_old_container(sagemaker_session):
Expand All@@ -392,6 +399,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand DownExpand Up@@ -434,6 +442,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -465,6 +474,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -306,6 +311,7 @@ def test_attach(sagemaker_session, pytorch_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -348,6 +354,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -380,6 +387,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -60,6 +64,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -360,6 +365,7 @@ def test_attach(sagemaker_session, rl_coach_mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {
Expand DownExpand Up@@ -406,6 +412,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -438,6 +445,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig':
 {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_sklearn.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -311,6 +316,7 @@ def test_attach(sagemaker_session, sklearn_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -353,6 +359,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -385,6 +392,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

11 changes: 11 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -69,6 +73,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 return session


Expand DownExpand Up@@ -496,6 +501,7 @@ def test_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -544,6 +550,7 @@ def test_attach_new_repo_name(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -593,6 +600,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -642,6 +650,7 @@ def test_attach_wrong_framework(sagemaker_session):
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -681,6 +690,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -856,6 +866,7 @@ def test_tf_script_mode_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: emit HyperparameterTuner tags to model and endpoint#803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jesterhazy
merged 2 commits into

from

May 21, 2019
 Merged


fix: emit HyperparameterTuner tags to model and endpoint
#803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81fb7b1

feature: emit training jobs tags to estimator


imujjwal96 May 20, 2019
b0192b7

Merge branch 'master' into pulkit


jesterhazy May 21, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,8 @@ def attach(cls, training_job_name, sagemaker_session=None, model_channel_name='m

 job_details = sagemaker_session.sagemaker_client.describe_training_job(TrainingJobName=training_job_name)
 init_params = cls._prepare_init_params_from_job_description(job_details, model_channel_name)
 tags = sagemaker_session.sagemaker_client.list_tags(ResourceArn=job_details['TrainingJobArn'])['Tags']
 init_params.update(tags=tags)

 estimator = cls(sagemaker_session=sagemaker_session, **init_params)
 estimator.latest_training_job = _TrainingJob(sagemaker_session=sagemaker_session,
Expand Down

9 changes: 9 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -65,6 +69,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -222,6 +227,7 @@ def test_attach_with_additional_hyperparameters(sagemaker_session, chainer_versi
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -404,6 +410,7 @@ def test_attach(sagemaker_session, chainer_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -446,6 +453,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -478,6 +486,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

7 changes: 7 additions & 0 deletions
tests/unit/test_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -111,6 +112,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


class DummyFramework(Framework):
 __framework_name__ = 'dummy'
Expand DownExpand Up@@ -157,6 +162,7 @@ def sagemaker_session():
 return_value=DESCRIBE_TRAINING_JOB_RESULT)
 sms.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 sms.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 sms.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the mock call is set up here, but there's no test that shows estimator uses the result of the call. adding an assert for this to test_attach_framework would cover this.
 return sms


Expand DownExpand Up@@ -460,6 +466,7 @@ def test_attach_framework(sagemaker_session):
 assert framework_estimator.subnets == ['foo']
 assert framework_estimator.security_group_ids == ['bar']
 assert framework_estimator.encrypt_inter_container_traffic is False
 assert framework_estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_without_hyperparameters(sagemaker_session):
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -66,6 +70,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, there is no test that the tags actually get added to the estimator. adding an assert in test_attach would cover this. since we are testing parent class behavior, we don't need to add this for every framework, but it would be nice to test it in one of them.
 session.wait_for_compilation_job = Mock(return_value=describe_compilation)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
Expand DownExpand Up@@ -346,6 +351,7 @@ def test_attach(sagemaker_session, mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand All@@ -369,6 +375,7 @@ def test_attach(sagemaker_session, mxnet_version):
 assert estimator.hyperparameters()['training_steps'] == '100'
 assert estimator.source_dir == 's3://some/sourcedir.tar.gz'
 assert estimator.entry_point == 'iris-dnn-classifier.py'
 assert estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_old_container(sagemaker_session):
Expand All@@ -392,6 +399,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand DownExpand Up@@ -434,6 +442,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -465,6 +474,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -306,6 +311,7 @@ def test_attach(sagemaker_session, pytorch_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -348,6 +354,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -380,6 +387,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -60,6 +64,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -360,6 +365,7 @@ def test_attach(sagemaker_session, rl_coach_mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {
Expand DownExpand Up@@ -406,6 +412,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -438,6 +445,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig':
 {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_sklearn.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -311,6 +316,7 @@ def test_attach(sagemaker_session, sklearn_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -353,6 +359,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -385,6 +392,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

11 changes: 11 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -69,6 +73,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 return session


Expand DownExpand Up@@ -496,6 +501,7 @@ def test_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -544,6 +550,7 @@ def test_attach_new_repo_name(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -593,6 +600,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -642,6 +650,7 @@ def test_attach_wrong_framework(sagemaker_session):
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -681,6 +690,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -856,6 +866,7 @@ def test_tf_script_mode_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: emit HyperparameterTuner tags to model and endpoint#803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jesterhazy
merged 2 commits into

from

May 21, 2019
 Merged


fix: emit HyperparameterTuner tags to model and endpoint
#803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81fb7b1

feature: emit training jobs tags to estimator


imujjwal96 May 20, 2019
b0192b7

Merge branch 'master' into pulkit


jesterhazy May 21, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,8 @@ def attach(cls, training_job_name, sagemaker_session=None, model_channel_name='m

 job_details = sagemaker_session.sagemaker_client.describe_training_job(TrainingJobName=training_job_name)
 init_params = cls._prepare_init_params_from_job_description(job_details, model_channel_name)
 tags = sagemaker_session.sagemaker_client.list_tags(ResourceArn=job_details['TrainingJobArn'])['Tags']
 init_params.update(tags=tags)

 estimator = cls(sagemaker_session=sagemaker_session, **init_params)
 estimator.latest_training_job = _TrainingJob(sagemaker_session=sagemaker_session,
Expand Down

9 changes: 9 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -65,6 +69,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -222,6 +227,7 @@ def test_attach_with_additional_hyperparameters(sagemaker_session, chainer_versi
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -404,6 +410,7 @@ def test_attach(sagemaker_session, chainer_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -446,6 +453,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -478,6 +486,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

7 changes: 7 additions & 0 deletions
tests/unit/test_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -111,6 +112,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


class DummyFramework(Framework):
 __framework_name__ = 'dummy'
Expand DownExpand Up@@ -157,6 +162,7 @@ def sagemaker_session():
 return_value=DESCRIBE_TRAINING_JOB_RESULT)
 sms.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 sms.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 sms.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the mock call is set up here, but there's no test that shows estimator uses the result of the call. adding an assert for this to test_attach_framework would cover this.
 return sms


Expand DownExpand Up@@ -460,6 +466,7 @@ def test_attach_framework(sagemaker_session):
 assert framework_estimator.subnets == ['foo']
 assert framework_estimator.security_group_ids == ['bar']
 assert framework_estimator.encrypt_inter_container_traffic is False
 assert framework_estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_without_hyperparameters(sagemaker_session):
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -66,6 +70,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, there is no test that the tags actually get added to the estimator. adding an assert in test_attach would cover this. since we are testing parent class behavior, we don't need to add this for every framework, but it would be nice to test it in one of them.
 session.wait_for_compilation_job = Mock(return_value=describe_compilation)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
Expand DownExpand Up@@ -346,6 +351,7 @@ def test_attach(sagemaker_session, mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand All@@ -369,6 +375,7 @@ def test_attach(sagemaker_session, mxnet_version):
 assert estimator.hyperparameters()['training_steps'] == '100'
 assert estimator.source_dir == 's3://some/sourcedir.tar.gz'
 assert estimator.entry_point == 'iris-dnn-classifier.py'
 assert estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_old_container(sagemaker_session):
Expand All@@ -392,6 +399,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand DownExpand Up@@ -434,6 +442,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -465,6 +474,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -306,6 +311,7 @@ def test_attach(sagemaker_session, pytorch_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -348,6 +354,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -380,6 +387,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -60,6 +64,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -360,6 +365,7 @@ def test_attach(sagemaker_session, rl_coach_mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {
Expand DownExpand Up@@ -406,6 +412,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -438,6 +445,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig':
 {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_sklearn.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -311,6 +316,7 @@ def test_attach(sagemaker_session, sklearn_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -353,6 +359,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -385,6 +392,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

11 changes: 11 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -69,6 +73,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 return session


Expand DownExpand Up@@ -496,6 +501,7 @@ def test_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -544,6 +550,7 @@ def test_attach_new_repo_name(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -593,6 +600,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -642,6 +650,7 @@ def test_attach_wrong_framework(sagemaker_session):
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -681,6 +690,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -856,6 +866,7 @@ def test_tf_script_mode_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: emit HyperparameterTuner tags to model and endpoint#803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jesterhazy
merged 2 commits into

from

May 21, 2019
 Merged


fix: emit HyperparameterTuner tags to model and endpoint
#803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81fb7b1

feature: emit training jobs tags to estimator


imujjwal96 May 20, 2019
b0192b7

Merge branch 'master' into pulkit


jesterhazy May 21, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,8 @@ def attach(cls, training_job_name, sagemaker_session=None, model_channel_name='m

 job_details = sagemaker_session.sagemaker_client.describe_training_job(TrainingJobName=training_job_name)
 init_params = cls._prepare_init_params_from_job_description(job_details, model_channel_name)
 tags = sagemaker_session.sagemaker_client.list_tags(ResourceArn=job_details['TrainingJobArn'])['Tags']
 init_params.update(tags=tags)

 estimator = cls(sagemaker_session=sagemaker_session, **init_params)
 estimator.latest_training_job = _TrainingJob(sagemaker_session=sagemaker_session,
Expand Down

9 changes: 9 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -65,6 +69,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -222,6 +227,7 @@ def test_attach_with_additional_hyperparameters(sagemaker_session, chainer_versi
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -404,6 +410,7 @@ def test_attach(sagemaker_session, chainer_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -446,6 +453,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -478,6 +486,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

7 changes: 7 additions & 0 deletions
tests/unit/test_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -111,6 +112,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


class DummyFramework(Framework):
 __framework_name__ = 'dummy'
Expand DownExpand Up@@ -157,6 +162,7 @@ def sagemaker_session():
 return_value=DESCRIBE_TRAINING_JOB_RESULT)
 sms.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 sms.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 sms.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the mock call is set up here, but there's no test that shows estimator uses the result of the call. adding an assert for this to test_attach_framework would cover this.
 return sms


Expand DownExpand Up@@ -460,6 +466,7 @@ def test_attach_framework(sagemaker_session):
 assert framework_estimator.subnets == ['foo']
 assert framework_estimator.security_group_ids == ['bar']
 assert framework_estimator.encrypt_inter_container_traffic is False
 assert framework_estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_without_hyperparameters(sagemaker_session):
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -66,6 +70,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, there is no test that the tags actually get added to the estimator. adding an assert in test_attach would cover this. since we are testing parent class behavior, we don't need to add this for every framework, but it would be nice to test it in one of them.
 session.wait_for_compilation_job = Mock(return_value=describe_compilation)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
Expand DownExpand Up@@ -346,6 +351,7 @@ def test_attach(sagemaker_session, mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand All@@ -369,6 +375,7 @@ def test_attach(sagemaker_session, mxnet_version):
 assert estimator.hyperparameters()['training_steps'] == '100'
 assert estimator.source_dir == 's3://some/sourcedir.tar.gz'
 assert estimator.entry_point == 'iris-dnn-classifier.py'
 assert estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_old_container(sagemaker_session):
Expand All@@ -392,6 +399,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand DownExpand Up@@ -434,6 +442,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -465,6 +474,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -306,6 +311,7 @@ def test_attach(sagemaker_session, pytorch_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -348,6 +354,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -380,6 +387,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -60,6 +64,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -360,6 +365,7 @@ def test_attach(sagemaker_session, rl_coach_mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {
Expand DownExpand Up@@ -406,6 +412,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -438,6 +445,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig':
 {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_sklearn.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -311,6 +316,7 @@ def test_attach(sagemaker_session, sklearn_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -353,6 +359,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -385,6 +392,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

11 changes: 11 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -69,6 +73,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 return session


Expand DownExpand Up@@ -496,6 +501,7 @@ def test_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -544,6 +550,7 @@ def test_attach_new_repo_name(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -593,6 +600,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -642,6 +650,7 @@ def test_attach_wrong_framework(sagemaker_session):
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -681,6 +690,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -856,6 +866,7 @@ def test_tf_script_mode_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: emit HyperparameterTuner tags to model and endpoint#803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jesterhazy
merged 2 commits into

from

May 21, 2019
 Merged


fix: emit HyperparameterTuner tags to model and endpoint
#803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81fb7b1

feature: emit training jobs tags to estimator


imujjwal96 May 20, 2019
b0192b7

Merge branch 'master' into pulkit


jesterhazy May 21, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,8 @@ def attach(cls, training_job_name, sagemaker_session=None, model_channel_name='m

 job_details = sagemaker_session.sagemaker_client.describe_training_job(TrainingJobName=training_job_name)
 init_params = cls._prepare_init_params_from_job_description(job_details, model_channel_name)
 tags = sagemaker_session.sagemaker_client.list_tags(ResourceArn=job_details['TrainingJobArn'])['Tags']
 init_params.update(tags=tags)

 estimator = cls(sagemaker_session=sagemaker_session, **init_params)
 estimator.latest_training_job = _TrainingJob(sagemaker_session=sagemaker_session,
Expand Down

9 changes: 9 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -65,6 +69,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -222,6 +227,7 @@ def test_attach_with_additional_hyperparameters(sagemaker_session, chainer_versi
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -404,6 +410,7 @@ def test_attach(sagemaker_session, chainer_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -446,6 +453,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -478,6 +486,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

7 changes: 7 additions & 0 deletions
tests/unit/test_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -111,6 +112,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


class DummyFramework(Framework):
 __framework_name__ = 'dummy'
Expand DownExpand Up@@ -157,6 +162,7 @@ def sagemaker_session():
 return_value=DESCRIBE_TRAINING_JOB_RESULT)
 sms.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 sms.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 sms.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the mock call is set up here, but there's no test that shows estimator uses the result of the call. adding an assert for this to test_attach_framework would cover this.
 return sms


Expand DownExpand Up@@ -460,6 +466,7 @@ def test_attach_framework(sagemaker_session):
 assert framework_estimator.subnets == ['foo']
 assert framework_estimator.security_group_ids == ['bar']
 assert framework_estimator.encrypt_inter_container_traffic is False
 assert framework_estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_without_hyperparameters(sagemaker_session):
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -66,6 +70,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, there is no test that the tags actually get added to the estimator. adding an assert in test_attach would cover this. since we are testing parent class behavior, we don't need to add this for every framework, but it would be nice to test it in one of them.
 session.wait_for_compilation_job = Mock(return_value=describe_compilation)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
Expand DownExpand Up@@ -346,6 +351,7 @@ def test_attach(sagemaker_session, mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand All@@ -369,6 +375,7 @@ def test_attach(sagemaker_session, mxnet_version):
 assert estimator.hyperparameters()['training_steps'] == '100'
 assert estimator.source_dir == 's3://some/sourcedir.tar.gz'
 assert estimator.entry_point == 'iris-dnn-classifier.py'
 assert estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_old_container(sagemaker_session):
Expand All@@ -392,6 +399,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand DownExpand Up@@ -434,6 +442,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -465,6 +474,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -306,6 +311,7 @@ def test_attach(sagemaker_session, pytorch_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -348,6 +354,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -380,6 +387,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -60,6 +64,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -360,6 +365,7 @@ def test_attach(sagemaker_session, rl_coach_mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {
Expand DownExpand Up@@ -406,6 +412,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -438,6 +445,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig':
 {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_sklearn.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -311,6 +316,7 @@ def test_attach(sagemaker_session, sklearn_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -353,6 +359,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -385,6 +392,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

11 changes: 11 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -69,6 +73,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 return session


Expand DownExpand Up@@ -496,6 +501,7 @@ def test_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -544,6 +550,7 @@ def test_attach_new_repo_name(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -593,6 +600,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -642,6 +650,7 @@ def test_attach_wrong_framework(sagemaker_session):
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -681,6 +690,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -856,6 +866,7 @@ def test_tf_script_mode_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: emit HyperparameterTuner tags to model and endpoint#803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jesterhazy
merged 2 commits into

from

May 21, 2019
 Merged


fix: emit HyperparameterTuner tags to model and endpoint
#803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
81fb7b1

feature: emit training jobs tags to estimator


imujjwal96 May 20, 2019
b0192b7

Merge branch 'master' into pulkit


jesterhazy May 21, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
src/sagemaker/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,6 +320,8 @@ def attach(cls, training_job_name, sagemaker_session=None, model_channel_name='m

 job_details = sagemaker_session.sagemaker_client.describe_training_job(TrainingJobName=training_job_name)
 init_params = cls._prepare_init_params_from_job_description(job_details, model_channel_name)
 tags = sagemaker_session.sagemaker_client.list_tags(ResourceArn=job_details['TrainingJobArn'])['Tags']
 init_params.update(tags=tags)

 estimator = cls(sagemaker_session=sagemaker_session, **init_params)
 estimator.latest_training_job = _TrainingJob(sagemaker_session=sagemaker_session,
Expand Down

9 changes: 9 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -65,6 +69,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -222,6 +227,7 @@ def test_attach_with_additional_hyperparameters(sagemaker_session, chainer_versi
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -404,6 +410,7 @@ def test_attach(sagemaker_session, chainer_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -446,6 +453,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -478,6 +486,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

7 changes: 7 additions & 0 deletions
tests/unit/test_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,7 @@
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -111,6 +112,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


class DummyFramework(Framework):
 __framework_name__ = 'dummy'
Expand DownExpand Up@@ -157,6 +162,7 @@ def sagemaker_session():
 return_value=DESCRIBE_TRAINING_JOB_RESULT)
 sms.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 sms.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 sms.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the mock call is set up here, but there's no test that shows estimator uses the result of the call. adding an assert for this to test_attach_framework would cover this.
 return sms


Expand DownExpand Up@@ -460,6 +466,7 @@ def test_attach_framework(sagemaker_session):
 assert framework_estimator.subnets == ['foo']
 assert framework_estimator.security_group_ids == ['bar']
 assert framework_estimator.encrypt_inter_container_traffic is False
 assert framework_estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_without_hyperparameters(sagemaker_session):
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -66,6 +70,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
@jesterhazyjesterhazyMay 21, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, there is no test that the tags actually get added to the estimator. adding an assert in test_attach would cover this. since we are testing parent class behavior, we don't need to add this for every framework, but it would be nice to test it in one of them.
 session.wait_for_compilation_job = Mock(return_value=describe_compilation)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
Expand DownExpand Up@@ -346,6 +351,7 @@ def test_attach(sagemaker_session, mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand All@@ -369,6 +375,7 @@ def test_attach(sagemaker_session, mxnet_version):
 assert estimator.hyperparameters()['training_steps'] == '100'
 assert estimator.source_dir == 's3://some/sourcedir.tar.gz'
 assert estimator.entry_point == 'iris-dnn-classifier.py'
 assert estimator.tags == LIST_TAGS_RESULT['Tags']


def test_attach_old_container(sagemaker_session):
Expand All@@ -392,6 +399,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand DownExpand Up@@ -434,6 +442,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -465,6 +474,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job',
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -306,6 +311,7 @@ def test_attach(sagemaker_session, pytorch_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -348,6 +354,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -380,6 +387,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_rl.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,6 +49,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture(name='sagemaker_session')
def fixture_sagemaker_session():
Expand All@@ -60,6 +64,7 @@ def fixture_sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -360,6 +365,7 @@ def test_attach(sagemaker_session, rl_coach_mxnet_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {
Expand DownExpand Up@@ -406,6 +412,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -438,6 +445,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig':
 {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
Expand Down

8 changes: 8 additions & 0 deletions
tests/unit/test_sklearn.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -63,6 +67,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 session.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
 session.expand_role = Mock(name="expand_role", return_value=ROLE)
 return session
Expand DownExpand Up@@ -311,6 +316,7 @@ def test_attach(sagemaker_session, sklearn_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -353,6 +359,7 @@ def test_attach_wrong_framework(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand DownExpand Up@@ -385,6 +392,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
Expand Down

11 changes: 11 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,10 @@
 {'ModelName': 'model-2'}]
}

LIST_TAGS_RESULT = {
 'Tags': [{'Key': 'TagtestKey', 'Value': 'TagtestValue'}]
}


@pytest.fixture()
def sagemaker_session():
Expand All@@ -69,6 +73,7 @@ def sagemaker_session():
 session.sagemaker_client.describe_training_job = Mock(return_value=describe)
 session.sagemaker_client.describe_endpoint = Mock(return_value=ENDPOINT_DESC)
 session.sagemaker_client.describe_endpoint_config = Mock(return_value=ENDPOINT_CONFIG_DESC)
 session.sagemaker_client.list_tags = Mock(return_value=LIST_TAGS_RESULT)
 return session


Expand DownExpand Up@@ -496,6 +501,7 @@ def test_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -544,6 +550,7 @@ def test_attach_new_repo_name(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -593,6 +600,7 @@ def test_attach_old_container(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -642,6 +650,7 @@ def test_attach_wrong_framework(sagemaker_session):
 },
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {
 'KmsKeyId': '',
 'S3OutputPath': 's3://place/output/neo'
Expand DownExpand Up@@ -681,6 +690,7 @@ def test_attach_custom_image(sagemaker_session):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand DownExpand Up@@ -856,6 +866,7 @@ def test_tf_script_mode_attach(sagemaker_session, tf_version):
 'StoppingCondition': {'MaxRuntimeInSeconds': 24 * 60 * 60},
 'TrainingJobName': 'neo',
 'TrainingJobStatus': 'Completed',
 'TrainingJobArn': 'arn:aws:sagemaker:us-west-2:336:training-job/neo',
 'OutputDataConfig': {'KmsKeyId': '', 'S3OutputPath': 's3://place/output/neo'},
 'TrainingJobOutput': {'S3TrainingJobOutput': 's3://here/output.tar.gz'}}
 sagemaker_session.sagemaker_client.describe_training_job = Mock(name='describe_training_job', return_value=rjd)
Expand Down
Loading