Skip to content

Add SageMaker hosting integ test #18

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 2 commits into from
Jun 14, 2019
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,10 @@ def read(fname):
'Programming Language :: Python :: 3.6',
],

# We don't declare our dependency on mxnet here because we build with
# different packages for different variants (e.g. mxnet-mkl and mxnet-cu90).
install_requires=['sagemaker-inference==1.0.0'],
extras_require={
'test': ['tox', 'flake8', 'pytest', 'pytest-cov', 'pytest-xdist', 'mock', 'sagemaker',
'docker-compose', 'mxnet==1.4.0']
'test': ['tox', 'flake8', 'pytest', 'pytest-cov', 'pytest-xdist', 'mock',
'sagemaker==1.23.0', 'docker-compose', 'mxnet==1.4.0', 'awslogs']
},

entry_points={
Expand Down
18 changes: 9 additions & 9 deletions test/conftest.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
# Licensed under the Apache License, Version 2.0 (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
from __future__ import absolute_import

import logging
Expand Down
18 changes: 9 additions & 9 deletions test/integration/local/test_hosting.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
# Licensed under the Apache License, Version 2.0 (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://www.apache.org/licenses/LICENSE-2.0
# http://www.apache.org/licenses/LICENSE-2.0
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
from __future__ import absolute_import

import json
Expand Down
42 changes: 42 additions & 0 deletions test/integration/sagemaker/test_hosting.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License").
# You may not use this file except in compliance with the License.
# A copy of the License is located at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# or in the "license" file accompanying this file. This file is distributed
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
from __future__ import absolute_import

import os

from sagemaker import utils
from sagemaker.mxnet.model import MXNetModel

from test.integration import RESOURCE_PATH
import timeout

DEFAULT_HANDLER_PATH = os.path.join(RESOURCE_PATH, 'default_handlers')
MODEL_PATH = os.path.join(DEFAULT_HANDLER_PATH, 'model.tar.gz')
SCRIPT_PATH = os.path.join(DEFAULT_HANDLER_PATH, 'model', 'code', 'empty_module.py')


def test_hosting(sagemaker_session, ecr_image, instance_type):
prefix = 'mxnet-serving/default-handlers'
model_data = sagemaker_session.upload_data(path=MODEL_PATH, key_prefix=prefix)
model = MXNetModel(model_data,
'SageMakerRole',
SCRIPT_PATH,
image=ecr_image,
sagemaker_session=sagemaker_session)

endpoint_name = utils.unique_name_from_base('test-mxnet-serving')
with timeout.timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
predictor = model.deploy(1, instance_type, endpoint_name=endpoint_name)

output = predictor.predict([[1, 2]])
assert [[4.9999918937683105]] == output
135 changes: 135 additions & 0 deletions test/integration/sagemaker/timeout.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from __future__ import absolute_import

from contextlib import contextmanager
import logging
import signal
from time import sleep

from awslogs.core import AWSLogs
from botocore.exceptions import ClientError

LOGGER = logging.getLogger('timeout')


class TimeoutError(Exception):
pass


@contextmanager
def timeout(seconds=0, minutes=0, hours=0):
"""
Add a signal-based timeout to any block of code.
If multiple time units are specified, they will be added together to determine time limit.
Usage:
with timeout(seconds=5):
my_slow_function(...)
Args:
- seconds: The time limit, in seconds.
- minutes: The time limit, in minutes.
- hours: The time limit, in hours.
"""

limit = seconds + 60 * minutes + 3600 * hours

def handler(signum, frame):
raise TimeoutError('timed out after {} seconds'.format(limit))

try:
signal.signal(signal.SIGALRM, handler)
signal.alarm(limit)

yield
finally:
signal.alarm(0)


@contextmanager
def timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session, seconds=0, minutes=45, hours=0):
with timeout(seconds=seconds, minutes=minutes, hours=hours) as t:
no_errors = False
try:
yield [t]
no_errors = True
finally:
attempts = 3

while attempts > 0:
attempts -= 1
try:
sagemaker_session.delete_endpoint(endpoint_name)
LOGGER.info('deleted endpoint {}'.format(endpoint_name))

_show_logs(endpoint_name, 'Endpoints', sagemaker_session)
if no_errors:
_cleanup_logs(endpoint_name, 'Endpoints', sagemaker_session)
break
except ClientError as ce:
if ce.response['Error']['Code'] == 'ValidationException':
# avoids the inner exception to be overwritten
pass
# trying to delete the resource again in 10 seconds
sleep(10)


@contextmanager
def timeout_and_delete_model_with_transformer(transformer, sagemaker_session, seconds=0, minutes=0, hours=0):
with timeout(seconds=seconds, minutes=minutes, hours=hours) as t:
no_errors = False
try:
yield [t]
no_errors = True
finally:
attempts = 3

while attempts > 0:
attempts -= 1
try:
transformer.delete_model()
LOGGER.info('deleted SageMaker model {}'.format(transformer.model_name))

_show_logs(transformer.model_name, 'Models', sagemaker_session)
if no_errors:
_cleanup_logs(transformer.model_name, 'Models', sagemaker_session)
break
except ClientError as ce:
if ce.response['Error']['Code'] == 'ValidationException':
pass
sleep(10)


def _show_logs(resource_name, resource_type, sagemaker_session):
log_group = '/aws/sagemaker/{}/{}'.format(resource_type, resource_name)
try:
# print out logs before deletion for debuggability
LOGGER.info('cloudwatch logs for log group {}:'.format(log_group))
logs = AWSLogs(log_group_name=log_group, log_stream_name='ALL', start='1d',
aws_region=sagemaker_session.boto_session.region_name)
logs.list_logs()
except Exception:
LOGGER.exception('Failure occurred while listing cloudwatch log group %s. Swallowing exception but printing '
'stacktrace for debugging.', log_group)


def _cleanup_logs(resource_name, resource_type, sagemaker_session):
log_group = '/aws/sagemaker/{}/{}'.format(resource_type, resource_name)
try:
# print out logs before deletion for debuggability
LOGGER.info('deleting cloudwatch log group {}:'.format(log_group))
cwl_client = sagemaker_session.boto_session.client('logs')
cwl_client.delete_log_group(logGroupName=log_group)
LOGGER.info('deleted cloudwatch log group: {}'.format(log_group))
except Exception:
LOGGER.exception('Failure occurred while cleaning up cloudwatch log group %s. '
'Swallowing exception but printing stacktrace for debugging.', log_group)
Binary file added test/resources/default_handlers/model.tar.gz
Binary file not shown.