Skip to content

Fix local mode not using the right s3 bucket. #144

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.

Sign up for GitHub

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 2 commits into from
Apr 13, 2018
Merged

Fix local mode not using the right s3 bucket. #144

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7eccc6
Fix local mode not using the right s3 bucket.
Apr 12, 2018
57b8289
Add a unit test for _download_folder() in image.py
Apr 13, 2018
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
4 changes: 2 additions & 2 deletions src/sagemaker/local/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ def train(self, input_data_config, hyperparameters):
os.mkdir(os.path.join(self.container_root, 'output'))

data_dir = self._create_tmp_folder()
bucket_name = self.sagemaker_session.default_bucket()
volumes = []

# Set up the channels for the containers. For local data we will
Expand All @@ -102,7 +101,8 @@ def train(self, input_data_config, hyperparameters):
channel_dir = os.path.join(data_dir, channel_name)
os.mkdir(channel_dir)

if uri.lower().startswith("s3://"):
if parsed_uri.scheme == 's3':
bucket_name = parsed_uri.netloc
self._download_folder(bucket_name, key, channel_dir)
else:
volumes.append(_Volume(uri, channel=channel_name))
Expand Down
24 changes: 17 additions & 7 deletions tests/unit/test_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import pytest
import yaml
from mock import patch, Mock
from mock import call, patch, Mock, ANY

import sagemaker
from sagemaker.local.image import _SageMakerContainer
Expand All @@ -40,7 +40,7 @@
'S3DataSource': {
'S3DataDistributionType': 'FullyReplicated',
'S3DataType': 'S3Prefix',
'S3Uri': 's3://foo/bar'
'S3Uri': 's3://my-own-bucket/prefix'
}
}
}
Expand All @@ -54,12 +54,12 @@ def sagemaker_session():
boto_mock.client('sts').get_caller_identity.return_value = {'Account': '123'}
boto_mock.resource('s3').Bucket(BUCKET_NAME).objects.filter.return_value = []

ims = sagemaker.Session(boto_session=boto_mock, sagemaker_client=Mock())
sms = sagemaker.Session(boto_session=boto_mock, sagemaker_client=Mock())

ims.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
ims.expand_role = Mock(return_value=EXPANDED_ROLE)
sms.default_bucket = Mock(name='default_bucket', return_value=BUCKET_NAME)
sms.expand_role = Mock(return_value=EXPANDED_ROLE)

return ims
return sms


@patch('sagemaker.local.local_session.LocalSession')
Expand Down Expand Up @@ -181,7 +181,8 @@ def test_check_output():
@patch('sagemaker.local.local_session.LocalSession')
@patch('sagemaker.local.image._execute_and_stream_output')
@patch('sagemaker.local.image._SageMakerContainer._cleanup')
def test_train(LocalSession, _execute_and_stream_output, _cleanup, tmpdir, sagemaker_session):
@patch('sagemaker.local.image._SageMakerContainer._download_folder')
def test_train(_download_folder, _cleanup, _execute_and_stream_output, LocalSession, tmpdir, sagemaker_session):

with patch('sagemaker.local.image._SageMakerContainer._create_tmp_folder',
side_effect=[str(tmpdir.mkdir('container-root')), str(tmpdir.mkdir('data'))]):
Expand All @@ -191,6 +192,15 @@ def test_train(LocalSession, _execute_and_stream_output, _cleanup, tmpdir, sagem
sagemaker_container = _SageMakerContainer('local', instance_count, image, sagemaker_session=sagemaker_session)
sagemaker_container.train(INPUT_DATA_CONFIG, HYPERPARAMETERS)

download_folder_calls = []
for channel in INPUT_DATA_CONFIG:
s3_uri = channel['DataSource']['S3DataSource']['S3Uri']
if 's3://' in s3_uri:
bucket, prefix = s3_uri.replace('s3://', '').split('/')
download_folder_calls.append(call(bucket, prefix, ANY))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of ANY for the channel_dir param - is there a clean way to verify the right argument is being passed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I'd recommend just hard coding the expect result rather than using this for loop.

_download_folder.assert_called()
_download_folder.assert_has_calls(download_folder_calls)

docker_compose_file = os.path.join(sagemaker_container.container_root, 'docker-compose.yaml')

call_args = _execute_and_stream_output.call_args[0][0]
Expand Down