Skip to content

infra: use Model class for model deployment unit tests #1418

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 1 commit into from
Apr 16, 2020
Merged

infra: use Model class for model deployment unit tests #1418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
140 changes: 0 additions & 140 deletions tests/unit/sagemaker/model/test_framework_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
MODEL_DATA = "s3://bucket/model.tar.gz"
MODEL_IMAGE = "mi"
ENTRY_POINT = "blah.py"
INSTANCE_TYPE = "p2.xlarge"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this removal is because it's later defined in line 36

ROLE = "some-role"

DATA_DIR = os.path.join(os.path.dirname(__file__), "..", "data")
Expand Down Expand Up @@ -172,145 +171,6 @@ def test_create_no_defaults(sagemaker_session, tmpdir):
}


@patch("sagemaker.fw_utils.tar_and_upload_dir", MagicMock())
@patch("time.strftime", MagicMock(return_value=TIMESTAMP))
def test_deploy(sagemaker_session, tmpdir):
model = DummyFrameworkModel(sagemaker_session, source_dir=str(tmpdir))
model.deploy(instance_type=INSTANCE_TYPE, initial_instance_count=1)
sagemaker_session.endpoint_from_production_variants.assert_called_with(
name=MODEL_NAME,
production_variants=[
{
"InitialVariantWeight": 1,
"ModelName": MODEL_NAME,
"InstanceType": INSTANCE_TYPE,
"InitialInstanceCount": 1,
"VariantName": "AllTraffic",
}
],
tags=None,
kms_key=None,
wait=True,
data_capture_config_dict=None,
)


@patch("sagemaker.fw_utils.tar_and_upload_dir", MagicMock())
@patch("time.strftime", MagicMock(return_value=TIMESTAMP))
def test_deploy_endpoint_name(sagemaker_session, tmpdir):
model = DummyFrameworkModel(sagemaker_session, source_dir=str(tmpdir))
model.deploy(endpoint_name="blah", instance_type=INSTANCE_TYPE, initial_instance_count=55)
sagemaker_session.endpoint_from_production_variants.assert_called_with(
name="blah",
production_variants=[
{
"InitialVariantWeight": 1,
"ModelName": MODEL_NAME,
"InstanceType": INSTANCE_TYPE,
"InitialInstanceCount": 55,
"VariantName": "AllTraffic",
}
],
tags=None,
kms_key=None,
wait=True,
data_capture_config_dict=None,
)


@patch("sagemaker.fw_utils.tar_and_upload_dir", MagicMock())
@patch("time.strftime", MagicMock(return_value=TIMESTAMP))
def test_deploy_tags(sagemaker_session, tmpdir):
model = DummyFrameworkModel(sagemaker_session, source_dir=str(tmpdir))
tags = [{"ModelName": "TestModel"}]
model.deploy(instance_type=INSTANCE_TYPE, initial_instance_count=1, tags=tags)
sagemaker_session.endpoint_from_production_variants.assert_called_with(
name=MODEL_NAME,
production_variants=[
{
"InitialVariantWeight": 1,
"ModelName": MODEL_NAME,
"InstanceType": INSTANCE_TYPE,
"InitialInstanceCount": 1,
"VariantName": "AllTraffic",
}
],
tags=tags,
kms_key=None,
wait=True,
data_capture_config_dict=None,
)


@patch("sagemaker.fw_utils.tar_and_upload_dir", MagicMock())
@patch("tarfile.open")
@patch("time.strftime", return_value=TIMESTAMP)
def test_deploy_accelerator_type(tfo, time, sagemaker_session):
model = DummyFrameworkModel(sagemaker_session)
model.deploy(
instance_type=INSTANCE_TYPE, initial_instance_count=1, accelerator_type=ACCELERATOR_TYPE
)
sagemaker_session.endpoint_from_production_variants.assert_called_with(
name=MODEL_NAME,
production_variants=[
{
"InitialVariantWeight": 1,
"ModelName": MODEL_NAME,
"InstanceType": INSTANCE_TYPE,
"InitialInstanceCount": 1,
"VariantName": "AllTraffic",
"AcceleratorType": ACCELERATOR_TYPE,
}
],
tags=None,
kms_key=None,
wait=True,
data_capture_config_dict=None,
)


@patch("sagemaker.fw_utils.tar_and_upload_dir", MagicMock())
@patch("tarfile.open")
@patch("time.strftime", return_value=TIMESTAMP)
def test_deploy_kms_key(tfo, time, sagemaker_session):
key = "some-key-arn"
model = DummyFrameworkModel(sagemaker_session)
model.deploy(instance_type=INSTANCE_TYPE, initial_instance_count=1, kms_key=key)
sagemaker_session.endpoint_from_production_variants.assert_called_with(
name=MODEL_NAME,
production_variants=[
{
"InitialVariantWeight": 1,
"ModelName": MODEL_NAME,
"InstanceType": INSTANCE_TYPE,
"InitialInstanceCount": 1,
"VariantName": "AllTraffic",
}
],
tags=None,
kms_key=key,
wait=True,
data_capture_config_dict=None,
)


@patch("sagemaker.session.Session")
@patch("sagemaker.local.LocalSession")
@patch("sagemaker.fw_utils.tar_and_upload_dir", MagicMock())
def test_deploy_creates_correct_session(local_session, session, tmpdir):
# We expect a LocalSession when deploying to instance_type = 'local'
model = DummyFrameworkModel(sagemaker_session=None, source_dir=str(tmpdir))
model.deploy(endpoint_name="blah", instance_type="local", initial_instance_count=1)
assert model.sagemaker_session == local_session.return_value

# We expect a real Session when deploying to instance_type != local/local_gpu
model = DummyFrameworkModel(sagemaker_session=None, source_dir=str(tmpdir))
model.deploy(
endpoint_name="remote_endpoint", instance_type="ml.m4.4xlarge", initial_instance_count=2
)
assert model.sagemaker_session == session.return_value


@patch("sagemaker.fw_utils.tar_and_upload_dir", MagicMock())
def test_deploy_update_endpoint(sagemaker_session, tmpdir):
model = DummyFrameworkModel(sagemaker_session, source_dir=tmpdir)
Expand Down
Loading