change: add support for me-south-1 region (#1097)

* change: add support for me-south-1 region

Author: chuyang-deng

src/sagemaker/amazon/amazon_estimator.py

@@ -465,6 +465,7 @@ def registry(region_name, algorithm=None):
             "eu-north-1": "669576153137",
             "eu-west-3": "749696950732",
             "sa-east-1": "855470959533",
+            "me-south-1": "249704162688",
         }[region_name]
     elif algorithm in ["lda"]:
         account_id = {
@@ -505,6 +506,7 @@ def registry(region_name, algorithm=None):
             "eu-north-1": "669576153137",
             "eu-west-3": "749696950732",
             "sa-east-1": "855470959533",
+            "me-south-1": "249704162688",
         }[region_name]
     elif algorithm in [
         "xgboost",
@@ -534,6 +536,7 @@ def registry(region_name, algorithm=None):
             "eu-north-1": "669576153137",
             "eu-west-3": "749696950732",
             "sa-east-1": "855470959533",
+            "me-south-1": "249704162688",
         }[region_name]
     elif algorithm in ["image-classification-neo", "xgboost-neo"]:
         account_id = NEO_IMAGE_ACCOUNT[region_name]

src/sagemaker/fw_registry.py

@@ -112,6 +112,11 @@
         "scikit-learn": "659782779980",
         "xgboost": "659782779980",
     },
+    "me-south-1": {
+        "sparkml-serving": "801668240914",
+        "scikit-learn": "801668240914",
+        "xgboost": "801668240914",
+    },
 }
 
 

src/sagemaker/fw_utils.py

@@ -57,8 +57,8 @@
 VALID_EIA_FRAMEWORKS = ["tensorflow", "tensorflow-serving", "mxnet", "mxnet-serving"]
 VALID_ACCOUNTS_BY_REGION = {"us-gov-west-1": "246785580436", "us-iso-east-1": "744548109606"}
 ASIMOV_VALID_ACCOUNTS_BY_REGION = {"us-iso-east-1": "886529160074"}
-OPT_IN_ACCOUNTS_BY_REGION = {"ap-east-1": "057415533634"}
-ASIMOV_OPT_IN_ACCOUNTS_BY_REGION = {"ap-east-1": "871362719292"}
+OPT_IN_ACCOUNTS_BY_REGION = {"ap-east-1": "057415533634", "me-south-1": "724002660598"}
+ASIMOV_OPT_IN_ACCOUNTS_BY_REGION = {"ap-east-1": "871362719292", "me-south-1": "217643126080"}
 DEFAULT_ACCOUNT = "520713654638"
 
 MERGED_FRAMEWORKS_REPO_MAP = {

src/sagemaker/model.py

@@ -40,6 +40,9 @@
         "rk3288",
         "rk3399",
         "sbe_c",
+        "aisage",
+        "qcs603",
+        "qcs605",
     ]
 )
 NEO_ALLOWED_FRAMEWORKS = set(["mxnet", "tensorflow", "pytorch", "onnx", "xgboost"])
@@ -62,6 +65,7 @@
     "ap-south-1": "763008648453",
     "sa-east-1": "756306329178",
     "ca-central-1": "464438896020",
+    "me-south-1": "836785723513",
 }
 
 

tests/conftest.py

@@ -31,9 +31,9 @@
 
 DEFAULT_REGION = "us-west-2"
 
-NO_M4_REGIONS = ["eu-west-3", "eu-north-1", "ap-east-1", "sa-east-1"]
+NO_M4_REGIONS = ["eu-west-3", "eu-north-1", "ap-east-1", "sa-east-1", "me-south-1"]
 
-NO_T2_REGIONS = ["eu-north-1", "ap-east-1"]
+NO_T2_REGIONS = ["eu-north-1", "ap-east-1", "me-south-1"]
 
 
 def pytest_addoption(parser):

tests/integ/__init__.py

@@ -55,6 +55,7 @@
     "eu-north-1",
     "sa-east-1",
     "ap-east-1",
+    "me-south-1",
 ]
 
 # EI is currently only supported in the following regions
@@ -68,8 +69,8 @@
     "ap-northeast-2",
 ]
 
-NO_LDA_REGIONS = ["eu-west-3", "eu-north-1", "sa-east-1", "ap-east-1"]
-NO_MARKET_PLACE_REGIONS = ["eu-west-3", "eu-north-1", "sa-east-1", "ap-east-1"]
+NO_LDA_REGIONS = ["eu-west-3", "eu-north-1", "sa-east-1", "ap-east-1", "me-south-1"]
+NO_MARKET_PLACE_REGIONS = ["eu-west-3", "eu-north-1", "sa-east-1", "ap-east-1", "me-south-1"]
 
 EFS_TEST_ENABLED_REGION = []
 

tests/integ/test_horovod.py

@@ -35,15 +35,15 @@ def gpu_instance_type(request):
 
 @pytest.mark.canary_quick
 def test_hvd_cpu(sagemaker_session, cpu_instance_type, tmpdir):
-    __create_and_fit_estimator(sagemaker_session, cpu_instance_type, tmpdir)
+    _create_and_fit_estimator(sagemaker_session, cpu_instance_type, tmpdir)
 
 
 @pytest.mark.canary_quick
 @pytest.mark.skipif(
-    integ.test_region() in integ.HOSTING_NO_P2_REGIONS, reason="no ml.p2 instances in this region"
+    integ.test_region() in integ.TRAINING_NO_P2_REGIONS, reason="no ml.p2 instances in this region"
 )
 def test_hvd_gpu(sagemaker_session, gpu_instance_type, tmpdir):
-    __create_and_fit_estimator(sagemaker_session, gpu_instance_type, tmpdir)
+    _create_and_fit_estimator(sagemaker_session, gpu_instance_type, tmpdir)
 
 
 @pytest.mark.local_mode
@@ -97,7 +97,7 @@ def extract_files_from_s3(s3_url, tmpdir):
         tar_file.extractall(tmpdir)
 
 
-def __create_and_fit_estimator(sagemaker_session, instance_type, tmpdir):
+def _create_and_fit_estimator(sagemaker_session, instance_type, tmpdir):
     job_name = sagemaker.utils.unique_name_from_base("tf-horovod")
     estimator = TensorFlow(
         entry_point=os.path.join(horovod_dir, "hvd_basic.py"),

tests/unit/test_fw_utils.py

@@ -34,6 +34,7 @@
 MOCK_REGION = "mars-south-3"
 MOCK_ACCELERATOR = "eia1.medium"
 MOCK_HKG_REGION = "ap-east-1"
+MOCK_BAH_REGION = "me-south-1"
 
 
 @contextmanager
@@ -146,6 +147,15 @@ def test_create_image_uri_hkg():
     }
 
 
+def test_create_image_uri_bah():
+    image_uri = fw_utils.create_image_uri(
+        MOCK_BAH_REGION, MOCK_FRAMEWORK, "ml.p3.2xlarge", "1.0rc", "py3"
+    )
+    assert {
+        image_uri == "217643126080.dkr.ecr.me-south-1.amazonaws.com/sagemaker-mlfw:1.0rc-gpu-py3"
+    }
+
+
 def test_tf_eia_images():
     image_uri = fw_utils.create_image_uri(
         "us-west-2",

tests/unit/test_model.py

@@ -568,6 +568,7 @@ def test_check_neo_region(sagemaker_session, tmpdir):
         "ap-southeast-2",
         "sa-east-1",
         "ca-central-1",
+        "me-south-1",
     ]
     for region_name in ec2_region_list:
         if region_name in neo_support_region: