Skip to content

Commit 27383ea

Browse files
lorenzwalthertlorenzwalthert
committed
feat: add new sklearn release 1.0-1
1 parent 255a339 commit 27383ea

File tree

14 files changed

+54
-23
lines changed

14 files changed

+54
-23
lines changed

‎doc/amazon_sagemaker_processing.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ You first create a ``SKLearnProcessor``
3636
from sagemaker.sklearn.processing import SKLearnProcessor
3737
3838
sklearn_processor = SKLearnProcessor(
39-
framework_version="0.20.0",
39+
framework_version="1.0-1",
4040
role="[Your SageMaker-compatible IAM role]",
4141
instance_type="ml.m5.xlarge",
4242
instance_count=1,

‎doc/frameworks/sklearn/using_sklearn.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ directories ('train' and 'test').
139139
140140
sklearn_estimator = SKLearn('sklearn-train.py',
141141
instance_type='ml.m4.xlarge',
142-
framework_version='0.20.0',
142+
framework_version='1.0-1',
143143
hyperparameters = {'epochs': 20, 'batch-size': 64, 'learning-rate': 0.1})
144144
sklearn_estimator.fit({'train': 's3://my-data-bucket/path/to/my/training/data',
145145
'test': 's3://my-data-bucket/path/to/my/test/data'})
@@ -203,7 +203,7 @@ operation.
203203
# Train my estimator
204204
sklearn_estimator = SKLearn(entry_point='train_and_deploy.py',
205205
instance_type='ml.m4.xlarge',
206-
framework_version='0.20.0')
206+
framework_version='1.0-1')
207207
sklearn_estimator.fit('s3://my_bucket/my_training_data/')
208208
209209
# Deploy my estimator to a SageMaker Endpoint and get a Predictor
@@ -472,7 +472,7 @@ The following code sample shows how to do this, using the ``SKLearnModel`` class
472472
sklearn_model = SKLearnModel(model_data="s3://bucket/model.tar.gz",
473473
role="SageMakerRole",
474474
entry_point="transform_script.py",
475-
framework_version="0.20.0")
475+
framework_version="1.0-1")
476476
477477
predictor = sklearn_model.deploy(instance_type="ml.c4.xlarge", initial_instance_count=1)
478478

‎doc/overview.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,7 @@ To train a model in network isolation mode, set the optional parameter ``enable_
16211621
# set the enable_network_isolation parameter to True
16221622
sklearn_estimator = SKLearn('sklearn-train.py',
16231623
instance_type='ml.m4.xlarge',
1624-
framework_version='0.20.0',
1624+
framework_version='1.0-1',
16251625
hyperparameters = {'epochs': 20, 'batch-size': 64, 'learning-rate': 0.1},
16261626
enable_network_isolation=True)
16271627

‎src/sagemaker/image_uri_config/sklearn.json

+31
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,37 @@
6363
"us-west-2": "246618743249"
6464
},
6565
"repository": "sagemaker-scikit-learn"
66+
},
67+
"1.0-1": {
68+
"py_versions": ["py3"],
69+
"registries": {
70+
"af-south-1": "510948584623",
71+
"ap-east-1": "651117190479",
72+
"ap-northeast-1": "354813040037",
73+
"ap-northeast-2": "366743142698",
74+
"ap-northeast-3": "867004704886",
75+
"ap-south-1": "720646828776",
76+
"ap-southeast-1": "121021644041",
77+
"ap-southeast-2": "783357654285",
78+
"ca-central-1": "341280168497",
79+
"cn-north-1": "450853457545",
80+
"cn-northwest-1": "451049120500",
81+
"eu-central-1": "492215442770",
82+
"eu-north-1": "662702820516",
83+
"eu-west-1": "141502667606",
84+
"eu-west-2": "764974769150",
85+
"eu-west-3": "659782779980",
86+
"eu-south-1": "978288397137",
87+
"me-south-1": "801668240914",
88+
"sa-east-1": "737474898029",
89+
"us-east-1": "683313688378",
90+
"us-east-2": "257758044811",
91+
"us-gov-west-1": "414596584902",
92+
"us-iso-east-1": "833128469047",
93+
"us-west-1": "746614075791",
94+
"us-west-2": "246618743249"
95+
},
96+
"repository": "sagemaker-scikit-learn"
6697
}
6798
}
6899
}

‎src/sagemaker/workflow/_utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
if TYPE_CHECKING:
3838
from sagemaker.workflow.step_collections import StepCollection
3939

40-
FRAMEWORK_VERSION = "0.23-1"
40+
FRAMEWORK_VERSION = "1.0-1"
4141
INSTANCE_TYPE = "ml.m5.large"
4242
REPACK_SCRIPT = "_repack_model.py"
4343

‎tests/integ/sagemaker/workflow/test_workflow.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ def test_end_to_end_pipeline_successful_execution(
676676
)
677677

678678
# define processing step
679-
framework_version = "0.23-1"
679+
framework_version = "1.0-1"
680680
sklearn_processor = SKLearnProcessor(
681681
framework_version=framework_version,
682682
instance_type=processing_instance_type,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def test_jumpstart_sklearn_image_uri(patched_get_model_specs, session):
5555

5656
assert uri == framework_class_uri
5757
assert (
58-
uri == "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:0.23-1-cpu-py3"
58+
uri == "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:1.0-1-cpu-py3"
5959
)
6060

6161
# training
@@ -81,7 +81,7 @@ def test_jumpstart_sklearn_image_uri(patched_get_model_specs, session):
8181

8282
assert uri == framework_class_uri
8383
assert (
84-
uri == "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:0.23-1-cpu-py3"
84+
uri == "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:1.0-1-cpu-py3"
8585
)
8686

8787
with pytest.raises(ValueError):

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@
959959
"incremental_training_supported": False,
960960
"hosting_ecr_specs": {
961961
"framework": "sklearn",
962-
"framework_version": "0.23-1",
962+
"framework_version": "1.0-1",
963963
"py_version": "py3",
964964
},
965965
"hosting_artifact_key": "sklearn-infer/infer-sklearn-classification-linear.tar.gz",
@@ -1025,7 +1025,7 @@
10251025
"training_script_key": "source-directory-tarballs/sklearn/transfer_learning/classification/"
10261026
"v1.0.0/sourcedir.tar.gz",
10271027
"training_ecr_specs": {
1028-
"framework_version": "0.23-1",
1028+
"framework_version": "1.0-1",
10291029
"framework": "sklearn",
10301030
"py_version": "py3",
10311031
},

‎tests/unit/sagemaker/lineage/test_query.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ def test_vertex_to_dataset_artifact(sagemaker_session):
404404
sagemaker_session.sagemaker_client.describe_artifact.return_value = {
405405
"ArtifactArn": "arn:aws:sagemaker:us-west-2:0123456789012:artifact/e66eef7f19c05e75284089183491bd4f",
406406
"Source": {
407-
"SourceUri": "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:0.23-1-cpu-py3",
407+
"SourceUri": "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:1.0-1-cpu-py3",
408408
"SourceTypes": [],
409409
},
410410
"ArtifactType": "Image",
@@ -435,7 +435,7 @@ def test_vertex_to_model_artifact(sagemaker_session):
435435
sagemaker_session.sagemaker_client.describe_artifact.return_value = {
436436
"ArtifactArn": "arn:aws:sagemaker:us-west-2:0123456789012:artifact/e66eef7f19c05e75284089183491bd4f",
437437
"Source": {
438-
"SourceUri": "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:0.23-1-cpu-py3",
438+
"SourceUri": "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:1.0-1-cpu-py3",
439439
"SourceTypes": [],
440440
},
441441
"ArtifactType": "Image",
@@ -466,7 +466,7 @@ def test_vertex_to_object_image_artifact(sagemaker_session):
466466
sagemaker_session.sagemaker_client.describe_artifact.return_value = {
467467
"ArtifactArn": "arn:aws:sagemaker:us-west-2:0123456789012:artifact/e66eef7f19c05e75284089183491bd4f",
468468
"Source": {
469-
"SourceUri": "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:0.23-1-cpu-py3",
469+
"SourceUri": "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:1.0-1-cpu-py3",
470470
"SourceTypes": [],
471471
},
472472
"ArtifactType": "Image",
@@ -497,7 +497,7 @@ def test_vertex_to_object_action(sagemaker_session):
497497
sagemaker_session.sagemaker_client.describe_action.return_value = {
498498
"ActionName": "cp-m5-20210424t041405868z-1619237657-1-aws-endpoint",
499499
"Source": {
500-
"SourceUri": "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:0.23-1-cpu-py3",
500+
"SourceUri": "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:1.0-1-cpu-py3",
501501
"SourceTypes": [],
502502
},
503503
"ActionType": "A",

‎tests/unit/sagemaker/model/test_model.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ def test_all_framework_models_add_jumpstart_tags(
598598
},
599599
MXNetModel: {"framework_version": "1.7.0", "py_version": "py3"},
600600
SKLearnModel: {
601-
"framework_version": "0.23-1",
601+
"framework_version": "1.0-1",
602602
},
603603
XGBoostModel: {
604604
"framework_version": "1.3-1",
@@ -690,7 +690,7 @@ def test_all_framework_models_add_jumpstart_base_name(
690690
},
691691
MXNetModel: {"framework_version": "1.7.0", "py_version": "py3"},
692692
SKLearnModel: {
693-
"framework_version": "0.23-1",
693+
"framework_version": "1.0-1",
694694
},
695695
XGBoostModel: {
696696
"framework_version": "1.3-1",

‎tests/unit/sagemaker/workflow/test_processing_step.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def test_processing_step_with_script_processor(pipeline_session, processing_inpu
233233
),
234234
(
235235
SKLearnProcessor(
236-
framework_version="0.23-1",
236+
framework_version="1.0-1",
237237
instance_type=INSTANCE_TYPE,
238238
instance_count=1,
239239
role=sagemaker.get_execution_role(),

‎tests/unit/sagemaker/workflow/test_step_collections.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
ROLE = "DummyRole"
6464
MODEL_NAME = "gisele"
6565
MODEL_REPACKING_IMAGE_URI = (
66-
"246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:0.23-1-cpu-py3"
66+
"246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:1.0-1-cpu-py3"
6767
)
6868

6969

@@ -1044,7 +1044,7 @@ def test_estimator_transformer_with_model_repack_with_estimator(estimator):
10441044
"AlgorithmSpecification": {
10451045
"TrainingInputMode": "File",
10461046
"TrainingImage": "246618743249.dkr.ecr.us-west-2.amazonaws.com/"
1047-
+ "sagemaker-scikit-learn:0.23-1-cpu-py3",
1047+
+ "sagemaker-scikit-learn:1.0-1-cpu-py3",
10481048
},
10491049
"OutputDataConfig": {"S3OutputPath": "s3://my-bucket/"},
10501050
"StoppingCondition": {"MaxRuntimeInSeconds": 86400},

‎tests/unit/sagemaker/workflow/test_training_step.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def test_training_step_with_estimator(pipeline_session, training_input, hyperpar
126126
"estimator",
127127
[
128128
SKLearn(
129-
framework_version="0.23-1",
129+
framework_version="1.0-1",
130130
py_version="py3",
131131
instance_type=INSTANCE_TYPE,
132132
instance_count=1,

‎tests/unit/test_estimator.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3808,7 +3808,7 @@ def test_all_framework_estimators_add_jumpstart_tags(
38083808
"instance_type": "ml.p2.xlarge",
38093809
},
38103810
MXNet: {"framework_version": "1.7.0", "py_version": "py3", "instance_type": "ml.p2.xlarge"},
3811-
SKLearn: {"framework_version": "0.23-1", "instance_type": "ml.m2.xlarge"},
3811+
SKLearn: {"framework_version": "1.0-1", "instance_type": "ml.m2.xlarge"},
38123812
XGBoost: {"framework_version": "1.3-1", "instance_type": "ml.m2.xlarge"},
38133813
}
38143814
jumpstart_model_uri = f"s3://{list(JUMPSTART_BUCKET_NAME_SET)[0]}/model_dirs/model.tar.gz"
@@ -3959,7 +3959,7 @@ def test_all_framework_estimators_add_jumpstart_base_name(
39593959
"instance_type": "ml.p2.xlarge",
39603960
},
39613961
MXNet: {"framework_version": "1.7.0", "py_version": "py3", "instance_type": "ml.p2.xlarge"},
3962-
SKLearn: {"framework_version": "0.23-1", "instance_type": "ml.m2.xlarge"},
3962+
SKLearn: {"framework_version": "1.0-1", "instance_type": "ml.m2.xlarge"},
39633963
XGBoost: {"framework_version": "1.3-1", "instance_type": "ml.m2.xlarge"},
39643964
}
39653965
jumpstart_model_uri = f"s3://{list(JUMPSTART_BUCKET_NAME_SET)[0]}/model_dirs/model.tar.gz"

0 commit comments

Comments
 (0)