Skip to content

Commit 7d818c6

Browse files
amzn-choericamzn-choeric
authored
Merge branch 'master' into tgi133
2 parents 3f3f947 + ef7c5a0 commit 7d818c6

32 files changed

+249
-179
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ A clear and concise description of what the bug is.
1212

1313
**To reproduce**
1414
A clear, step-by-step set of instructions to reproduce the bug.
15+
The provided code need to be **complete** and **runnable**, if additional data is needed, please include them in the issue.
1516

1617
**Expected behavior**
1718
A clear and concise description of what you expected to happen.

‎src/sagemaker/base_predictor.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
LOGGER = logging.getLogger("sagemaker")
6464

6565

66+
logger = logging.getLogger(__name__)
67+
68+
6669
class PredictorBase(abc.ABC):
6770
"""An object that encapsulates a deployed model."""
6871

@@ -714,7 +717,7 @@ def list_monitors(self):
714717
endpoint_name=self.endpoint_name
715718
)
716719
if len(monitoring_schedules_dict["MonitoringScheduleSummaries"]) == 0:
717-
print("No monitors found for endpoint. endpoint: {}".format(self.endpoint_name))
720+
logger.debug("No monitors found for endpoint. endpoint: %s", self.endpoint_name)
718721
return []
719722

720723
monitors = []

‎src/sagemaker/cli/compatibility/v2/files.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
from sagemaker.cli.compatibility.v2.ast_transformer import ASTTransformer
2424

25-
LOGGER = logging.getLogger(__name__)
25+
# Setting LOGGER for backward compatibility, in case users import this...
26+
logger = LOGGER = logging.getLogger(__name__)
2627

2728

2829
class FileUpdater(object):
@@ -59,7 +60,7 @@ def _make_output_dirs_if_needed(self):
5960
os.makedirs(output_dir)
6061

6162
if os.path.exists(self.output_path):
62-
LOGGER.warning("Overwriting file %s", self.output_path)
63+
logger.warning("Overwriting file %s", self.output_path)
6364

6465

6566
class PyFileUpdater(FileUpdater):

‎src/sagemaker/fw_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ def tar_and_upload_dir(
474474
if s3_resource is None:
475475
s3_resource = session.resource("s3", region_name=session.region_name)
476476
else:
477-
print("Using provided s3_resource")
477+
logger.debug("Using provided s3_resource")
478478

479479
s3_resource.Object(bucket, key).upload_file(tar_file, ExtraArgs=extra_args)
480480
finally:

‎src/sagemaker/image_uri_config/blazingtext.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "813361260812",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "664544806723",

‎src/sagemaker/image_uri_config/forecasting-deepar.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "495149712605",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "813361260812",

‎src/sagemaker/image_uri_config/ipinsights.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "664544806723",

‎src/sagemaker/image_uri_config/kmeans.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "664544806723",

‎src/sagemaker/image_uri_config/knn.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "664544806723",

‎src/sagemaker/image_uri_config/linear-learner.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "664544806723",

‎src/sagemaker/image_uri_config/ntm.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "664544806723",

‎src/sagemaker/image_uri_config/object-detection.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "813361260812",

‎src/sagemaker/image_uri_config/object2vec.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "664544806723",

‎src/sagemaker/image_uri_config/pca.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "664544806723",

‎src/sagemaker/image_uri_config/randomcutforest.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "664544806723",

‎src/sagemaker/image_uri_config/semantic-segmentation.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "813361260812",

‎src/sagemaker/image_uri_config/seq2seq.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-3": "951798379941",
1919
"ap-southeast-4": "106583098589",
2020
"ca-central-1": "469771592824",
21+
"ca-west-1": "190319476487",
2122
"cn-north-1": "390948362332",
2223
"cn-northwest-1": "387376663083",
2324
"eu-central-1": "813361260812",

‎src/sagemaker/image_uri_config/sklearn.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"ap-southeast-3": "951798379941",
2222
"ap-southeast-4": "106583098589",
2323
"ca-central-1": "341280168497",
24+
"ca-west-1": "190319476487",
2425
"cn-north-1": "450853457545",
2526
"cn-northwest-1": "451049120500",
2627
"eu-central-1": "492215442770",
@@ -66,6 +67,7 @@
6667
"ap-southeast-3": "951798379941",
6768
"ap-southeast-4": "106583098589",
6869
"ca-central-1": "341280168497",
70+
"ca-west-1": "190319476487",
6971
"cn-north-1": "450853457545",
7072
"cn-northwest-1": "451049120500",
7173
"eu-central-1": "492215442770",
@@ -111,6 +113,7 @@
111113
"ap-southeast-3": "951798379941",
112114
"ap-southeast-4": "106583098589",
113115
"ca-central-1": "341280168497",
116+
"ca-west-1": "190319476487",
114117
"cn-north-1": "450853457545",
115118
"cn-northwest-1": "451049120500",
116119
"eu-central-1": "492215442770",
@@ -156,6 +159,7 @@
156159
"ap-southeast-3": "951798379941",
157160
"ap-southeast-4": "106583098589",
158161
"ca-central-1": "341280168497",
162+
"ca-west-1": "190319476487",
159163
"cn-north-1": "450853457545",
160164
"cn-northwest-1": "451049120500",
161165
"eu-central-1": "492215442770",
@@ -205,6 +209,7 @@
205209
"ap-southeast-3": "951798379941",
206210
"ap-southeast-4": "106583098589",
207211
"ca-central-1": "341280168497",
212+
"ca-west-1": "190319476487",
208213
"cn-north-1": "450853457545",
209214
"cn-northwest-1": "451049120500",
210215
"eu-central-1": "492215442770",
@@ -250,6 +255,7 @@
250255
"ap-southeast-3": "951798379941",
251256
"ap-southeast-4": "106583098589",
252257
"ca-central-1": "341280168497",
258+
"ca-west-1": "190319476487",
253259
"cn-north-1": "450853457545",
254260
"cn-northwest-1": "451049120500",
255261
"eu-central-1": "492215442770",
@@ -295,6 +301,7 @@
295301
"ap-southeast-3": "951798379941",
296302
"ap-southeast-4": "106583098589",
297303
"ca-central-1": "341280168497",
304+
"ca-west-1": "190319476487",
298305
"cn-north-1": "450853457545",
299306
"cn-northwest-1": "451049120500",
300307
"eu-central-1": "492215442770",
@@ -340,6 +347,7 @@
340347
"ap-southeast-3": "951798379941",
341348
"ap-southeast-4": "106583098589",
342349
"ca-central-1": "341280168497",
350+
"ca-west-1": "190319476487",
343351
"cn-north-1": "450853457545",
344352
"cn-northwest-1": "451049120500",
345353
"eu-central-1": "492215442770",
@@ -389,6 +397,7 @@
389397
"ap-southeast-3": "951798379941",
390398
"ap-southeast-4": "106583098589",
391399
"ca-central-1": "341280168497",
400+
"ca-west-1": "190319476487",
392401
"cn-north-1": "450853457545",
393402
"cn-northwest-1": "451049120500",
394403
"eu-central-1": "492215442770",

‎src/sagemaker/image_uri_config/xgboost.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"ap-southeast-3": "951798379941",
6363
"ap-southeast-4": "106583098589",
6464
"ca-central-1": "341280168497",
65+
"ca-west-1": "190319476487",
6566
"cn-north-1": "450853457545",
6667
"cn-northwest-1": "451049120500",
6768
"eu-central-1": "492215442770",
@@ -107,6 +108,7 @@
107108
"ap-southeast-3": "951798379941",
108109
"ap-southeast-4": "106583098589",
109110
"ca-central-1": "341280168497",
111+
"ca-west-1": "190319476487",
110112
"cn-north-1": "450853457545",
111113
"cn-northwest-1": "451049120500",
112114
"eu-central-1": "492215442770",
@@ -152,6 +154,7 @@
152154
"ap-southeast-3": "951798379941",
153155
"ap-southeast-4": "106583098589",
154156
"ca-central-1": "341280168497",
157+
"ca-west-1": "190319476487",
155158
"cn-north-1": "450853457545",
156159
"cn-northwest-1": "451049120500",
157160
"eu-central-1": "492215442770",
@@ -191,6 +194,7 @@
191194
"ap-southeast-3": "951798379941",
192195
"ap-southeast-4": "106583098589",
193196
"ca-central-1": "341280168497",
197+
"ca-west-1": "190319476487",
194198
"cn-north-1": "450853457545",
195199
"cn-northwest-1": "451049120500",
196200
"eu-central-1": "492215442770",
@@ -230,6 +234,7 @@
230234
"ap-southeast-3": "951798379941",
231235
"ap-southeast-4": "106583098589",
232236
"ca-central-1": "341280168497",
237+
"ca-west-1": "190319476487",
233238
"cn-north-1": "450853457545",
234239
"cn-northwest-1": "451049120500",
235240
"eu-central-1": "492215442770",
@@ -269,6 +274,7 @@
269274
"ap-southeast-3": "951798379941",
270275
"ap-southeast-4": "106583098589",
271276
"ca-central-1": "341280168497",
277+
"ca-west-1": "190319476487",
272278
"cn-north-1": "450853457545",
273279
"cn-northwest-1": "451049120500",
274280
"eu-central-1": "492215442770",
@@ -308,6 +314,7 @@
308314
"ap-southeast-3": "951798379941",
309315
"ap-southeast-4": "106583098589",
310316
"ca-central-1": "341280168497",
317+
"ca-west-1": "190319476487",
311318
"cn-north-1": "450853457545",
312319
"cn-northwest-1": "451049120500",
313320
"eu-central-1": "492215442770",
@@ -347,6 +354,7 @@
347354
"ap-southeast-3": "951798379941",
348355
"ap-southeast-4": "106583098589",
349356
"ca-central-1": "341280168497",
357+
"ca-west-1": "190319476487",
350358
"cn-north-1": "450853457545",
351359
"cn-northwest-1": "451049120500",
352360
"eu-central-1": "492215442770",
@@ -437,6 +445,7 @@
437445
"ap-southeast-3": "951798379941",
438446
"ap-southeast-4": "106583098589",
439447
"ca-central-1": "341280168497",
448+
"ca-west-1": "190319476487",
440449
"cn-north-1": "450853457545",
441450
"cn-northwest-1": "451049120500",
442451
"eu-central-1": "492215442770",
@@ -482,6 +491,7 @@
482491
"ap-southeast-3": "951798379941",
483492
"ap-southeast-4": "106583098589",
484493
"ca-central-1": "341280168497",
494+
"ca-west-1": "190319476487",
485495
"cn-north-1": "450853457545",
486496
"cn-northwest-1": "451049120500",
487497
"eu-central-1": "492215442770",
@@ -527,6 +537,7 @@
527537
"ap-southeast-3": "951798379941",
528538
"ap-southeast-4": "106583098589",
529539
"ca-central-1": "341280168497",
540+
"ca-west-1": "190319476487",
530541
"cn-north-1": "450853457545",
531542
"cn-northwest-1": "451049120500",
532543
"eu-central-1": "492215442770",
@@ -566,6 +577,7 @@
566577
"ap-southeast-3": "951798379941",
567578
"ap-southeast-4": "106583098589",
568579
"ca-central-1": "341280168497",
580+
"ca-west-1": "190319476487",
569581
"cn-north-1": "450853457545",
570582
"cn-northwest-1": "451049120500",
571583
"eu-central-1": "492215442770",
@@ -605,6 +617,7 @@
605617
"ap-southeast-3": "951798379941",
606618
"ap-southeast-4": "106583098589",
607619
"ca-central-1": "341280168497",
620+
"ca-west-1": "190319476487",
608621
"cn-north-1": "450853457545",
609622
"cn-northwest-1": "451049120500",
610623
"eu-central-1": "492215442770",
@@ -644,6 +657,7 @@
644657
"ap-southeast-3": "951798379941",
645658
"ap-southeast-4": "106583098589",
646659
"ca-central-1": "341280168497",
660+
"ca-west-1": "190319476487",
647661
"cn-north-1": "450853457545",
648662
"cn-northwest-1": "451049120500",
649663
"eu-central-1": "492215442770",
@@ -683,6 +697,7 @@
683697
"ap-southeast-3": "951798379941",
684698
"ap-southeast-4": "106583098589",
685699
"ca-central-1": "341280168497",
700+
"ca-west-1": "190319476487",
686701
"cn-north-1": "450853457545",
687702
"cn-northwest-1": "451049120500",
688703
"eu-central-1": "492215442770",
@@ -722,6 +737,7 @@
722737
"ap-southeast-3": "951798379941",
723738
"ap-southeast-4": "106583098589",
724739
"ca-central-1": "341280168497",
740+
"ca-west-1": "190319476487",
725741
"cn-north-1": "450853457545",
726742
"cn-northwest-1": "451049120500",
727743
"eu-central-1": "492215442770",
@@ -765,6 +781,7 @@
765781
"ap-southeast-3": "951798379941",
766782
"ap-southeast-4": "106583098589",
767783
"ca-central-1": "341280168497",
784+
"ca-west-1": "190319476487",
768785
"cn-north-1": "450853457545",
769786
"cn-northwest-1": "451049120500",
770787
"eu-central-1": "492215442770",
@@ -804,6 +821,7 @@
804821
"ap-southeast-3": "951798379941",
805822
"ap-southeast-4": "106583098589",
806823
"ca-central-1": "341280168497",
824+
"ca-west-1": "190319476487",
807825
"cn-north-1": "450853457545",
808826
"cn-northwest-1": "451049120500",
809827
"eu-central-1": "492215442770",

0 commit comments

Comments
 (0)