Skip to content

Commit 3469907

Browse files
lxninglxning
committed
update xgboost from 1.7-1 to 1.7-1-1
1 parent fda438c commit 3469907

File tree

7 files changed

+96
-12
lines changed

7 files changed

+96
-12
lines changed

‎doc/overview.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ If you want to bring your own container that is extended from a SageMaker contai
914914
model=model,
915915
model_server=ModelServer.TORCHSERVE,
916916
schema_builder=SchemaBuilder(X_test, y_pred),
917-
image_uri="123123123123.dkr.ecr.ap-southeast-2.amazonaws.com/byoc-image:xgb-1.7-1")
917+
image_uri="123123123123.dkr.ecr.ap-southeast-2.amazonaws.com/byoc-image:xgb-1.7-1-1")
918918
)
919919
920920

‎src/sagemaker/image_uri_config/xgboost.json‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,48 @@
395395
"us-west-2": "246618743249"
396396
},
397397
"repository": "sagemaker-xgboost"
398+
},
399+
"1.7-1-1": {
400+
"registries": {
401+
"af-south-1": "510948584623",
402+
"ap-east-1": "651117190479",
403+
"ap-northeast-1": "354813040037",
404+
"ap-northeast-2": "366743142698",
405+
"ap-northeast-3": "867004704886",
406+
"ap-south-1": "720646828776",
407+
"ap-south-2": "628508329040",
408+
"ap-southeast-1": "121021644041",
409+
"ap-southeast-2": "783357654285",
410+
"ap-southeast-3": "951798379941",
411+
"ap-southeast-4": "106583098589",
412+
"ca-central-1": "341280168497",
413+
"ca-west-1": "190319476487",
414+
"cn-north-1": "450853457545",
415+
"cn-northwest-1": "451049120500",
416+
"eu-central-1": "492215442770",
417+
"eu-central-2": "680994064768",
418+
"eu-north-1": "662702820516",
419+
"eu-south-1": "978288397137",
420+
"eu-south-2": "104374241257",
421+
"eu-west-1": "141502667606",
422+
"eu-west-2": "764974769150",
423+
"eu-west-3": "659782779980",
424+
"il-central-1": "898809789911",
425+
"me-central-1": "272398656194",
426+
"me-south-1": "801668240914",
427+
"sa-east-1": "737474898029",
428+
"us-east-1": "683313688378",
429+
"us-east-2": "257758044811",
430+
"us-gov-east-1": "237065988967",
431+
"us-gov-west-1": "414596584902",
432+
"us-iso-east-1": "833128469047",
433+
"us-isob-east-1": "281123927165",
434+
"us-isof-east-1": "108575199400",
435+
"us-isof-south-1": "124985052026",
436+
"us-west-1": "746614075791",
437+
"us-west-2": "246618743249"
438+
},
439+
"repository": "sagemaker-xgboost"
398440
}
399441
}
400442
},
@@ -794,6 +836,48 @@
794836
"us-west-2": "246618743249"
795837
},
796838
"repository": "sagemaker-xgboost"
839+
},
840+
"1.7-1-1": {
841+
"registries": {
842+
"af-south-1": "510948584623",
843+
"ap-east-1": "651117190479",
844+
"ap-northeast-1": "354813040037",
845+
"ap-northeast-2": "366743142698",
846+
"ap-northeast-3": "867004704886",
847+
"ap-south-1": "720646828776",
848+
"ap-south-2": "628508329040",
849+
"ap-southeast-1": "121021644041",
850+
"ap-southeast-2": "783357654285",
851+
"ap-southeast-3": "951798379941",
852+
"ap-southeast-4": "106583098589",
853+
"ca-central-1": "341280168497",
854+
"ca-west-1": "190319476487",
855+
"cn-north-1": "450853457545",
856+
"cn-northwest-1": "451049120500",
857+
"eu-central-1": "492215442770",
858+
"eu-central-2": "680994064768",
859+
"eu-north-1": "662702820516",
860+
"eu-south-1": "978288397137",
861+
"eu-south-2": "104374241257",
862+
"eu-west-1": "141502667606",
863+
"eu-west-2": "764974769150",
864+
"eu-west-3": "659782779980",
865+
"il-central-1": "898809789911",
866+
"me-central-1": "272398656194",
867+
"me-south-1": "801668240914",
868+
"sa-east-1": "737474898029",
869+
"us-east-1": "683313688378",
870+
"us-east-2": "257758044811",
871+
"us-gov-east-1": "237065988967",
872+
"us-gov-west-1": "414596584902",
873+
"us-iso-east-1": "833128469047",
874+
"us-isob-east-1": "281123927165",
875+
"us-isof-east-1": "108575199400",
876+
"us-isof-south-1": "124985052026",
877+
"us-west-1": "746614075791",
878+
"us-west-2": "246618743249"
879+
},
880+
"repository": "sagemaker-xgboost"
797881
}
798882
}
799883
},

‎tests/integ/test_serve.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def base_user_settings(sagemaker_session, cpu_instance_type):
5252
@pytest.fixture
5353
def xgb_user_settings(sagemaker_session, base_user_settings):
5454
base_user_settings["image"] = image_uris.retrieve(
55-
"xgboost", sagemaker_session._region_name, "1.7-1", "py38"
55+
"xgboost", sagemaker_session._region_name, "1.7-1-1", "py310"
5656
)
5757
base_user_settings["model_path"] = os.path.join(XGB_RESOURCE_DIR, "tmp")
5858
base_user_settings["content_type"] = "application/x-npy"

‎tests/unit/sagemaker/image_uris/jumpstart/test_xgboost.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ def test_jumpstart_xgboost_image_uri(patched_get_model_specs, session):
5555
# framework classes dont use digest
5656
assert (
5757
framework_class_uri
58-
== "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1"
58+
== "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1-1"
5959
)
6060
assert (
6161
uri == "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost@sha256:"
62-
"ba417ec6d8d3e0c6b5f463bc9202e3b498b42260a29b61875f34beb6d99d8444"
62+
"7901b5885e03785a4a6743e5a950e1a4a0fd69def76ab7d91e0a01c779cf5ca4"
6363
)
6464

6565
# training
@@ -86,9 +86,9 @@ def test_jumpstart_xgboost_image_uri(patched_get_model_specs, session):
8686
# framework classes dont use digest
8787
assert (
8888
framework_class_uri
89-
== "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1"
89+
== "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1-1"
9090
)
9191
assert (
9292
uri == "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost"
93-
"@sha256:ba417ec6d8d3e0c6b5f463bc9202e3b498b42260a29b61875f34beb6d99d8444"
93+
"@sha256:7901b5885e03785a4a6743e5a950e1a4a0fd69def76ab7d91e0a01c779cf5ca4"
9494
)

‎tests/unit/sagemaker/jumpstart/constants.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14330,7 +14330,7 @@
1433014330
"incremental_training_supported": True,
1433114331
"hosting_ecr_specs": {
1433214332
"framework": "xgboost",
14333-
"framework_version": "1.7-1",
14333+
"framework_version": "1.7-1-1",
1433414334
"py_version": "py3",
1433514335
},
1433614336
"hosting_artifact_key": "xgboost-infer/infer-xgboost-classification-model.tar.gz",
@@ -14484,7 +14484,7 @@
1448414484
"training_script_key": "source-directory-tarballs/training/xgboost-classification/v1.3.1/sourcedir.tar.gz",
1448514485
"training_ecr_specs": {
1448614486
"framework": "xgboost",
14487-
"framework_version": "1.7-1",
14487+
"framework_version": "1.7-1-1",
1448814488
"py_version": "py3",
1448914489
},
1449014490
"training_artifact_key": "xgboost-training/train-xgboost-classification-model.tar.gz",

‎tests/unit/sagemaker/serve/detector/test_image_detector.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_detect_latest_downcast_xgb(self):
4747
xgb_model = Mock()
4848
xgb_model.__class__.__bases__ = (xgboost,)
4949
self.assert_dlc_is_expected(
50-
"246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1", xgb_model
50+
"246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1-1", xgb_model
5151
)
5252

5353
@patch.dict(sys.modules, {"xgboost": MagicMock(__version__="1.6.5")})
@@ -57,7 +57,7 @@ def test_detect_earliest_upcast_xgb(self, platform):
5757
xgb_model = Mock()
5858
xgb_model.__class__.__bases__ = (xgboost,)
5959
self.assert_dlc_is_expected(
60-
"246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1", xgb_model
60+
"246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1-1", xgb_model
6161
)
6262

6363
@patch.dict(sys.modules, {"xgboost": MagicMock(__version__="1.5.1")})
@@ -202,7 +202,7 @@ def test_detect_model_no_base(self, platform):
202202
xgb_model = Mock()
203203
xgb_model.__class__ = xgboost
204204
self.assert_dlc_is_expected(
205-
"246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1", xgb_model
205+
"246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1-1", xgb_model
206206
)
207207

208208
# helpers

‎tests/unit/sagemaker/serve/model_server/torchserve/test_prepare.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
DEPENDENCIES = "dependencies"
2323
INFERENCE_SPEC = Mock()
2424
IMAGE_URI = "mock_image_uri"
25-
XGB_1P_IMAGE_URI = "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1"
25+
XGB_1P_IMAGE_URI = "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1-1"
2626
INFERENCE_SPEC.prepare = Mock(return_value=None)
2727

2828
SECRET_KEY = "secret-key"

0 commit comments

Comments
 (0)