Skip to content

Fix bug in local mode #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 15, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CHANGELOG

* feature: Local Mode: Add support for Batch Inference
* feature: Add timestamp to secondary status in training job output
* bug-fix: Local Mode: Set correct default values for additional_volumes and additional_env_vars

1.11.2
======
Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/local/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ def _generate_compose_file(self, command, additional_volumes=None, additional_en

"""
boto_session = self.sagemaker_session.boto_session
additional_env_vars = additional_env_vars or []
additional_volumes = additional_volumes or {}
additional_volumes = additional_volumes or []
additional_env_vars = additional_env_vars or {}
environment = []
optml_dirs = set()

Expand Down
10 changes: 7 additions & 3 deletions src/sagemaker/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def secondary_training_status_changed(current_job_description, prev_job_descript


def secondary_training_status_message(job_description, prev_description):
"""Returns a string contains start time and the secondary training job status message.
"""Returns a string contains last modified time and the secondary training job status message.

Args:
job_description: Returned response from DescribeTrainingJob call
Expand All @@ -181,8 +181,12 @@ def secondary_training_status_message(job_description, prev_description):
if prev_description_secondary_transitions is not None else 0
current_transitions = job_description['SecondaryStatusTransitions']

transitions_to_print = current_transitions[-1:] if len(current_transitions) == prev_transitions_num else \
current_transitions[prev_transitions_num - len(current_transitions):]
if len(current_transitions) == prev_transitions_num:
# Secondary status is not changed but the message changed.
transitions_to_print = current_transitions[-1:]
else:
# Secondary status is changed we need to print all the entries.
transitions_to_print = current_transitions[prev_transitions_num - len(current_transitions):]

status_strs = []
for transition in transitions_to_print:
Expand Down
22 changes: 22 additions & 0 deletions tests/unit/test_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,28 @@ def test_serve_local_code(up, copy, copytree, tmpdir, sagemaker_session):
assert '%s:/opt/ml/code' % '/tmp/code' in volumes


@patch('sagemaker.local.image._HostingContainer.run')
@patch('shutil.copy')
@patch('shutil.copytree')
def test_serve_local_code_no_env(up, copy, copytree, tmpdir, sagemaker_session):

with patch('sagemaker.local.image._SageMakerContainer._create_tmp_folder',
return_value=str(tmpdir.mkdir('container-root'))):

image = 'my-image'
sagemaker_container = _SageMakerContainer('local', 1, image, sagemaker_session=sagemaker_session)
sagemaker_container.serve('/some/model/path', {})
docker_compose_file = os.path.join(sagemaker_container.container_root,
'docker-compose.yaml')

with open(docker_compose_file, 'r') as f:
config = yaml.load(f)

for h in sagemaker_container.hosts:
assert config['services'][h]['image'] == image
assert config['services'][h]['command'] == 'serve'


@patch('sagemaker.utils.download_file')
@patch('tarfile.is_tarfile')
@patch('tarfile.open', MagicMock())
Expand Down