Skip to content

Commit e375999

Browse files
beniericbenieric
authored
Merge branch 'master' into sdk-defaults-logging-behavior-quick-fix
2 parents 8f91fce + 8d5d7fd commit e375999

File tree

17 files changed

+189
-39
lines changed

17 files changed

+189
-39
lines changed

‎.githooks/pre-push

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ start_time=`date +%s`
1212
tox -e sphinx,doc8 --parallel all
1313
./ci-scripts/displaytime.sh 'sphinx,doc8' $start_time
1414
start_time=`date +%s`
15-
tox -e py37,py38,py39 --parallel all -- tests/unit
16-
./ci-scripts/displaytime.sh 'py37,py38,py39 unit' $start_time
15+
tox -e py38,py39,py310 --parallel all -- tests/unit
16+
./ci-scripts/displaytime.sh 'py38,py39,py310 unit' $start_time

‎README.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ Supported Python Versions
8787

8888
SageMaker Python SDK is tested on:
8989

90-
- Python 3.7
9190
- Python 3.8
9291
- Python 3.9
9392
- Python 3.10

‎setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,13 @@ def read_requirements(filename):
9292
url="https://github.com/aws/sagemaker-python-sdk/",
9393
license="Apache License 2.0",
9494
keywords="ML Amazon AWS AI Tensorflow MXNet",
95-
python_requires=">= 3.6",
95+
python_requires=">= 3.7",
9696
classifiers=[
9797
"Development Status :: 5 - Production/Stable",
9898
"Intended Audience :: Developers",
9999
"Natural Language :: English",
100100
"License :: OSI Approved :: Apache Software License",
101101
"Programming Language :: Python",
102-
"Programming Language :: Python :: 3.7",
103102
"Programming Language :: Python :: 3.8",
104103
"Programming Language :: Python :: 3.9",
105104
"Programming Language :: Python :: 3.10",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
"us-iso-east-1": "167761179201",
2929
"us-isob-east-1": "406031935815",
3030
"us-west-1": "710691900526",
31-
"us-west-2": "301217895009"
31+
"us-west-2": "301217895009",
32+
"il-central-1": "275950707576"
3233
},
3334
"repository": "image-classification-neo"
3435
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"us-iso-east-1": "167761179201",
3131
"us-isob-east-1": "406031935815",
3232
"us-west-1": "710691900526",
33-
"us-west-2": "301217895009"
33+
"us-west-2": "301217895009",
34+
"il-central-1": "275950707576"
3435
},
3536
"repository": "sagemaker-neo-mxnet"
3637
},
@@ -62,7 +63,8 @@
6263
"us-iso-east-1": "167761179201",
6364
"us-isob-east-1": "406031935815",
6465
"us-west-1": "710691900526",
65-
"us-west-2": "301217895009"
66+
"us-west-2": "301217895009",
67+
"il-central-1": "275950707576"
6668
},
6769
"repository": "sagemaker-neo-mxnet"
6870
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"us-iso-east-1": "167761179201",
3131
"us-isob-east-1": "406031935815",
3232
"us-west-1": "710691900526",
33-
"us-west-2": "301217895009"
33+
"us-west-2": "301217895009",
34+
"il-central-1": "275950707576"
3435
},
3536
"repository": "sagemaker-neo-pytorch"
3637
},
@@ -62,7 +63,8 @@
6263
"us-iso-east-1": "167761179201",
6364
"us-isob-east-1": "406031935815",
6465
"us-west-1": "710691900526",
65-
"us-west-2": "301217895009"
66+
"us-west-2": "301217895009",
67+
"il-central-1": "275950707576"
6668
},
6769
"repository": "sagemaker-neo-pytorch"
6870
},
@@ -94,7 +96,8 @@
9496
"us-iso-east-1": "167761179201",
9597
"us-isob-east-1": "406031935815",
9698
"us-west-1": "710691900526",
97-
"us-west-2": "301217895009"
99+
"us-west-2": "301217895009",
100+
"il-central-1": "275950707576"
98101
},
99102
"repository": "sagemaker-neo-pytorch"
100103
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"us-iso-east-1": "167761179201",
3131
"us-isob-east-1": "406031935815",
3232
"us-west-1": "710691900526",
33-
"us-west-2": "301217895009"
33+
"us-west-2": "301217895009",
34+
"il-central-1": "275950707576"
3435
},
3536
"repository": "sagemaker-neo-tensorflow"
3637
},
@@ -62,7 +63,8 @@
6263
"us-iso-east-1": "167761179201",
6364
"us-isob-east-1": "406031935815",
6465
"us-west-1": "710691900526",
65-
"us-west-2": "301217895009"
66+
"us-west-2": "301217895009",
67+
"il-central-1": "275950707576"
6668
},
6769
"repository": "sagemaker-neo-tensorflow"
6870
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
"us-iso-east-1": "167761179201",
4545
"us-isob-east-1": "406031935815",
4646
"us-west-1": "710691900526",
47-
"us-west-2": "301217895009"
47+
"us-west-2": "301217895009",
48+
"il-central-1": "275950707576"
4849
},
4950
"repository": "sagemaker-inference-mxnet"
5051
}

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
"us-iso-east-1": "167761179201",
4949
"us-isob-east-1": "406031935815",
5050
"us-west-1": "710691900526",
51-
"us-west-2": "301217895009"
51+
"us-west-2": "301217895009",
52+
"il-central-1": "275950707576"
5253
},
5354
"repository": "sagemaker-inference-pytorch"
5455
},
@@ -80,7 +81,8 @@
8081
"us-iso-east-1": "167761179201",
8182
"us-isob-east-1": "406031935815",
8283
"us-west-1": "710691900526",
83-
"us-west-2": "301217895009"
84+
"us-west-2": "301217895009",
85+
"il-central-1": "275950707576"
8486
},
8587
"repository": "sagemaker-inference-pytorch"
8688
},
@@ -112,7 +114,8 @@
112114
"us-iso-east-1": "167761179201",
113115
"us-isob-east-1": "406031935815",
114116
"us-west-1": "710691900526",
115-
"us-west-2": "301217895009"
117+
"us-west-2": "301217895009",
118+
"il-central-1": "275950707576"
116119
},
117120
"repository": "sagemaker-inference-pytorch"
118121
},
@@ -144,7 +147,8 @@
144147
"us-iso-east-1": "167761179201",
145148
"us-isob-east-1": "406031935815",
146149
"us-west-1": "710691900526",
147-
"us-west-2": "301217895009"
150+
"us-west-2": "301217895009",
151+
"il-central-1": "275950707576"
148152
},
149153
"repository": "sagemaker-inference-pytorch"
150154
},
@@ -176,7 +180,8 @@
176180
"us-iso-east-1": "167761179201",
177181
"us-isob-east-1": "406031935815",
178182
"us-west-1": "710691900526",
179-
"us-west-2": "301217895009"
183+
"us-west-2": "301217895009",
184+
"il-central-1": "275950707576"
180185
},
181186
"repository": "sagemaker-inference-pytorch"
182187
},
@@ -208,7 +213,8 @@
208213
"us-iso-east-1": "167761179201",
209214
"us-isob-east-1": "406031935815",
210215
"us-west-1": "710691900526",
211-
"us-west-2": "301217895009"
216+
"us-west-2": "301217895009",
217+
"il-central-1": "275950707576"
212218
},
213219
"repository": "sagemaker-inference-pytorch"
214220
},
@@ -240,7 +246,8 @@
240246
"us-iso-east-1": "167761179201",
241247
"us-isob-east-1": "406031935815",
242248
"us-west-1": "710691900526",
243-
"us-west-2": "301217895009"
249+
"us-west-2": "301217895009",
250+
"il-central-1": "275950707576"
244251
},
245252
"repository": "sagemaker-inference-pytorch"
246253
},
@@ -272,7 +279,8 @@
272279
"us-iso-east-1": "167761179201",
273280
"us-isob-east-1": "406031935815",
274281
"us-west-1": "710691900526",
275-
"us-west-2": "301217895009"
282+
"us-west-2": "301217895009",
283+
"il-central-1": "275950707576"
276284
},
277285
"repository": "sagemaker-inference-pytorch"
278286
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050
"us-iso-east-1": "167761179201",
5151
"us-isob-east-1": "406031935815",
5252
"us-west-1": "710691900526",
53-
"us-west-2": "301217895009"
53+
"us-west-2": "301217895009",
54+
"il-central-1": "275950707576"
5455
},
5556
"repository": "sagemaker-inference-tensorflow"
5657
},
@@ -82,7 +83,8 @@
8283
"us-iso-east-1": "167761179201",
8384
"us-isob-east-1": "406031935815",
8485
"us-west-1": "710691900526",
85-
"us-west-2": "301217895009"
86+
"us-west-2": "301217895009",
87+
"il-central-1": "275950707576"
8688
},
8789
"repository": "sagemaker-inference-tensorflow"
8890
}

‎src/sagemaker/image_uri_config/pytorch.json

Lines changed: 115 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"1.11": "1.11.0",
7979
"1.12": "1.12.1",
8080
"1.13": "1.13.1",
81-
"2.0": "2.0.0"
81+
"2.0": "2.0.1"
8282
},
8383
"versions": {
8484
"0.4.0": {
@@ -893,6 +893,44 @@
893893
"us-west-2": "763104351884"
894894
},
895895
"repository": "pytorch-inference"
896+
},
897+
"2.0.1": {
898+
"py_versions": [
899+
"py310"
900+
],
901+
"registries": {
902+
"af-south-1": "626614931356",
903+
"il-central-1": "780543022126",
904+
"ap-east-1": "871362719292",
905+
"ap-northeast-1": "763104351884",
906+
"ap-northeast-2": "763104351884",
907+
"ap-northeast-3": "364406365360",
908+
"ap-south-1": "763104351884",
909+
"ap-southeast-1": "763104351884",
910+
"ap-southeast-2": "763104351884",
911+
"ap-southeast-3": "907027046896",
912+
"ap-southeast-4": "457447274322",
913+
"ca-central-1": "763104351884",
914+
"cn-north-1": "727897471807",
915+
"cn-northwest-1": "727897471807",
916+
"eu-central-1": "763104351884",
917+
"eu-north-1": "763104351884",
918+
"eu-west-1": "763104351884",
919+
"eu-west-2": "763104351884",
920+
"eu-west-3": "763104351884",
921+
"eu-south-1": "692866216735",
922+
"me-south-1": "217643126080",
923+
"sa-east-1": "763104351884",
924+
"us-east-1": "763104351884",
925+
"us-east-2": "763104351884",
926+
"us-gov-east-1": "446045086412",
927+
"us-gov-west-1": "442386744353",
928+
"us-iso-east-1": "886529160074",
929+
"us-isob-east-1": "094389454867",
930+
"us-west-1": "763104351884",
931+
"us-west-2": "763104351884"
932+
},
933+
"repository": "pytorch-inference"
896934
}
897935
}
898936
},
@@ -902,7 +940,7 @@
902940
],
903941
"version_aliases": {
904942
"1.12": "1.12.1",
905-
"2.0": "2.0.0"
943+
"2.0": "2.0.1"
906944
},
907945
"versions": {
908946
"1.12.1": {
@@ -982,6 +1020,42 @@
9821020
},
9831021
"repository": "pytorch-inference-graviton",
9841022
"container_version": {"cpu": "ubuntu20.04"}
1023+
},
1024+
"2.0.1": {
1025+
"py_versions": [
1026+
"py310"
1027+
],
1028+
"registries": {
1029+
"af-south-1": "626614931356",
1030+
"il-central-1": "780543022126",
1031+
"ap-east-1": "871362719292",
1032+
"ap-northeast-1": "763104351884",
1033+
"ap-northeast-2": "763104351884",
1034+
"ap-northeast-3": "364406365360",
1035+
"ap-south-1": "763104351884",
1036+
"ap-south-2": "772153158452",
1037+
"ap-southeast-1": "763104351884",
1038+
"ap-southeast-2": "763104351884",
1039+
"ap-southeast-3": "907027046896",
1040+
"ap-southeast-4": "457447274322",
1041+
"ca-central-1": "763104351884",
1042+
"eu-central-1": "763104351884",
1043+
"eu-central-2": "380420809688",
1044+
"eu-north-1": "763104351884",
1045+
"eu-west-1": "763104351884",
1046+
"eu-west-2": "763104351884",
1047+
"eu-west-3": "763104351884",
1048+
"eu-south-1": "692866216735",
1049+
"eu-south-2": "503227376785",
1050+
"me-south-1": "217643126080",
1051+
"sa-east-1": "763104351884",
1052+
"us-east-1": "763104351884",
1053+
"us-east-2": "763104351884",
1054+
"us-west-1": "763104351884",
1055+
"us-west-2": "763104351884"
1056+
},
1057+
"repository": "pytorch-inference-graviton",
1058+
"container_version": {"cpu": "ubuntu20.04"}
9851059
}
9861060
}
9871061
},
@@ -1006,7 +1080,7 @@
10061080
"1.11": "1.11.0",
10071081
"1.12": "1.12.1",
10081082
"1.13": "1.13.1",
1009-
"2.0": "2.0.0"
1083+
"2.0": "2.0.1"
10101084
},
10111085
"versions": {
10121086
"0.4.0": {
@@ -1822,6 +1896,44 @@
18221896
"us-west-2": "763104351884"
18231897
},
18241898
"repository": "pytorch-training"
1899+
},
1900+
"2.0.1": {
1901+
"py_versions": [
1902+
"py310"
1903+
],
1904+
"registries": {
1905+
"af-south-1": "626614931356",
1906+
"il-central-1": "780543022126",
1907+
"ap-east-1": "871362719292",
1908+
"ap-northeast-1": "763104351884",
1909+
"ap-northeast-2": "763104351884",
1910+
"ap-northeast-3": "364406365360",
1911+
"ap-south-1": "763104351884",
1912+
"ap-southeast-1": "763104351884",
1913+
"ap-southeast-2": "763104351884",
1914+
"ap-southeast-3": "907027046896",
1915+
"ap-southeast-4": "457447274322",
1916+
"ca-central-1": "763104351884",
1917+
"cn-north-1": "727897471807",
1918+
"cn-northwest-1": "727897471807",
1919+
"eu-central-1": "763104351884",
1920+
"eu-north-1": "763104351884",
1921+
"eu-west-1": "763104351884",
1922+
"eu-west-2": "763104351884",
1923+
"eu-west-3": "763104351884",
1924+
"eu-south-1": "692866216735",
1925+
"me-south-1": "217643126080",
1926+
"sa-east-1": "763104351884",
1927+
"us-east-1": "763104351884",
1928+
"us-east-2": "763104351884",
1929+
"us-gov-east-1": "446045086412",
1930+
"us-gov-west-1": "442386744353",
1931+
"us-iso-east-1": "886529160074",
1932+
"us-isob-east-1": "094389454867",
1933+
"us-west-1": "763104351884",
1934+
"us-west-2": "763104351884"
1935+
},
1936+
"repository": "pytorch-training"
18251937
}
18261938
}
18271939
}

‎src/sagemaker/image_uri_config/xgboost-neo.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
"us-iso-east-1": "167761179201",
2929
"us-isob-east-1": "406031935815",
3030
"us-west-1": "710691900526",
31-
"us-west-2": "301217895009"
31+
"us-west-2": "301217895009",
32+
"il-central-1": "275950707576"
3233
},
3334
"repository": "xgboost-neo"
3435
}

‎tests/data/remote_function/old_deps_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pandas==1.1.0
1+
pandas==1.3.4

0 commit comments

Comments
 (0)