Merge branch 'aws:master' into model-registry-sip

Author: sreedes

src/sagemaker/estimator.py

@@ -718,7 +718,7 @@ def compile_model(
                 'onnx', 'xgboost'
             framework_version (str): The version of the framework
             compile_max_run (int): Timeout in seconds for compilation (default:
-                3 * 60). After this amount of time Amazon SageMaker Neo
+                15 * 60). After this amount of time Amazon SageMaker Neo
                 terminates the compilation job regardless of its current status.
             tags (list[dict]): List of tags for labeling a compilation job. For
                 more, see

src/sagemaker/model.py

@@ -565,7 +565,7 @@ def compile(
         role,
         tags=None,
         job_name=None,
-        compile_max_run=5 * 60,
+        compile_max_run=15 * 60,
         framework=None,
         framework_version=None,
         target_platform_os=None,
@@ -594,7 +594,7 @@ def compile(
                 https://docs.aws.amazon.com/sagemaker/latest/dg/API_Tag.html.
             job_name (str): The name of the compilation job
             compile_max_run (int): Timeout in seconds for compilation (default:
-                3 * 60). After this amount of time Amazon SageMaker Neo
+                15 * 60). After this amount of time Amazon SageMaker Neo
                 terminates the compilation job regardless of its current status.
             framework (str): The framework that is used to train the original
                 model. Allowed values: 'mxnet', 'tensorflow', 'keras', 'pytorch',

tests/integ/test_huggingface.py

@@ -68,8 +68,9 @@ def test_huggingface_training(
         hf.fit(train_input)
 
 
-@pytest.mark.skip(
-    reason="need to re enable it later",
+@pytest.mark.release
+@pytest.mark.skipif(
+    integ.test_region() in integ.TRAINING_NO_P2_REGIONS, reason="no ml.p2 instances in this region"
 )
 def test_huggingface_training_tf(
     sagemaker_session,
@@ -107,9 +108,8 @@ def test_huggingface_training_tf(
         hf.fit(train_input)
 
 
-@pytest.mark.release
-@pytest.mark.skipif(
-    integ.test_region() in integ.TRAINING_NO_P2_REGIONS, reason="no ml.p2 instances in this region"
+@pytest.mark.skip(
+    reason="need to re enable it later",
 )
 def test_huggingface_inference(
     sagemaker_session,