Skip to content

Commit d201b41

Browse files
bryannahm1bryannahm1
authored
Merge branch 'master' into hf-inf-spec-pr
2 parents 3e0a98a + 502b060 commit d201b41

File tree

5 files changed

+139
-43
lines changed

5 files changed

+139
-43
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## v2.224.4 (2024-07-04)
4+
5+
### Bug Fixes and Other Changes
6+
7+
* allow for inf spec and server override to be passed
8+
39
## v2.224.3 (2024-07-03)
410

511
### Bug Fixes and Other Changes

‎VERSION

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

‎src/sagemaker/image_uri_config/autogluon.json

Lines changed: 86 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"0.7": "0.7.0",
1313
"0.8": "0.8.2",
1414
"1.0": "1.0.0",
15-
"1.1": "1.1.0"
15+
"1.1": "1.1.1"
1616
},
1717
"versions": {
1818
"0.3.1": {
@@ -522,6 +522,47 @@
522522
"py_versions": [
523523
"py310"
524524
]
525+
},
526+
"1.1.1": {
527+
"registries": {
528+
"af-south-1": "626614931356",
529+
"il-central-1": "780543022126",
530+
"ap-east-1": "871362719292",
531+
"ap-northeast-1": "763104351884",
532+
"ap-northeast-2": "763104351884",
533+
"ap-northeast-3": "364406365360",
534+
"ap-south-1": "763104351884",
535+
"ap-southeast-1": "763104351884",
536+
"ap-southeast-2": "763104351884",
537+
"ap-southeast-3": "907027046896",
538+
"ap-southeast-4": "457447274322",
539+
"ca-central-1": "763104351884",
540+
"eu-central-1": "763104351884",
541+
"eu-north-1": "763104351884",
542+
"eu-west-1": "763104351884",
543+
"eu-west-2": "763104351884",
544+
"eu-west-3": "763104351884",
545+
"eu-south-1": "692866216735",
546+
"me-south-1": "217643126080",
547+
"sa-east-1": "763104351884",
548+
"us-east-1": "763104351884",
549+
"us-east-2": "763104351884",
550+
"us-gov-east-1": "446045086412",
551+
"us-gov-west-1": "442386744353",
552+
"us-iso-east-1": "886529160074",
553+
"us-isob-east-1": "094389454867",
554+
"us-west-1": "763104351884",
555+
"us-west-2": "763104351884",
556+
"ca-west-1": "204538143572"
557+
},
558+
"repository": "autogluon-training",
559+
"processors": [
560+
"cpu",
561+
"gpu"
562+
],
563+
"py_versions": [
564+
"py311"
565+
]
525566
}
526567
}
527568
},
@@ -534,7 +575,7 @@
534575
"0.7": "0.7.0",
535576
"0.8": "0.8.2",
536577
"1.0": "1.0.0",
537-
"1.1": "1.1.0"
578+
"1.1": "1.1.1"
538579
},
539580
"versions": {
540581
"0.3.1": {
@@ -1073,6 +1114,49 @@
10731114
"py_versions": [
10741115
"py310"
10751116
]
1117+
},
1118+
"1.1.1": {
1119+
"registries": {
1120+
"af-south-1": "626614931356",
1121+
"il-central-1": "780543022126",
1122+
"ap-east-1": "871362719292",
1123+
"ap-northeast-1": "763104351884",
1124+
"ap-northeast-2": "763104351884",
1125+
"ap-northeast-3": "364406365360",
1126+
"ap-south-1": "763104351884",
1127+
"ap-southeast-1": "763104351884",
1128+
"ap-southeast-2": "763104351884",
1129+
"ap-southeast-3": "907027046896",
1130+
"ap-southeast-4": "457447274322",
1131+
"ca-central-1": "763104351884",
1132+
"cn-north-1": "727897471807",
1133+
"cn-northwest-1": "727897471807",
1134+
"eu-central-1": "763104351884",
1135+
"eu-north-1": "763104351884",
1136+
"eu-west-1": "763104351884",
1137+
"eu-west-2": "763104351884",
1138+
"eu-west-3": "763104351884",
1139+
"eu-south-1": "692866216735",
1140+
"me-south-1": "217643126080",
1141+
"sa-east-1": "763104351884",
1142+
"us-east-1": "763104351884",
1143+
"us-east-2": "763104351884",
1144+
"us-gov-east-1": "446045086412",
1145+
"us-gov-west-1": "442386744353",
1146+
"us-iso-east-1": "886529160074",
1147+
"us-isob-east-1": "094389454867",
1148+
"us-west-1": "763104351884",
1149+
"us-west-2": "763104351884",
1150+
"ca-west-1": "204538143572"
1151+
},
1152+
"repository": "autogluon-inference",
1153+
"processors": [
1154+
"cpu",
1155+
"gpu"
1156+
],
1157+
"py_versions": [
1158+
"py311"
1159+
]
10761160
}
10771161
}
10781162
}

‎src/sagemaker/image_uri_config/pytorch.json

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,8 @@
11071107
"1.12": "1.12.1",
11081108
"2.0": "2.0.1",
11091109
"2.1": "2.1.0",
1110-
"2.2": "2.2.1"
1110+
"2.2": "2.2.1",
1111+
"2.3": "2.3.0"
11111112
},
11121113
"versions": {
11131114
"1.12.1": {
@@ -1331,6 +1332,50 @@
13311332
"us-west-2": "763104351884"
13321333
},
13331334
"repository": "pytorch-inference-graviton"
1335+
},
1336+
"2.3.0": {
1337+
"container_version": {
1338+
"cpu": "ubuntu20.04"
1339+
},
1340+
"py_versions": [
1341+
"py311"
1342+
],
1343+
"registries": {
1344+
"af-south-1": "626614931356",
1345+
"ap-east-1": "871362719292",
1346+
"ap-northeast-1": "763104351884",
1347+
"ap-northeast-2": "763104351884",
1348+
"ap-northeast-3": "364406365360",
1349+
"ap-south-1": "763104351884",
1350+
"ap-south-2": "772153158452",
1351+
"ap-southeast-1": "763104351884",
1352+
"ap-southeast-2": "763104351884",
1353+
"ap-southeast-3": "907027046896",
1354+
"ap-southeast-4": "457447274322",
1355+
"ca-central-1": "763104351884",
1356+
"ca-west-1": "204538143572",
1357+
"cn-north-1": "727897471807",
1358+
"cn-northwest-1": "727897471807",
1359+
"eu-central-1": "763104351884",
1360+
"eu-central-2": "380420809688",
1361+
"eu-north-1": "763104351884",
1362+
"eu-south-1": "692866216735",
1363+
"eu-south-2": "503227376785",
1364+
"eu-west-1": "763104351884",
1365+
"eu-west-2": "763104351884",
1366+
"eu-west-3": "763104351884",
1367+
"il-central-1": "780543022126",
1368+
"me-central-1": "914824155844",
1369+
"me-south-1": "217643126080",
1370+
"sa-east-1": "763104351884",
1371+
"us-east-1": "763104351884",
1372+
"us-east-2": "763104351884",
1373+
"us-gov-east-1": "446045086412",
1374+
"us-gov-west-1": "442386744353",
1375+
"us-west-1": "763104351884",
1376+
"us-west-2": "763104351884"
1377+
},
1378+
"repository": "pytorch-inference-graviton"
13341379
}
13351380
}
13361381
},

‎tests/integ/test_processing.py

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from sagemaker import image_uris, Session
2121
from sagemaker.dataset_definition.inputs import (
2222
DatasetDefinition,
23-
RedshiftDatasetDefinition,
2423
AthenaDatasetDefinition,
2524
S3Input,
2625
)
@@ -766,25 +765,6 @@ def _get_processing_inputs_with_all_parameters(bucket):
766765
s3_compression_type="None",
767766
),
768767
),
769-
ProcessingInput(
770-
input_name="redshift_dataset_definition",
771-
app_managed=True,
772-
dataset_definition=DatasetDefinition(
773-
local_path="/opt/ml/processing/input/rdd",
774-
data_distribution_type="FullyReplicated",
775-
input_mode="File",
776-
redshift_dataset_definition=RedshiftDatasetDefinition(
777-
cluster_id="integ-test-cluster-prod-us-west-2",
778-
database="dev",
779-
db_user="awsuser",
780-
query_string="SELECT * FROM shoes",
781-
cluster_role_arn="arn:aws:iam::037210630505:role/RedshiftClusterRole-prod-us-west-2",
782-
output_s3_uri=f"s3://{bucket}/rdd",
783-
output_format="CSV",
784-
output_compression="None",
785-
),
786-
),
787-
),
788768
ProcessingInput(
789769
input_name="athena_dataset_definition",
790770
app_managed=True,
@@ -853,25 +833,6 @@ def _get_processing_job_inputs_and_outputs(bucket, output_kms_key):
853833
"S3CompressionType": "None",
854834
},
855835
},
856-
{
857-
"InputName": "redshift_dataset_definition",
858-
"AppManaged": True,
859-
"DatasetDefinition": {
860-
"RedshiftDatasetDefinition": {
861-
"ClusterId": "integ-test-cluster-prod-us-west-2",
862-
"Database": "dev",
863-
"DbUser": "awsuser",
864-
"QueryString": "SELECT * FROM shoes",
865-
"ClusterRoleArn": "arn:aws:iam::037210630505:role/RedshiftClusterRole-prod-us-west-2",
866-
"OutputS3Uri": f"s3://{bucket}/rdd",
867-
"OutputFormat": "CSV",
868-
"OutputCompression": "None",
869-
},
870-
"LocalPath": "/opt/ml/processing/input/rdd",
871-
"DataDistributionType": "FullyReplicated",
872-
"InputMode": "File",
873-
},
874-
},
875836
{
876837
"InputName": "athena_dataset_definition",
877838
"AppManaged": True,

0 commit comments

Comments
 (0)