Merge branch 'master' into patch-1

TEChopra1000 · web-flow · commit ebda52995603 · 2021-05-04T10:33:34.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v2.39.0.post0 (2021-05-04)
+
+### Testing and Release Infrastructure
+
+ * disable smdataparallel tests
+
 ## v2.39.0 (2021-04-28)
 
 ### Features
diff --git a/src/sagemaker/pytorch/estimator.py b/src/sagemaker/pytorch/estimator.py
@@ -75,7 +75,7 @@ def __init__(
             framework_version (str): PyTorch version you want to use for
                 executing your model training code. Defaults to ``None``. Required unless
                 ``image_uri`` is provided. List of supported versions:
-                https://github.com/aws/sagemaker-python-sdk#pytorch-sagemaker-estimators.
+                https://github.com/aws/deep-learning-containers/blob/master/available_images.md.
             py_version (str): Python version you want to use for executing your
                 model training code. One of 'py2' or 'py3'. Defaults to ``None``. Required
                 unless ``image_uri`` is provided.
diff --git a/tests/integ/test_smdataparallel_pt.py b/tests/integ/test_smdataparallel_pt.py
@@ -28,6 +28,10 @@
 )
 
 
+@pytest.mark.skip(
+    reason="This test is skipped for now due ML capacity error."
+    "This test should be re-enabled later."
+)
 @pytest.mark.skipif(
     integ.test_region() not in integ.DATA_PARALLEL_TESTING_REGIONS,
     reason="Only allow this test to run in IAD and CMH to limit usage of p3.16xlarge",
diff --git a/tests/integ/test_smdataparallel_tf.py b/tests/integ/test_smdataparallel_tf.py
@@ -27,6 +27,10 @@
 )
 
 
+@pytest.mark.skip(
+    reason="This test is skipped for now due ML capacity error."
+    "This test should be re-enabled later."
+)
 @pytest.mark.skipif(
     integ.test_region() not in integ.DATA_PARALLEL_TESTING_REGIONS,
     reason="Only allow this test to run in IAD and CMH to limit usage of p3.16xlarge",

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,10 @@`
`28`	`28`	`)`
`29`	`29`
`30`	`30`
	`31`	`+@pytest.mark.skip(`
	`32`	`+ reason="This test is skipped for now due ML capacity error."`
	`33`	`+ "This test should be re-enabled later."`
	`34`	`+)`
`31`	`35`	`@pytest.mark.skipif(`
`32`	`36`	`integ.test_region() not in integ.DATA_PARALLEL_TESTING_REGIONS,`
`33`	`37`	`reason="Only allow this test to run in IAD and CMH to limit usage of p3.16xlarge",`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@`
`27`	`27`	`)`
`28`	`28`
`29`	`29`
	`30`	`+@pytest.mark.skip(`
	`31`	`+ reason="This test is skipped for now due ML capacity error."`
	`32`	`+ "This test should be re-enabled later."`
	`33`	`+)`
`30`	`34`	`@pytest.mark.skipif(`
`31`	`35`	`integ.test_region() not in integ.DATA_PARALLEL_TESTING_REGIONS,`
`32`	`36`	`reason="Only allow this test to run in IAD and CMH to limit usage of p3.16xlarge",`