From e8ffe7012595f758de6863be7876d1b654ed5953 Mon Sep 17 00:00:00 2001 From: Chuyang Deng Date: Thu, 17 Sep 2020 09:46:52 -0700 Subject: [PATCH 1/3] fix: blazingtext tag and upgrade sparkml version --- .../image_uri_config/blazingtext.json | 2 +- .../image_uri_config/sparkml-serving.json | 29 +++++++++++++++++++ tests/unit/sagemaker/image_uris/test_algos.py | 3 +- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/sagemaker/image_uri_config/blazingtext.json b/src/sagemaker/image_uri_config/blazingtext.json index 2d6287ff64..f2b915df9b 100644 --- a/src/sagemaker/image_uri_config/blazingtext.json +++ b/src/sagemaker/image_uri_config/blazingtext.json @@ -1,7 +1,7 @@ { "scope": ["inference", "training"], "versions": { - "1": { + "latest": { "registries": { "af-south-1": "455444449433", "ap-east-1": "286214385809", diff --git a/src/sagemaker/image_uri_config/sparkml-serving.json b/src/sagemaker/image_uri_config/sparkml-serving.json index de9d0e0d4c..3cfeeaa6bf 100644 --- a/src/sagemaker/image_uri_config/sparkml-serving.json +++ b/src/sagemaker/image_uri_config/sparkml-serving.json @@ -29,6 +29,35 @@ "us-west-2": "246618743249" }, "repository": "sagemaker-sparkml-serving" + }, + "2.4": { + "registries": { + "af-south-1": "510948584623", + "ap-east-1": "651117190479", + "ap-northeast-1": "354813040037", + "ap-northeast-2": "366743142698", + "ap-south-1": "720646828776", + "ap-southeast-1": "121021644041", + "ap-southeast-2": "783357654285", + "ca-central-1": "341280168497", + "cn-north-1": "450853457545", + "cn-northwest-1": "451049120500", + "eu-central-1": "492215442770", + "eu-north-1": "662702820516", + "eu-west-1": "141502667606", + "eu-west-2": "764974769150", + "eu-west-3": "659782779980", + "eu-south-1": "978288397137", + "me-south-1": "801668240914", + "sa-east-1": "737474898029", + "us-east-1": "683313688378", + "us-east-2": "257758044811", + "us-gov-west-1": "414596584902", + "us-iso-east-1": "833128469047", + "us-west-1": "746614075791", + "us-west-2": "246618743249" + }, + "repository": "sagemaker-sparkml-serving" } } } diff --git a/tests/unit/sagemaker/image_uris/test_algos.py b/tests/unit/sagemaker/image_uris/test_algos.py index e051f53933..ca05a693a8 100644 --- a/tests/unit/sagemaker/image_uris/test_algos.py +++ b/tests/unit/sagemaker/image_uris/test_algos.py @@ -177,7 +177,8 @@ def test_algo_uris(algo): for region in regions.regions(): uri = image_uris.retrieve(algo, region) - assert expected_uris.algo_uri(algo, accounts[region], region) == uri + version = "latest" if algo == "blazingtext" else 1 + assert expected_uris.algo_uri(algo, accounts[region], region, version) == uri def test_lda(): From f031c5351ac5062d8afbbc5df1dbbaa649af6de4 Mon Sep 17 00:00:00 2001 From: Chuyang Deng Date: Thu, 17 Sep 2020 11:28:11 -0700 Subject: [PATCH 2/3] update sparkml default version --- src/sagemaker/sparkml/model.py | 4 ++-- tests/unit/test_pipeline_model.py | 2 +- tests/unit/test_sparkml_serving.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sagemaker/sparkml/model.py b/src/sagemaker/sparkml/model.py index a2b91ff6a8..32ce0e683a 100644 --- a/src/sagemaker/sparkml/model.py +++ b/src/sagemaker/sparkml/model.py @@ -59,7 +59,7 @@ class SparkMLModel(Model): model . """ - def __init__(self, model_data, role=None, spark_version=2.2, sagemaker_session=None, **kwargs): + def __init__(self, model_data, role=None, spark_version="2.4", sagemaker_session=None, **kwargs): """Initialize a SparkMLModel. Args: @@ -73,7 +73,7 @@ def __init__(self, model_data, role=None, spark_version=2.2, sagemaker_session=N artifacts. After the endpoint is created, the inference code might use the IAM role, if it needs to access an AWS resource. spark_version (str): Spark version you want to use for executing the - inference (default: '2.2'). + inference (default: '2.4'). sagemaker_session (sagemaker.session.Session): Session object which manages interactions with Amazon SageMaker APIs and any other AWS services needed. If not specified, the estimator creates one diff --git a/tests/unit/test_pipeline_model.py b/tests/unit/test_pipeline_model.py index fed0fde01f..fdde338ad9 100644 --- a/tests/unit/test_pipeline_model.py +++ b/tests/unit/test_pipeline_model.py @@ -97,7 +97,7 @@ def test_prepare_container_def(tfo, time, sagemaker_session): { "Environment": {"SAGEMAKER_DEFAULT_INVOCATIONS_ACCEPT": "text/csv"}, "Image": "246618743249.dkr.ecr.us-west-2.amazonaws.com" - + "/sagemaker-sparkml-serving:2.2", + + "/sagemaker-sparkml-serving:2.4", "ModelDataUrl": "s3://bucket/model_2.tar.gz", }, ] diff --git a/tests/unit/test_sparkml_serving.py b/tests/unit/test_sparkml_serving.py index eb91022b72..4888639537 100644 --- a/tests/unit/test_sparkml_serving.py +++ b/tests/unit/test_sparkml_serving.py @@ -49,7 +49,7 @@ def sagemaker_session(): def test_sparkml_model(sagemaker_session): sparkml = SparkMLModel(sagemaker_session=sagemaker_session, model_data=MODEL_DATA, role=ROLE) - assert sparkml.image_uri == image_uris.retrieve("sparkml-serving", REGION, version="2.2") + assert sparkml.image_uri == image_uris.retrieve("sparkml-serving", REGION, version="2.4") def test_predictor_type(sagemaker_session): From d6d1012ceb619fac4799d4c10f686567e0d1cb65 Mon Sep 17 00:00:00 2001 From: Chuyang Deng Date: Thu, 17 Sep 2020 15:27:19 -0700 Subject: [PATCH 3/3] fix pylint error --- src/sagemaker/sparkml/model.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sagemaker/sparkml/model.py b/src/sagemaker/sparkml/model.py index 32ce0e683a..dd790ea763 100644 --- a/src/sagemaker/sparkml/model.py +++ b/src/sagemaker/sparkml/model.py @@ -59,7 +59,9 @@ class SparkMLModel(Model): model . """ - def __init__(self, model_data, role=None, spark_version="2.4", sagemaker_session=None, **kwargs): + def __init__( + self, model_data, role=None, spark_version="2.4", sagemaker_session=None, **kwargs + ): """Initialize a SparkMLModel. Args: