Skip to content

change: downgrade c5 in integ tests and test all TF Script Mode images #840

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
Jun 9, 2019
Merged

change: downgrade c5 in integ tests and test all TF Script Mode images #840

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
dc7b30a
change: downgrade c5 in integ tests and test all TF Script Mode images
laurenyu Jun 7, 2019
4a4f11d
Merge branch 'master' into tests
laurenyu Jun 8, 2019
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 tests/integ/test_horovod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
# Copyright 2017-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
Expand Down Expand Up @@ -29,7 +29,7 @@


@pytest.fixture(scope='session', params=[
'ml.c5.xlarge',
'ml.c4.xlarge',
pytest.param('ml.p3.2xlarge',
marks=pytest.mark.skipif(
test_region() in HOSTING_NO_P3_REGIONS,
Expand Down
18 changes: 6 additions & 12 deletions tests/integ/test_tf_script_mode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
# Copyright 2017-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
Expand Down Expand Up @@ -39,7 +39,7 @@


@pytest.fixture(scope='session', params=[
'ml.c5.xlarge',
'ml.c4.xlarge',
pytest.param('ml.p2.xlarge',
marks=pytest.mark.skipif(
tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
Expand All @@ -49,15 +49,13 @@ def instance_type(request):
return request.param


@pytest.mark.skipif(tests.integ.PYTHON_VERSION != 'py3',
reason="Script Mode tests are only configured to run with Python 3")
def test_mnist(sagemaker_session, instance_type):
estimator = TensorFlow(entry_point=SCRIPT,
role='SageMakerRole',
train_instance_count=1,
train_instance_type=instance_type,
sagemaker_session=sagemaker_session,
py_version='py3',
script_mode=True,
framework_version=TensorFlow.LATEST_VERSION,
metric_definitions=[
{'Name': 'train:global_steps', 'Regex': r'global_step\/sec:\s(.*)'}])
Expand Down Expand Up @@ -85,7 +83,7 @@ def test_server_side_encryption(sagemaker_session):
train_instance_count=1,
train_instance_type='ml.c5.xlarge',
sagemaker_session=sagemaker_session,
py_version='py3',
script_mode=True,
framework_version=TensorFlow.LATEST_VERSION,
code_location=output_path,
output_path=output_path,
Expand All @@ -102,8 +100,6 @@ def test_server_side_encryption(sagemaker_session):


@pytest.mark.canary_quick
@pytest.mark.skipif(tests.integ.PYTHON_VERSION != 'py3',
reason="Script Mode tests are only configured to run with Python 3")
def test_mnist_distributed(sagemaker_session, instance_type):
estimator = TensorFlow(entry_point=SCRIPT,
role=ROLE,
Expand All @@ -130,7 +126,7 @@ def test_mnist_async(sagemaker_session):
train_instance_count=1,
train_instance_type='ml.c5.4xlarge',
sagemaker_session=sagemaker_session,
py_version='py3',
script_mode=True,
framework_version=TensorFlow.LATEST_VERSION,
tags=TAGS)
inputs = estimator.sagemaker_session.upload_data(
Expand All @@ -155,16 +151,14 @@ def test_mnist_async(sagemaker_session):
estimator.latest_training_job.name, TAGS)


@pytest.mark.skipif(tests.integ.PYTHON_VERSION != 'py3',
reason="Script Mode tests are only configured to run with Python 3")
def test_deploy_with_input_handlers(sagemaker_session, instance_type):
estimator = TensorFlow(entry_point='inference.py',
source_dir=TFS_RESOURCE_PATH,
role=ROLE,
train_instance_count=1,
train_instance_type=instance_type,
sagemaker_session=sagemaker_session,
py_version='py3',
script_mode=True,
framework_version=TensorFlow.LATEST_VERSION,
tags=TAGS)

Expand Down