Skip to content

update xgboost from 1.7-1 to 1.7-1-1 #5285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

update xgboost from 1.7-1 to 1.7-1-1 #5285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/overview.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ If you want to bring your own container that is extended from a SageMaker contai
model=model,
model_server=ModelServer.TORCHSERVE,
schema_builder=SchemaBuilder(X_test, y_pred),
image_uri="123123123123.dkr.ecr.ap-southeast-2.amazonaws.com/byoc-image:xgb-1.7-1")
image_uri="123123123123.dkr.ecr.ap-southeast-2.amazonaws.com/byoc-image:xgb-1.7-1-1")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not our image seems like some byoc usecase.

)


Expand Down
84 changes: 84 additions & 0 deletions src/sagemaker/image_uri_config/xgboost.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,48 @@
"us-west-2": "246618743249"
},
"repository": "sagemaker-xgboost"
},
"1.7-1-1": {
"registries": {
"af-south-1": "510948584623",
"ap-east-1": "651117190479",
"ap-northeast-1": "354813040037",
"ap-northeast-2": "366743142698",
"ap-northeast-3": "867004704886",
"ap-south-1": "720646828776",
"ap-south-2": "628508329040",
"ap-southeast-1": "121021644041",
"ap-southeast-2": "783357654285",
"ap-southeast-3": "951798379941",
"ap-southeast-4": "106583098589",
"ca-central-1": "341280168497",
"ca-west-1": "190319476487",
"cn-north-1": "450853457545",
"cn-northwest-1": "451049120500",
"eu-central-1": "492215442770",
"eu-central-2": "680994064768",
"eu-north-1": "662702820516",
"eu-south-1": "978288397137",
"eu-south-2": "104374241257",
"eu-west-1": "141502667606",
"eu-west-2": "764974769150",
"eu-west-3": "659782779980",
"il-central-1": "898809789911",
"me-central-1": "272398656194",
"me-south-1": "801668240914",
"sa-east-1": "737474898029",
"us-east-1": "683313688378",
"us-east-2": "257758044811",
"us-gov-east-1": "237065988967",
"us-gov-west-1": "414596584902",
"us-iso-east-1": "833128469047",
"us-isob-east-1": "281123927165",
"us-isof-east-1": "108575199400",
"us-isof-south-1": "124985052026",
"us-west-1": "746614075791",
"us-west-2": "246618743249"
},
"repository": "sagemaker-xgboost"
}
}
},
Expand Down Expand Up @@ -794,6 +836,48 @@
"us-west-2": "246618743249"
},
"repository": "sagemaker-xgboost"
},
"1.7-1-1": {
"registries": {
"af-south-1": "510948584623",
"ap-east-1": "651117190479",
"ap-northeast-1": "354813040037",
"ap-northeast-2": "366743142698",
"ap-northeast-3": "867004704886",
"ap-south-1": "720646828776",
"ap-south-2": "628508329040",
"ap-southeast-1": "121021644041",
"ap-southeast-2": "783357654285",
"ap-southeast-3": "951798379941",
"ap-southeast-4": "106583098589",
"ca-central-1": "341280168497",
"ca-west-1": "190319476487",
"cn-north-1": "450853457545",
"cn-northwest-1": "451049120500",
"eu-central-1": "492215442770",
"eu-central-2": "680994064768",
"eu-north-1": "662702820516",
"eu-south-1": "978288397137",
"eu-south-2": "104374241257",
"eu-west-1": "141502667606",
"eu-west-2": "764974769150",
"eu-west-3": "659782779980",
"il-central-1": "898809789911",
"me-central-1": "272398656194",
"me-south-1": "801668240914",
"sa-east-1": "737474898029",
"us-east-1": "683313688378",
"us-east-2": "257758044811",
"us-gov-east-1": "237065988967",
"us-gov-west-1": "414596584902",
"us-iso-east-1": "833128469047",
"us-isob-east-1": "281123927165",
"us-isof-east-1": "108575199400",
"us-isof-south-1": "124985052026",
"us-west-1": "746614075791",
"us-west-2": "246618743249"
},
"repository": "sagemaker-xgboost"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion tests/integ/test_serve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def base_user_settings(sagemaker_session, cpu_instance_type):
@pytest.fixture
def xgb_user_settings(sagemaker_session, base_user_settings):
base_user_settings["image"] = image_uris.retrieve(
"xgboost", sagemaker_session._region_name, "1.7-1", "py38"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the reason why I don't know this code change is needed or not is because this is still on Py38 and not on the current version of python in the container which is 39

"xgboost", sagemaker_session._region_name, "1.7-1-1", "py310"
)
base_user_settings["model_path"] = os.path.join(XGB_RESOURCE_DIR, "tmp")
base_user_settings["content_type"] = "application/x-npy"
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/sagemaker/image_uris/jumpstart/test_xgboost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ def test_jumpstart_xgboost_image_uri(patched_get_model_specs, session):
# framework classes dont use digest
assert (
framework_class_uri
== "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1"
== "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1-1"
)
assert (
uri == "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost@sha256:"
"ba417ec6d8d3e0c6b5f463bc9202e3b498b42260a29b61875f34beb6d99d8444"
"7901b5885e03785a4a6743e5a950e1a4a0fd69def76ab7d91e0a01c779cf5ca4"
)

# training
Expand All @@ -86,9 +86,9 @@ def test_jumpstart_xgboost_image_uri(patched_get_model_specs, session):
# framework classes dont use digest
assert (
framework_class_uri
== "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1"
== "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1-1"
)
assert (
uri == "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost"
"@sha256:ba417ec6d8d3e0c6b5f463bc9202e3b498b42260a29b61875f34beb6d99d8444"
"@sha256:7901b5885e03785a4a6743e5a950e1a4a0fd69def76ab7d91e0a01c779cf5ca4"
)
4 changes: 2 additions & 2 deletions tests/unit/sagemaker/jumpstart/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14330,7 +14330,7 @@
"incremental_training_supported": True,
"hosting_ecr_specs": {
"framework": "xgboost",
"framework_version": "1.7-1",
"framework_version": "1.7-1-1",
"py_version": "py3",
},
"hosting_artifact_key": "xgboost-infer/infer-xgboost-classification-model.tar.gz",
Expand Down Expand Up @@ -14484,7 +14484,7 @@
"training_script_key": "source-directory-tarballs/training/xgboost-classification/v1.3.1/sourcedir.tar.gz",
"training_ecr_specs": {
"framework": "xgboost",
"framework_version": "1.7-1",
"framework_version": "1.7-1-1",
"py_version": "py3",
},
"training_artifact_key": "xgboost-training/train-xgboost-classification-model.tar.gz",
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/sagemaker/serve/detector/test_image_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_detect_latest_downcast_xgb(self):
xgb_model = Mock()
xgb_model.__class__.__bases__ = (xgboost,)
self.assert_dlc_is_expected(
"246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1", xgb_model
"246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1-1", xgb_model
)

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

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

# helpers
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/sagemaker/serve/model_server/torchserve/test_prepare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
DEPENDENCIES = "dependencies"
INFERENCE_SPEC = Mock()
IMAGE_URI = "mock_image_uri"
XGB_1P_IMAGE_URI = "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1"
XGB_1P_IMAGE_URI = "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-xgboost:1.7-1-1"
INFERENCE_SPEC.prepare = Mock(return_value=None)

SECRET_KEY = "secret-key"
Expand Down