feat: Add new Triton DLC URIs #4432

nikhil-sk · 2024-02-16T22:18:05Z

Issue #, if available:

Description of changes:

Starting Triton version 23.12, sagemaker tritonserver is available in a different set of accounts, similar to other model servers such as djl-serving, torchserve etc. i.e. original DLC accounts, as opposed to SageMaker Neo accounts. Triton on SageMaker will be available on both Neo accounts and new DLC accounts until v23.05. After v23.05, Triton will only be available in the new DLC URIs (i.e. accounts listed in this PR).
Adding the account id and region map for DLC accounts.

Testing done:

 pytest -s tests/unit/sagemaker/image_uris/test_sagemaker_tritonserver.py

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 certify that the changes I am introducing will be backward compatible, and I have discussed concerns about this, if any, with the Python SDK team
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 added unit and/or integration tests as appropriate to ensure backward compatibility of the changes
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.

nikhil-sk · 2024-02-16T22:19:46Z

cc : @mufaddal-rohawala for review

mohanasudhan · 2024-02-17T00:10:10Z

src/sagemaker/image_uris.py

@@ -335,6 +336,11 @@ def _get_image_tag(
            if key in container_versions:
                tag = "-".join([tag, container_versions[key]])

+    # Triton images don't have a trailing -gpu tag. Only -cpu images do.


Because it's default option is gpu?

@mohanasudhan Hi Mohan, that is correct - the default option is gpu.

knikure · 2024-02-20T16:17:28Z

src/sagemaker/image_uri_config/sagemaker-tritonserver.json

@@ -0,0 +1,75 @@
+{


@nskool Can your team onboard to PySDK RBA to create this JSON? Please reach out to me for more details.

DLC would be taking the RBA automation of this file on behalf of Large Model Inference/Model Serving team.

knikure

/bot run all

mufaddal-rohawala · 2024-02-26T22:05:10Z

AWS CodeBuild CI Report

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

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

mufaddal-rohawala · 2024-02-26T23:55:19Z

AWS CodeBuild CI Report

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

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

mufaddal-rohawala · 2024-02-26T23:56:32Z

AWS CodeBuild CI Report

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

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

mufaddal-rohawala · 2024-02-27T00:24:17Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 761b92c
Result: SUCCEEDED
Build Logs (available for 30 days)

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

mufaddal-rohawala · 2024-02-27T00:30:00Z

AWS CodeBuild CI Report

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

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

mufaddal-rohawala · 2024-02-27T01:01:39Z

AWS CodeBuild CI Report

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

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

codecov · 2024-02-27T01:02:05Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.16%. Comparing base (8b206ba) to head (d0278a9).
Report is 45 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #4432      +/-   ##
==========================================
+ Coverage   86.94%   87.16%   +0.22%     
==========================================
  Files        1203      387     -816     
  Lines      107211    35811   -71400     
==========================================
- Hits        93211    31215   -61996     
+ Misses      14000     4596    -9404

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

mufaddal-rohawala · 2024-02-27T21:55:30Z

AWS CodeBuild CI Report

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

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

mufaddal-rohawala · 2024-02-27T21:56:14Z

AWS CodeBuild CI Report

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

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

mufaddal-rohawala · 2024-02-27T22:16:09Z

AWS CodeBuild CI Report

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

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

mufaddal-rohawala · 2024-02-27T22:28:50Z

AWS CodeBuild CI Report

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

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

mufaddal-rohawala · 2024-02-27T22:56:08Z

AWS CodeBuild CI Report

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

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

* Add new Triton DLC URIs * Update according to black and pylint

* prepare release v2.210.0 * update development version to v2.210.1.dev0 * feat: Add new Triton DLC URIs (#4432) * Add new Triton DLC URIs * Update according to black and pylint * feat: Support selective pipeline execution between function step and regular step (#4392) * feat: Add AutoMLV2 support (#4461) * Add AutoMLV2 support * Improvements of the integration tests --------- Co-authored-by: Anton Repushko <[email protected]> * feature: Add TensorFlow 2.14 image configs (#4446) * fix: remove enable_network_isolation from the python doc (#4465) Co-authored-by: Rohan Gujarathi <[email protected]> * doc: Add doc for new feature processor APIs and classes (#4250) * fix: properly close sagemaker config file after loading config (#4457) Closes #4456 * feat: instance specific jumpstart host requirements (#4397) * feat: instance specific jumpstart host requirements * chore: add js support for copies resource requirement, enforce coupling with ResourceRequirements class * fix: typing * fix: pylint * change: Bump Apache Airflow version to 2.8.2 (#4470) * Update tox.ini * Update test_requirements.txt * fix: make sure gpus are found in local_gpu run (#4384) * fix: make sure gpus are found in local_gpu run * fix: black formatting * fix: adjust unit test * feat: pin dll version to support python3.11 to the sdk (#4472) Co-authored-by: Ashwin Krishna <[email protected]> * fix: Skip No Canvas regions for test_deploy_best_candidate (#4477) * prepare release v2.211.0 * update development version to v2.211.1.dev0 * change: Enhance model builder selection logic to include model size (#4429) * change: Enhance model builder selection logic to include model size * Fix conflicts * Address PR comments * fix formatting * fix formatting of test * Fix token in tasks.json * Increase coverage for tests * fix formatting * Fix requirements * Import code instead of importing accelerate * Fix formatting * Setup dependencies * change: Upgrade smp to version 2.2 (#4479) * upgrading smp to version 2.2 * fixing linting issue * fixing syntax error with multiline if statement * upgrading smp to version 2.2 * fixing linting issue * fixing syntax error with multiline if statement * fixing formatting --------- Co-authored-by: Andrew Tian <[email protected]> * feat: Update SM Python SDK for PT 2.2.0 SM DLC (#4481) * update pt2.2 sm training dlc pysdk * update pt2.2 sm inference dlc pysdk and region list * fix: Create custom tarfile extractall util to fix backward compatibility issue (#4476) * fix: Create custom tarfile extractall util to fix backward compatibility issue * Address review comments * fix logger.error statements * prepare release v2.212.0 * update development version to v2.212.1.dev0 * change: Update tblib constraint (#4452) * fix: make unit tests compatible with pytest-xdist (#4486) * fix: make unit tests compatible with pytest-xdist * fix failing test * feature: Add overriding logic in ModelBuilder when task is provided (#4460) * feat: Add Optional task to Model * Revert "feat: Add Optional task to Model" This reverts commit fd3e86b. * Add override logic in ModelBuilder with task provided * Adjusted formatting * Add extra unit tests for invalid inputs * Address PR comments * Add more test inputs to integration test * Add model_metadata field to ModelBuilder * Update doc * Update doc * Adjust formatting --------- Co-authored-by: Samrudhi Sharma <[email protected]> Co-authored-by: Xiong Zeng <[email protected]> * feature: Accept user-defined env variables for the entry-point (#4175) * fix: Move sagemaker pysdk version check after bootstrap in remote job (#4487) * change: enable github actions for PRs (#4489) * change: enable github actions for PRs * Update codebuild-ci.yml * trigger on pull_request_target * add source-version-override * fix permission * feature: Add ModelDataSource and SourceUri support for model package and while registering (#4492) Co-authored-by: Erick Benitez-Ramos <[email protected]> * feat: support JumpStart proprietary models (#4467) * feat: add proprietary manifest/specs parsing add unittests for test_cache small refactoring address comments and more unittests fix linting and fix more tests fix: pylint feat: JumpStartModel class for prop models * remove unused imports and fix docstyle * fix: remove unused args * fix: remove unused args * fix: more unused vars * fix: slow tests * fix: unittests * added more tests to cover some lines * remove estimator warn check * chore: address comments re performance * fix: address comments * complete list experience and other fixes * fix: pylint * add doc utils and fix pylint * fix: docstyle * fix: doc * fix: default payloads * fix: doc and tags and enums * fix: jumpstart doc * rename to open_weights and fix filtering * update filter name * doc update * fix: black * rename to proprietary model and fix unittests * address comments * fix: docstyle and flake8 * address more comments and fix doc * put back doc utils for future refactoring * add prop model title in doc * doc update --------- Co-authored-by: liujiaor <[email protected]> * chore: emit warning when no instance specific gated training env var is available, and raise exception when accept_eula flag is not supplied (#4485) * fix: raise exception when no instance specific gated training env var available * chore: raise client exception if accept_eula flag is not set for gated models * chore: address flake8 errors * chore: emit warning when instance type is chosen with no gated training artifacts * change: bump jinja2 to 3.1.3 in doc/requirments.txt (#4421) (#4423) * change: bump jinja2 to 3.1.3 in doc/requirments.txt (#4421) * change: bump jinja2 to 3.1.3 in doc/requirments.txt * Update requirements.txt * feature: TGI 1.4.0 (#4424) * documentation: fix the ClarifyCheckStep documentation to mention PDP (#4259) * documentation: fix the ClarifyCheckStep documentation to mention PDP support * fix: break the lines to meet pylint requirement --------- Co-authored-by: Shing Lyu <[email protected]> * documentation: Explain the ClarifyCheckStep and QualityCheckStep parameters (#4261) * documentation: explain the ClarifyCheckStep and QualityCheckStep parameters * fix: remove trailing space --------- Co-authored-by: Shing Lyu <[email protected]> * feat: Telemetry metrics (#4414) * Emit additional telemetry metrics * Fix unit tests * Emit endpoint failure to telemetry * Address PR Comments * Emit latency in telemetry * Address PR Comments * Addressed PR Comments * Address PR Comments * Fix tests * Fix integ tests --------- Co-authored-by: Jonathan Makunga <[email protected]> Co-authored-by: Erick Benitez-Ramos <[email protected]> * documentation: change order of pipelines topics (#4427) * prepare release v2.208.0 * update development version to v2.208.1.dev0 * feature: AutoGluon 1.0.0 image_uris update (#4426) --------- Co-authored-by: Erick Benitez-Ramos <[email protected]> Co-authored-by: Jinyoung Lim <[email protected]> Co-authored-by: Shing Lyu <[email protected]> Co-authored-by: Shing Lyu <[email protected]> Co-authored-by: Jonathan Makunga <[email protected]> Co-authored-by: Jonathan Makunga <[email protected]> Co-authored-by: stacicho <[email protected]> Co-authored-by: ci <ci> Co-authored-by: tonyhu <[email protected]> * feat: add hub and hubcontent support in retrieval function for jumpstart model cache (#4438) * feat: jsch jumpstart estimator support (#4439) * Master jumpstart curated hub (#4464) * add hub_arn support for accept_types, content_types, serializers, deserializers, and predictor (#4463) * feature: JumpStart CuratedHub class creation and function definitions (#4448) * MultiPartCopy with Sync Algorithm (#4475) * first pass at sync function with util classes * adding tests and update clases * linting * file generator class inheritance * lint * multipart copy and algorithm updates * modularize sync * reformatting folders * testing for sync * do not tolerate vulnerable * remove prints * handle multithreading progress bar * update tests * optimize function and add hub bucket prefix * docstrings and linting * rebase with master * bad rebase * trying to fix codecov * uncomment codebuild-ci --------- Co-authored-by: ci <ci> Co-authored-by: Nikhil Kulkarni <[email protected]> Co-authored-by: qidewenwhen <[email protected]> Co-authored-by: Anton Repushko <[email protected]> Co-authored-by: Anton Repushko <[email protected]> Co-authored-by: Sai Parthasarathy Miduthuri <[email protected]> Co-authored-by: Rohan Gujarathi <[email protected]> Co-authored-by: Rohan Gujarathi <[email protected]> Co-authored-by: cansun <[email protected]> Co-authored-by: Justin <[email protected]> Co-authored-by: evakravi <[email protected]> Co-authored-by: Kalyani Nikure <[email protected]> Co-authored-by: gv <[email protected]> Co-authored-by: akrishna1995 <[email protected]> Co-authored-by: Ashwin Krishna <[email protected]> Co-authored-by: Samrudhi Sharma <[email protected]> Co-authored-by: adtian2 <[email protected]> Co-authored-by: Andrew Tian <[email protected]> Co-authored-by: Sirut Buasai <[email protected]> Co-authored-by: Danny Bushkanets <[email protected]> Co-authored-by: Erick Benitez-Ramos <[email protected]> Co-authored-by: xiongz945 <[email protected]> Co-authored-by: Samrudhi Sharma <[email protected]> Co-authored-by: Xiong Zeng <[email protected]> Co-authored-by: martinRenou <[email protected]> Co-authored-by: mrudulmn <[email protected]> Co-authored-by: Haotian An <[email protected]> Co-authored-by: liujiaor <[email protected]> Co-authored-by: Jinyoung Lim <[email protected]> Co-authored-by: Shing Lyu <[email protected]> Co-authored-by: Shing Lyu <[email protected]> Co-authored-by: Jonathan Makunga <[email protected]> Co-authored-by: Jonathan Makunga <[email protected]> Co-authored-by: stacicho <[email protected]> Co-authored-by: tonyhu <[email protected]>

* Add new Triton DLC URIs * Update according to black and pylint

nikhil-sk requested a review from a team as a code owner February 16, 2024 22:18

nikhil-sk requested review from mohanasudhan and removed request for a team February 16, 2024 22:18

mohanasudhan approved these changes Feb 17, 2024

View reviewed changes

knikure self-assigned this Feb 20, 2024

knikure self-requested a review February 20, 2024 16:16

knikure reviewed Feb 20, 2024

View reviewed changes

knikure added do-not-merge Use when PR needs to be marked as do not merge and removed do-not-merge Use when PR needs to be marked as do not merge labels Feb 20, 2024

knikure reviewed Feb 26, 2024

View reviewed changes

maaquib approved these changes Feb 26, 2024

View reviewed changes

knikure changed the title ~~Add new Triton DLC URIs~~ feat: Add new Triton DLC URIs Feb 27, 2024

knikure approved these changes Feb 27, 2024

View reviewed changes

nikhil-sk added 2 commits February 27, 2024 12:54

Add new Triton DLC URIs

324bd3d

Update according to black and pylint

d0278a9

knikure force-pushed the add_triton_uris branch from 761b92c to d0278a9 Compare February 27, 2024 20:54

knikure merged commit 5158749 into aws:master Feb 28, 2024

nikhil-sk deleted the add_triton_uris branch February 29, 2024 22:15

bencrabtree pushed a commit to bencrabtree/sagemaker-python-sdk that referenced this pull request Mar 13, 2024

feat: Add new Triton DLC URIs (aws#4432)

2f1bed0

* Add new Triton DLC URIs * Update according to black and pylint

malav-shastri pushed a commit to malav-shastri/sagemaker-python-sdk that referenced this pull request Jun 20, 2024

feat: Add new Triton DLC URIs (aws#4432)

10c93d1

* Add new Triton DLC URIs * Update according to black and pylint

jiapinw pushed a commit to jiapinw/sagemaker-python-sdk that referenced this pull request Jun 25, 2024

feat: Add new Triton DLC URIs (aws#4432)

9fba2f9

* Add new Triton DLC URIs * Update according to black and pylint

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add new Triton DLC URIs #4432

feat: Add new Triton DLC URIs #4432

nikhil-sk commented Feb 16, 2024

nikhil-sk commented Feb 16, 2024 •

edited

Loading

mohanasudhan Feb 17, 2024

nikhil-sk Feb 19, 2024

knikure Feb 20, 2024

knikure Feb 26, 2024

knikure left a comment

mufaddal-rohawala commented Feb 26, 2024

mufaddal-rohawala commented Feb 26, 2024

mufaddal-rohawala commented Feb 26, 2024

mufaddal-rohawala commented Feb 27, 2024

mufaddal-rohawala commented Feb 27, 2024

mufaddal-rohawala commented Feb 27, 2024

codecov bot commented Feb 27, 2024 •

edited

Loading

mufaddal-rohawala commented Feb 27, 2024

mufaddal-rohawala commented Feb 27, 2024

mufaddal-rohawala commented Feb 27, 2024

mufaddal-rohawala commented Feb 27, 2024

mufaddal-rohawala commented Feb 27, 2024

feat: Add new Triton DLC URIs #4432

feat: Add new Triton DLC URIs #4432

Conversation

nikhil-sk commented Feb 16, 2024

Merge Checklist

General

Tests

nikhil-sk commented Feb 16, 2024 • edited Loading

mohanasudhan Feb 17, 2024

Choose a reason for hiding this comment

nikhil-sk Feb 19, 2024

Choose a reason for hiding this comment

knikure Feb 20, 2024

Choose a reason for hiding this comment

knikure Feb 26, 2024

Choose a reason for hiding this comment

knikure left a comment

Choose a reason for hiding this comment

mufaddal-rohawala commented Feb 26, 2024

AWS CodeBuild CI Report

mufaddal-rohawala commented Feb 26, 2024

AWS CodeBuild CI Report

mufaddal-rohawala commented Feb 26, 2024

AWS CodeBuild CI Report

mufaddal-rohawala commented Feb 27, 2024

AWS CodeBuild CI Report

mufaddal-rohawala commented Feb 27, 2024

AWS CodeBuild CI Report

mufaddal-rohawala commented Feb 27, 2024

AWS CodeBuild CI Report

codecov bot commented Feb 27, 2024 • edited Loading

Codecov Report

mufaddal-rohawala commented Feb 27, 2024

AWS CodeBuild CI Report

mufaddal-rohawala commented Feb 27, 2024

AWS CodeBuild CI Report

mufaddal-rohawala commented Feb 27, 2024

AWS CodeBuild CI Report

mufaddal-rohawala commented Feb 27, 2024

AWS CodeBuild CI Report

mufaddal-rohawala commented Feb 27, 2024

AWS CodeBuild CI Report

nikhil-sk commented Feb 16, 2024 •

edited

Loading

codecov bot commented Feb 27, 2024 •

edited

Loading