Skip to content

Commit 07d3f9e

Browse files
HCharlieHCharlie
authored
Merge branch 'master' into MLX-1269
2 parents 2f5345a + 58717d2 commit 07d3f9e

File tree

24 files changed

+1027
-81
lines changed

24 files changed

+1027
-81
lines changed

‎CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Changelog
22

3+
## v2.214.2 (2024-04-01)
4+
5+
### Bug Fixes and Other Changes
6+
7+
* Skip JS Tune integration test
8+
* bump apache-airflow version to 2.8.3
9+
* bump onnx version to >=1.15.0
10+
* Updates for DJL 0.27.0 release
11+
* Tune (local mode) support for Jumpstart Models
12+
* attach jumpstart estimator for gated model
13+
14+
## v2.214.1 (2024-03-27)
15+
16+
### Bug Fixes and Other Changes
17+
18+
* Update schema dependency version
19+
* remove failing deprecated tests from suite
20+
* update readme, trigger p311 tests
21+
* JumpStart list models flaky tests
22+
* fix badge in README
23+
324
## v2.214.0 (2024-03-22)
425

526
### Features

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.214.1.dev0
1+
2.214.3.dev0

‎requirements/extras/test_requirements.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ awslogs==0.14.0
1212
black==22.3.0
1313
stopit==1.1.2
1414
# Update tox.ini to have correct version of airflow constraints file
15-
apache-airflow==2.8.2
15+
apache-airflow==2.8.3
1616
apache-airflow-providers-amazon==7.2.1
1717
attrs>=23.1.0,<24
1818
fabric==2.6.0
@@ -31,6 +31,8 @@ transformers>=4.36.0
3131
sentencepiece==0.1.99
3232
# https://github.com/triton-inference-server/server/issues/6246
3333
tritonclient[http]<2.37.0
34-
onnx==1.14.1
34+
onnx>=1.15.0
3535
# tf2onnx==1.15.1
3636
nbformat>=5.9,<6
37+
accelerate>=0.24.1,<=0.27.0
38+
schema==0.7.5

‎src/sagemaker/image_uri_config/djl-deepspeed.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,38 @@
33
"inference"
44
],
55
"versions": {
6+
"0.27.0": {
7+
"registries": {
8+
"af-south-1": "626614931356",
9+
"il-central-1": "780543022126",
10+
"ap-east-1": "871362719292",
11+
"ap-northeast-1": "763104351884",
12+
"ap-northeast-2": "763104351884",
13+
"ap-northeast-3": "364406365360",
14+
"ap-south-1": "763104351884",
15+
"ap-southeast-1": "763104351884",
16+
"ap-southeast-2": "763104351884",
17+
"ap-southeast-3": "907027046896",
18+
"ca-central-1": "763104351884",
19+
"cn-north-1": "727897471807",
20+
"cn-northwest-1": "727897471807",
21+
"eu-central-1": "763104351884",
22+
"eu-north-1": "763104351884",
23+
"eu-west-1": "763104351884",
24+
"eu-west-2": "763104351884",
25+
"eu-west-3": "763104351884",
26+
"eu-south-1": "692866216735",
27+
"me-south-1": "217643126080",
28+
"sa-east-1": "763104351884",
29+
"us-east-1": "763104351884",
30+
"us-east-2": "763104351884",
31+
"us-west-1": "763104351884",
32+
"us-west-2": "763104351884",
33+
"ca-west-1": "204538143572"
34+
},
35+
"repository": "djl-inference",
36+
"tag_prefix": "0.27.0-deepspeed0.12.6-cu121"
37+
},
638
"0.26.0": {
739
"registries": {
840
"af-south-1": "626614931356",

‎src/sagemaker/image_uri_config/djl-neuronx.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,24 @@
33
"inference"
44
],
55
"versions": {
6+
"0.27.0": {
7+
"registries": {
8+
"ap-northeast-1": "763104351884",
9+
"ap-south-1": "763104351884",
10+
"ap-southeast-1": "763104351884",
11+
"ap-southeast-2": "763104351884",
12+
"eu-central-1": "763104351884",
13+
"eu-west-1": "763104351884",
14+
"eu-west-3": "763104351884",
15+
"sa-east-1": "763104351884",
16+
"us-east-1": "763104351884",
17+
"us-east-2": "763104351884",
18+
"us-west-2": "763104351884",
19+
"ca-west-1": "204538143572"
20+
},
21+
"repository": "djl-inference",
22+
"tag_prefix": "0.27.0-neuronx-sdk2.18.0"
23+
},
624
"0.26.0": {
725
"registries": {
826
"ap-northeast-1": "763104351884",

‎src/sagemaker/image_uri_config/djl-tensorrtllm.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,38 @@
33
"inference"
44
],
55
"versions": {
6+
"0.27.0": {
7+
"registries": {
8+
"af-south-1": "626614931356",
9+
"il-central-1": "780543022126",
10+
"ap-east-1": "871362719292",
11+
"ap-northeast-1": "763104351884",
12+
"ap-northeast-2": "763104351884",
13+
"ap-northeast-3": "364406365360",
14+
"ap-south-1": "763104351884",
15+
"ap-southeast-1": "763104351884",
16+
"ap-southeast-2": "763104351884",
17+
"ap-southeast-3": "907027046896",
18+
"ca-central-1": "763104351884",
19+
"cn-north-1": "727897471807",
20+
"cn-northwest-1": "727897471807",
21+
"eu-central-1": "763104351884",
22+
"eu-north-1": "763104351884",
23+
"eu-west-1": "763104351884",
24+
"eu-west-2": "763104351884",
25+
"eu-west-3": "763104351884",
26+
"eu-south-1": "692866216735",
27+
"me-south-1": "217643126080",
28+
"sa-east-1": "763104351884",
29+
"us-east-1": "763104351884",
30+
"us-east-2": "763104351884",
31+
"us-west-1": "763104351884",
32+
"us-west-2": "763104351884",
33+
"ca-west-1": "204538143572"
34+
},
35+
"repository": "djl-inference",
36+
"tag_prefix": "0.27.0-tensorrtllm0.8.0-cu122"
37+
},
638
"0.26.0": {
739
"registries": {
840
"af-south-1": "626614931356",

‎src/sagemaker/jumpstart/estimator.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
from sagemaker.jumpstart.utils import (
3838
validate_model_id_and_get_type,
3939
resolve_model_sagemaker_config_field,
40+
verify_model_region_and_return_specs,
4041
)
4142
from sagemaker.utils import stringify_object, format_tags, Tags
4243
from sagemaker.model_monitor.data_capture_config import DataCaptureConfig
@@ -729,11 +730,27 @@ def attach(
729730

730731
model_version = model_version or "*"
731732

733+
additional_kwargs = {"model_id": model_id, "model_version": model_version}
734+
735+
model_specs = verify_model_region_and_return_specs(
736+
model_id=model_id,
737+
version=model_version,
738+
region=sagemaker_session.boto_region_name,
739+
scope=JumpStartScriptScope.TRAINING,
740+
tolerate_deprecated_model=True, # model is already trained, so tolerate if deprecated
741+
tolerate_vulnerable_model=True, # model is already trained, so tolerate if vulnerable
742+
sagemaker_session=sagemaker_session,
743+
)
744+
745+
# eula was already accepted if the model was successfully trained
746+
if model_specs.is_gated_model():
747+
additional_kwargs.update({"environment": {"accept_eula": "true"}})
748+
732749
return cls._attach(
733750
training_job_name=training_job_name,
734751
sagemaker_session=sagemaker_session,
735752
model_channel_name=model_channel_name,
736-
additional_kwargs={"model_id": model_id, "model_version": model_version},
753+
additional_kwargs=additional_kwargs,
737754
)
738755

739756
def deploy(

0 commit comments

Comments
 (0)