Merge branch 'master' into patch-1

Author: ajaykarpur

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## v2.5.4 (2020-09-08)
+
+### Bug Fixes and Other Changes
+
+ * update max_run_wait to max_wait in v2.rst for estimator parameters
+ * Updating regional account ids for af-south-1 and eu-south-1
+ * add account ids for af-south-1 and eu-south-1 for debugger rules
+
+## v2.5.3 (2020-09-02)
+
+### Bug Fixes and Other Changes
+
+ * Revert "change: update image uri config for pytorch 1.6.0 inference (#1864)"
+ * update image uri config for pytorch 1.6.0 inference
+ * add missing framework version image uri config
+
 ## v2.5.2 (2020-08-31)
 
 ### Bug Fixes and Other Changes

VERSION

@@ -1 +1 @@
-2.5.3.dev0
+2.5.5.dev0

doc/v2.rst

@@ -231,7 +231,7 @@ The following estimator parameters have been renamed:
 +------------------------------+------------------------+
 | ``train_use_spot_instances`` | ``use_spot_instances`` |
 +------------------------------+------------------------+
-| ``train_max_run_wait``       | ``max_run_wait``       |
+| ``train_max_run_wait``       | ``max_wait``           |
 +------------------------------+------------------------+
 | ``train_volume_size``        | ``volume_size``        |
 +------------------------------+------------------------+

src/sagemaker/image_uri_config/debugger.json

@@ -3,6 +3,7 @@
     "versions": {
         "latest": {
             "registries": {
+                "af-south-1": "314341159256",
                 "ap-east-1": "199566480951",
                 "ap-northeast-1": "430734990657",
                 "ap-northeast-2": "578805364391",
@@ -14,6 +15,7 @@
                 "cn-northwest-1": "658757709296",
                 "eu-central-1": "482524230118",
                 "eu-north-1": "314864569078",
+                "eu-south-1": "563282790590",
                 "eu-west-1": "929884845733",
                 "eu-west-2": "250201462417",
                 "eu-west-3": "447278800020",

src/sagemaker/image_uri_config/pytorch.json

@@ -53,8 +53,7 @@
             "1.2": "1.2.0",
             "1.3": "1.3.1",
             "1.4": "1.4.0",
-            "1.5": "1.5.0",
-            "1.6": "1.6.0"
+            "1.5": "1.5.0"
         },
         "versions": {
             "0.4.0": {
@@ -285,38 +284,6 @@
                     "us-west-2": "763104351884"
                 },
                 "repository": "pytorch-inference"
-            },
-            "1.6.0": {
-                "py_versions": [
-                    "py3"
-                ],
-                "registries": {
-                    "af-south-1": "626614931356",
-                    "ap-east-1": "871362719292",
-                    "ap-northeast-1": "763104351884",
-                    "ap-northeast-2": "763104351884",
-                    "ap-south-1": "763104351884",
-                    "ap-southeast-1": "763104351884",
-                    "ap-southeast-2": "763104351884",
-                    "ca-central-1": "763104351884",
-                    "cn-north-1": "727897471807",
-                    "cn-northwest-1": "727897471807",
-                    "eu-central-1": "763104351884",
-                    "eu-north-1": "763104351884",
-                    "eu-west-1": "763104351884",
-                    "eu-west-2": "763104351884",
-                    "eu-west-3": "763104351884",
-                    "eu-south-1": "692866216735",
-                    "me-south-1": "217643126080",
-                    "sa-east-1": "763104351884",
-                    "us-east-1": "763104351884",
-                    "us-east-2": "763104351884",
-                    "us-gov-west-1": "442386744353",
-                    "us-iso-east-1": "886529160074",
-                    "us-west-1": "763104351884",
-                    "us-west-2": "763104351884"
-                },
-                "repository": "pytorch-inference"
             }
         }
     },

tests/unit/sagemaker/image_uris/test_debugger.py

@@ -16,6 +16,7 @@
 from tests.unit.sagemaker.image_uris import expected_uris, regions
 
 ACCOUNTS = {
+    "af-south-1": "314341159256",
     "ap-east-1": "199566480951",
     "ap-northeast-1": "430734990657",
     "ap-northeast-2": "578805364391",
@@ -27,6 +28,7 @@
     "cn-northwest-1": "658757709296",
     "eu-central-1": "482524230118",
     "eu-north-1": "314864569078",
+    "eu-south-1": "563282790590",
     "eu-west-1": "929884845733",
     "eu-west-2": "250201462417",
     "eu-west-3": "447278800020",