Skip to content

Commit cc9e858

Browse files
CaptainiaCaptainia
authored
Merge branch 'master' into tgi-config
2 parents e7728cc + 292a00d commit cc9e858

33 files changed

+607
-128
lines changed

‎CHANGELOG.md

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

3+
## v2.233.0 (2024-11-04)
4+
5+
### Features
6+
7+
* triton v24.09
8+
* Marketplace model support in HubService
9+
10+
### Bug Fixes and Other Changes
11+
12+
* Fixing JumpStart Tests
13+
* bumping smp version from 2.6.0 to 2.6.1
14+
* Updates for DJL 0.30.0 release
15+
16+
## v2.232.3 (2024-10-30)
17+
18+
### Bug Fixes and Other Changes
19+
20+
* update image_uri_configs 10-29-2024 07:17:56 PST
21+
* Skip pytorch tests incompatible with latest version 2.4.0
22+
* adding eu-central-2 bucket info to JS constants
23+
* update image_uri_configs 10-23-2024 11:26:03 PST
24+
* update image_uri_configs 10-17-2024 07:17:55 PST
25+
* update image_uri_configs 10-03-2024 07:17:59 PST
26+
* update image_uri_configs 09-27-2024 07:18:01 PST
27+
* modified pull request template
28+
* fixing typo in dependecy setup
29+
* release: huggingface tgi neuronx 0.0.25 image
30+
* Revert "update cloudpickle version to >=2.2.1 in pyproject.toml (#4899)"
31+
* update cloudpickle version to >=2.2.1 in pyproject.toml
32+
* update cloudpickle version to >=2.2.1
33+
* chore(deps): bump pyspark from 3.3.1 to 3.3.2 in /requirements/extras
34+
* changes for PT 2.4 currency upgrade
35+
* chore: add lmi image config in me-central-1
36+
* tests: Implement integration tests covering JumpStart PrivateHub workflows
37+
* Use Miniforge to replace MambaForge
38+
339
## v2.232.2 (2024-10-03)
440

541
### Bug Fixes and Other Changes

‎VERSION

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

‎hatch_build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def read_feature_deps(feature):
2020

2121
optional_dependencies = {"all": []}
2222

23-
for feature in ("feature-processor", "huggingface", "local", "scipy"):
23+
for feature in ("feature-processor", "huggingface", "local", "scipy", "sagemaker-mlflow"):
2424
dependencies = read_feature_deps(feature)
2525
optional_dependencies[feature] = dependencies
2626
optional_dependencies["all"].extend(dependencies)

‎pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ dependencies = [
4848
"PyYAML~=6.0",
4949
"requests",
5050
"sagemaker-core>=1.0.0,<2.0.0",
51-
"sagemaker-mlflow",
5251
"schema",
5352
"smdebug_rulesconfig==1.0.1",
5453
"tblib>=1.7.0,<4",

‎requirements/extras/sagemaker-mlflow_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sagemaker-mlflow>=0.1.0

‎requirements/extras/test_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@ huggingface_hub>=0.23.4
4444
uvicorn>=0.30.1
4545
fastapi>=0.111.0
4646
nest-asyncio
47+
sagemaker-mlflow>=0.1.0

‎src/sagemaker/estimator.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
from sagemaker.workflow.parameters import ParameterString
108108
from sagemaker.workflow.pipeline_context import PipelineSession, runnable_by_pipeline
109109

110-
from sagemaker.mlflow.forward_sagemaker_metrics import log_sagemaker_job_to_mlflow
111110

112111
logger = logging.getLogger(__name__)
113112

@@ -1374,8 +1373,14 @@ def fit(
13741373
forward_to_mlflow_tracking_server = True
13751374
if wait:
13761375
self.latest_training_job.wait(logs=logs)
1377-
if forward_to_mlflow_tracking_server:
1378-
log_sagemaker_job_to_mlflow(self.latest_training_job.name)
1376+
try:
1377+
if forward_to_mlflow_tracking_server:
1378+
from sagemaker.mlflow.forward_sagemaker_metrics import log_sagemaker_job_to_mlflow
1379+
1380+
log_sagemaker_job_to_mlflow(self.latest_training_job.name)
1381+
except ImportError:
1382+
if forward_to_mlflow_tracking_server:
1383+
raise ValueError("Unable to import mlflow, check if sagemaker-mlflow is installed")
13791384

13801385
def _compilation_job_name(self):
13811386
"""Placeholder docstring"""

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

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,44 @@
33
"inference"
44
],
55
"version_aliases": {
6-
"latest": "0.29.0"
6+
"latest": "0.30.0"
77
},
88
"versions": {
9+
"0.30.0": {
10+
"registries": {
11+
"af-south-1": "626614931356",
12+
"il-central-1": "780543022126",
13+
"ap-east-1": "871362719292",
14+
"ap-northeast-1": "763104351884",
15+
"ap-northeast-2": "763104351884",
16+
"ap-northeast-3": "364406365360",
17+
"ap-south-1": "763104351884",
18+
"ap-southeast-1": "763104351884",
19+
"ap-southeast-2": "763104351884",
20+
"ap-southeast-3": "907027046896",
21+
"ca-central-1": "763104351884",
22+
"cn-north-1": "727897471807",
23+
"cn-northwest-1": "727897471807",
24+
"eu-central-1": "763104351884",
25+
"eu-north-1": "763104351884",
26+
"eu-west-1": "763104351884",
27+
"eu-west-2": "763104351884",
28+
"eu-west-3": "763104351884",
29+
"eu-south-1": "692866216735",
30+
"me-south-1": "217643126080",
31+
"me-central-1": "914824155844",
32+
"sa-east-1": "763104351884",
33+
"us-east-1": "763104351884",
34+
"us-east-2": "763104351884",
35+
"us-gov-east-1": "446045086412",
36+
"us-gov-west-1": "442386744353",
37+
"us-west-1": "763104351884",
38+
"us-west-2": "763104351884",
39+
"ca-west-1": "204538143572"
40+
},
41+
"repository": "djl-inference",
42+
"tag_prefix": "0.30.0-lmi12.0.0-cu124"
43+
},
944
"0.29.0": {
1045
"registries": {
1146
"af-south-1": "626614931356",

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

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,43 @@
33
"inference"
44
],
55
"version_aliases": {
6-
"latest": "0.29.0"
6+
"latest": "0.30.0"
77
},
88
"versions": {
9+
"0.30.0": {
10+
"registries": {
11+
"af-south-1": "626614931356",
12+
"il-central-1": "780543022126",
13+
"ap-east-1": "871362719292",
14+
"ap-northeast-1": "763104351884",
15+
"ap-northeast-2": "763104351884",
16+
"ap-northeast-3": "364406365360",
17+
"ap-south-1": "763104351884",
18+
"ap-southeast-1": "763104351884",
19+
"ap-southeast-2": "763104351884",
20+
"ap-southeast-3": "907027046896",
21+
"ca-central-1": "763104351884",
22+
"cn-north-1": "727897471807",
23+
"cn-northwest-1": "727897471807",
24+
"eu-central-1": "763104351884",
25+
"eu-north-1": "763104351884",
26+
"eu-west-1": "763104351884",
27+
"eu-west-2": "763104351884",
28+
"eu-west-3": "763104351884",
29+
"eu-south-1": "692866216735",
30+
"me-south-1": "217643126080",
31+
"sa-east-1": "763104351884",
32+
"us-east-1": "763104351884",
33+
"us-east-2": "763104351884",
34+
"us-gov-east-1": "446045086412",
35+
"us-gov-west-1": "442386744353",
36+
"us-west-1": "763104351884",
37+
"us-west-2": "763104351884",
38+
"ca-west-1": "204538143572"
39+
},
40+
"repository": "djl-inference",
41+
"tag_prefix": "0.30.0-tensorrtllm0.12.0-cu125"
42+
},
943
"0.29.0": {
1044
"registries": {
1145
"af-south-1": "626614931356",

‎src/sagemaker/image_uri_config/image-classification-neo.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"us-gov-west-1": "263933020539",
3232
"us-iso-east-1": "167761179201",
3333
"us-isob-east-1": "406031935815",
34+
"us-isof-east-1": "751086301963",
35+
"us-isof-south-1": "935523707064",
3436
"us-west-1": "710691900526",
3537
"us-west-2": "301217895009"
3638
},

0 commit comments

Comments
 (0)