Skip to content

Commit bc24f5e

Browse files
sushanthkumar2004sushanthkumar2004
authored
Merge branch 'aws:master' into data-quality-automatic-dashboard
2 parents 9f1adf2 + c200b4f commit bc24f5e

20 files changed

+354
-43
lines changed

‎.github/workflows/codeql.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: "CodeQL"
2+
on:
3+
push:
4+
branches: [ "master" ]
5+
pull_request:
6+
branches: [ "master" ]
7+
schedule:
8+
- cron: '30 8 * * *'
9+
jobs:
10+
analyze:
11+
name: Analyze (${{ matrix.language }})
12+
runs-on: ${{ 'ubuntu-latest' }}
13+
permissions:
14+
security-events: write
15+
packages: read
16+
17+
strategy:
18+
matrix:
19+
include:
20+
- language: python
21+
build-mode: none
22+
- language: java-kotlin
23+
build-mode: none
24+
steps:
25+
- name: Checkout repository
26+
uses: actions/checkout@6ccd57f4c5d15bdc2fef309bd9fb6cc9db2ef1c6
27+
- name: Initialize CodeQL
28+
uses: github/codeql-action/init@4b1d7da102ff94aca014c0245062b1a463356d72
29+
with:
30+
languages: ${{ matrix.language }}
31+
build-mode: ${{ matrix.build-mode }}
32+
- name: Perform CodeQL Analysis
33+
uses: github/codeql-action/analyze@4b1d7da102ff94aca014c0245062b1a463356d72
34+
with:
35+
category: "/language:${{matrix.language}}"

‎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.227.0 (2024-07-30)
4+
5+
### Features
6+
7+
* added code scanning through CodeQL
8+
9+
### Bug Fixes and Other Changes
10+
11+
* Fixed cpu isntance type for the estimator register test
12+
* update image_uri_configs 07-29-2024 11:28:28 PST
13+
* avoid AccessDenied error for a while on SageMaker Studio wtih do…
14+
* SMP PT 2.3 Fix
15+
* chore: pin framework version in serverless inference tests
16+
* image uri in TGI 2.2.0 image
17+
* explicitly access enum member values to avoid Python version related regression
18+
* chore: add huggingface TGI 2.2.0 config
19+
* update image_uri_configs 07-22-2024 11:53:54 PST
20+
* update image_uri_configs 07-17-2024 07:17:38 PST
21+
* update image_uri_configs 07-16-2024 07:17:45 PST
22+
* add support for new regions
23+
324
## v2.226.1 (2024-07-17)
425

526
## v2.226.0 (2024-07-12)

‎VERSION

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

‎src/sagemaker/estimator.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
from sagemaker.interactive_apps import SupportedInteractiveAppTypes
6969
from sagemaker.interactive_apps.tensorboard import TensorBoardApp
7070
from sagemaker.instance_group import InstanceGroup
71+
from sagemaker.model_card.model_card import ModelCard, TrainingDetails
7172
from sagemaker.utils import instance_supports_kms
7273
from sagemaker.job import _Job
7374
from sagemaker.jumpstart.utils import (
@@ -1797,8 +1798,17 @@ def register(
17971798
else:
17981799
if "model_kms_key" not in kwargs:
17991800
kwargs["model_kms_key"] = self.output_kms_key
1800-
model = self.create_model(image_uri=image_uri, **kwargs)
1801+
model = self.create_model(image_uri=image_uri, name=model_name, **kwargs)
18011802
model.name = model_name
1803+
if self.model_data is not None and model_card is None:
1804+
training_details = TrainingDetails.from_model_s3_artifacts(
1805+
model_artifacts=[self.model_data], sagemaker_session=self.sagemaker_session
1806+
)
1807+
model_card = ModelCard(
1808+
name="estimator_card",
1809+
training_details=training_details,
1810+
sagemaker_session=self.sagemaker_session,
1811+
)
18021812
return model.register(
18031813
content_types,
18041814
response_types,

‎src/sagemaker/fw_utils.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@
152152
"2.1.0",
153153
"2.1.2",
154154
"2.2.0",
155-
"2.3.0",
156155
"2.3.1",
157156
]
158157

‎src/sagemaker/image_uri_config/huggingface-llm.json

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"1.2": "1.2.0",
1313
"1.3": "1.3.3",
1414
"1.4": "1.4.5",
15-
"2.0": "2.0.2"
15+
"2.0": "2.2.0"
1616
},
1717
"versions": {
1818
"0.6.0": {
@@ -672,6 +672,53 @@
672672
"container_version": {
673673
"gpu": "cu121-ubuntu22.04"
674674
}
675+
},
676+
"2.2.0": {
677+
"py_versions": [
678+
"py310"
679+
],
680+
"registries": {
681+
"af-south-1": "626614931356",
682+
"il-central-1": "780543022126",
683+
"ap-east-1": "871362719292",
684+
"ap-northeast-1": "763104351884",
685+
"ap-northeast-2": "763104351884",
686+
"ap-northeast-3": "364406365360",
687+
"ap-south-1": "763104351884",
688+
"ap-south-2": "772153158452",
689+
"ap-southeast-1": "763104351884",
690+
"ap-southeast-2": "763104351884",
691+
"ap-southeast-3": "907027046896",
692+
"ap-southeast-4": "457447274322",
693+
"ca-central-1": "763104351884",
694+
"cn-north-1": "727897471807",
695+
"cn-northwest-1": "727897471807",
696+
"eu-central-1": "763104351884",
697+
"eu-central-2": "380420809688",
698+
"eu-north-1": "763104351884",
699+
"eu-west-1": "763104351884",
700+
"eu-west-2": "763104351884",
701+
"eu-west-3": "763104351884",
702+
"eu-south-1": "692866216735",
703+
"eu-south-2": "503227376785",
704+
"me-south-1": "217643126080",
705+
"me-central-1": "914824155844",
706+
"sa-east-1": "763104351884",
707+
"us-east-1": "763104351884",
708+
"us-east-2": "763104351884",
709+
"us-gov-east-1": "446045086412",
710+
"us-gov-west-1": "442386744353",
711+
"us-iso-east-1": "886529160074",
712+
"us-isob-east-1": "094389454867",
713+
"us-west-1": "763104351884",
714+
"us-west-2": "763104351884",
715+
"ca-west-1": "204538143572"
716+
},
717+
"tag_prefix": "2.3.0-tgi2.2.0",
718+
"repository": "huggingface-pytorch-tgi-inference",
719+
"container_version": {
720+
"gpu": "cu121-ubuntu22.04-v2.0"
721+
}
675722
}
676723
}
677724
}

‎src/sagemaker/image_uri_config/huggingface-tei-cpu.json

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"cpu"
55
],
66
"version_aliases": {
7-
"1.2": "1.2.3"
7+
"1.2": "1.2.3",
8+
"1.4": "1.4.0"
89
},
910
"versions": {
1011
"1.2.3": {
@@ -53,6 +54,53 @@
5354
"container_version": {
5455
"cpu": "ubuntu22.04"
5556
}
57+
},
58+
"1.4.0":{
59+
"py_versions": [
60+
"py310"
61+
],
62+
"registries": {
63+
"af-south-1": "510948584623",
64+
"ap-east-1": "651117190479",
65+
"ap-northeast-1": "354813040037",
66+
"ap-northeast-2": "366743142698",
67+
"ap-northeast-3": "867004704886",
68+
"ap-south-1": "720646828776",
69+
"ap-south-2": "628508329040",
70+
"ap-southeast-1": "121021644041",
71+
"ap-southeast-2": "783357654285",
72+
"ap-southeast-3": "951798379941",
73+
"ap-southeast-4": "106583098589",
74+
"ca-central-1": "341280168497",
75+
"ca-west-1": "190319476487",
76+
"cn-north-1": "450853457545",
77+
"cn-northwest-1": "451049120500",
78+
"eu-central-1": "492215442770",
79+
"eu-central-2": "680994064768",
80+
"eu-north-1": "662702820516",
81+
"eu-south-1": "978288397137",
82+
"eu-south-2": "104374241257",
83+
"eu-west-1": "141502667606",
84+
"eu-west-2": "764974769150",
85+
"eu-west-3": "659782779980",
86+
"il-central-1": "898809789911",
87+
"me-central-1": "272398656194",
88+
"me-south-1": "801668240914",
89+
"sa-east-1": "737474898029",
90+
"us-east-1": "683313688378",
91+
"us-east-2": "257758044811",
92+
"us-gov-east-1": "237065988967",
93+
"us-gov-west-1": "414596584902",
94+
"us-iso-east-1": "833128469047",
95+
"us-isob-east-1": "281123927165",
96+
"us-west-1": "746614075791",
97+
"us-west-2": "246618743249"
98+
},
99+
"tag_prefix": "2.0.1-tei1.4.0",
100+
"repository": "tei-cpu",
101+
"container_version": {
102+
"cpu": "ubuntu22.04"
103+
}
56104
}
57105
}
58106
}

‎src/sagemaker/image_uri_config/huggingface-tei.json

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"gpu"
55
],
66
"version_aliases": {
7-
"1.2": "1.2.3"
7+
"1.2": "1.2.3",
8+
"1.4": "1.4.0"
89
},
910
"versions": {
1011
"1.2.3": {
@@ -53,6 +54,53 @@
5354
"container_version": {
5455
"gpu": "cu122-ubuntu22.04"
5556
}
57+
},
58+
"1.4.0": {
59+
"py_versions": [
60+
"py310"
61+
],
62+
"registries": {
63+
"af-south-1": "510948584623",
64+
"ap-east-1": "651117190479",
65+
"ap-northeast-1": "354813040037",
66+
"ap-northeast-2": "366743142698",
67+
"ap-northeast-3": "867004704886",
68+
"ap-south-1": "720646828776",
69+
"ap-south-2": "628508329040",
70+
"ap-southeast-1": "121021644041",
71+
"ap-southeast-2": "783357654285",
72+
"ap-southeast-3": "951798379941",
73+
"ap-southeast-4": "106583098589",
74+
"ca-central-1": "341280168497",
75+
"ca-west-1": "190319476487",
76+
"cn-north-1": "450853457545",
77+
"cn-northwest-1": "451049120500",
78+
"eu-central-1": "492215442770",
79+
"eu-central-2": "680994064768",
80+
"eu-north-1": "662702820516",
81+
"eu-south-1": "978288397137",
82+
"eu-south-2": "104374241257",
83+
"eu-west-1": "141502667606",
84+
"eu-west-2": "764974769150",
85+
"eu-west-3": "659782779980",
86+
"il-central-1": "898809789911",
87+
"me-central-1": "272398656194",
88+
"me-south-1": "801668240914",
89+
"sa-east-1": "737474898029",
90+
"us-east-1": "683313688378",
91+
"us-east-2": "257758044811",
92+
"us-gov-east-1": "237065988967",
93+
"us-gov-west-1": "414596584902",
94+
"us-iso-east-1": "833128469047",
95+
"us-isob-east-1": "281123927165",
96+
"us-west-1": "746614075791",
97+
"us-west-2": "246618743249"
98+
},
99+
"tag_prefix": "2.0.1-tei1.4.0",
100+
"repository": "tei",
101+
"container_version": {
102+
"gpu": "cu122-ubuntu22.04"
103+
}
56104
}
57105
}
58106
}

‎src/sagemaker/image_uri_config/pytorch-smp.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"2.1": "2.1.2",
99
"2.2": "2.3.1",
1010
"2.2.0": "2.3.1",
11-
"2.3": "2.4.0"
11+
"2.3.1": "2.4.0"
1212
},
1313
"versions": {
1414
"2.0.1": {

‎src/sagemaker/image_uri_config/pytorch.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,7 @@
10081008
"us-gov-west-1": "442386744353",
10091009
"us-iso-east-1": "886529160074",
10101010
"us-isob-east-1": "094389454867",
1011+
"us-isof-east-1": "303241398832",
10111012
"us-isof-south-1": "454834333376",
10121013
"us-west-1": "763104351884",
10131014
"us-west-2": "763104351884"
@@ -1052,6 +1053,7 @@
10521053
"us-gov-west-1": "442386744353",
10531054
"us-iso-east-1": "886529160074",
10541055
"us-isob-east-1": "094389454867",
1056+
"us-isof-east-1": "303241398832",
10551057
"us-isof-south-1": "454834333376",
10561058
"us-west-1": "763104351884",
10571059
"us-west-2": "763104351884"
@@ -2331,6 +2333,7 @@
23312333
"us-gov-west-1": "442386744353",
23322334
"us-iso-east-1": "886529160074",
23332335
"us-isob-east-1": "094389454867",
2336+
"us-isof-east-1": "303241398832",
23342337
"us-isof-south-1": "454834333376",
23352338
"us-west-1": "763104351884",
23362339
"us-west-2": "763104351884"
@@ -2419,6 +2422,7 @@
24192422
"us-gov-west-1": "442386744353",
24202423
"us-iso-east-1": "886529160074",
24212424
"us-isob-east-1": "094389454867",
2425+
"us-isof-east-1": "303241398832",
24222426
"us-isof-south-1": "454834333376",
24232427
"us-west-1": "763104351884",
24242428
"us-west-2": "763104351884"

0 commit comments

Comments
 (0)