Revert the distributions change

Author: Ignacio Quintero

CHANGELOG.rst

@@ -5,7 +5,7 @@ CHANGELOG
 1.14.2dev
 =========
 
-* breaking-change: rename MXNet argument from distributions -> distribution
+* build: added pylint
 
 1.14.1
 ======

src/sagemaker/mxnet/estimator.py

@@ -33,7 +33,7 @@ class MXNet(Framework):
     LAUNCH_PS_ENV_NAME = 'sagemaker_parameter_server_enabled'
 
     def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_version='py2',
-                 framework_version=None, image_name=None, distribution=None, **kwargs):
+                 framework_version=None, image_name=None, distributions=None, **kwargs):
         """
         This ``Estimator`` executes an MXNet script in a managed MXNet execution environment, within a SageMaker
         Training Job. The managed MXNet environment is an Amazon-built Docker container that executes functions
@@ -78,18 +78,18 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
         super(MXNet, self).__init__(entry_point, source_dir, hyperparameters,
                                     image_name=image_name, **kwargs)
         self.py_version = py_version
-        self._configure_distribution(distribution)
+        self._configure_distribution(distributions)
 
-    def _configure_distribution(self, distribution):
-        if distribution is None:
+    def _configure_distribution(self, distributions):
+        if distributions is None:
             return
 
         if self.framework_version.split('.') < self._LOWEST_SCRIPT_MODE_VERSION:
-            raise ValueError('The distribution option is valid for only versions {} and higher'
+            raise ValueError('The distributions option is valid for only versions {} and higher'
                              .format('.'.join(self._LOWEST_SCRIPT_MODE_VERSION)))
 
-        if 'parameter_server' in distribution:
-            enabled = distribution['parameter_server'].get('enabled', False)
+        if 'parameter_server' in distributions:
+            enabled = distributions['parameter_server'].get('enabled', False)
             self._hyperparameters[self.LAUNCH_PS_ENV_NAME] = enabled
 
     def create_model(self, model_server_workers=None, role=None, vpc_config_override=VPC_CONFIG_DEFAULT):

tests/integ/test_mxnet_train.py

@@ -81,7 +81,7 @@ def test_async_fit(sagemaker_session, mxnet_full_version):
         mx = MXNet(entry_point=script_path, role='SageMakerRole', py_version=PYTHON_VERSION,
                    train_instance_count=1, train_instance_type='ml.c4.xlarge',
                    sagemaker_session=sagemaker_session, framework_version=mxnet_full_version,
-                   distribution={'parameter_server': {'enabled': True}})
+                   distributions={'parameter_server': {'enabled': True}})
 
         train_input = mx.sagemaker_session.upload_data(path=os.path.join(data_path, 'train'),
                                                        key_prefix='integ-test-data/mxnet_mnist/train')

tests/unit/test_mxnet.py

@@ -378,20 +378,20 @@ def test_attach_custom_image(sagemaker_session):
 def test_estimator_script_mode_launch_parameter_server(sagemaker_session):
     mx = MXNet(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
                train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
-               distribution=LAUNCH_PS_DISTRIBUTIONS_DICT, framework_version='1.3.0')
+               distributions=LAUNCH_PS_DISTRIBUTIONS_DICT, framework_version='1.3.0')
     assert mx.hyperparameters().get(MXNet.LAUNCH_PS_ENV_NAME) == 'true'
 
 
 def test_estimator_script_mode_dont_launch_parameter_server(sagemaker_session):
     mx = MXNet(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
                train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
-               distribution={'parameter_server': {'enabled': False}}, framework_version='1.3.0')
+               distributions={'parameter_server': {'enabled': False}}, framework_version='1.3.0')
     assert mx.hyperparameters().get(MXNet.LAUNCH_PS_ENV_NAME) == 'false'
 
 
 def test_estimator_wrong_version_launch_parameter_server(sagemaker_session):
     with pytest.raises(ValueError) as e:
         MXNet(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
               train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
-              distribution=LAUNCH_PS_DISTRIBUTIONS_DICT, framework_version='1.2.1')
-    assert 'The distribution option is valid for only versions 1.3 and higher' in str(e)
+              distributions=LAUNCH_PS_DISTRIBUTIONS_DICT, framework_version='1.2.1')
+    assert 'The distributions option is valid for only versions 1.3 and higher' in str(e)