Merge branch 'master' into deprecate_lambda_model

Author: shreyapandit

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v2.63.1 (2021-10-14)
+
+### Bug Fixes and Other Changes
+
+ * HF estimator attach modified to work with py38
+
 ## v2.63.0 (2021-10-13)
 
 ### Features

VERSION

@@ -1 +1 @@
-2.63.1.dev0
+2.63.2.dev0

src/sagemaker/huggingface/estimator.py

@@ -312,7 +312,7 @@ def _prepare_init_params_from_job_description(cls, job_details, model_channel_na
             framework_version = None
         else:
             framework, pt_or_tf = framework.split("-")
-            tag_pattern = re.compile("^(.*)-transformers(.*)-(cpu|gpu)-(py2|py3[67]?)$")
+            tag_pattern = re.compile(r"^(.*)-transformers(.*)-(cpu|gpu)-(py2|py3\d*)$")
             tag_match = tag_pattern.match(tag)
             pt_or_tf_version = tag_match.group(1)
             framework_version = tag_match.group(2)

tests/unit/sagemaker/huggingface/test_estimator.py

@@ -253,12 +253,16 @@ def test_huggingface(
 
 
 def test_attach(
-    sagemaker_session, huggingface_training_version, huggingface_pytorch_training_version
+    sagemaker_session,
+    huggingface_training_version,
+    huggingface_pytorch_training_version,
+    huggingface_pytorch_training_py_version,
 ):
     training_image = (
         f"1.dkr.ecr.us-east-1.amazonaws.com/huggingface-pytorch-training:"
         f"{huggingface_pytorch_training_version}-"
-        f"transformers{huggingface_training_version}-gpu-py36-cu110-ubuntu18.04"
+        f"transformers{huggingface_training_version}-gpu-"
+        f"{huggingface_pytorch_training_py_version}-cu110-ubuntu20.04"
     )
     returned_job_description = {
         "AlgorithmSpecification": {"TrainingInputMode": "File", "TrainingImage": training_image},
@@ -290,7 +294,7 @@ def test_attach(
 
     estimator = HuggingFace.attach(training_job_name="neo", sagemaker_session=sagemaker_session)
     assert estimator.latest_training_job.job_name == "neo"
-    assert estimator.py_version == "py36"
+    assert estimator.py_version == huggingface_pytorch_training_py_version
     assert estimator.framework_version == huggingface_training_version
     assert estimator.pytorch_version == huggingface_pytorch_training_version
     assert estimator.role == "arn:aws:iam::366:role/SageMakerRole"