Skip to content

fix: repack model locally when local_code local mode #3094

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
May 6, 2022
Merged

fix: repack model locally when local_code local mode #3094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21acd45
fix: repack model locally when local_code local mode
mufaddal-rohawala May 4, 2022
bccd37d
fix: remove pdb
mufaddal-rohawala May 4, 2022
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
14 changes: 8 additions & 6 deletions src/sagemaker/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,9 +454,14 @@ def _upload_code(self, key_prefix: str, repack: bool = False) -> None:
if is_pipeline_variable(self.model_data):
# model is not yet there, defer repacking to later during pipeline execution
return

bucket = self.bucket or self.sagemaker_session.default_bucket()
repacked_model_data = "s3://" + "/".join([bucket, key_prefix, "model.tar.gz"])
if local_code and self.model_data.startswith("file://"):
repacked_model_data = self.model_data
else:
bucket = self.bucket or self.sagemaker_session.default_bucket()
repacked_model_data = "s3://" + "/".join([bucket, key_prefix, "model.tar.gz"])
self.uploaded_code = fw_utils.UploadedCode(
s3_prefix=repacked_model_data, script_name=os.path.basename(self.entry_point)
)

utils.repack_model(
inference_script=self.entry_point,
Expand All @@ -469,9 +474,6 @@ def _upload_code(self, key_prefix: str, repack: bool = False) -> None:
)

self.repacked_model_data = repacked_model_data
self.uploaded_code = fw_utils.UploadedCode(
s3_prefix=self.repacked_model_data, script_name=os.path.basename(self.entry_point)
)

def _script_mode_env_vars(self):
"""Returns a mapping of environment variables for script mode execution"""
Expand Down
15 changes: 14 additions & 1 deletion tests/integ/test_local_mode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import tests.integ.lock as lock
from tests.integ import DATA_DIR
from mock import Mock, ANY

from sagemaker import image_uris

Expand Down Expand Up @@ -221,6 +222,13 @@ def test_mxnet_local_data_local_script(
):
data_path = os.path.join(DATA_DIR, "mxnet_mnist")
script_path = os.path.join(data_path, "mnist.py")
local_no_s3_session = LocalNoS3Session()
local_no_s3_session.boto_session.resource = Mock(
side_effect=local_no_s3_session.boto_session.resource
)
local_no_s3_session.boto_session.client = Mock(
side_effect=local_no_s3_session.boto_session.client
)

mx = MXNet(
entry_point=script_path,
Expand All @@ -229,7 +237,7 @@ def test_mxnet_local_data_local_script(
instance_type="local",
framework_version=mxnet_training_latest_version,
py_version=mxnet_training_latest_py_version,
sagemaker_session=LocalNoS3Session(),
sagemaker_session=local_no_s3_session,
)

train_input = "file://" + os.path.join(data_path, "train")
Expand All @@ -243,6 +251,11 @@ def test_mxnet_local_data_local_script(
predictor = mx.deploy(1, "local", endpoint_name=endpoint_name)
data = numpy.zeros(shape=(1, 1, 28, 28))
predictor.predict(data)
# check if no boto_session s3 calls were made
with pytest.raises(AssertionError):
local_no_s3_session.boto_session.resource.assert_called_with("s3", region_name=ANY)
with pytest.raises(AssertionError):
local_no_s3_session.boto_session.client.assert_called_with("s3", region_name=ANY)
finally:
predictor.delete_endpoint()

Expand Down