From f1d4238735cdeee846e7eeb48fe804f2ca0470ac Mon Sep 17 00:00:00 2001 From: Malav Shastri Date: Mon, 7 Aug 2023 14:40:42 -0400 Subject: [PATCH] Add TLV accounts for 1P Algorithms --- .../image_uri_config/blazingtext.json | 1 + .../factorization-machines.json | 1 + .../image_uri_config/forecasting-deepar.json | 1 + .../image-classification.json | 1 + .../image_uri_config/ipinsights.json | 1 + src/sagemaker/image_uri_config/kmeans.json | 1 + src/sagemaker/image_uri_config/knn.json | 1 + .../image_uri_config/linear-learner.json | 1 + src/sagemaker/image_uri_config/ntm.json | 1 + .../image_uri_config/object-detection.json | 1 + .../image_uri_config/object2vec.json | 1 + src/sagemaker/image_uri_config/pca.json | 1 + .../image_uri_config/randomcutforest.json | 1 + .../semantic-segmentation.json | 1 + src/sagemaker/image_uri_config/seq2seq.json | 1 + src/sagemaker/image_uri_config/sklearn.json | 9 ++++ src/sagemaker/image_uri_config/xgboost.json | 14 ++++++ tests/unit/sagemaker/image_uris/test_algos.py | 2 + .../unit/sagemaker/image_uris/test_sklearn.py | 1 + .../unit/sagemaker/image_uris/test_xgboost.py | 44 +++++++++++-------- 20 files changed, 66 insertions(+), 19 deletions(-) diff --git a/src/sagemaker/image_uri_config/blazingtext.json b/src/sagemaker/image_uri_config/blazingtext.json index 478e6c3ffd..66a58720ee 100644 --- a/src/sagemaker/image_uri_config/blazingtext.json +++ b/src/sagemaker/image_uri_config/blazingtext.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/factorization-machines.json b/src/sagemaker/image_uri_config/factorization-machines.json index 010fe65e1f..8ec3b5e4de 100644 --- a/src/sagemaker/image_uri_config/factorization-machines.json +++ b/src/sagemaker/image_uri_config/factorization-machines.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/forecasting-deepar.json b/src/sagemaker/image_uri_config/forecasting-deepar.json index 09e3eaae87..721150a715 100644 --- a/src/sagemaker/image_uri_config/forecasting-deepar.json +++ b/src/sagemaker/image_uri_config/forecasting-deepar.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/image-classification.json b/src/sagemaker/image_uri_config/image-classification.json index cbc3ddc67b..d9fc0e3308 100644 --- a/src/sagemaker/image_uri_config/image-classification.json +++ b/src/sagemaker/image_uri_config/image-classification.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/ipinsights.json b/src/sagemaker/image_uri_config/ipinsights.json index 2ab6274037..195772d67e 100644 --- a/src/sagemaker/image_uri_config/ipinsights.json +++ b/src/sagemaker/image_uri_config/ipinsights.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/kmeans.json b/src/sagemaker/image_uri_config/kmeans.json index 668cc4b09c..a8a31144c5 100644 --- a/src/sagemaker/image_uri_config/kmeans.json +++ b/src/sagemaker/image_uri_config/kmeans.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/knn.json b/src/sagemaker/image_uri_config/knn.json index 7aaf872639..4bd66172c5 100644 --- a/src/sagemaker/image_uri_config/knn.json +++ b/src/sagemaker/image_uri_config/knn.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/linear-learner.json b/src/sagemaker/image_uri_config/linear-learner.json index 8e4030dd83..5768c6e7d3 100644 --- a/src/sagemaker/image_uri_config/linear-learner.json +++ b/src/sagemaker/image_uri_config/linear-learner.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/ntm.json b/src/sagemaker/image_uri_config/ntm.json index 3bd06736e3..493e150885 100644 --- a/src/sagemaker/image_uri_config/ntm.json +++ b/src/sagemaker/image_uri_config/ntm.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/object-detection.json b/src/sagemaker/image_uri_config/object-detection.json index 14b69a83ad..00a2b90213 100644 --- a/src/sagemaker/image_uri_config/object-detection.json +++ b/src/sagemaker/image_uri_config/object-detection.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/object2vec.json b/src/sagemaker/image_uri_config/object2vec.json index 4bb0f5acf2..950bd60157 100644 --- a/src/sagemaker/image_uri_config/object2vec.json +++ b/src/sagemaker/image_uri_config/object2vec.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/pca.json b/src/sagemaker/image_uri_config/pca.json index 635ac42094..ff5e247220 100644 --- a/src/sagemaker/image_uri_config/pca.json +++ b/src/sagemaker/image_uri_config/pca.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/randomcutforest.json b/src/sagemaker/image_uri_config/randomcutforest.json index cc58968e51..8035001661 100644 --- a/src/sagemaker/image_uri_config/randomcutforest.json +++ b/src/sagemaker/image_uri_config/randomcutforest.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/semantic-segmentation.json b/src/sagemaker/image_uri_config/semantic-segmentation.json index 596869fbdc..3f21ddf2e3 100644 --- a/src/sagemaker/image_uri_config/semantic-segmentation.json +++ b/src/sagemaker/image_uri_config/semantic-segmentation.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/seq2seq.json b/src/sagemaker/image_uri_config/seq2seq.json index e97f7fd3ee..ecf2b180e1 100644 --- a/src/sagemaker/image_uri_config/seq2seq.json +++ b/src/sagemaker/image_uri_config/seq2seq.json @@ -25,6 +25,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/src/sagemaker/image_uri_config/sklearn.json b/src/sagemaker/image_uri_config/sklearn.json index 70a451bfbe..bd3981da9f 100644 --- a/src/sagemaker/image_uri_config/sklearn.json +++ b/src/sagemaker/image_uri_config/sklearn.json @@ -27,6 +27,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -67,6 +68,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -107,6 +109,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -147,6 +150,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -191,6 +195,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -231,6 +236,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -271,6 +277,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -311,6 +318,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -355,6 +363,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", diff --git a/src/sagemaker/image_uri_config/xgboost.json b/src/sagemaker/image_uri_config/xgboost.json index 35e2c7e6b3..bedd7cf067 100644 --- a/src/sagemaker/image_uri_config/xgboost.json +++ b/src/sagemaker/image_uri_config/xgboost.json @@ -148,6 +148,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -186,6 +187,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -224,6 +226,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -262,6 +265,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -300,6 +304,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -338,6 +343,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -503,6 +509,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -541,6 +548,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -579,6 +587,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -617,6 +626,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -655,6 +665,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -693,6 +704,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -735,6 +747,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -773,6 +786,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", diff --git a/tests/unit/sagemaker/image_uris/test_algos.py b/tests/unit/sagemaker/image_uris/test_algos.py index 34180a94b0..aa715ada41 100644 --- a/tests/unit/sagemaker/image_uris/test_algos.py +++ b/tests/unit/sagemaker/image_uris/test_algos.py @@ -71,6 +71,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", @@ -167,6 +168,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", diff --git a/tests/unit/sagemaker/image_uris/test_sklearn.py b/tests/unit/sagemaker/image_uris/test_sklearn.py index d22d364b58..3cc3a69373 100644 --- a/tests/unit/sagemaker/image_uris/test_sklearn.py +++ b/tests/unit/sagemaker/image_uris/test_sklearn.py @@ -40,6 +40,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", diff --git a/tests/unit/sagemaker/image_uris/test_xgboost.py b/tests/unit/sagemaker/image_uris/test_xgboost.py index 1a891c5612..a8afda7ef5 100644 --- a/tests/unit/sagemaker/image_uris/test_xgboost.py +++ b/tests/unit/sagemaker/image_uris/test_xgboost.py @@ -38,6 +38,7 @@ "eu-west-3": "749696950732", "eu-south-1": "257386234256", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "249704162688", "me-central-1": "272398656194", "sa-east-1": "855470959533", @@ -77,6 +78,7 @@ "eu-west-3": "659782779980", "eu-south-1": "978288397137", "eu-south-2": "104374241257", + "il-central-1": "898809789911", "me-south-1": "801668240914", "me-central-1": "272398656194", "sa-east-1": "737474898029", @@ -114,29 +116,33 @@ def test_xgboost_framework(xgboost_framework_version): @pytest.mark.parametrize("xgboost_framework_version", XGBOOST_FRAMEWORK_CPU_ONLY_VERSIONS) def test_xgboost_framework_cpu_only(xgboost_framework_version): for region in FRAMEWORK_REGISTRIES.keys(): - uri = image_uris.retrieve( - framework="xgboost", - region=region, - version=xgboost_framework_version, - ) + if not (xgboost_framework_version in ["0.90-2", "0.90-1"] and region == "il-central-1"): + uri = image_uris.retrieve( + framework="xgboost", + region=region, + version=xgboost_framework_version, + ) - expected = expected_uris.framework_uri( - "sagemaker-xgboost", - xgboost_framework_version, - FRAMEWORK_REGISTRIES[region], - region=region, - py_version="py3", - processor="cpu", - ) - assert expected == uri + expected = expected_uris.framework_uri( + "sagemaker-xgboost", + xgboost_framework_version, + FRAMEWORK_REGISTRIES[region], + region=region, + py_version="py3", + processor="cpu", + ) + assert expected == uri @pytest.mark.parametrize("xgboost_algo_version", ALGO_VERSIONS) def test_xgboost_algo(xgboost_algo_version): for region in ALGO_REGISTRIES.keys(): - uri = image_uris.retrieve(framework="xgboost", region=region, version=xgboost_algo_version) + if region != "il-central-1": + uri = image_uris.retrieve( + framework="xgboost", region=region, version=xgboost_algo_version + ) - expected = expected_uris.algo_uri( - "xgboost", ALGO_REGISTRIES[region], region, version=xgboost_algo_version - ) - assert expected == uri + expected = expected_uris.algo_uri( + "xgboost", ALGO_REGISTRIES[region], region, version=xgboost_algo_version + ) + assert expected == uri