Merge remote-tracking branch 'origin/master' into mvs-fix-principal

Author: mvsusp

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.18.7 (2019-03-21)
+
+### Other changes
+
+ * add pytest marks for integ tests using local mode
+ * add account number and unit tests for govcloud
+
+### Documentation changes
+
+ * move chainer readme content into sphinx and fix broken link in using_mxnet
+
 ## v1.18.6.post0 (2019-03-20)
 
 ### Documentation changes

VERSION

@@ -1 +1 @@
-1.18.7.dev0
+1.18.8.dev0

doc/index.rst

@@ -95,6 +95,11 @@ Chainer
 *******
 A managed environment for Chainer training and hosting on Amazon SageMaker
 
+.. toctree::
+    :maxdepth: 1
+
+    using_chainer
+
 .. toctree::
     :maxdepth: 2
 

doc/using_chainer.rst

@@ -155,7 +155,7 @@ During training, SageMaker automatically starts an MXNet kvstore server and sche
 Your script runs as an MXNet worker task, with one server process on each host in your cluster.
 One host is selected arbitrarily to run the scheduler process.
 
-To learn more about writing distributed MXNet programs, please see `Distributed Training <http://newdocs.readthedocs.io/en/latest/distributed_training.html>`__ in the MXNet docs.
+To learn more about writing distributed MXNet programs, please see `Distributed Training <https://mxnet.incubator.apache.org/versions/master/faq/distributed_training.html>`__ in the MXNet docs.
 
 Saving models
 '''''''''''''

doc/using_mxnet.rst

@@ -52,6 +52,7 @@ def test_horovod(sagemaker_session, instance_type, tmpdir):
             assert read_json('rank-%s' % rank, tmp)['rank'] == rank
 
 
+@pytest.mark.local_mode
 @pytest.mark.parametrize('instances, processes', [
     [1, 2],
     (2, 1),

tests/integ/test_horovod.py

@@ -77,6 +77,7 @@ def _create_model(output_path):
     return _create_model
 
 
+@pytest.mark.local_mode
 @pytest.mark.skipif(PYTHON_VERSION != 'py2', reason="TensorFlow image supports only python 2.")
 def test_tf_local_mode(tf_full_version, sagemaker_local_session):
     with timeout(minutes=5):
@@ -116,6 +117,7 @@ def test_tf_local_mode(tf_full_version, sagemaker_local_session):
             estimator.delete_endpoint()
 
 
+@pytest.mark.local_mode
 @pytest.mark.skipif(PYTHON_VERSION != 'py2', reason="TensorFlow image supports only python 2.")
 def test_tf_distributed_local_mode(sagemaker_local_session):
     with timeout(minutes=5):
@@ -154,6 +156,7 @@ def test_tf_distributed_local_mode(sagemaker_local_session):
             estimator.delete_endpoint()
 
 
+@pytest.mark.local_mode
 @pytest.mark.skipif(PYTHON_VERSION != 'py2', reason="TensorFlow image supports only python 2.")
 def test_tf_local_data(sagemaker_local_session):
     with timeout(minutes=5):
@@ -191,6 +194,7 @@ def test_tf_local_data(sagemaker_local_session):
             estimator.delete_endpoint()
 
 
+@pytest.mark.local_mode
 @pytest.mark.skipif(PYTHON_VERSION != 'py2', reason="TensorFlow image supports only python 2.")
 def test_tf_local_data_local_script():
     with timeout(minutes=5):
@@ -229,6 +233,7 @@ def test_tf_local_data_local_script():
             estimator.delete_endpoint()
 
 
+@pytest.mark.local_mode
 def test_local_mode_serving_from_s3_model(sagemaker_local_session, mxnet_model, mxnet_full_version):
     path = 's3://%s' % sagemaker_local_session.default_bucket()
     s3_model = mxnet_model(path)
@@ -245,6 +250,7 @@ def test_local_mode_serving_from_s3_model(sagemaker_local_session, mxnet_model,
                 predictor.delete_endpoint()
 
 
+@pytest.mark.local_mode
 def test_local_mode_serving_from_local_model(tmpdir, sagemaker_local_session, mxnet_model):
     predictor = None
 
@@ -261,6 +267,7 @@ def test_local_mode_serving_from_local_model(tmpdir, sagemaker_local_session, mx
                 predictor.delete_endpoint()
 
 
+@pytest.mark.local_mode
 def test_mxnet_local_mode(sagemaker_local_session, mxnet_full_version):
     script_path = os.path.join(DATA_DIR, 'mxnet_mnist', 'mnist.py')
     data_path = os.path.join(DATA_DIR, 'mxnet_mnist')
@@ -286,6 +293,7 @@ def test_mxnet_local_mode(sagemaker_local_session, mxnet_full_version):
             mx.delete_endpoint()
 
 
+@pytest.mark.local_mode
 def test_mxnet_local_data_local_script(mxnet_full_version):
     data_path = os.path.join(DATA_DIR, 'mxnet_mnist')
     script_path = os.path.join(data_path, 'mnist.py')
@@ -310,6 +318,7 @@ def test_mxnet_local_data_local_script(mxnet_full_version):
             mx.delete_endpoint()
 
 
+@pytest.mark.local_mode
 def test_local_transform_mxnet(sagemaker_local_session, tmpdir, mxnet_full_version):
     data_path = os.path.join(DATA_DIR, 'mxnet_mnist')
     script_path = os.path.join(data_path, 'mnist.py')

tests/integ/test_local_mode.py

@@ -14,12 +14,15 @@
 
 import os
 
+import pytest
+
 import tests.integ.local_mode_utils as local_mode_utils
 from tests.integ import DATA_DIR, PYTHON_VERSION
 
 from sagemaker.pytorch.estimator import PyTorch
 
 
+@pytest.mark.local_mode
 def test_source_dirs(tmpdir, sagemaker_local_session):
     source_dir = os.path.join(DATA_DIR, 'pytorch_source_dirs')
     lib = os.path.join(str(tmpdir), 'alexa.py')