Skip to content

breaking: rename sagemaker.tensorflow.serving to sagemaker.tensorflow.model #1541

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.

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
merged 3 commits into from
Jun 3, 2020

Conversation

laurenyu
Copy link
Contributor

@laurenyu laurenyu commented Jun 2, 2020

Issue #, if available:
#1462

Description of changes:
This changes the following two classes:

  • sagemaker.tensorflow.serving.Model --> sagemaker.tensorflow.model.TensorFlowModel
  • sagemaker.tensorflow.serving.Predictor --> sagemaker.tensorflow.model.TensorFlowPredictor

This PR also changes two attributes to match the other framework model classes:

  • FRAMEWORK_NAME --> __framework_name__
  • _framework_version --> framework_version

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 added 2 commits June 2, 2020 16:41
…maker.tensorflow.model.TensorFlowModel/Predictor

This commit also changes two attributes to
match the other framework model classes:

* FRAMEWORK_NAME --> __framework_name__
* _framework_version --> framework_version
@sagemaker-bot
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-local-mode-tests
  • Commit ID: 8b60c51
  • 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

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-unit-tests
  • Commit ID: 8b60c51
  • 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

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-notebook-tests
  • Commit ID: 8b60c51
  • 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

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-zwei-pr
  • Commit ID: 8b60c51
  • 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

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-unit-tests
  • Commit ID: 0119486
  • 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

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-notebook-tests
  • Commit ID: 0119486
  • 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

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-zwei-pr
  • Commit ID: 0119486
  • 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

AWS CodeBuild CI Report

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

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

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 778a4ee into aws:zwei Jun 3, 2020
@laurenyu laurenyu deleted the tfs-rename branch June 3, 2020 18:39
pintaoz-aws pushed a commit that referenced this pull request Dec 4, 2024
pintaoz-aws added a commit that referenced this pull request Dec 4, 2024
* Base model trainer (#1521)

* Base model trainer

* flake8

* add testing notebook

* add param validation & set defaults

* Implement simple train method

* feature: support script mode with local train.sh (#1523)

* feature: support script mode with local train.sh

* Stop tracking train.sh and add it to .gitignore

* update message

* make dir if not exist

* fix docs

* fix: docstyle

* Address comments

* fix hyperparams

* Revert pydantic custom error

* pylint

* Image Spec refactoring and updates (#1525)

* Image Spec refactoring and updates

* Unit tests and update function for Image Spec

* Fix hugging face test

* Fix Tests

* Add unit tests for ModelTrainer (#1527)

* Add unit tests for ModelTrainer

* Flake8

* format

* Add example notebook (#1528)

* Add testing notebook

* format

* use smaller data

* remove large dataset

* update

* pylint

* flake8

* ignore docstyle in directories with test

* format

* format

* Add enviornment variable bootstrapping script (#1530)

* Add enviornment variables scripts

* format

* fix comment

* add docstrings

* fix comment

* feature: add utility function to capture local snapshot (#1524)

* local snapshot

* Update pip list command

* Remove function calls

* Address comments

* Address comments

* Change to make Model Trainer return a Model Object

* Fix

* Cleanup

* Support intelligent parameters (#1540)

* Support intelligent parameters

* fix codestyle

* Revert Image Spec (#1541)

* Cleanup ModelTrainer (#1542)

* General image builder (#1546)

* General image builder

* General image builder

* Fix codestyle

* Fix codestyle

* Move location

* Add warnings

* Add integ tests

* Fix integ test

* Fix integ test

* Fix region error

* Add region

* Latest Container Image (#1545)

* Latest Container Image

* Test Fixes

* Parameterized tests and some logic updates

* Test fixes

* Move to Image URI

* Fixes for unit test

* Fixes for unit test

* Fix codestyle error checks

* Cleanup ModelTrainer code (#1552)

* Updates

* feat: add pre-processing and post-processing logic to inference_spec (#1560)

* add pre-processing and post-processing logic to inference_spec

* fix format

* make  accept_type and content_type optional

* remove accept_type and content_type from pre/post processing

* correct typo

* Add Distributed Training Support Model Trainer (#1536)

* Add path to set Additional Settings in ModelTrainer (#1555)

* Updates

* Mask Sensitive Env Logs in Container (#1568)

* Cleanup PR

* Codestyle fixes

* Update logic to use model parameter instead of model_path

* Fixes

* Fixes

* Tests

* Codestyle Fixes

* Codestyle Fixes

* Codestyle Fixes

* Codestyle Fixes

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>
Co-authored-by: pintaoz-aws <[email protected]>
Co-authored-by: Pravali Uppugunduri <[email protected]>
pintaoz-aws added a commit that referenced this pull request Dec 4, 2024
* Base model trainer (#1521)

* Base model trainer

* flake8

* add testing notebook

* add param validation & set defaults

* Implement simple train method

* feature: support script mode with local train.sh (#1523)

* feature: support script mode with local train.sh

* Stop tracking train.sh and add it to .gitignore

* update message

* make dir if not exist

* fix docs

* fix: docstyle

* Address comments

* fix hyperparams

* Revert pydantic custom error

* pylint

* Image Spec refactoring and updates (#1525)

* Image Spec refactoring and updates

* Unit tests and update function for Image Spec

* Fix hugging face test

* Fix Tests

* Add unit tests for ModelTrainer (#1527)

* Add unit tests for ModelTrainer

* Flake8

* format

* Add example notebook (#1528)

* Add testing notebook

* format

* use smaller data

* remove large dataset

* update

* pylint

* flake8

* ignore docstyle in directories with test

* format

* format

* Add enviornment variable bootstrapping script (#1530)

* Add enviornment variables scripts

* format

* fix comment

* add docstrings

* fix comment

* feature: add utility function to capture local snapshot (#1524)

* local snapshot

* Update pip list command

* Remove function calls

* Address comments

* Address comments

* Support intelligent parameters (#1540)

* Support intelligent parameters

* fix codestyle

* Revert Image Spec (#1541)

* Cleanup ModelTrainer (#1542)

* General image builder (#1546)

* General image builder

* General image builder

* Fix codestyle

* Fix codestyle

* Move location

* Add warnings

* Add integ tests

* Fix integ test

* Fix integ test

* Fix region error

* Add region

* Latest Container Image (#1545)

* Latest Container Image

* Test Fixes

* Parameterized tests and some logic updates

* Test fixes

* Move to Image URI

* Fixes for unit test

* Fixes for unit test

* Fix codestyle error checks

* Cleanup ModelTrainer code (#1552)

* feat: add pre-processing and post-processing logic to inference_spec (#1560)

* add pre-processing and post-processing logic to inference_spec

* fix format

* make  accept_type and content_type optional

* remove accept_type and content_type from pre/post processing

* correct typo

* Add Distributed Training Support Model Trainer (#1536)

* Add path to set Additional Settings in ModelTrainer (#1555)

* Support building image from Dockerfile

* Fix test

* Fix test

* Rename functions

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>
Co-authored-by: Gokul Anantha Narayanan <[email protected]>
Co-authored-by: Pravali Uppugunduri <[email protected]>
pintaoz-aws added a commit that referenced this pull request Dec 4, 2024
* Base model trainer (#1521)

* Base model trainer

* flake8

* add testing notebook

* add param validation & set defaults

* Implement simple train method

* feature: support script mode with local train.sh (#1523)

* feature: support script mode with local train.sh

* Stop tracking train.sh and add it to .gitignore

* update message

* make dir if not exist

* fix docs

* fix: docstyle

* Address comments

* fix hyperparams

* Revert pydantic custom error

* pylint

* Image Spec refactoring and updates (#1525)

* Image Spec refactoring and updates

* Unit tests and update function for Image Spec

* Fix hugging face test

* Fix Tests

* Add unit tests for ModelTrainer (#1527)

* Add unit tests for ModelTrainer

* Flake8

* format

* Add example notebook (#1528)

* Add testing notebook

* format

* use smaller data

* remove large dataset

* update

* pylint

* flake8

* ignore docstyle in directories with test

* format

* format

* Add enviornment variable bootstrapping script (#1530)

* Add enviornment variables scripts

* format

* fix comment

* add docstrings

* fix comment

* feature: add utility function to capture local snapshot (#1524)

* local snapshot

* Update pip list command

* Remove function calls

* Address comments

* Address comments

* Support intelligent parameters (#1540)

* Support intelligent parameters

* fix codestyle

* Revert Image Spec (#1541)

* Cleanup ModelTrainer (#1542)

* Initial Prototype

* General image builder (#1546)

* General image builder

* General image builder

* Fix codestyle

* Fix codestyle

* Move location

* Add warnings

* Add integ tests

* Fix integ test

* Fix integ test

* Fix region error

* Add region

* Unified deploying in ModelBuilder

* Latest Container Image (#1545)

* Latest Container Image

* Test Fixes

* Parameterized tests and some logic updates

* Test fixes

* Move to Image URI

* Fixes for unit test

* Fixes for unit test

* Fix codestyle error checks

* Address PR comments

* Address Codestyle errors

* Cleanup ModelTrainer code (#1552)

* Black format

* Codestyle changes

* Codestyle changes

* from __future__ import absolute_import

* DocString formatting

* Black formatting

* Address PR comments

* Noteboook changes and fixes

* feat: add pre-processing and post-processing logic to inference_spec (#1560)

* add pre-processing and post-processing logic to inference_spec

* fix format

* make  accept_type and content_type optional

* remove accept_type and content_type from pre/post processing

* correct typo

* Add Distributed Training Support Model Trainer (#1536)

* Add path to set Additional Settings in ModelTrainer (#1555)

* Checkstyle Fixes

* Address PR comments

* Fixes

* Merge Fixes

* Codestyle Fixes

* Codestyle Fixes

* Codestyle Fixes

* Codestyle Fixes

* Codestyle Fixes

* Update Docstring

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>
Co-authored-by: pintaoz-aws <[email protected]>
Co-authored-by: Pravali Uppugunduri <[email protected]>
pintaoz-aws added a commit that referenced this pull request Dec 4, 2024
* Base model trainer (#1521)

* Base model trainer

* flake8

* add testing notebook

* add param validation & set defaults

* Implement simple train method

* feature: support script mode with local train.sh (#1523)

* feature: support script mode with local train.sh

* Stop tracking train.sh and add it to .gitignore

* update message

* make dir if not exist

* fix docs

* fix: docstyle

* Address comments

* fix hyperparams

* Revert pydantic custom error

* pylint

* Image Spec refactoring and updates (#1525)

* Image Spec refactoring and updates

* Unit tests and update function for Image Spec

* Fix hugging face test

* Fix Tests

* Add unit tests for ModelTrainer (#1527)

* Add unit tests for ModelTrainer

* Flake8

* format

* Add example notebook (#1528)

* Add testing notebook

* format

* use smaller data

* remove large dataset

* update

* pylint

* flake8

* ignore docstyle in directories with test

* format

* format

* Add enviornment variable bootstrapping script (#1530)

* Add enviornment variables scripts

* format

* fix comment

* add docstrings

* fix comment

* feature: add utility function to capture local snapshot (#1524)

* local snapshot

* Update pip list command

* Remove function calls

* Address comments

* Address comments

* Support intelligent parameters (#1540)

* Support intelligent parameters

* fix codestyle

* Revert Image Spec (#1541)

* Cleanup ModelTrainer (#1542)

* General image builder (#1546)

* General image builder

* General image builder

* Fix codestyle

* Fix codestyle

* Move location

* Add warnings

* Add integ tests

* Fix integ test

* Fix integ test

* Fix region error

* Add region

* Latest Container Image (#1545)

* Latest Container Image

* Test Fixes

* Parameterized tests and some logic updates

* Test fixes

* Move to Image URI

* Fixes for unit test

* Fixes for unit test

* Fix codestyle error checks

* Cleanup ModelTrainer code (#1552)

* Single container local mode training

* Add wait argument

* Implement helper funtions

* Add helper functions

* Fix bugs

* Fix codestyle

* feat: add pre-processing and post-processing logic to inference_spec (#1560)

* add pre-processing and post-processing logic to inference_spec

* fix format

* make  accept_type and content_type optional

* remove accept_type and content_type from pre/post processing

* correct typo

* Fix test and codestyle

* Add Distributed Training Support Model Trainer (#1536)

* Add tests

* Add path to set Additional Settings in ModelTrainer (#1555)

* Added example notebook

* Fix codestyle

* Address comments

* resolve merge conflict

* Support multi container local training (#1576)

* Fix codestyle

* Mask Sensitive Env Logs in Container (#1568)

* Fix bug in script mode setup ModelTrainer (#1575)

* Support multi container local training

* Merge branch 'single_container_local_training' into multi_container_local_training

* Update unit tests

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>

* Remove LocalTrainingJob class

* Bypass pydantic check

* Add example

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>
Co-authored-by: Gokul Anantha Narayanan <[email protected]>
Co-authored-by: Pravali Uppugunduri <[email protected]>
pintaoz-aws added a commit that referenced this pull request Dec 4, 2024
* Base model trainer (#1521)

* Base model trainer

* flake8

* add testing notebook

* add param validation & set defaults

* Implement simple train method

* feature: support script mode with local train.sh (#1523)

* feature: support script mode with local train.sh

* Stop tracking train.sh and add it to .gitignore

* update message

* make dir if not exist

* fix docs

* fix: docstyle

* Address comments

* fix hyperparams

* Revert pydantic custom error

* pylint

* Image Spec refactoring and updates (#1525)

* Image Spec refactoring and updates

* Unit tests and update function for Image Spec

* Fix hugging face test

* Fix Tests

* Add unit tests for ModelTrainer (#1527)

* Add unit tests for ModelTrainer

* Flake8

* format

* Add example notebook (#1528)

* Add testing notebook

* format

* use smaller data

* remove large dataset

* update

* pylint

* flake8

* ignore docstyle in directories with test

* format

* format

* Add enviornment variable bootstrapping script (#1530)

* Add enviornment variables scripts

* format

* fix comment

* add docstrings

* fix comment

* feature: add utility function to capture local snapshot (#1524)

* local snapshot

* Update pip list command

* Remove function calls

* Address comments

* Address comments

* Support intelligent parameters (#1540)

* Support intelligent parameters

* fix codestyle

* Revert Image Spec (#1541)

* Cleanup ModelTrainer (#1542)

* General image builder (#1546)

* General image builder

* General image builder

* Fix codestyle

* Fix codestyle

* Move location

* Add warnings

* Add integ tests

* Fix integ test

* Fix integ test

* Fix region error

* Add region

* Latest Container Image (#1545)

* Latest Container Image

* Test Fixes

* Parameterized tests and some logic updates

* Test fixes

* Move to Image URI

* Fixes for unit test

* Fixes for unit test

* Fix codestyle error checks

* Cleanup ModelTrainer code (#1552)

* feat: add pre-processing and post-processing logic to inference_spec (#1560)

* add pre-processing and post-processing logic to inference_spec

* fix format

* make  accept_type and content_type optional

* remove accept_type and content_type from pre/post processing

* correct typo

* Add Distributed Training Support Model Trainer (#1536)

* Add path to set Additional Settings in ModelTrainer (#1555)

* feature: support HuggingFace models with JumpStart configs

* Update bucket name for the model mapping

* Mask Sensitive Env Logs in Container (#1568)

* Fix unit test

* Fix bug in script mode setup ModelTrainer (#1575)

* Save mapping as attribute

* Fix style issues

* Fix style issues

* Fix: bypass jumpstart mapping when not in endpoint mode

* Skip JS model mapping with env vars or image URI provided

* Revert "Merge branch 'aws:master' into dev-morpheus"

This reverts commit 26a0b0bb37e0343b3287f5c5c484df22726fc858, reversing
changes made to d19d4e178442be4b6e1d07d55498dd76dfac50f0.

* Merge branch 'aws:master' into dev-morpheus

This reverts commit 076442bd83e5ca977bf5b6ce1b716474d2794feb.

* Rebase on master-morpheus

* Fix unit test description

* Fix TEI integ test

* Fix style issue

* Fix style issues

* Fix schema builder integ tests

* Fix TEI integ test

* Fix code style issue

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>
Co-authored-by: Gokul Anantha Narayanan <[email protected]>
Co-authored-by: pintaoz-aws <[email protected]>
Co-authored-by: Pravali Uppugunduri <[email protected]>
Co-authored-by: Xiong Zeng <[email protected]>
Co-authored-by: Gary Wang <[email protected]>
pintaoz-aws pushed a commit that referenced this pull request Dec 4, 2024
pintaoz-aws added a commit that referenced this pull request Dec 4, 2024
* Base model trainer (#1521)

* Base model trainer

* flake8

* add testing notebook

* add param validation & set defaults

* Implement simple train method

* feature: support script mode with local train.sh (#1523)

* feature: support script mode with local train.sh

* Stop tracking train.sh and add it to .gitignore

* update message

* make dir if not exist

* fix docs

* fix: docstyle

* Address comments

* fix hyperparams

* Revert pydantic custom error

* pylint

* Image Spec refactoring and updates (#1525)

* Image Spec refactoring and updates

* Unit tests and update function for Image Spec

* Fix hugging face test

* Fix Tests

* Add unit tests for ModelTrainer (#1527)

* Add unit tests for ModelTrainer

* Flake8

* format

* Add example notebook (#1528)

* Add testing notebook

* format

* use smaller data

* remove large dataset

* update

* pylint

* flake8

* ignore docstyle in directories with test

* format

* format

* Add enviornment variable bootstrapping script (#1530)

* Add enviornment variables scripts

* format

* fix comment

* add docstrings

* fix comment

* feature: add utility function to capture local snapshot (#1524)

* local snapshot

* Update pip list command

* Remove function calls

* Address comments

* Address comments

* Change to make Model Trainer return a Model Object

* Fix

* Cleanup

* Support intelligent parameters (#1540)

* Support intelligent parameters

* fix codestyle

* Revert Image Spec (#1541)

* Cleanup ModelTrainer (#1542)

* General image builder (#1546)

* General image builder

* General image builder

* Fix codestyle

* Fix codestyle

* Move location

* Add warnings

* Add integ tests

* Fix integ test

* Fix integ test

* Fix region error

* Add region

* Latest Container Image (#1545)

* Latest Container Image

* Test Fixes

* Parameterized tests and some logic updates

* Test fixes

* Move to Image URI

* Fixes for unit test

* Fixes for unit test

* Fix codestyle error checks

* Cleanup ModelTrainer code (#1552)

* Updates

* feat: add pre-processing and post-processing logic to inference_spec (#1560)

* add pre-processing and post-processing logic to inference_spec

* fix format

* make  accept_type and content_type optional

* remove accept_type and content_type from pre/post processing

* correct typo

* Add Distributed Training Support Model Trainer (#1536)

* Add path to set Additional Settings in ModelTrainer (#1555)

* Updates

* Mask Sensitive Env Logs in Container (#1568)

* Cleanup PR

* Codestyle fixes

* Update logic to use model parameter instead of model_path

* Fixes

* Fixes

* Tests

* Codestyle Fixes

* Codestyle Fixes

* Codestyle Fixes

* Codestyle Fixes

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>
Co-authored-by: pintaoz-aws <[email protected]>
Co-authored-by: Pravali Uppugunduri <[email protected]>
pintaoz-aws added a commit that referenced this pull request Dec 4, 2024
* Base model trainer (#1521)

* Base model trainer

* flake8

* add testing notebook

* add param validation & set defaults

* Implement simple train method

* feature: support script mode with local train.sh (#1523)

* feature: support script mode with local train.sh

* Stop tracking train.sh and add it to .gitignore

* update message

* make dir if not exist

* fix docs

* fix: docstyle

* Address comments

* fix hyperparams

* Revert pydantic custom error

* pylint

* Image Spec refactoring and updates (#1525)

* Image Spec refactoring and updates

* Unit tests and update function for Image Spec

* Fix hugging face test

* Fix Tests

* Add unit tests for ModelTrainer (#1527)

* Add unit tests for ModelTrainer

* Flake8

* format

* Add example notebook (#1528)

* Add testing notebook

* format

* use smaller data

* remove large dataset

* update

* pylint

* flake8

* ignore docstyle in directories with test

* format

* format

* Add enviornment variable bootstrapping script (#1530)

* Add enviornment variables scripts

* format

* fix comment

* add docstrings

* fix comment

* feature: add utility function to capture local snapshot (#1524)

* local snapshot

* Update pip list command

* Remove function calls

* Address comments

* Address comments

* Support intelligent parameters (#1540)

* Support intelligent parameters

* fix codestyle

* Revert Image Spec (#1541)

* Cleanup ModelTrainer (#1542)

* General image builder (#1546)

* General image builder

* General image builder

* Fix codestyle

* Fix codestyle

* Move location

* Add warnings

* Add integ tests

* Fix integ test

* Fix integ test

* Fix region error

* Add region

* Latest Container Image (#1545)

* Latest Container Image

* Test Fixes

* Parameterized tests and some logic updates

* Test fixes

* Move to Image URI

* Fixes for unit test

* Fixes for unit test

* Fix codestyle error checks

* Cleanup ModelTrainer code (#1552)

* feat: add pre-processing and post-processing logic to inference_spec (#1560)

* add pre-processing and post-processing logic to inference_spec

* fix format

* make  accept_type and content_type optional

* remove accept_type and content_type from pre/post processing

* correct typo

* Add Distributed Training Support Model Trainer (#1536)

* Add path to set Additional Settings in ModelTrainer (#1555)

* Support building image from Dockerfile

* Fix test

* Fix test

* Rename functions

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>
Co-authored-by: Gokul Anantha Narayanan <[email protected]>
Co-authored-by: Pravali Uppugunduri <[email protected]>
pintaoz-aws added a commit that referenced this pull request Dec 4, 2024
* Base model trainer (#1521)

* Base model trainer

* flake8

* add testing notebook

* add param validation & set defaults

* Implement simple train method

* feature: support script mode with local train.sh (#1523)

* feature: support script mode with local train.sh

* Stop tracking train.sh and add it to .gitignore

* update message

* make dir if not exist

* fix docs

* fix: docstyle

* Address comments

* fix hyperparams

* Revert pydantic custom error

* pylint

* Image Spec refactoring and updates (#1525)

* Image Spec refactoring and updates

* Unit tests and update function for Image Spec

* Fix hugging face test

* Fix Tests

* Add unit tests for ModelTrainer (#1527)

* Add unit tests for ModelTrainer

* Flake8

* format

* Add example notebook (#1528)

* Add testing notebook

* format

* use smaller data

* remove large dataset

* update

* pylint

* flake8

* ignore docstyle in directories with test

* format

* format

* Add enviornment variable bootstrapping script (#1530)

* Add enviornment variables scripts

* format

* fix comment

* add docstrings

* fix comment

* feature: add utility function to capture local snapshot (#1524)

* local snapshot

* Update pip list command

* Remove function calls

* Address comments

* Address comments

* Support intelligent parameters (#1540)

* Support intelligent parameters

* fix codestyle

* Revert Image Spec (#1541)

* Cleanup ModelTrainer (#1542)

* Initial Prototype

* General image builder (#1546)

* General image builder

* General image builder

* Fix codestyle

* Fix codestyle

* Move location

* Add warnings

* Add integ tests

* Fix integ test

* Fix integ test

* Fix region error

* Add region

* Unified deploying in ModelBuilder

* Latest Container Image (#1545)

* Latest Container Image

* Test Fixes

* Parameterized tests and some logic updates

* Test fixes

* Move to Image URI

* Fixes for unit test

* Fixes for unit test

* Fix codestyle error checks

* Address PR comments

* Address Codestyle errors

* Cleanup ModelTrainer code (#1552)

* Black format

* Codestyle changes

* Codestyle changes

* from __future__ import absolute_import

* DocString formatting

* Black formatting

* Address PR comments

* Noteboook changes and fixes

* feat: add pre-processing and post-processing logic to inference_spec (#1560)

* add pre-processing and post-processing logic to inference_spec

* fix format

* make  accept_type and content_type optional

* remove accept_type and content_type from pre/post processing

* correct typo

* Add Distributed Training Support Model Trainer (#1536)

* Add path to set Additional Settings in ModelTrainer (#1555)

* Checkstyle Fixes

* Address PR comments

* Fixes

* Merge Fixes

* Codestyle Fixes

* Codestyle Fixes

* Codestyle Fixes

* Codestyle Fixes

* Codestyle Fixes

* Update Docstring

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>
Co-authored-by: pintaoz-aws <[email protected]>
Co-authored-by: Pravali Uppugunduri <[email protected]>
pintaoz-aws added a commit that referenced this pull request Dec 4, 2024
* Base model trainer (#1521)

* Base model trainer

* flake8

* add testing notebook

* add param validation & set defaults

* Implement simple train method

* feature: support script mode with local train.sh (#1523)

* feature: support script mode with local train.sh

* Stop tracking train.sh and add it to .gitignore

* update message

* make dir if not exist

* fix docs

* fix: docstyle

* Address comments

* fix hyperparams

* Revert pydantic custom error

* pylint

* Image Spec refactoring and updates (#1525)

* Image Spec refactoring and updates

* Unit tests and update function for Image Spec

* Fix hugging face test

* Fix Tests

* Add unit tests for ModelTrainer (#1527)

* Add unit tests for ModelTrainer

* Flake8

* format

* Add example notebook (#1528)

* Add testing notebook

* format

* use smaller data

* remove large dataset

* update

* pylint

* flake8

* ignore docstyle in directories with test

* format

* format

* Add enviornment variable bootstrapping script (#1530)

* Add enviornment variables scripts

* format

* fix comment

* add docstrings

* fix comment

* feature: add utility function to capture local snapshot (#1524)

* local snapshot

* Update pip list command

* Remove function calls

* Address comments

* Address comments

* Support intelligent parameters (#1540)

* Support intelligent parameters

* fix codestyle

* Revert Image Spec (#1541)

* Cleanup ModelTrainer (#1542)

* General image builder (#1546)

* General image builder

* General image builder

* Fix codestyle

* Fix codestyle

* Move location

* Add warnings

* Add integ tests

* Fix integ test

* Fix integ test

* Fix region error

* Add region

* Latest Container Image (#1545)

* Latest Container Image

* Test Fixes

* Parameterized tests and some logic updates

* Test fixes

* Move to Image URI

* Fixes for unit test

* Fixes for unit test

* Fix codestyle error checks

* Cleanup ModelTrainer code (#1552)

* Single container local mode training

* Add wait argument

* Implement helper funtions

* Add helper functions

* Fix bugs

* Fix codestyle

* feat: add pre-processing and post-processing logic to inference_spec (#1560)

* add pre-processing and post-processing logic to inference_spec

* fix format

* make  accept_type and content_type optional

* remove accept_type and content_type from pre/post processing

* correct typo

* Fix test and codestyle

* Add Distributed Training Support Model Trainer (#1536)

* Add tests

* Add path to set Additional Settings in ModelTrainer (#1555)

* Added example notebook

* Fix codestyle

* Address comments

* resolve merge conflict

* Support multi container local training (#1576)

* Fix codestyle

* Mask Sensitive Env Logs in Container (#1568)

* Fix bug in script mode setup ModelTrainer (#1575)

* Support multi container local training

* Merge branch 'single_container_local_training' into multi_container_local_training

* Update unit tests

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>

* Remove LocalTrainingJob class

* Bypass pydantic check

* Add example

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>
Co-authored-by: Gokul Anantha Narayanan <[email protected]>
Co-authored-by: Pravali Uppugunduri <[email protected]>
pintaoz-aws added a commit that referenced this pull request Dec 4, 2024
* Base model trainer (#1521)

* Base model trainer

* flake8

* add testing notebook

* add param validation & set defaults

* Implement simple train method

* feature: support script mode with local train.sh (#1523)

* feature: support script mode with local train.sh

* Stop tracking train.sh and add it to .gitignore

* update message

* make dir if not exist

* fix docs

* fix: docstyle

* Address comments

* fix hyperparams

* Revert pydantic custom error

* pylint

* Image Spec refactoring and updates (#1525)

* Image Spec refactoring and updates

* Unit tests and update function for Image Spec

* Fix hugging face test

* Fix Tests

* Add unit tests for ModelTrainer (#1527)

* Add unit tests for ModelTrainer

* Flake8

* format

* Add example notebook (#1528)

* Add testing notebook

* format

* use smaller data

* remove large dataset

* update

* pylint

* flake8

* ignore docstyle in directories with test

* format

* format

* Add enviornment variable bootstrapping script (#1530)

* Add enviornment variables scripts

* format

* fix comment

* add docstrings

* fix comment

* feature: add utility function to capture local snapshot (#1524)

* local snapshot

* Update pip list command

* Remove function calls

* Address comments

* Address comments

* Support intelligent parameters (#1540)

* Support intelligent parameters

* fix codestyle

* Revert Image Spec (#1541)

* Cleanup ModelTrainer (#1542)

* General image builder (#1546)

* General image builder

* General image builder

* Fix codestyle

* Fix codestyle

* Move location

* Add warnings

* Add integ tests

* Fix integ test

* Fix integ test

* Fix region error

* Add region

* Latest Container Image (#1545)

* Latest Container Image

* Test Fixes

* Parameterized tests and some logic updates

* Test fixes

* Move to Image URI

* Fixes for unit test

* Fixes for unit test

* Fix codestyle error checks

* Cleanup ModelTrainer code (#1552)

* feat: add pre-processing and post-processing logic to inference_spec (#1560)

* add pre-processing and post-processing logic to inference_spec

* fix format

* make  accept_type and content_type optional

* remove accept_type and content_type from pre/post processing

* correct typo

* Add Distributed Training Support Model Trainer (#1536)

* Add path to set Additional Settings in ModelTrainer (#1555)

* feature: support HuggingFace models with JumpStart configs

* Update bucket name for the model mapping

* Mask Sensitive Env Logs in Container (#1568)

* Fix unit test

* Fix bug in script mode setup ModelTrainer (#1575)

* Save mapping as attribute

* Fix style issues

* Fix style issues

* Fix: bypass jumpstart mapping when not in endpoint mode

* Skip JS model mapping with env vars or image URI provided

* Revert "Merge branch 'aws:master' into dev-morpheus"

This reverts commit 26a0b0bb37e0343b3287f5c5c484df22726fc858, reversing
changes made to d19d4e178442be4b6e1d07d55498dd76dfac50f0.

* Merge branch 'aws:master' into dev-morpheus

This reverts commit 076442bd83e5ca977bf5b6ce1b716474d2794feb.

* Rebase on master-morpheus

* Fix unit test description

* Fix TEI integ test

* Fix style issue

* Fix style issues

* Fix schema builder integ tests

* Fix TEI integ test

* Fix code style issue

---------

Co-authored-by: Erick Benitez-Ramos <[email protected]>
Co-authored-by: Gokul Anantha Narayanan <[email protected]>
Co-authored-by: pintaoz-aws <[email protected]>
Co-authored-by: Pravali Uppugunduri <[email protected]>
Co-authored-by: Xiong Zeng <[email protected]>
Co-authored-by: Gary Wang <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants