Merge branch 'master' into MLFW-2344

Author: chuyang-deng

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## v1.25.0 (2019-06-03)
+
+### Features
+
+ * repack_model support dependencies and code location
+
+### Bug fixes and other changes
+
+ * skip p2 tests in ap-south-east
+ * add better default transform job name handling within Transformer
+
+### Documentation changes
+
+ * TFS support for pre/processing functions
+
 ## v1.24.0 (2019-05-29)
 
 ### Features

VERSION

@@ -1 +1 @@
-1.24.1.dev0
+1.25.1.dev0

tests/integ/__init__.py

@@ -28,6 +28,7 @@
 HOSTING_NO_P2_REGIONS = ['ca-central-1', 'eu-central-1', 'eu-west-2', 'us-west-1']
 HOSTING_NO_P3_REGIONS = ['ap-southeast-1', 'ap-southeast-2', 'ap-south-1', 'ca-central-1',
                          'eu-central-1', 'eu-west-2', 'us-west-1']
+TRAINING_NO_P2_REGIONS = ['ap-southeast-1', 'ap-southeast-2']
 
 # EI is currently only supported in the following regions
 # regions were derived from https://aws.amazon.com/machine-learning/elastic-inference/pricing/

tests/integ/test_chainer_train.py

@@ -36,7 +36,8 @@ def test_distributed_cpu_training(sagemaker_session, chainer_full_version):
     _run_mnist_training_job(sagemaker_session, "ml.c4.xlarge", 2, chainer_full_version)
 
 
-@pytest.mark.skipif(tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS,
+@pytest.mark.skipif(tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
+                    or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
                     reason='no ml.p2 instances in these regions')
 def test_distributed_gpu_training(sagemaker_session, chainer_full_version):
     _run_mnist_training_job(sagemaker_session, "ml.p2.xlarge", 2, chainer_full_version)

tests/integ/test_pytorch_train.py

@@ -75,7 +75,8 @@ def test_deploy_model(pytorch_training_job, sagemaker_session):
         assert output.shape == (batch_size, 10)
 
 
-@pytest.mark.skipif(tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS,
+@pytest.mark.skipif(tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
+                    or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
                     reason='no ml.p2 instances in these regions')
 def test_async_fit_deploy(sagemaker_session, pytorch_full_version):
     training_job_name = ""

tests/integ/test_tf_cifar.py

@@ -38,7 +38,8 @@ def __call__(self, data):
 @pytest.mark.canary_quick
 @pytest.mark.skipif(tests.integ.PYTHON_VERSION != 'py2',
                     reason="TensorFlow image supports only python 2.")
-@pytest.mark.skipif(tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS,
+@pytest.mark.skipif(tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
+                    or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
                     reason='no ml.p2 instances in these regions')
 def test_cifar(sagemaker_session, tf_full_version):
     with timeout(minutes=45):

tests/integ/test_tf_script_mode.py

@@ -42,7 +42,8 @@
     'ml.c5.xlarge',
     pytest.param('ml.p2.xlarge',
                  marks=pytest.mark.skipif(
-                     tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS,
+                     tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
+                     or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
                      reason='no ml.p2 instances in this region'))])
 def instance_type(request):
     return request.param