Skip to content

Commit 87d752f

Browse files
evakravievakravi
authored
Merge branch 'master' into fix/jumpstart-estimator-gated-uncompressed-training
2 parents 4c46f01 + ddc54d2 commit 87d752f

File tree

4 files changed

+64
-58
lines changed

4 files changed

+64
-58
lines changed

‎src/sagemaker/image_uri_config/huggingface-llm-neuronx.json‎

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"inf2"
55
],
66
"version_aliases": {
7-
"0.0": "0.0.28"
7+
"0.0": "0.0.27"
88
},
99
"versions": {
1010
"0.0.16": {
@@ -589,59 +589,6 @@
589589
"container_version": {
590590
"inf2": "ubuntu22.04"
591591
}
592-
},
593-
"0.0.28": {
594-
"py_versions": [
595-
"py310"
596-
],
597-
"registries": {
598-
"af-south-1": "626614931356",
599-
"ap-east-1": "871362719292",
600-
"ap-east-2": "975050140332",
601-
"ap-northeast-1": "763104351884",
602-
"ap-northeast-2": "763104351884",
603-
"ap-northeast-3": "364406365360",
604-
"ap-south-1": "763104351884",
605-
"ap-south-2": "772153158452",
606-
"ap-southeast-1": "763104351884",
607-
"ap-southeast-2": "763104351884",
608-
"ap-southeast-3": "907027046896",
609-
"ap-southeast-4": "457447274322",
610-
"ap-southeast-5": "550225433462",
611-
"ap-southeast-7": "590183813437",
612-
"ca-central-1": "763104351884",
613-
"ca-west-1": "204538143572",
614-
"cn-north-1": "727897471807",
615-
"cn-northwest-1": "727897471807",
616-
"eu-central-1": "763104351884",
617-
"eu-central-2": "380420809688",
618-
"eu-north-1": "763104351884",
619-
"eu-south-1": "692866216735",
620-
"eu-south-2": "503227376785",
621-
"eu-west-1": "763104351884",
622-
"eu-west-2": "763104351884",
623-
"eu-west-3": "763104351884",
624-
"il-central-1": "780543022126",
625-
"me-central-1": "914824155844",
626-
"me-south-1": "217643126080",
627-
"mx-central-1": "637423239942",
628-
"sa-east-1": "763104351884",
629-
"us-east-1": "763104351884",
630-
"us-east-2": "763104351884",
631-
"us-gov-east-1": "446045086412",
632-
"us-gov-west-1": "442386744353",
633-
"us-iso-east-1": "886529160074",
634-
"us-isob-east-1": "094389454867",
635-
"us-isof-east-1": "303241398832",
636-
"us-isof-south-1": "454834333376",
637-
"us-west-1": "763104351884",
638-
"us-west-2": "763104351884"
639-
},
640-
"tag_prefix": "2.1.2-optimum0.0.28",
641-
"repository": "huggingface-pytorch-tgi-inference",
642-
"container_version": {
643-
"inf2": "ubuntu22.04"
644-
}
645592
}
646593
}
647594
}

‎src/sagemaker/jumpstart/region_config.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
"content_bucket": "jumpstart-cache-prod-ap-east-1",
88
"gated_content_bucket": "jumpstart-private-cache-prod-ap-east-1"
99
},
10-
"ap-east-2": {
11-
"content_bucket": "jumpstart-cache-prod-ap-east-2",
12-
"gated_content_bucket": "jumpstart-private-cache-prod-ap-east-2"
13-
},
1410
"ap-northeast-1": {
1511
"content_bucket": "jumpstart-cache-prod-ap-northeast-1",
1612
"gated_content_bucket": "jumpstart-private-cache-prod-ap-northeast-1",

‎src/sagemaker/model_monitor/clarify_model_monitoring.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,6 +1103,8 @@ def create_monitoring_schedule(
11031103
monitor_schedule_name=monitor_schedule_name,
11041104
job_definition_name=new_job_definition_name,
11051105
schedule_cron_expression=schedule_cron_expression,
1106+
data_analysis_start_time=data_analysis_start_time,
1107+
data_analysis_end_time=data_analysis_end_time,
11061108
)
11071109
self.job_definition_name = new_job_definition_name
11081110
self.monitoring_schedule_name = monitor_schedule_name

‎tests/unit/sagemaker/monitor/test_clarify_model_monitor.py‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
subnets=SUBNETS,
9090
)
9191
CRON_HOURLY = CronExpressionGenerator.hourly()
92+
CRON_NOW = CronExpressionGenerator.now()
9293
ENDPOINT_NAME = "endpoint"
9394
GROUND_TRUTH_S3_URI = "s3://bucket/monitoring_captured/actuals"
9495
ANALYSIS_CONFIG_S3_URI = "s3://bucket/analysis_config.json"
@@ -1305,6 +1306,66 @@ def test_model_explainability_monitor(model_explainability_monitor, sagemaker_se
13051306
)
13061307

13071308

1309+
def test_model_explainability_create_one_time_schedule(
1310+
model_explainability_monitor, sagemaker_session
1311+
):
1312+
endpoint_input = EndpointInput(
1313+
endpoint_name=ENDPOINT_NAME,
1314+
destination=ENDPOINT_INPUT_LOCAL_PATH,
1315+
features_attribute=FEATURES_ATTRIBUTE,
1316+
inference_attribute=str(INFERENCE_ATTRIBUTE),
1317+
)
1318+
1319+
# Create one-time schedule
1320+
with patch(
1321+
"sagemaker.s3.S3Uploader.upload_string_as_file_body", return_value=ANALYSIS_CONFIG_S3_URI
1322+
) as _:
1323+
model_explainability_monitor.create_monitoring_schedule(
1324+
endpoint_input=endpoint_input,
1325+
analysis_config=ANALYSIS_CONFIG_S3_URI,
1326+
output_s3_uri=OUTPUT_S3_URI,
1327+
monitor_schedule_name=SCHEDULE_NAME,
1328+
schedule_cron_expression=CRON_NOW,
1329+
data_analysis_start_time=START_TIME_OFFSET,
1330+
data_analysis_end_time=END_TIME_OFFSET,
1331+
)
1332+
1333+
# Validate job definition creation
1334+
sagemaker_session.sagemaker_client.create_model_explainability_job_definition.assert_called_once()
1335+
job_definition_args = (
1336+
sagemaker_session.sagemaker_client.create_model_explainability_job_definition.call_args[1]
1337+
)
1338+
assert (
1339+
job_definition_args["JobDefinitionName"] == model_explainability_monitor.job_definition_name
1340+
)
1341+
assert job_definition_args == {
1342+
"JobDefinitionName": model_explainability_monitor.job_definition_name,
1343+
**EXPLAINABILITY_JOB_DEFINITION,
1344+
"Tags": TAGS,
1345+
}
1346+
1347+
# Validate monitoring schedule creation
1348+
sagemaker_session.sagemaker_client.create_monitoring_schedule.assert_called_once()
1349+
schedule_args = sagemaker_session.sagemaker_client.create_monitoring_schedule.call_args[1]
1350+
assert schedule_args == {
1351+
"MonitoringScheduleName": SCHEDULE_NAME,
1352+
"MonitoringScheduleConfig": {
1353+
"MonitoringJobDefinitionName": model_explainability_monitor.job_definition_name,
1354+
"MonitoringType": "ModelExplainability",
1355+
"ScheduleConfig": {
1356+
"ScheduleExpression": CRON_NOW,
1357+
"DataAnalysisStartTime": START_TIME_OFFSET,
1358+
"DataAnalysisEndTime": END_TIME_OFFSET,
1359+
},
1360+
},
1361+
"Tags": TAGS,
1362+
}
1363+
1364+
# Check if the monitoring schedule is stored in the monitor object
1365+
assert model_explainability_monitor.monitoring_schedule_name == SCHEDULE_NAME
1366+
assert model_explainability_monitor.job_definition_name is not None
1367+
1368+
13081369
def test_model_explainability_batch_transform_monitor(
13091370
model_explainability_monitor, sagemaker_session
13101371
):

0 commit comments

Comments
 (0)