Skip to content

Commit 12db52d

Browse files
repushkorepushko
authored
Merge branch 'master' into tuner_multifidelity_support
2 parents 6729e82 + 54e0c3a commit 12db52d

File tree

10 files changed

+1057
-398
lines changed

10 files changed

+1057
-398
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.114.0 (2022-10-26)
4+
5+
### Features
6+
7+
* Graviton support for XGB and SKLearn frameworks
8+
* Graviton support for PyTorch and Tensorflow frameworks
9+
* do not expand estimator role when it is pipeline parameter
10+
* added support for batch transform with model monitoring
11+
12+
### Bug Fixes and Other Changes
13+
14+
* regex in tuning integs
15+
* remove debugger environment var set up
16+
* adjacent slash in s3 key
17+
* Fix Repack step auto install behavior
18+
* Add retry for airflow ParsingError
19+
20+
### Documentation Changes
21+
22+
* doc fix
23+
324
## v2.113.0 (2022-10-21)
425

526
### Features

‎VERSION

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

‎src/sagemaker/fw_utils.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,12 @@
144144
SMDISTRIBUTED_SUPPORTED_STRATEGIES = ["dataparallel", "modelparallel"]
145145

146146

147+
GRAVITON_ALLOWED_TARGET_INSTANCE_FAMILY = ["c6g", "t4g", "r6g", "m6g"]
148+
149+
150+
GRAVITON_ALLOWED_FRAMEWORKS = set(["tensorflow", "pytorch", "xgboost", "sklearn"])
151+
152+
147153
def validate_source_dir(script, directory):
148154
"""Validate that the source directory exists and it contains the user script.
149155
@@ -163,12 +169,6 @@ def validate_source_dir(script, directory):
163169
return True
164170

165171

166-
GRAVITON_ALLOWED_TARGET_INSTANCE_FAMILY = ["c6g", "t4g", "r6g", "m6g"]
167-
168-
169-
GRAVITON_ALLOWED_FRAMEWORKS = set(["tensorflow", "pytorch"])
170-
171-
172172
def validate_source_code_input_against_pipeline_variables(
173173
entry_point: Optional[Union[str, PipelineVariable]] = None,
174174
source_dir: Optional[Union[str, PipelineVariable]] = None,

‎src/sagemaker/image_uri_config/sklearn.json

Lines changed: 238 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,245 @@
11
{
2-
"processors": ["cpu"],
3-
"scope": ["inference", "training"],
4-
"versions": {
5-
"0.20.0": {
6-
"py_versions": ["py3"],
7-
"registries": {
8-
"af-south-1": "510948584623",
9-
"ap-east-1": "651117190479",
10-
"ap-northeast-1": "354813040037",
11-
"ap-northeast-2": "366743142698",
12-
"ap-northeast-3": "867004704886",
13-
"ap-south-1": "720646828776",
14-
"ap-southeast-1": "121021644041",
15-
"ap-southeast-2": "783357654285",
16-
"ap-southeast-3": "951798379941",
17-
"ca-central-1": "341280168497",
18-
"cn-north-1": "450853457545",
19-
"cn-northwest-1": "451049120500",
20-
"eu-central-1": "492215442770",
21-
"eu-north-1": "662702820516",
22-
"eu-west-1": "141502667606",
23-
"eu-west-2": "764974769150",
24-
"eu-west-3": "659782779980",
25-
"eu-south-1": "978288397137",
26-
"me-south-1": "801668240914",
27-
"sa-east-1": "737474898029",
28-
"us-east-1": "683313688378",
29-
"us-east-2": "257758044811",
30-
"us-gov-west-1": "414596584902",
31-
"us-iso-east-1": "833128469047",
32-
"us-west-1": "746614075791",
33-
"us-west-2": "246618743249"
2+
"inference": {
3+
"versions": {
4+
"0.20.0": {
5+
"processors": ["cpu"],
6+
"py_versions": ["py3"],
7+
"registries": {
8+
"af-south-1": "510948584623",
9+
"ap-east-1": "651117190479",
10+
"ap-northeast-1": "354813040037",
11+
"ap-northeast-2": "366743142698",
12+
"ap-northeast-3": "867004704886",
13+
"ap-south-1": "720646828776",
14+
"ap-southeast-1": "121021644041",
15+
"ap-southeast-2": "783357654285",
16+
"ap-southeast-3": "951798379941",
17+
"ca-central-1": "341280168497",
18+
"cn-north-1": "450853457545",
19+
"cn-northwest-1": "451049120500",
20+
"eu-central-1": "492215442770",
21+
"eu-north-1": "662702820516",
22+
"eu-west-1": "141502667606",
23+
"eu-west-2": "764974769150",
24+
"eu-west-3": "659782779980",
25+
"eu-south-1": "978288397137",
26+
"me-south-1": "801668240914",
27+
"sa-east-1": "737474898029",
28+
"us-east-1": "683313688378",
29+
"us-east-2": "257758044811",
30+
"us-gov-west-1": "414596584902",
31+
"us-iso-east-1": "833128469047",
32+
"us-west-1": "746614075791",
33+
"us-west-2": "246618743249"
34+
},
35+
"repository": "sagemaker-scikit-learn"
3436
},
35-
"repository": "sagemaker-scikit-learn"
36-
},
37-
"0.23-1": {
38-
"py_versions": ["py3"],
39-
"registries": {
40-
"af-south-1": "510948584623",
41-
"ap-east-1": "651117190479",
42-
"ap-northeast-1": "354813040037",
43-
"ap-northeast-2": "366743142698",
44-
"ap-northeast-3": "867004704886",
45-
"ap-south-1": "720646828776",
46-
"ap-southeast-1": "121021644041",
47-
"ap-southeast-2": "783357654285",
48-
"ap-southeast-3": "951798379941",
49-
"ca-central-1": "341280168497",
50-
"cn-north-1": "450853457545",
51-
"cn-northwest-1": "451049120500",
52-
"eu-central-1": "492215442770",
53-
"eu-north-1": "662702820516",
54-
"eu-west-1": "141502667606",
55-
"eu-west-2": "764974769150",
56-
"eu-west-3": "659782779980",
57-
"eu-south-1": "978288397137",
58-
"me-south-1": "801668240914",
59-
"sa-east-1": "737474898029",
60-
"us-east-1": "683313688378",
61-
"us-east-2": "257758044811",
62-
"us-gov-west-1": "414596584902",
63-
"us-iso-east-1": "833128469047",
64-
"us-west-1": "746614075791",
65-
"us-west-2": "246618743249"
37+
"0.23-1": {
38+
"processors": ["cpu"],
39+
"py_versions": ["py3"],
40+
"registries": {
41+
"af-south-1": "510948584623",
42+
"ap-east-1": "651117190479",
43+
"ap-northeast-1": "354813040037",
44+
"ap-northeast-2": "366743142698",
45+
"ap-northeast-3": "867004704886",
46+
"ap-south-1": "720646828776",
47+
"ap-southeast-1": "121021644041",
48+
"ap-southeast-2": "783357654285",
49+
"ap-southeast-3": "951798379941",
50+
"ca-central-1": "341280168497",
51+
"cn-north-1": "450853457545",
52+
"cn-northwest-1": "451049120500",
53+
"eu-central-1": "492215442770",
54+
"eu-north-1": "662702820516",
55+
"eu-west-1": "141502667606",
56+
"eu-west-2": "764974769150",
57+
"eu-west-3": "659782779980",
58+
"eu-south-1": "978288397137",
59+
"me-south-1": "801668240914",
60+
"sa-east-1": "737474898029",
61+
"us-east-1": "683313688378",
62+
"us-east-2": "257758044811",
63+
"us-gov-west-1": "414596584902",
64+
"us-iso-east-1": "833128469047",
65+
"us-west-1": "746614075791",
66+
"us-west-2": "246618743249"
67+
},
68+
"repository": "sagemaker-scikit-learn"
6669
},
67-
"repository": "sagemaker-scikit-learn"
68-
},
69-
"1.0-1": {
70-
"py_versions": ["py3"],
71-
"registries": {
72-
"af-south-1": "510948584623",
73-
"ap-east-1": "651117190479",
74-
"ap-northeast-1": "354813040037",
75-
"ap-northeast-2": "366743142698",
76-
"ap-northeast-3": "867004704886",
77-
"ap-south-1": "720646828776",
78-
"ap-southeast-1": "121021644041",
79-
"ap-southeast-2": "783357654285",
80-
"ap-southeast-3": "951798379941",
81-
"ca-central-1": "341280168497",
82-
"cn-north-1": "450853457545",
83-
"cn-northwest-1": "451049120500",
84-
"eu-central-1": "492215442770",
85-
"eu-north-1": "662702820516",
86-
"eu-west-1": "141502667606",
87-
"eu-west-2": "764974769150",
88-
"eu-west-3": "659782779980",
89-
"eu-south-1": "978288397137",
90-
"me-south-1": "801668240914",
91-
"sa-east-1": "737474898029",
92-
"us-east-1": "683313688378",
93-
"us-east-2": "257758044811",
94-
"us-gov-west-1": "414596584902",
95-
"us-iso-east-1": "833128469047",
96-
"us-west-1": "746614075791",
97-
"us-west-2": "246618743249"
70+
"1.0-1": {
71+
"processors": ["cpu"],
72+
"py_versions": ["py3"],
73+
"registries": {
74+
"af-south-1": "510948584623",
75+
"ap-east-1": "651117190479",
76+
"ap-northeast-1": "354813040037",
77+
"ap-northeast-2": "366743142698",
78+
"ap-northeast-3": "867004704886",
79+
"ap-south-1": "720646828776",
80+
"ap-southeast-1": "121021644041",
81+
"ap-southeast-2": "783357654285",
82+
"ap-southeast-3": "951798379941",
83+
"ca-central-1": "341280168497",
84+
"cn-north-1": "450853457545",
85+
"cn-northwest-1": "451049120500",
86+
"eu-central-1": "492215442770",
87+
"eu-north-1": "662702820516",
88+
"eu-west-1": "141502667606",
89+
"eu-west-2": "764974769150",
90+
"eu-west-3": "659782779980",
91+
"eu-south-1": "978288397137",
92+
"me-south-1": "801668240914",
93+
"sa-east-1": "737474898029",
94+
"us-east-1": "683313688378",
95+
"us-east-2": "257758044811",
96+
"us-gov-west-1": "414596584902",
97+
"us-iso-east-1": "833128469047",
98+
"us-west-1": "746614075791",
99+
"us-west-2": "246618743249"
100+
},
101+
"repository": "sagemaker-scikit-learn"
102+
}
103+
}
104+
},
105+
"training": {
106+
"versions": {
107+
"0.20.0": {
108+
"processors": ["cpu"],
109+
"py_versions": ["py3"],
110+
"registries": {
111+
"af-south-1": "510948584623",
112+
"ap-east-1": "651117190479",
113+
"ap-northeast-1": "354813040037",
114+
"ap-northeast-2": "366743142698",
115+
"ap-northeast-3": "867004704886",
116+
"ap-south-1": "720646828776",
117+
"ap-southeast-1": "121021644041",
118+
"ap-southeast-2": "783357654285",
119+
"ap-southeast-3": "951798379941",
120+
"ca-central-1": "341280168497",
121+
"cn-north-1": "450853457545",
122+
"cn-northwest-1": "451049120500",
123+
"eu-central-1": "492215442770",
124+
"eu-north-1": "662702820516",
125+
"eu-west-1": "141502667606",
126+
"eu-west-2": "764974769150",
127+
"eu-west-3": "659782779980",
128+
"eu-south-1": "978288397137",
129+
"me-south-1": "801668240914",
130+
"sa-east-1": "737474898029",
131+
"us-east-1": "683313688378",
132+
"us-east-2": "257758044811",
133+
"us-gov-west-1": "414596584902",
134+
"us-iso-east-1": "833128469047",
135+
"us-west-1": "746614075791",
136+
"us-west-2": "246618743249"
137+
},
138+
"repository": "sagemaker-scikit-learn"
139+
},
140+
"0.23-1": {
141+
"processors": ["cpu"],
142+
"py_versions": ["py3"],
143+
"registries": {
144+
"af-south-1": "510948584623",
145+
"ap-east-1": "651117190479",
146+
"ap-northeast-1": "354813040037",
147+
"ap-northeast-2": "366743142698",
148+
"ap-northeast-3": "867004704886",
149+
"ap-south-1": "720646828776",
150+
"ap-southeast-1": "121021644041",
151+
"ap-southeast-2": "783357654285",
152+
"ap-southeast-3": "951798379941",
153+
"ca-central-1": "341280168497",
154+
"cn-north-1": "450853457545",
155+
"cn-northwest-1": "451049120500",
156+
"eu-central-1": "492215442770",
157+
"eu-north-1": "662702820516",
158+
"eu-west-1": "141502667606",
159+
"eu-west-2": "764974769150",
160+
"eu-west-3": "659782779980",
161+
"eu-south-1": "978288397137",
162+
"me-south-1": "801668240914",
163+
"sa-east-1": "737474898029",
164+
"us-east-1": "683313688378",
165+
"us-east-2": "257758044811",
166+
"us-gov-west-1": "414596584902",
167+
"us-iso-east-1": "833128469047",
168+
"us-west-1": "746614075791",
169+
"us-west-2": "246618743249"
170+
},
171+
"repository": "sagemaker-scikit-learn"
98172
},
99-
"repository": "sagemaker-scikit-learn"
173+
"1.0-1": {
174+
"processors": ["cpu"],
175+
"py_versions": ["py3"],
176+
"registries": {
177+
"af-south-1": "510948584623",
178+
"ap-east-1": "651117190479",
179+
"ap-northeast-1": "354813040037",
180+
"ap-northeast-2": "366743142698",
181+
"ap-northeast-3": "867004704886",
182+
"ap-south-1": "720646828776",
183+
"ap-southeast-1": "121021644041",
184+
"ap-southeast-2": "783357654285",
185+
"ap-southeast-3": "951798379941",
186+
"ca-central-1": "341280168497",
187+
"cn-north-1": "450853457545",
188+
"cn-northwest-1": "451049120500",
189+
"eu-central-1": "492215442770",
190+
"eu-north-1": "662702820516",
191+
"eu-west-1": "141502667606",
192+
"eu-west-2": "764974769150",
193+
"eu-west-3": "659782779980",
194+
"eu-south-1": "978288397137",
195+
"me-south-1": "801668240914",
196+
"sa-east-1": "737474898029",
197+
"us-east-1": "683313688378",
198+
"us-east-2": "257758044811",
199+
"us-gov-west-1": "414596584902",
200+
"us-iso-east-1": "833128469047",
201+
"us-west-1": "746614075791",
202+
"us-west-2": "246618743249"
203+
},
204+
"repository": "sagemaker-scikit-learn"
205+
}
206+
}
207+
},
208+
"inference_graviton": {
209+
"versions": {
210+
"1.0-1": {
211+
"processors": ["cpu"],
212+
"py_versions": ["py3"],
213+
"registries": {
214+
"af-south-1": "510948584623",
215+
"ap-east-1": "651117190479",
216+
"ap-northeast-1": "354813040037",
217+
"ap-northeast-2": "366743142698",
218+
"ap-northeast-3": "867004704886",
219+
"ap-south-1": "720646828776",
220+
"ap-southeast-1": "121021644041",
221+
"ap-southeast-2": "783357654285",
222+
"ap-southeast-3": "951798379941",
223+
"ca-central-1": "341280168497",
224+
"cn-north-1": "450853457545",
225+
"cn-northwest-1": "451049120500",
226+
"eu-central-1": "492215442770",
227+
"eu-north-1": "662702820516",
228+
"eu-west-1": "141502667606",
229+
"eu-west-2": "764974769150",
230+
"eu-west-3": "659782779980",
231+
"eu-south-1": "978288397137",
232+
"me-south-1": "801668240914",
233+
"sa-east-1": "737474898029",
234+
"us-east-1": "683313688378",
235+
"us-east-2": "257758044811",
236+
"us-gov-west-1": "414596584902",
237+
"us-iso-east-1": "833128469047",
238+
"us-west-1": "746614075791",
239+
"us-west-2": "246618743249"
240+
},
241+
"repository": "sagemaker-scikit-learn"
242+
}
100243
}
101244
}
102245
}

0 commit comments

Comments
 (0)