Skip to content

Commit 64fbce1

Browse files
danabensdanabens
authored
Merge branch 'master' into retry-context
2 parents 84d9173 + 1b5020b commit 64fbce1

File tree

6 files changed

+189
-1
lines changed

6 files changed

+189
-1
lines changed

‎CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## v2.65.0 (2021-10-21)
4+
5+
### Features
6+
7+
* modify RLEstimator to use newly generated Ray image (1.6.0)
8+
* network isolation mode for xgboost
9+
* update clarify imageURI for PDT
10+
11+
### Bug Fixes and Other Changes
12+
13+
* retry downstream_trials test
14+
* Add retries to pipeline execution
15+
316
## v2.64.0 (2021-10-20)
417

518
### Deprecations and Removals

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.64.1.dev0
1+
2.65.1.dev0

‎doc/v2.rst

+6
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,12 @@ Please use :func:`sagemaker.s3.parse_s3_url` instead.
265265

266266
The class ``sagemaker.session.ModelContainer`` has been deprecated, as it is not needed for creating inference pipelines.
267267

268+
``sagemaker.workflow.condition_step.JsonGet``
269+
---------------------------------------------
270+
271+
The class ``sagemaker.workflow.condition_step.JsonGet`` has been deprecated.
272+
Please use :class:`sagemaker.workflow.functions.JsonGet` instead.
273+
268274
Parameter and Class Name Changes
269275
================================
270276

‎src/sagemaker/image_uri_config/autogluon.json

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"training": {
3+
"processors": ["cpu", "gpu"],
4+
"versions": {
5+
"0.3.1": {
6+
"registries": {
7+
"af-south-1": "626614931356",
8+
"ap-east-1": "871362719292",
9+
"ap-northeast-1": "763104351884",
10+
"ap-northeast-2": "763104351884",
11+
"ap-northeast-3": "364406365360",
12+
"ap-south-1": "763104351884",
13+
"ap-southeast-1": "763104351884",
14+
"ap-southeast-2": "763104351884",
15+
"ca-central-1": "763104351884",
16+
"eu-central-1": "763104351884",
17+
"eu-north-1": "763104351884",
18+
"eu-west-1": "763104351884",
19+
"eu-west-2": "763104351884",
20+
"eu-west-3": "763104351884",
21+
"eu-south-1": "692866216735",
22+
"me-south-1": "217643126080",
23+
"sa-east-1": "763104351884",
24+
"us-east-1": "763104351884",
25+
"us-east-2": "763104351884",
26+
"us-gov-west-1": "442386744353",
27+
"us-iso-east-1": "886529160074",
28+
"us-west-1": "763104351884",
29+
"us-west-2": "763104351884"
30+
},
31+
"repository": "autogluon-training",
32+
"py_versions": ["py37"]
33+
}
34+
}
35+
},
36+
"inference": {
37+
"processors": ["cpu"],
38+
"versions": {
39+
"0.3.1": {
40+
"registries": {
41+
"af-south-1": "626614931356",
42+
"ap-east-1": "871362719292",
43+
"ap-northeast-1": "763104351884",
44+
"ap-northeast-2": "763104351884",
45+
"ap-northeast-3": "364406365360",
46+
"ap-south-1": "763104351884",
47+
"ap-southeast-1": "763104351884",
48+
"ap-southeast-2": "763104351884",
49+
"ca-central-1": "763104351884",
50+
"cn-north-1": "727897471807",
51+
"cn-northwest-1": "727897471807",
52+
"eu-central-1": "763104351884",
53+
"eu-north-1": "763104351884",
54+
"eu-west-1": "763104351884",
55+
"eu-west-2": "763104351884",
56+
"eu-west-3": "763104351884",
57+
"eu-south-1": "692866216735",
58+
"me-south-1": "217643126080",
59+
"sa-east-1": "763104351884",
60+
"us-east-1": "763104351884",
61+
"us-east-2": "763104351884",
62+
"us-gov-west-1": "442386744353",
63+
"us-iso-east-1": "886529160074",
64+
"us-west-1": "763104351884",
65+
"us-west-2": "763104351884"
66+
},
67+
"repository": "autogluon-inference",
68+
"py_versions": ["py37"]
69+
}
70+
}
71+
}
72+
}

‎tests/conftest.py

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"xgboost",
6060
"spark",
6161
"huggingface",
62+
"autogluon",
6263
)
6364

6465

‎tests/unit/sagemaker/image_uris/test_autogluon.py

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License"). You
4+
# may not use this file except in compliance with the License. A copy of
5+
# the License is located at
6+
#
7+
# http://aws.amazon.com/apache2.0/
8+
#
9+
# or in the "license" file accompanying this file. This file is
10+
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
11+
# ANY KIND, either express or implied. See the License for the specific
12+
# language governing permissions and limitations under the License.
13+
from __future__ import absolute_import
14+
15+
import pytest
16+
17+
from sagemaker import image_uris
18+
from tests.unit.sagemaker.image_uris import expected_uris
19+
20+
ACCOUNTS = {
21+
"af-south-1": "626614931356",
22+
"ap-east-1": "871362719292",
23+
"ap-northeast-1": "763104351884",
24+
"ap-northeast-2": "763104351884",
25+
"ap-northeast-3": "364406365360",
26+
"ap-south-1": "763104351884",
27+
"ap-southeast-1": "763104351884",
28+
"ap-southeast-2": "763104351884",
29+
"ca-central-1": "763104351884",
30+
"eu-central-1": "763104351884",
31+
"eu-north-1": "763104351884",
32+
"eu-west-1": "763104351884",
33+
"eu-west-2": "763104351884",
34+
"eu-west-3": "763104351884",
35+
"eu-south-1": "692866216735",
36+
"me-south-1": "217643126080",
37+
"sa-east-1": "763104351884",
38+
"us-east-1": "763104351884",
39+
"us-east-2": "763104351884",
40+
"us-gov-west-1": "442386744353",
41+
"us-iso-east-1": "886529160074",
42+
"us-west-1": "763104351884",
43+
"us-west-2": "763104351884",
44+
}
45+
VERSIONS = ["0.3.1"]
46+
47+
48+
@pytest.mark.parametrize("version", VERSIONS)
49+
def test_valid_uris(version):
50+
for region in ACCOUNTS.keys():
51+
uri = image_uris.retrieve(
52+
"autogluon",
53+
region=region,
54+
version=version,
55+
py_version="py37",
56+
image_scope="training",
57+
instance_type="ml.c4.xlarge",
58+
)
59+
60+
expected = expected_uris.framework_uri(
61+
"autogluon-training",
62+
version,
63+
ACCOUNTS[region],
64+
py_version="py37",
65+
region=region,
66+
)
67+
assert uri == expected
68+
69+
70+
@pytest.mark.parametrize("version", VERSIONS)
71+
def test_py3_error(version):
72+
with pytest.raises(ValueError) as e:
73+
image_uris.retrieve(
74+
"autogluon",
75+
region="us-west-2",
76+
version=version,
77+
py_version="py3",
78+
image_scope="training",
79+
instance_type="ml.c4.xlarge",
80+
)
81+
82+
assert "Unsupported Python version: py3." in str(e.value)
83+
84+
85+
@pytest.mark.parametrize("version", VERSIONS)
86+
def test_gpu_error(version):
87+
with pytest.raises(ValueError) as e:
88+
image_uris.retrieve(
89+
"autogluon",
90+
region="us-west-2",
91+
version=version,
92+
image_scope="inference",
93+
instance_type="ml.p2.xlarge",
94+
)
95+
96+
assert "Unsupported processor: gpu." in str(e.value)

0 commit comments

Comments
 (0)