Skip to content

feature: handle separate training/inference images and EI in image_uris.retrieve #1707

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

Jump to bottom
Merged
merged 3 commits into from
Jul 14, 2020
Merged

feature: handle separate training/inference images and EI in image_uris.retrieve #1707

merged 3 commits into from
Jul 14, 2020

Conversation

@laurenyu
Copy link
Contributor

@laurenyu laurenyu commented Jul 14, 2020

Issue #, if available:
#1464

Description of changes:
This change also introduces configuration for TensorFlow image URIs. Because it's already a pretty sizeable change, I chose not to modify the tests too much - I'll fix the TF fixtures in a future PR.

Testing done:
tox --parallel all tests/unit

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 all S3 and STS 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
feature: handle separate training/inference images and EI in image_ur…
810f2ad 
…is.retrieve

This change also introduces configuration for TensorFlow image URIs
@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jul 14, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-unit-tests
  • Commit ID: 810f2ad
  • 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 Jul 14, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-notebook-tests
  • Commit ID: 810f2ad
  • 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 Jul 14, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-zwei-pr
  • Commit ID: 810f2ad
  • 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 Jul 14, 2020

AWS CodeBuild CI Report

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

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

metrizable
metrizable reviewed Jul 14, 2020
View reviewed changes
src/sagemaker/image_uris.py

from sagemaker import utils

logger = logging.getLogger(__name__)
Copy link
Contributor

@metrizable metrizable Jul 14, 2020

Choose a reason for hiding this comment

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

There are difference in logger definitions in various parts of the code. What is your vision on this?

Copy link
Contributor Author

@laurenyu laurenyu Jul 14, 2020

Choose a reason for hiding this comment

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

I don't think I had a vision for this - just went with whatever looked reasonable after doing a grep -r "logger =" src 😅

src/sagemaker/image_uris.py Outdated
"""Creates a tag for the image URI."""
tag = "{}-{}".format(version, processor)
if py_version:
tag += "-{}".format(py_version)
Copy link
Contributor

@metrizable metrizable Jul 14, 2020

Choose a reason for hiding this comment

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

re: this, unify the way you do this?

chuyang-deng
chuyang-deng reviewed Jul 14, 2020
View reviewed changes
tests/conftest.py
def tf_version(request):
return request.param
@pytest.fixture(scope="module")
def tf_version(tensorflow_training_version):
Copy link
Contributor

@chuyang-deng chuyang-deng Jul 14, 2020

Choose a reason for hiding this comment

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

Will there be a tensorflow_serving_version?

Copy link
Contributor Author

@laurenyu laurenyu Jul 14, 2020

Choose a reason for hiding this comment

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

this PR creates tensorflow_training_version, tensorflow_inference_version, and tensorflow_ei_version. I'll fix all the fixture usage in the tests in a separate PR - I was worried that this PR had too many changes already 😂

@laurenyu laurenyu requested a review from metrizable July 14, 2020 17:46
@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jul 14, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-unit-tests
  • Commit ID: 5ac66e7
  • 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 Jul 14, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-notebook-tests
  • Commit ID: 5ac66e7
  • 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 Jul 14, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-local-mode-tests
  • Commit ID: 5ac66e7
  • 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 Jul 14, 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.

ship it

@sagemaker-bot
Copy link
Collaborator

sagemaker-bot commented Jul 14, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-zwei-pr
  • Commit ID: 5ac66e7
  • 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 Jul 14, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-unit-tests
  • Commit ID: fe14388
  • 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 Jul 14, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-notebook-tests
  • Commit ID: fe14388
  • 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 Jul 14, 2020

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-zwei-pr
  • Commit ID: fe14388
  • 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 Jul 14, 2020

AWS CodeBuild CI Report

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

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

@laurenyu laurenyu merged commit 413d05a into aws:zwei Jul 14, 2020
@laurenyu laurenyu deleted the tf-image-uri branch July 14, 2020 19:31
@laurenyu laurenyu mentioned this pull request Jul 15, 2020
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@chuyang-deng chuyang-deng chuyang-deng left review comments

@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.

4 participants

@laurenyu @sagemaker-bot @chuyang-deng @metrizable