Merge branch 'zwei' into v2-docs

Author: laurenyu

src/sagemaker/debugger.py

@@ -23,32 +23,9 @@
 
 import smdebug_rulesconfig as rule_configs  # noqa: F401 # pylint: disable=unused-import
 
-from sagemaker.utils import get_ecr_image_uri_prefix
-
-RULES_ECR_REPO_NAME = "sagemaker-debugger-rules"
-
-SAGEMAKER_RULE_CONTAINERS_ACCOUNTS_MAP = {
-    "eu-north-1": {RULES_ECR_REPO_NAME: "314864569078"},
-    "me-south-1": {RULES_ECR_REPO_NAME: "986000313247"},
-    "ap-south-1": {RULES_ECR_REPO_NAME: "904829902805"},
-    "eu-west-3": {RULES_ECR_REPO_NAME: "447278800020"},
-    "us-east-2": {RULES_ECR_REPO_NAME: "915447279597"},
-    "eu-west-1": {RULES_ECR_REPO_NAME: "929884845733"},
-    "eu-central-1": {RULES_ECR_REPO_NAME: "482524230118"},
-    "sa-east-1": {RULES_ECR_REPO_NAME: "818342061345"},
-    "ap-east-1": {RULES_ECR_REPO_NAME: "199566480951"},
-    "us-east-1": {RULES_ECR_REPO_NAME: "503895931360"},
-    "ap-northeast-2": {RULES_ECR_REPO_NAME: "578805364391"},
-    "eu-west-2": {RULES_ECR_REPO_NAME: "250201462417"},
-    "ap-northeast-1": {RULES_ECR_REPO_NAME: "430734990657"},
-    "us-west-2": {RULES_ECR_REPO_NAME: "895741380848"},
-    "us-west-1": {RULES_ECR_REPO_NAME: "685455198987"},
-    "ap-southeast-1": {RULES_ECR_REPO_NAME: "972752614525"},
-    "ap-southeast-2": {RULES_ECR_REPO_NAME: "184798709955"},
-    "ca-central-1": {RULES_ECR_REPO_NAME: "519511493484"},
-    "cn-north-1": {RULES_ECR_REPO_NAME: "618459771430"},
-    "cn-northwest-1": {RULES_ECR_REPO_NAME: "658757709296"},
-}
+from sagemaker import image_uris
+
+framework_name = "debugger"
 
 
 def get_rule_container_image_uri(region):
@@ -61,9 +38,7 @@ def get_rule_container_image_uri(region):
     Returns:
         str: Formatted image uri for the given region and the rule container type
     """
-    registry_id = SAGEMAKER_RULE_CONTAINERS_ACCOUNTS_MAP.get(region).get(RULES_ECR_REPO_NAME)
-    image_uri_prefix = get_ecr_image_uri_prefix(registry_id, region)
-    return "{}/{}:latest".format(image_uri_prefix, RULES_ECR_REPO_NAME)
+    return image_uris.retrieve(framework_name, region)
 
 
 class Rule(object):

src/sagemaker/estimator.py

@@ -29,11 +29,10 @@
 from sagemaker.debugger import DebuggerHookConfig
 from sagemaker.debugger import TensorBoardOutputConfig  # noqa: F401 # pylint: disable=unused-import
 from sagemaker.debugger import get_rule_container_image_uri
-from sagemaker.s3 import S3Uploader
+from sagemaker.s3 import S3Uploader, parse_s3_url
 
 from sagemaker.fw_utils import (
     tar_and_upload_dir,
-    parse_s3_url,
     UploadedCode,
     validate_source_dir,
     _region_supports_debugger,

src/sagemaker/fw_utils.py

@@ -21,7 +21,6 @@
 from collections import namedtuple
 
 import sagemaker.utils
-from sagemaker import s3
 
 logger = logging.getLogger("sagemaker")
 
@@ -33,15 +32,6 @@
 instantiated with positional or keyword arguments.
 """
 
-EMPTY_FRAMEWORK_VERSION_WARNING = (
-    "No framework_version specified, defaulting to version {}. "
-    "framework_version will be required in SageMaker Python SDK v2."
-)
-LATER_FRAMEWORK_VERSION_WARNING = (
-    "This is not the latest supported version. "
-    "If you would like to use version {latest}, "
-    "please add framework_version={latest} to your constructor."
-)
 PYTHON_2_DEPRECATION_WARNING = (
     "{latest_supported_version} is the latest version of {framework} that supports "
     "Python 2. Newer versions of {framework} will only be available for Python 3."
@@ -54,21 +44,10 @@
     "fully leverage all GPU cores; the parameter server will be configured to run "
     "only one worker per host regardless of the number of GPUs."
 )
-PARAMETER_V2_RENAME_WARNING = (
-    "Parameter {v1_parameter_name} will be renamed to {v2_parameter_name} "
-    "in SageMaker Python SDK v2."
-)
-
-
-EMPTY_FRAMEWORK_VERSION_ERROR = (
-    "framework_version is required for script mode estimator. "
-    "Please add framework_version={} to your constructor to avoid this error."
-)
 
+DEBUGGER_UNSUPPORTED_REGIONS = ("us-gov-west-1", "us-iso-east-1")
 SINGLE_GPU_INSTANCE_TYPES = ("ml.p2.xlarge", "ml.p3.2xlarge")
 
-DEBUGGER_UNSUPPORTED_REGIONS = ["us-gov-west-1", "us-iso-east-1"]
-
 
 def is_version_equal_or_higher(lowest_version, framework_version):
     """Determine whether the ``framework_version`` is equal to or higher than
@@ -264,20 +243,6 @@ def framework_version_from_tag(image_tag):
     return None if tag_match is None else tag_match.group(1)
 
 
-def parse_s3_url(url):
-    """Calls the method with the same name in the s3 module.
-
-    :func:~sagemaker.s3.parse_s3_url
-
-    Args:
-        url: A URL, expected with an s3 scheme.
-
-    Returns: The return value of s3.parse_s3_url, which is a tuple containing:
-        str: S3 bucket name str: S3 key
-    """
-    return s3.parse_s3_url(url)
-
-
 def model_code_key_prefix(code_location_key_prefix, model_name, image):
     """Returns the s3 key prefix for uploading code during model deployment
     The location returned is a potential concatenation of 2 parts
@@ -294,26 +259,6 @@ def model_code_key_prefix(code_location_key_prefix, model_name, image):
     return "/".join(filter(None, [code_location_key_prefix, model_name or training_job_name]))
 
 
-def empty_framework_version_warning(default_version, latest_version):
-    """
-    Args:
-        default_version:
-        latest_version:
-    """
-    msgs = [EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)]
-    if default_version != latest_version:
-        msgs.append(later_framework_version_warning(latest_version))
-    return " ".join(msgs)
-
-
-def later_framework_version_warning(latest_version):
-    """
-    Args:
-        latest_version:
-    """
-    return LATER_FRAMEWORK_VERSION_WARNING.format(latest=latest_version)
-
-
 def warn_if_parameter_server_with_multi_gpu(training_instance_type, distribution):
     """Warn the user that training will not fully leverage all the GPU
     cores if parameter server is enabled and a multi-GPU instance is selected.
@@ -363,17 +308,6 @@ def python_deprecation_warning(framework, latest_supported_version):
     )
 
 
-def parameter_v2_rename_warning(v1_parameter_name, v2_parameter_name):
-    """
-    Args:
-        v1_parameter_name: parameter name used in SageMaker Python SDK v1
-        v2_parameter_name: parameter name used in SageMaker Python SDK v2
-    """
-    return PARAMETER_V2_RENAME_WARNING.format(
-        v1_parameter_name=v1_parameter_name, v2_parameter_name=v2_parameter_name
-    )
-
-
 def _region_supports_debugger(region_name):
     """Returns boolean indicating whether the region supports Amazon SageMaker Debugger.
 

src/sagemaker/image_uri_config/debugger.json

@@ -0,0 +1,30 @@
+{
+    "scope": ["debugger"],
+    "versions": {
+        "latest": {
+            "registries": {
+                "ap-east-1": "199566480951",
+                "ap-northeast-1": "430734990657",
+                "ap-northeast-2": "578805364391",
+                "ap-south-1": "904829902805",
+                "ap-southeast-1": "972752614525",
+                "ap-southeast-2": "184798709955",
+                "ca-central-1": "519511493484",
+                "cn-north-1": "618459771430",
+                "cn-northwest-1": "658757709296",
+                "eu-central-1": "482524230118",
+                "eu-north-1": "314864569078",
+                "eu-west-1": "929884845733",
+                "eu-west-2": "250201462417",
+                "eu-west-3": "447278800020",
+                "me-south-1": "986000313247",
+                "sa-east-1": "818342061345",
+                "us-east-1": "199566480951",
+                "us-east-2": "915447279597",
+                "us-west-1": "685455198987",
+                "us-west-2": "895741380848"
+            },
+            "repository": "sagemaker-debugger-rules"
+        }
+    }
+}

src/sagemaker/image_uri_config/model-monitor.json

@@ -3,26 +3,26 @@
     "versions": {
         "": {
             "registries": {
-                "eu-north-1": "895015795356",
-                "me-south-1": "607024016150",
-                "ap-south-1": "126357580389",
-                "us-east-2": "777275614652",
-                "eu-west-1": "468650794304",
-                "eu-central-1": "048819808253",
-                "sa-east-1": "539772159869",
                 "ap-east-1": "001633400207",
-                "us-east-1": "156813124566",
-                "ap-northeast-2": "709848358524",
-                "eu-west-2": "749857270468",
-                "eu-west-3": "680080141114",
                 "ap-northeast-1": "574779866223",
-                "us-west-2": "159807026194",
-                "us-west-1": "890145073186",
+                "ap-northeast-2": "709848358524",
+                "ap-south-1": "126357580389",
                 "ap-southeast-1": "245545462676",
                 "ap-southeast-2": "563025443158",
                 "ca-central-1": "536280801234",
                 "cn-north-1": "453000072557",
-                "cn-northwest-1": "453252182341"
+                "cn-northwest-1": "453252182341",
+                "eu-central-1": "048819808253",
+                "eu-north-1": "895015795356",
+                "eu-west-1": "468650794304",
+                "eu-west-2": "749857270468",
+                "eu-west-3": "680080141114",
+                "me-south-1": "607024016150",
+                "sa-east-1": "539772159869",
+                "us-east-1": "156813124566",
+                "us-east-2": "777275614652",
+                "us-west-1": "890145073186",
+                "us-west-2": "159807026194"
             },
             "repository": "sagemaker-model-monitor-analyzer"
         }

src/sagemaker/model.py

@@ -18,8 +18,7 @@
 import os
 
 import sagemaker
-from sagemaker import fw_utils, image_uris, local, session, utils, git_utils
-from sagemaker.fw_utils import UploadedCode
+from sagemaker import fw_utils, image_uris, local, s3, session, utils, git_utils
 from sagemaker.transformer import Transformer
 
 LOGGER = logging.getLogger("sagemaker")
@@ -715,7 +714,7 @@ def __init__(
         self.git_config = git_config
         self.container_log_level = container_log_level
         if code_location:
-            self.bucket, self.key_prefix = fw_utils.parse_s3_url(code_location)
+            self.bucket, self.key_prefix = s3.parse_s3_url(code_location)
         else:
             self.bucket, self.key_prefix = None, None
         if self.git_config:
@@ -788,7 +787,7 @@ def _upload_code(self, key_prefix, repack=False):
             )
 
             self.repacked_model_data = repacked_model_data
-            self.uploaded_code = UploadedCode(
+            self.uploaded_code = fw_utils.UploadedCode(
                 s3_prefix=self.repacked_model_data, script_name=os.path.basename(self.entry_point)
             )
 

src/sagemaker/session.py

@@ -3370,29 +3370,6 @@ def __init__(self, seed):
         self.seed = seed
 
 
-class ModelContainer(object):
-    """Amazon SageMaker Model configurations for inference pipelines.
-
-    Attributes:
-        model_data (str): S3 Model artifact location
-        image_uri (str): Docker image URL in ECR
-        env (dict[str,str]): Environment variable mapping
-    """
-
-    def __init__(self, model_data, image_uri, env=None):
-        """Create a definition of a model which can be part of an Inference Pipeline
-
-        Args:
-            model_data (str): The S3 location of a SageMaker model data ``.tar.gz`` file.
-            image_uri (str): A Docker image URI.
-            env (dict[str, str]): Environment variables to run with ``image_uri`` when hosted in
-                SageMaker (default: None).
-        """
-        self.model_data = model_data
-        self.image_uri = image_uri
-        self.env = env
-
-
 def _create_model_request(
     name, role, container_def=None, tags=None
 ):  # pylint: disable=redefined-outer-name