Merge branch 'zwei' into json-update-script

Author: chuyang-deng

src/sagemaker/chainer/estimator.py

@@ -32,7 +32,7 @@
 class Chainer(Framework):
     """Handle end-to-end training and deployment of custom Chainer code."""
 
-    __framework_name__ = "chainer"
+    _framework_name = "chainer"
 
     # Hyperparameters
     _use_mpi = "sagemaker_use_mpi"
@@ -131,7 +131,7 @@ def __init__(
         validate_version_or_image_args(framework_version, py_version, image_uri)
         if py_version == "py2":
             logger.warning(
-                python_deprecation_warning(self.__framework_name__, defaults.LATEST_PY2_VERSION)
+                python_deprecation_warning(self._framework_name, defaults.LATEST_PY2_VERSION)
             )
         self.framework_version = framework_version
         self.py_version = py_version
@@ -272,7 +272,7 @@ class constructor
             init_params["image_uri"] = image_uri
             return init_params
 
-        if framework != cls.__framework_name__:
+        if framework != cls._framework_name:
             raise ValueError(
                 "Training job: {} didn't use image for requested framework".format(
                     job_details["TrainingJobName"]

src/sagemaker/chainer/model.py

@@ -59,7 +59,7 @@ class ChainerModel(FrameworkModel):
     ``Endpoint``.
     """
 
-    __framework_name__ = "chainer"
+    _framework_name = "chainer"
 
     def __init__(
         self,
@@ -116,7 +116,7 @@ def __init__(
         validate_version_or_image_args(framework_version, py_version, image_uri)
         if py_version == "py2":
             logger.warning(
-                python_deprecation_warning(self.__framework_name__, defaults.LATEST_PY2_VERSION)
+                python_deprecation_warning(self._framework_name, defaults.LATEST_PY2_VERSION)
             )
         self.framework_version = framework_version
         self.py_version = py_version
@@ -176,7 +176,7 @@ def serving_image_uri(self, region_name, instance_type, accelerator_type=None):
 
         """
         return image_uris.retrieve(
-            self.__framework_name__,
+            self._framework_name,
             region_name,
             version=self.framework_version,
             py_version=self.py_version,

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/deserializers.py

@@ -266,7 +266,8 @@ def deserialize(self, stream, content_type):
             list: A list of JSON serializable objects.
         """
         try:
-            lines = stream.read().rstrip().split("\n")
+            body = stream.read().decode("utf-8")
+            lines = body.rstrip().split("\n")
             return [json.loads(line) for line in lines]
         finally:
             stream.close()

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,
@@ -1418,7 +1417,7 @@ class Framework(EstimatorBase):
     such as training/deployment images and predictor instances.
     """
 
-    __framework_name__ = None
+    _framework_name = None
 
     LAUNCH_PS_ENV_NAME = "sagemaker_parameter_server_enabled"
     LAUNCH_MPI_ENV_NAME = "sagemaker_mpi_enabled"
@@ -1816,7 +1815,7 @@ def train_image(self):
         if self.image_uri:
             return self.image_uri
         return image_uris.retrieve(
-            self.__framework_name__,
+            self._framework_name,
             self.sagemaker_session.boto_region_name,
             instance_type=self.instance_type,
             version=self.framework_version,  # pylint: disable=no-member