Skip to content

breaking: force image_uri to be passed for legacy TF images#1539

Merged
laurenyu merged 5 commits intoaws:zweifrom
laurenyu:tf-more-legacy-mode-cleanup
Jun 2, 2020
Merged

breaking: force image_uri to be passed for legacy TF images#1539
laurenyu merged 5 commits intoaws:zweifrom
laurenyu:tf-more-legacy-mode-cleanup

Conversation

@laurenyu
Copy link
Contributor

@laurenyu laurenyu commented Jun 2, 2020

Issue #, if available:
#1462

Description of changes:

  • The main point of this change was to remove the script_mode setting from the TF estimator.
  • In the process, I also made it so that model_dir=False won't pass on the model_dir hyperparameter. This is because the legacy TF images don't accept it. This particular pattern follows the way debugger_hook_config works in estimators.
  • Re: the todo comment I deleted - I did think about it, and I decided against creating a "create TensorBoard command" function because really the only thing potentially determined by the estimator is self.model_dir, and I don't want to have a function responsible for replicating the various options of TB.
  • This change also reorganizes the TF unit tests a bit because I got lost in the test_tf_estimator.py file. If the diff is too much as a result, I can revert it.
    • I removed some redundant tests: test_fw_utils.py already takes care of the create_image_uri logic, and there were two unit tests for deploying an estimator with a custom image.
    • I'll add some comments in the test files to point out what's new.
  • I also updated the tf_version fixture to include recent versions, as it was relevant for some of the unit tests I added.

Because the diff is already a lot, I'll update the migration script in a separate PR.

Testing done:

  • unit tests, linters

Merge Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your pull request.

General

  • I have read the CONTRIBUTING doc
  • I used the commit message format described in CONTRIBUTING
  • I have passed the region in to any/all clients that I've initialized as part of this change.
  • I have updated any necessary documentation, including READMEs and API docs (if appropriate)

Tests

  • I have added tests that prove my fix is effective or that my feature works (if appropriate)
  • I have checked that my tests are not configured for a specific region or account (if appropriate)
  • I have used unique_name_from_base to create resource names in integ tests (if appropriate)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@laurenyu
breaking: force image_uri to be passed for legacy TF images
f857c33 
This change also reorganizes the TF unit tests a bit,
and updates the tf_version fixture to include recent versions.
laurenyu
laurenyu commented Jun 2, 2020
View reviewed changes
tests/unit/sagemaker/tensorflow/test_estimator.py
assert actual_train_args == expected_train_args


def test_hyperparameters_no_model_dir(sagemaker_session):
Copy link
Contributor Author

@laurenyu laurenyu Jun 2, 2020

Choose a reason for hiding this comment

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

this test is new

tests/unit/sagemaker/tensorflow/test_estimator.py
assert expected_image == tf.train_image()


def test_train_image_custom_image(sagemaker_session):
Copy link
Contributor Author

@laurenyu laurenyu Jun 2, 2020

Choose a reason for hiding this comment

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

this test is new

tests/unit/sagemaker/tensorflow/test_estimator_init.py
assert tf.enable_sagemaker_metrics


def test_require_image_name_if_fw_ver_is_less_than_1_11(sagemaker_session, tf_version):
Copy link
Contributor Author

@laurenyu laurenyu Jun 2, 2020

Choose a reason for hiding this comment

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

this test is new

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-unit-tests
  • Commit ID: f857c33
  • Result: FAILED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-notebook-tests
  • Commit ID: f857c33
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-zwei-pr
  • Commit ID: f857c33
  • Result: FAILED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-local-mode-tests
  • Commit ID: f857c33
  • Result: FAILED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-unit-tests
  • Commit ID: 41483a6
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-notebook-tests
  • Commit ID: 41483a6
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-local-mode-tests
  • Commit ID: 41483a6
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-zwei-pr
  • Commit ID: 41483a6
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-unit-tests
  • Commit ID: 5b3003e
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-notebook-tests
  • Commit ID: 5b3003e
  • Result: FAILED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-zwei-pr
  • Commit ID: 5b3003e
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-local-mode-tests
  • Commit ID: 5b3003e
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-unit-tests
  • Commit ID: a0b9ae8
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

metrizable
metrizable reviewed Jun 2, 2020
View reviewed changes
tests/unit/sagemaker/tensorflow/test_estimator_attach.py

@pytest.fixture()
def sagemaker_session():
boto_mock = Mock(name="boto_session", region_name=REGION)
Copy link
Contributor

@metrizable metrizable Jun 2, 2020

Choose a reason for hiding this comment

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

side question: using botocore.stub a possibility?

Copy link
Contributor Author

@laurenyu laurenyu Jun 2, 2020

Choose a reason for hiding this comment

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

good suggestion. seems like we could use it for mocking out the clients that sagemaker_session keeps track of explicitly across our unit tests.

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-notebook-tests
  • Commit ID: 5b3003e
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-notebook-tests
  • Commit ID: a0b9ae8
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-zwei-pr
  • Commit ID: a0b9ae8
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jun 2, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-local-mode-tests
  • Commit ID: a0b9ae8
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

metrizable
metrizable approved these changes Jun 2, 2020
View reviewed changes
Copy link
Contributor

@metrizable metrizable left a comment

Choose a reason for hiding this comment

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

looks good to me

@laurenyu laurenyu merged commit d0eb4a2 into aws:zwei Jun 2, 2020
@laurenyu laurenyu deleted the tf-more-legacy-mode-cleanup branch June 2, 2020 19:16
@laurenyu laurenyu mentioned this pull request Jun 2, 2020
Merged
7 tasks
chrstfu added a commit to chrstfu/sagemaker-python-sdk that referenced this pull request Oct 30, 2024
@chrstfu
feat: Adding Bedrock Store model support for HubService (aws#1539)
cf8e5cb 
* feat: Adding BRS support
chrstfu added a commit to chrstfu/sagemaker-python-sdk that referenced this pull request Oct 30, 2024
@chrstfu
feat: Adding Marketplace model support for HubService (aws#1539)
70f6589 
* feat: Adding BRS support
chrstfu added a commit to chrstfu/sagemaker-python-sdk that referenced this pull request Oct 30, 2024
@chrstfu
feat: Adding Bedrock Store model support for HubService (aws#1539)
d15723f 
* feat: Adding BRS support
benieric pushed a commit that referenced this pull request Dec 4, 2024
@chrstfu @benieric
feat: Adding Bedrock Store model support for HubService (#1539)
eb3f92c 
* feat: Adding BRS support
benieric pushed a commit that referenced this pull request Dec 5, 2024
@chrstfu @benieric
feat: Adding Bedrock Store model support for HubService (#1539)
1a4a86c 
* feat: Adding BRS support
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@metrizable metrizable metrizable approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@laurenyu @sagemaker-bot @metrizable