Skip to content

Commit b67e68c

Browse files
navinsoninavinsoni
authored
Merge branch 'master' into update_HF_image
2 parents ceb1f8e + f11a80e commit b67e68c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+921
-225
lines changed

‎CHANGELOG.md

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,69 @@
11
# Changelog
22

3+
## v2.59.1.post0 (2021-09-13)
4+
5+
### Documentation Changes
6+
7+
* update experiment config doc on fit method
8+
9+
## v2.59.1 (2021-09-02)
10+
11+
### Bug Fixes and Other Changes
12+
13+
* pin docker to 5.0.0
14+
15+
## v2.59.0 (2021-09-01)
16+
17+
### Features
18+
19+
* Add KIX account for SM XGBoost 1.2-2 and 1.3-1
20+
21+
### Bug Fixes and Other Changes
22+
23+
* revert #2572 and address #2611
24+
25+
## v2.58.0 (2021-08-31)
26+
27+
### Features
28+
29+
* update debugger for KIX
30+
* support displayName and description for pipeline steps
31+
32+
### Bug Fixes and Other Changes
33+
34+
* localmode subprocess parent process not sending SIGTERM to child
35+
36+
## v2.57.0 (2021-08-30)
37+
38+
### Deprecations and Removals
39+
40+
* Remove stale S3DownloadMode from test_session.py
41+
42+
### Features
43+
44+
* update clarify imageURI for KIX
45+
46+
### Bug Fixes and Other Changes
47+
48+
* propagate KMS key to model.deploy
49+
* Propagate tags and VPC configs to repack model steps
50+
51+
## v2.56.0 (2021-08-26)
52+
53+
### Features
54+
55+
* Add NEO KIX Configuration
56+
* Algorithms region launch on KIX
57+
58+
### Bug Fixes and Other Changes
59+
60+
* remove dots from CHANGELOG
61+
362
## v2.55.0 (2021-08-25)
463

564
### Features
665

7-
* Add information of Amazon-provided analysis image used by Mo…
66+
* Add information of Amazon-provided analysis image used by Model Monitor
867

968
### Bug Fixes and Other Changes
1069

‎VERSION

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

‎doc/_static/aws-ux-shortbread/index.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎doc/_static/aws-ux-shortbread/init.js

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎doc/conf.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@
7171
# For Adobe Analytics
7272
html_js_files = [
7373
"https://a0.awsstatic.com/s_code/js/3.0/awshome_s_code.js",
74-
"aws-ux-shortbread/index.js",
75-
"aws-ux-shortbread/init.js",
7674
]
7775

7876
html_context = {"css_files": ["_static/theme_overrides.css"]}

‎setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ def read_version():
5151
"local": [
5252
"urllib3>=1.21.1,!=1.25,!=1.25.1",
5353
"docker-compose>=1.25.2",
54+
"docker==5.0.0",
5455
"PyYAML>=5.3, <6", # PyYAML version has to match docker-compose requirements
5556
],
5657
"scipy": ["scipy>=0.19.0"],

‎src/sagemaker/amazon/amazon_estimator.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,16 @@ def fit(
229229
generates a default job name, based on the training image name
230230
and current timestamp.
231231
experiment_config (dict[str, str]): Experiment management configuration.
232-
Dictionary contains three optional keys, 'ExperimentName',
233-
'TrialName', and 'TrialComponentName'
234-
(default: ``None``).
232+
Optionally, the dict can contain three keys:
233+
'ExperimentName', 'TrialName', and 'TrialComponentDisplayName'.
234+
The behavior of setting these keys is as follows:
235+
* If `ExperimentName` is supplied but `TrialName` is not a Trial will be
236+
automatically created and the job's Trial Component associated with the Trial.
237+
* If `TrialName` is supplied and the Trial already exists the job's Trial Component
238+
will be associated with the Trial.
239+
* If both `ExperimentName` and `TrialName` are not supplied the trial component
240+
will be unassociated.
241+
* `TrialComponentDisplayName` is used for display in Studio.
235242
"""
236243
self._prepare_for_training(records, job_name=job_name, mini_batch_size=mini_batch_size)
237244

‎src/sagemaker/automl/automl.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ def deploy(
420420
serializer=serializer,
421421
deserializer=deserializer,
422422
endpoint_name=endpoint_name,
423+
kms_key=model_kms_key,
423424
tags=tags,
424425
wait=wait,
425426
)

‎src/sagemaker/clarify.py

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,16 @@ def _run(
455455
kms_key (str): The ARN of the KMS key that is used to encrypt the
456456
user code file (default: None).
457457
experiment_config (dict[str, str]): Experiment management configuration.
458-
Dictionary contains three optional keys:
458+
Optionally, the dict can contain three keys:
459459
'ExperimentName', 'TrialName', and 'TrialComponentDisplayName'.
460+
The behavior of setting these keys is as follows:
461+
* If `ExperimentName` is supplied but `TrialName` is not a Trial will be
462+
automatically created and the job's Trial Component associated with the Trial.
463+
* If `TrialName` is supplied and the Trial already exists the job's Trial Component
464+
will be associated with the Trial.
465+
* If both `ExperimentName` and `TrialName` are not supplied the trial component
466+
will be unassociated.
467+
* `TrialComponentDisplayName` is used for display in Studio.
460468
"""
461469
analysis_config["methods"]["report"] = {"name": "report", "title": "Analysis Report"}
462470
with tempfile.TemporaryDirectory() as tmpdirname:
@@ -541,8 +549,16 @@ def run_pre_training_bias(
541549
kms_key (str): The ARN of the KMS key that is used to encrypt the
542550
user code file (default: None).
543551
experiment_config (dict[str, str]): Experiment management configuration.
544-
Dictionary contains three optional keys:
552+
Optionally, the dict can contain three keys:
545553
'ExperimentName', 'TrialName', and 'TrialComponentDisplayName'.
554+
The behavior of setting these keys is as follows:
555+
* If `ExperimentName` is supplied but `TrialName` is not a Trial will be
556+
automatically created and the job's Trial Component associated with the Trial.
557+
* If `TrialName` is supplied and the Trial already exists the job's Trial Component
558+
will be associated with the Trial.
559+
* If both `ExperimentName` and `TrialName` are not supplied the trial component
560+
will be unassociated.
561+
* `TrialComponentDisplayName` is used for display in Studio.
546562
""" # noqa E501
547563
analysis_config = data_config.get_config()
548564
analysis_config.update(data_bias_config.get_config())
@@ -604,8 +620,16 @@ def run_post_training_bias(
604620
kms_key (str): The ARN of the KMS key that is used to encrypt the
605621
user code file (default: None).
606622
experiment_config (dict[str, str]): Experiment management configuration.
607-
Dictionary contains three optional keys:
623+
Optionally, the dict can contain three keys:
608624
'ExperimentName', 'TrialName', and 'TrialComponentDisplayName'.
625+
The behavior of setting these keys is as follows:
626+
* If `ExperimentName` is supplied but `TrialName` is not a Trial will be
627+
automatically created and the job's Trial Component associated with the Trial.
628+
* If `TrialName` is supplied and the Trial already exists the job's Trial Component
629+
will be associated with the Trial.
630+
* If both `ExperimentName` and `TrialName` are not supplied the trial component
631+
will be unassociated.
632+
* `TrialComponentDisplayName` is used for display in Studio.
609633
"""
610634
analysis_config = data_config.get_config()
611635
analysis_config.update(data_bias_config.get_config())
@@ -684,8 +708,16 @@ def run_bias(
684708
kms_key (str): The ARN of the KMS key that is used to encrypt the
685709
user code file (default: None).
686710
experiment_config (dict[str, str]): Experiment management configuration.
687-
Dictionary contains three optional keys:
711+
Optionally, the dict can contain three keys:
688712
'ExperimentName', 'TrialName', and 'TrialComponentDisplayName'.
713+
The behavior of setting these keys is as follows:
714+
* If `ExperimentName` is supplied but `TrialName` is not a Trial will be
715+
automatically created and the job's Trial Component associated with the Trial.
716+
* If `TrialName` is supplied and the Trial already exists the job's Trial Component
717+
will be associated with the Trial.
718+
* If both `ExperimentName` and `TrialName` are not supplied the trial component
719+
will be unassociated.
720+
* `TrialComponentDisplayName` is used for display in Studio.
689721
""" # noqa E501
690722
analysis_config = data_config.get_config()
691723
analysis_config.update(bias_config.get_config())
@@ -755,8 +787,16 @@ def run_explainability(
755787
kms_key (str): The ARN of the KMS key that is used to encrypt the
756788
user code file (default: None).
757789
experiment_config (dict[str, str]): Experiment management configuration.
758-
Dictionary contains three optional keys:
790+
Optionally, the dict can contain three keys:
759791
'ExperimentName', 'TrialName', and 'TrialComponentDisplayName'.
792+
The behavior of setting these keys is as follows:
793+
* If `ExperimentName` is supplied but `TrialName` is not a Trial will be
794+
automatically created and the job's Trial Component associated with the Trial.
795+
* If `TrialName` is supplied and the Trial already exists the job's Trial Component
796+
will be associated with the Trial.
797+
* If both `ExperimentName` and `TrialName` are not supplied the trial component
798+
will be unassociated.
799+
* `TrialComponentDisplayName` is used for display in Studio.
760800
"""
761801
analysis_config = data_config.get_config()
762802
predictor_config = model_config.get_predictor_config()

‎src/sagemaker/estimator.py

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -674,9 +674,16 @@ def fit(self, inputs=None, wait=True, logs="All", job_name=None, experiment_conf
674674
job_name (str): Training job name. If not specified, the estimator generates
675675
a default job name based on the training image name and current timestamp.
676676
experiment_config (dict[str, str]): Experiment management configuration.
677-
Dictionary contains three optional keys,
677+
Optionally, the dict can contain three keys:
678678
'ExperimentName', 'TrialName', and 'TrialComponentDisplayName'.
679-
679+
The behavior of setting these keys is as follows:
680+
* If `ExperimentName` is supplied but `TrialName` is not a Trial will be
681+
automatically created and the job's Trial Component associated with the Trial.
682+
* If `TrialName` is supplied and the Trial already exists the job's Trial Component
683+
will be associated with the Trial.
684+
* If both `ExperimentName` and `TrialName` are not supplied the trial component
685+
will be unassociated.
686+
* `TrialComponentDisplayName` is used for display in Studio.
680687
"""
681688
self._prepare_for_training(job_name=job_name)
682689

@@ -1443,10 +1450,17 @@ def start_new(cls, estimator, inputs, experiment_config):
14431450
created by the user.
14441451
inputs (str): Parameters used when called
14451452
:meth:`~sagemaker.estimator.EstimatorBase.fit`.
1446-
experiment_config (dict[str, str]): Experiment management configuration used when called
1447-
:meth:`~sagemaker.estimator.EstimatorBase.fit`. Dictionary contains
1448-
three optional keys, 'ExperimentName', 'TrialName', and 'TrialComponentDisplayName'.
1449-
1453+
experiment_config (dict[str, str]): Experiment management configuration.
1454+
Optionally, the dict can contain three keys:
1455+
'ExperimentName', 'TrialName', and 'TrialComponentDisplayName'.
1456+
The behavior of setting these keys is as follows:
1457+
* If `ExperimentName` is supplied but `TrialName` is not a Trial will be
1458+
automatically created and the job's Trial Component associated with the Trial.
1459+
* If `TrialName` is supplied and the Trial already exists the job's Trial Component
1460+
will be associated with the Trial.
1461+
* If both `ExperimentName` and `TrialName` are not supplied the trial component
1462+
will be unassociated.
1463+
* `TrialComponentDisplayName` is used for display in Studio.
14501464
Returns:
14511465
sagemaker.estimator._TrainingJob: Constructed object that captures
14521466
all information about the started training job.
@@ -1465,9 +1479,17 @@ def _get_train_args(cls, estimator, inputs, experiment_config):
14651479
created by the user.
14661480
inputs (str): Parameters used when called
14671481
:meth:`~sagemaker.estimator.EstimatorBase.fit`.
1468-
experiment_config (dict[str, str]): Experiment management configuration used when called
1469-
:meth:`~sagemaker.estimator.EstimatorBase.fit`. Dictionary contains
1470-
three optional keys, 'ExperimentName', 'TrialName', and 'TrialComponentDisplayName'.
1482+
experiment_config (dict[str, str]): Experiment management configuration.
1483+
Optionally, the dict can contain three keys:
1484+
'ExperimentName', 'TrialName', and 'TrialComponentDisplayName'.
1485+
The behavior of setting these keys is as follows:
1486+
* If `ExperimentName` is supplied but `TrialName` is not a Trial will be
1487+
automatically created and the job's Trial Component associated with the Trial.
1488+
* If `TrialName` is supplied and the Trial already exists the job's Trial Component
1489+
will be associated with the Trial.
1490+
* If both `ExperimentName` and `TrialName` are not supplied the trial component
1491+
will be unassociated.
1492+
* `TrialComponentDisplayName` is used for display in Studio.
14711493
14721494
Returns:
14731495
Dict: dict for `sagemaker.session.Session.train` method

‎src/sagemaker/image_uri_config/blazingtext.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"ap-east-1": "286214385809",
88
"ap-northeast-1": "501404015308",
99
"ap-northeast-2": "306986355934",
10+
"ap-northeast-3": "867004704886",
1011
"ap-south-1": "991648021394",
1112
"ap-southeast-1": "475088953585",
1213
"ap-southeast-2": "544295431143",

‎src/sagemaker/image_uri_config/clarify.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"ap-east-1": "098760798382",
88
"ap-northeast-1": "377024640650",
99
"ap-northeast-2": "263625296855",
10+
"ap-northeast-3": "912233562940",
1011
"ap-south-1": "452307495513",
1112
"ap-southeast-1": "834264404009",
1213
"ap-southeast-2": "007051062584",

‎src/sagemaker/image_uri_config/debugger.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"ap-east-1": "199566480951",
88
"ap-northeast-1": "430734990657",
99
"ap-northeast-2": "578805364391",
10+
"ap-northeast-3": "479947661362",
1011
"ap-south-1": "904829902805",
1112
"ap-southeast-1": "972752614525",
1213
"ap-southeast-2": "184798709955",

‎src/sagemaker/image_uri_config/factorization-machines.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"ap-east-1": "286214385809",
88
"ap-northeast-1": "351501993468",
99
"ap-northeast-2": "835164637446",
10+
"ap-northeast-3": "867004704886",
1011
"ap-south-1": "991648021394",
1112
"ap-southeast-1": "475088953585",
1213
"ap-southeast-2": "712309505854",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"ap-east-1": "110948597952",
88
"ap-northeast-1": "941853720454",
99
"ap-northeast-2": "151534178276",
10+
"ap-northeast-3": "925152966179",
1011
"ap-south-1": "763008648453",
1112
"ap-southeast-1": "324986816169",
1213
"ap-southeast-2": "355873309152",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"ap-south-1": "991648021394",
1111
"ap-southeast-1": "475088953585",
1212
"ap-southeast-2": "544295431143",
13+
"ap-northeast-3": "867004704886",
1314
"ca-central-1": "469771592824",
1415
"cn-north-1": "390948362332",
1516
"cn-northwest-1": "387376663083",

‎src/sagemaker/image_uri_config/inferentia-mxnet.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"ap-east-1": "110948597952",
1010
"ap-northeast-1": "941853720454",
1111
"ap-northeast-2": "151534178276",
12+
"ap-northeast-3": "925152966179",
1213
"ap-south-1": "763008648453",
1314
"ap-southeast-1": "324986816169",
1415
"ap-southeast-2": "355873309152",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"ap-east-1": "110948597952",
1010
"ap-northeast-1": "941853720454",
1111
"ap-northeast-2": "151534178276",
12+
"ap-northeast-3": "925152966179",
1213
"ap-south-1": "763008648453",
1314
"ap-southeast-1": "324986816169",
1415
"ap-southeast-2": "355873309152",

‎src/sagemaker/image_uri_config/inferentia-tensorflow.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"ap-east-1": "110948597952",
1010
"ap-northeast-1": "941853720454",
1111
"ap-northeast-2": "151534178276",
12+
"ap-northeast-3": "925152966179",
1213
"ap-south-1": "763008648453",
1314
"ap-southeast-1": "324986816169",
1415
"ap-southeast-2": "355873309152",

‎src/sagemaker/image_uri_config/ipinsights.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"ap-east-1": "286214385809",
88
"ap-northeast-1": "351501993468",
99
"ap-northeast-2": "835164637446",
10+
"ap-northeast-3": "867004704886",
1011
"ap-south-1": "991648021394",
1112
"ap-southeast-1": "475088953585",
1213
"ap-southeast-2": "712309505854",

‎src/sagemaker/image_uri_config/kmeans.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"ap-east-1": "286214385809",
88
"ap-northeast-1": "351501993468",
99
"ap-northeast-2": "835164637446",
10+
"ap-northeast-3": "867004704886",
1011
"ap-south-1": "991648021394",
1112
"ap-southeast-1": "475088953585",
1213
"ap-southeast-2": "712309505854",

0 commit comments

Comments
 (0)