change: removing unnecessary tests cases#951

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
mvsusp merged 7 commits into from
Jul 25, 2019
Merged

change: removing unnecessary tests cases #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1e7fcc8
Removing unnecessary test case
mvsusp Jul 24, 2019
2b4dcf9
Update test_tf_script_mode.py
mvsusp Jul 24, 2019
09642f5
Update test_tf_script_mode.py
mvsusp Jul 24, 2019
5bdde9f
Merge branch 'master' into mvs-remove-tf-test
mvsusp Jul 25, 2019
b6a735f
removed additional tests
mvsusp Jul 25, 2019
c819089
Merge branch 'mvs-remove-tf-test' of github.com:aws/sagemaker-python-…
mvsusp Jul 25, 2019
ae4cfc2
Merge branch 'master' into mvs-remove-tf-test
mvsusp Jul 25, 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
15 changes: 2 additions & 13 deletions tests/integ/test_horovod.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,12 @@
import sagemaker.utils
import tests.integ as integ
from sagemaker.tensorflow import TensorFlow
from tests.integ import test_region, timeout, HOSTING_NO_P3_REGIONS
from tests.integ import timeout

horovod_dir = os.path.join(os.path.dirname(__file__), "..", "data", "horovod")


@pytest.fixture(
scope="session",
params=[
"ml.c4.xlarge",
pytest.param(
"ml.p3.2xlarge",
marks=pytest.mark.skipif(
test_region() in HOSTING_NO_P3_REGIONS, reason="no ml.p3 instances in this region"
),
),
],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
return request.param

Expand Down
38 changes: 0 additions & 38 deletions tests/integ/test_pytorch_train.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,9 @@
from __future__ import absolute_import

import os
import time

import numpy
import pytest
import tests.integ
from tests.integ import DATA_DIR, PYTHON_VERSION, TRAINING_DEFAULT_TIMEOUT_MINUTES
from tests.integ.timeout import timeout, timeout_and_delete_endpoint_by_name

Expand DownExpand Up@@ -80,42 +78,6 @@ def test_deploy_model(pytorch_training_job, sagemaker_session):
assert output.shape == (batch_size, 10)


@pytest.mark.skipif(
tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
reason="no ml.p2 instances in these regions",
)
def test_async_fit_deploy(sagemaker_session, pytorch_full_version):
training_job_name = ""
# TODO: add tests against local mode when it's ready to be used
instance_type = "ml.p2.xlarge"

with timeout(minutes=10):
pytorch = _get_pytorch_estimator(sagemaker_session, pytorch_full_version, instance_type)

pytorch.fit({"training": _upload_training_data(pytorch)}, wait=False)
training_job_name = pytorch.latest_training_job.name

print("Waiting to re-attach to the training job: %s" % training_job_name)
time.sleep(20)

if not _is_local_mode(instance_type):
endpoint_name = "test-pytorch-async-fit-attach-deploy-{}".format(sagemaker_timestamp())

with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
print("Re-attaching now to: %s" % training_job_name)
estimator = PyTorch.attach(
training_job_name=training_job_name, sagemaker_session=sagemaker_session
)
predictor = estimator.deploy(1, instance_type, endpoint_name=endpoint_name)

batch_size = 100
data = numpy.random.rand(batch_size, 1, 28, 28).astype(numpy.float32)
output = predictor.predict(data)

assert output.shape == (batch_size, 10)


def _upload_training_data(pytorch):
return pytorch.sagemaker_session.upload_data(
path=os.path.join(MNIST_DIR, "training"),
Expand Down
83 changes: 0 additions & 83 deletions tests/integ/test_tf_cifar.py
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions tests/integ/test_tf_keras.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
@pytest.mark.skipif(
tests.integ.PYTHON_VERSION != "py2", reason="TensorFlow image supports only python 2."
)
@pytest.mark.skipif(
tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS,
reason="no ml.p2 instances in these regions",
)
def test_keras(sagemaker_session):
script_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "source")
dataset_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "data")
Expand DownExpand Up@@ -60,7 +56,7 @@ def test_keras(sagemaker_session):

endpoint_name = estimator.latest_training_job.name
with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.p2.xlarge")
predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.c4.xlarge")

data = np.random.randn(32, 32, 3)
predict_response = predictor.predict(data)
Expand Down
29 changes: 12 additions & 17 deletions tests/integ/test_tf_script_mode.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,20 +38,7 @@
TAGS = [{"Key": "some-key", "Value": "some-value"}]


@pytest.fixture(
scope="session",
params=[
"ml.c4.xlarge",
pytest.param(
"ml.p2.xlarge",
marks=pytest.mark.skipif(
tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
reason="no ml.p2 instances in this region",
),
),
],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
return request.param

Expand DownExpand Up@@ -228,8 +215,15 @@ def _assert_s3_files_exist(s3_url, files):
raise ValueError("File {} is not found under {}".format(f, s3_url))


def _assert_tags_match(sagemaker_client, resource_arn, tags):
actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
def _assert_tags_match(sagemaker_client, resource_arn, tags, retries=1):
actual_tags = None
for _ in range(retries):
actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
if actual_tags:
break
else:
# endpoint tags might take minutes to propagate. Sleeping.
time.sleep(30)
assert actual_tags == tags


Expand All@@ -240,7 +234,8 @@ def _assert_model_tags_match(sagemaker_client, model_name, tags):

def _assert_endpoint_tags_match(sagemaker_client, endpoint_name, tags):
endpoint_description = sagemaker_client.describe_endpoint(EndpointName=endpoint_name)
_assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags)

_assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags, retries=10)


def _assert_training_job_tags_match(sagemaker_client, training_job_name, tags):
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
change: removing unnecessary tests cases#951

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

mvsusp
merged 7 commits into

from

Jul 25, 2019
 Merged


change: removing unnecessary tests cases
#951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
1e7fcc8

Removing unnecessary test case


mvsusp Jul 24, 2019
2b4dcf9

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
09642f5

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
5bdde9f

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 2019
b6a735f

removed additional tests


mvsusp Jul 25, 2019
c819089

Merge branch 'mvs-remove-tf-test' of github.com:aws/sagemaker-python-…


mvsusp Jul 25, 2019
ae4cfc2

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 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


15 changes: 2 additions & 13 deletions
tests/integ/test_horovod.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,12 @@
import sagemaker.utils
import tests.integ as integ
from sagemaker.tensorflow import TensorFlow
from tests.integ import test_region, timeout, HOSTING_NO_P3_REGIONS
from tests.integ import timeout

horovod_dir = os.path.join(os.path.dirname(__file__), "..", "data", "horovod")


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p3.2xlarge",
 marks=pytest.mark.skipif(
 test_region() in HOSTING_NO_P3_REGIONS, reason="no ml.p3 instances in this region"
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand Down

38 changes: 0 additions & 38 deletions
tests/integ/test_pytorch_train.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,9 @@
from __future__ import absolute_import

import os
import time

import numpy
import pytest
import tests.integ
from tests.integ import DATA_DIR, PYTHON_VERSION, TRAINING_DEFAULT_TIMEOUT_MINUTES
from tests.integ.timeout import timeout, timeout_and_delete_endpoint_by_name

Expand DownExpand Up@@ -80,42 +78,6 @@ def test_deploy_model(pytorch_training_job, sagemaker_session):
 assert output.shape == (batch_size, 10)


@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_async_fit_deploy(sagemaker_session, pytorch_full_version):
 training_job_name = ""
 # TODO: add tests against local mode when it's ready to be used
 instance_type = "ml.p2.xlarge"

 with timeout(minutes=10):
 pytorch = _get_pytorch_estimator(sagemaker_session, pytorch_full_version, instance_type)

 pytorch.fit({"training": _upload_training_data(pytorch)}, wait=False)
 training_job_name = pytorch.latest_training_job.name

 print("Waiting to re-attach to the training job: %s" % training_job_name)
 time.sleep(20)

 if not _is_local_mode(instance_type):
 endpoint_name = "test-pytorch-async-fit-attach-deploy-{}".format(sagemaker_timestamp())

 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 print("Re-attaching now to: %s" % training_job_name)
 estimator = PyTorch.attach(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )
 predictor = estimator.deploy(1, instance_type, endpoint_name=endpoint_name)

 batch_size = 100
 data = numpy.random.rand(batch_size, 1, 28, 28).astype(numpy.float32)
 output = predictor.predict(data)

 assert output.shape == (batch_size, 10)


def _upload_training_data(pytorch):
 return pytorch.sagemaker_session.upload_data(
 path=os.path.join(MNIST_DIR, "training"),
Expand Down

83 changes: 0 additions & 83 deletions
tests/integ/test_tf_cifar.py

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
tests/integ/test_tf_keras.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
@pytest.mark.skipif(
 tests.integ.PYTHON_VERSION != "py2", reason="TensorFlow image supports only python 2."
)
@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_keras(sagemaker_session):
 script_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "source")
 dataset_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "data")
Expand DownExpand Up@@ -60,7 +56,7 @@ def test_keras(sagemaker_session):

 endpoint_name = estimator.latest_training_job.name
 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.p2.xlarge")
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.c4.xlarge")

 data = np.random.randn(32, 32, 3)
 predict_response = predictor.predict(data)
Expand Down

29 changes: 12 additions & 17 deletions
tests/integ/test_tf_script_mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,20 +38,7 @@
TAGS = [{"Key": "some-key", "Value": "some-value"}]


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p2.xlarge",
 marks=pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in this region",
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand DownExpand Up@@ -228,8 +215,15 @@ def _assert_s3_files_exist(s3_url, files):
 raise ValueError("File {} is not found under {}".format(f, s3_url))


def _assert_tags_match(sagemaker_client, resource_arn, tags):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
def _assert_tags_match(sagemaker_client, resource_arn, tags, retries=1):
 actual_tags = None
 for _ in range(retries):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
 if actual_tags:
 break
 else:
 # endpoint tags might take minutes to propagate. Sleeping.
 time.sleep(30)
 assert actual_tags == tags


Expand All@@ -240,7 +234,8 @@ def _assert_model_tags_match(sagemaker_client, model_name, tags):

def _assert_endpoint_tags_match(sagemaker_client, endpoint_name, tags):
 endpoint_description = sagemaker_client.describe_endpoint(EndpointName=endpoint_name)
 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags)

 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags, retries=10)


def _assert_training_job_tags_match(sagemaker_client, training_job_name, tags):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
change: removing unnecessary tests cases#951

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

mvsusp
merged 7 commits into

from

Jul 25, 2019
 Merged


change: removing unnecessary tests cases
#951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
1e7fcc8

Removing unnecessary test case


mvsusp Jul 24, 2019
2b4dcf9

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
09642f5

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
5bdde9f

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 2019
b6a735f

removed additional tests


mvsusp Jul 25, 2019
c819089

Merge branch 'mvs-remove-tf-test' of github.com:aws/sagemaker-python-…


mvsusp Jul 25, 2019
ae4cfc2

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 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


15 changes: 2 additions & 13 deletions
tests/integ/test_horovod.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,12 @@
import sagemaker.utils
import tests.integ as integ
from sagemaker.tensorflow import TensorFlow
from tests.integ import test_region, timeout, HOSTING_NO_P3_REGIONS
from tests.integ import timeout

horovod_dir = os.path.join(os.path.dirname(__file__), "..", "data", "horovod")


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p3.2xlarge",
 marks=pytest.mark.skipif(
 test_region() in HOSTING_NO_P3_REGIONS, reason="no ml.p3 instances in this region"
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand Down

38 changes: 0 additions & 38 deletions
tests/integ/test_pytorch_train.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,9 @@
from __future__ import absolute_import

import os
import time

import numpy
import pytest
import tests.integ
from tests.integ import DATA_DIR, PYTHON_VERSION, TRAINING_DEFAULT_TIMEOUT_MINUTES
from tests.integ.timeout import timeout, timeout_and_delete_endpoint_by_name

Expand DownExpand Up@@ -80,42 +78,6 @@ def test_deploy_model(pytorch_training_job, sagemaker_session):
 assert output.shape == (batch_size, 10)


@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_async_fit_deploy(sagemaker_session, pytorch_full_version):
 training_job_name = ""
 # TODO: add tests against local mode when it's ready to be used
 instance_type = "ml.p2.xlarge"

 with timeout(minutes=10):
 pytorch = _get_pytorch_estimator(sagemaker_session, pytorch_full_version, instance_type)

 pytorch.fit({"training": _upload_training_data(pytorch)}, wait=False)
 training_job_name = pytorch.latest_training_job.name

 print("Waiting to re-attach to the training job: %s" % training_job_name)
 time.sleep(20)

 if not _is_local_mode(instance_type):
 endpoint_name = "test-pytorch-async-fit-attach-deploy-{}".format(sagemaker_timestamp())

 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 print("Re-attaching now to: %s" % training_job_name)
 estimator = PyTorch.attach(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )
 predictor = estimator.deploy(1, instance_type, endpoint_name=endpoint_name)

 batch_size = 100
 data = numpy.random.rand(batch_size, 1, 28, 28).astype(numpy.float32)
 output = predictor.predict(data)

 assert output.shape == (batch_size, 10)


def _upload_training_data(pytorch):
 return pytorch.sagemaker_session.upload_data(
 path=os.path.join(MNIST_DIR, "training"),
Expand Down

83 changes: 0 additions & 83 deletions
tests/integ/test_tf_cifar.py

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
tests/integ/test_tf_keras.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
@pytest.mark.skipif(
 tests.integ.PYTHON_VERSION != "py2", reason="TensorFlow image supports only python 2."
)
@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_keras(sagemaker_session):
 script_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "source")
 dataset_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "data")
Expand DownExpand Up@@ -60,7 +56,7 @@ def test_keras(sagemaker_session):

 endpoint_name = estimator.latest_training_job.name
 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.p2.xlarge")
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.c4.xlarge")

 data = np.random.randn(32, 32, 3)
 predict_response = predictor.predict(data)
Expand Down

29 changes: 12 additions & 17 deletions
tests/integ/test_tf_script_mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,20 +38,7 @@
TAGS = [{"Key": "some-key", "Value": "some-value"}]


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p2.xlarge",
 marks=pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in this region",
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand DownExpand Up@@ -228,8 +215,15 @@ def _assert_s3_files_exist(s3_url, files):
 raise ValueError("File {} is not found under {}".format(f, s3_url))


def _assert_tags_match(sagemaker_client, resource_arn, tags):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
def _assert_tags_match(sagemaker_client, resource_arn, tags, retries=1):
 actual_tags = None
 for _ in range(retries):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
 if actual_tags:
 break
 else:
 # endpoint tags might take minutes to propagate. Sleeping.
 time.sleep(30)
 assert actual_tags == tags


Expand All@@ -240,7 +234,8 @@ def _assert_model_tags_match(sagemaker_client, model_name, tags):

def _assert_endpoint_tags_match(sagemaker_client, endpoint_name, tags):
 endpoint_description = sagemaker_client.describe_endpoint(EndpointName=endpoint_name)
 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags)

 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags, retries=10)


def _assert_training_job_tags_match(sagemaker_client, training_job_name, tags):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
change: removing unnecessary tests cases#951

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

mvsusp
merged 7 commits into

from

Jul 25, 2019
 Merged


change: removing unnecessary tests cases
#951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
1e7fcc8

Removing unnecessary test case


mvsusp Jul 24, 2019
2b4dcf9

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
09642f5

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
5bdde9f

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 2019
b6a735f

removed additional tests


mvsusp Jul 25, 2019
c819089

Merge branch 'mvs-remove-tf-test' of github.com:aws/sagemaker-python-…


mvsusp Jul 25, 2019
ae4cfc2

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 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


15 changes: 2 additions & 13 deletions
tests/integ/test_horovod.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,12 @@
import sagemaker.utils
import tests.integ as integ
from sagemaker.tensorflow import TensorFlow
from tests.integ import test_region, timeout, HOSTING_NO_P3_REGIONS
from tests.integ import timeout

horovod_dir = os.path.join(os.path.dirname(__file__), "..", "data", "horovod")


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p3.2xlarge",
 marks=pytest.mark.skipif(
 test_region() in HOSTING_NO_P3_REGIONS, reason="no ml.p3 instances in this region"
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand Down

38 changes: 0 additions & 38 deletions
tests/integ/test_pytorch_train.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,9 @@
from __future__ import absolute_import

import os
import time

import numpy
import pytest
import tests.integ
from tests.integ import DATA_DIR, PYTHON_VERSION, TRAINING_DEFAULT_TIMEOUT_MINUTES
from tests.integ.timeout import timeout, timeout_and_delete_endpoint_by_name

Expand DownExpand Up@@ -80,42 +78,6 @@ def test_deploy_model(pytorch_training_job, sagemaker_session):
 assert output.shape == (batch_size, 10)


@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_async_fit_deploy(sagemaker_session, pytorch_full_version):
 training_job_name = ""
 # TODO: add tests against local mode when it's ready to be used
 instance_type = "ml.p2.xlarge"

 with timeout(minutes=10):
 pytorch = _get_pytorch_estimator(sagemaker_session, pytorch_full_version, instance_type)

 pytorch.fit({"training": _upload_training_data(pytorch)}, wait=False)
 training_job_name = pytorch.latest_training_job.name

 print("Waiting to re-attach to the training job: %s" % training_job_name)
 time.sleep(20)

 if not _is_local_mode(instance_type):
 endpoint_name = "test-pytorch-async-fit-attach-deploy-{}".format(sagemaker_timestamp())

 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 print("Re-attaching now to: %s" % training_job_name)
 estimator = PyTorch.attach(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )
 predictor = estimator.deploy(1, instance_type, endpoint_name=endpoint_name)

 batch_size = 100
 data = numpy.random.rand(batch_size, 1, 28, 28).astype(numpy.float32)
 output = predictor.predict(data)

 assert output.shape == (batch_size, 10)


def _upload_training_data(pytorch):
 return pytorch.sagemaker_session.upload_data(
 path=os.path.join(MNIST_DIR, "training"),
Expand Down

83 changes: 0 additions & 83 deletions
tests/integ/test_tf_cifar.py

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
tests/integ/test_tf_keras.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
@pytest.mark.skipif(
 tests.integ.PYTHON_VERSION != "py2", reason="TensorFlow image supports only python 2."
)
@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_keras(sagemaker_session):
 script_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "source")
 dataset_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "data")
Expand DownExpand Up@@ -60,7 +56,7 @@ def test_keras(sagemaker_session):

 endpoint_name = estimator.latest_training_job.name
 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.p2.xlarge")
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.c4.xlarge")

 data = np.random.randn(32, 32, 3)
 predict_response = predictor.predict(data)
Expand Down

29 changes: 12 additions & 17 deletions
tests/integ/test_tf_script_mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,20 +38,7 @@
TAGS = [{"Key": "some-key", "Value": "some-value"}]


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p2.xlarge",
 marks=pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in this region",
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand DownExpand Up@@ -228,8 +215,15 @@ def _assert_s3_files_exist(s3_url, files):
 raise ValueError("File {} is not found under {}".format(f, s3_url))


def _assert_tags_match(sagemaker_client, resource_arn, tags):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
def _assert_tags_match(sagemaker_client, resource_arn, tags, retries=1):
 actual_tags = None
 for _ in range(retries):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
 if actual_tags:
 break
 else:
 # endpoint tags might take minutes to propagate. Sleeping.
 time.sleep(30)
 assert actual_tags == tags


Expand All@@ -240,7 +234,8 @@ def _assert_model_tags_match(sagemaker_client, model_name, tags):

def _assert_endpoint_tags_match(sagemaker_client, endpoint_name, tags):
 endpoint_description = sagemaker_client.describe_endpoint(EndpointName=endpoint_name)
 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags)

 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags, retries=10)


def _assert_training_job_tags_match(sagemaker_client, training_job_name, tags):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
change: removing unnecessary tests cases#951

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

mvsusp
merged 7 commits into

from

Jul 25, 2019
 Merged


change: removing unnecessary tests cases
#951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
1e7fcc8

Removing unnecessary test case


mvsusp Jul 24, 2019
2b4dcf9

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
09642f5

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
5bdde9f

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 2019
b6a735f

removed additional tests


mvsusp Jul 25, 2019
c819089

Merge branch 'mvs-remove-tf-test' of github.com:aws/sagemaker-python-…


mvsusp Jul 25, 2019
ae4cfc2

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 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


15 changes: 2 additions & 13 deletions
tests/integ/test_horovod.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,12 @@
import sagemaker.utils
import tests.integ as integ
from sagemaker.tensorflow import TensorFlow
from tests.integ import test_region, timeout, HOSTING_NO_P3_REGIONS
from tests.integ import timeout

horovod_dir = os.path.join(os.path.dirname(__file__), "..", "data", "horovod")


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p3.2xlarge",
 marks=pytest.mark.skipif(
 test_region() in HOSTING_NO_P3_REGIONS, reason="no ml.p3 instances in this region"
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand Down

38 changes: 0 additions & 38 deletions
tests/integ/test_pytorch_train.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,9 @@
from __future__ import absolute_import

import os
import time

import numpy
import pytest
import tests.integ
from tests.integ import DATA_DIR, PYTHON_VERSION, TRAINING_DEFAULT_TIMEOUT_MINUTES
from tests.integ.timeout import timeout, timeout_and_delete_endpoint_by_name

Expand DownExpand Up@@ -80,42 +78,6 @@ def test_deploy_model(pytorch_training_job, sagemaker_session):
 assert output.shape == (batch_size, 10)


@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_async_fit_deploy(sagemaker_session, pytorch_full_version):
 training_job_name = ""
 # TODO: add tests against local mode when it's ready to be used
 instance_type = "ml.p2.xlarge"

 with timeout(minutes=10):
 pytorch = _get_pytorch_estimator(sagemaker_session, pytorch_full_version, instance_type)

 pytorch.fit({"training": _upload_training_data(pytorch)}, wait=False)
 training_job_name = pytorch.latest_training_job.name

 print("Waiting to re-attach to the training job: %s" % training_job_name)
 time.sleep(20)

 if not _is_local_mode(instance_type):
 endpoint_name = "test-pytorch-async-fit-attach-deploy-{}".format(sagemaker_timestamp())

 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 print("Re-attaching now to: %s" % training_job_name)
 estimator = PyTorch.attach(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )
 predictor = estimator.deploy(1, instance_type, endpoint_name=endpoint_name)

 batch_size = 100
 data = numpy.random.rand(batch_size, 1, 28, 28).astype(numpy.float32)
 output = predictor.predict(data)

 assert output.shape == (batch_size, 10)


def _upload_training_data(pytorch):
 return pytorch.sagemaker_session.upload_data(
 path=os.path.join(MNIST_DIR, "training"),
Expand Down

83 changes: 0 additions & 83 deletions
tests/integ/test_tf_cifar.py

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
tests/integ/test_tf_keras.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
@pytest.mark.skipif(
 tests.integ.PYTHON_VERSION != "py2", reason="TensorFlow image supports only python 2."
)
@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_keras(sagemaker_session):
 script_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "source")
 dataset_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "data")
Expand DownExpand Up@@ -60,7 +56,7 @@ def test_keras(sagemaker_session):

 endpoint_name = estimator.latest_training_job.name
 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.p2.xlarge")
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.c4.xlarge")

 data = np.random.randn(32, 32, 3)
 predict_response = predictor.predict(data)
Expand Down

29 changes: 12 additions & 17 deletions
tests/integ/test_tf_script_mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,20 +38,7 @@
TAGS = [{"Key": "some-key", "Value": "some-value"}]


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p2.xlarge",
 marks=pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in this region",
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand DownExpand Up@@ -228,8 +215,15 @@ def _assert_s3_files_exist(s3_url, files):
 raise ValueError("File {} is not found under {}".format(f, s3_url))


def _assert_tags_match(sagemaker_client, resource_arn, tags):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
def _assert_tags_match(sagemaker_client, resource_arn, tags, retries=1):
 actual_tags = None
 for _ in range(retries):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
 if actual_tags:
 break
 else:
 # endpoint tags might take minutes to propagate. Sleeping.
 time.sleep(30)
 assert actual_tags == tags


Expand All@@ -240,7 +234,8 @@ def _assert_model_tags_match(sagemaker_client, model_name, tags):

def _assert_endpoint_tags_match(sagemaker_client, endpoint_name, tags):
 endpoint_description = sagemaker_client.describe_endpoint(EndpointName=endpoint_name)
 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags)

 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags, retries=10)


def _assert_training_job_tags_match(sagemaker_client, training_job_name, tags):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
change: removing unnecessary tests cases#951

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

mvsusp
merged 7 commits into

from

Jul 25, 2019
 Merged


change: removing unnecessary tests cases
#951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
1e7fcc8

Removing unnecessary test case


mvsusp Jul 24, 2019
2b4dcf9

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
09642f5

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
5bdde9f

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 2019
b6a735f

removed additional tests


mvsusp Jul 25, 2019
c819089

Merge branch 'mvs-remove-tf-test' of github.com:aws/sagemaker-python-…


mvsusp Jul 25, 2019
ae4cfc2

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 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


15 changes: 2 additions & 13 deletions
tests/integ/test_horovod.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,12 @@
import sagemaker.utils
import tests.integ as integ
from sagemaker.tensorflow import TensorFlow
from tests.integ import test_region, timeout, HOSTING_NO_P3_REGIONS
from tests.integ import timeout

horovod_dir = os.path.join(os.path.dirname(__file__), "..", "data", "horovod")


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p3.2xlarge",
 marks=pytest.mark.skipif(
 test_region() in HOSTING_NO_P3_REGIONS, reason="no ml.p3 instances in this region"
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand Down

38 changes: 0 additions & 38 deletions
tests/integ/test_pytorch_train.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,9 @@
from __future__ import absolute_import

import os
import time

import numpy
import pytest
import tests.integ
from tests.integ import DATA_DIR, PYTHON_VERSION, TRAINING_DEFAULT_TIMEOUT_MINUTES
from tests.integ.timeout import timeout, timeout_and_delete_endpoint_by_name

Expand DownExpand Up@@ -80,42 +78,6 @@ def test_deploy_model(pytorch_training_job, sagemaker_session):
 assert output.shape == (batch_size, 10)


@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_async_fit_deploy(sagemaker_session, pytorch_full_version):
 training_job_name = ""
 # TODO: add tests against local mode when it's ready to be used
 instance_type = "ml.p2.xlarge"

 with timeout(minutes=10):
 pytorch = _get_pytorch_estimator(sagemaker_session, pytorch_full_version, instance_type)

 pytorch.fit({"training": _upload_training_data(pytorch)}, wait=False)
 training_job_name = pytorch.latest_training_job.name

 print("Waiting to re-attach to the training job: %s" % training_job_name)
 time.sleep(20)

 if not _is_local_mode(instance_type):
 endpoint_name = "test-pytorch-async-fit-attach-deploy-{}".format(sagemaker_timestamp())

 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 print("Re-attaching now to: %s" % training_job_name)
 estimator = PyTorch.attach(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )
 predictor = estimator.deploy(1, instance_type, endpoint_name=endpoint_name)

 batch_size = 100
 data = numpy.random.rand(batch_size, 1, 28, 28).astype(numpy.float32)
 output = predictor.predict(data)

 assert output.shape == (batch_size, 10)


def _upload_training_data(pytorch):
 return pytorch.sagemaker_session.upload_data(
 path=os.path.join(MNIST_DIR, "training"),
Expand Down

83 changes: 0 additions & 83 deletions
tests/integ/test_tf_cifar.py

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
tests/integ/test_tf_keras.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
@pytest.mark.skipif(
 tests.integ.PYTHON_VERSION != "py2", reason="TensorFlow image supports only python 2."
)
@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_keras(sagemaker_session):
 script_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "source")
 dataset_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "data")
Expand DownExpand Up@@ -60,7 +56,7 @@ def test_keras(sagemaker_session):

 endpoint_name = estimator.latest_training_job.name
 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.p2.xlarge")
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.c4.xlarge")

 data = np.random.randn(32, 32, 3)
 predict_response = predictor.predict(data)
Expand Down

29 changes: 12 additions & 17 deletions
tests/integ/test_tf_script_mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,20 +38,7 @@
TAGS = [{"Key": "some-key", "Value": "some-value"}]


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p2.xlarge",
 marks=pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in this region",
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand DownExpand Up@@ -228,8 +215,15 @@ def _assert_s3_files_exist(s3_url, files):
 raise ValueError("File {} is not found under {}".format(f, s3_url))


def _assert_tags_match(sagemaker_client, resource_arn, tags):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
def _assert_tags_match(sagemaker_client, resource_arn, tags, retries=1):
 actual_tags = None
 for _ in range(retries):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
 if actual_tags:
 break
 else:
 # endpoint tags might take minutes to propagate. Sleeping.
 time.sleep(30)
 assert actual_tags == tags


Expand All@@ -240,7 +234,8 @@ def _assert_model_tags_match(sagemaker_client, model_name, tags):

def _assert_endpoint_tags_match(sagemaker_client, endpoint_name, tags):
 endpoint_description = sagemaker_client.describe_endpoint(EndpointName=endpoint_name)
 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags)

 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags, retries=10)


def _assert_training_job_tags_match(sagemaker_client, training_job_name, tags):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
change: removing unnecessary tests cases#951

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

mvsusp
merged 7 commits into

from

Jul 25, 2019
 Merged


change: removing unnecessary tests cases
#951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
1e7fcc8

Removing unnecessary test case


mvsusp Jul 24, 2019
2b4dcf9

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
09642f5

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
5bdde9f

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 2019
b6a735f

removed additional tests


mvsusp Jul 25, 2019
c819089

Merge branch 'mvs-remove-tf-test' of github.com:aws/sagemaker-python-…


mvsusp Jul 25, 2019
ae4cfc2

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 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


15 changes: 2 additions & 13 deletions
tests/integ/test_horovod.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,12 @@
import sagemaker.utils
import tests.integ as integ
from sagemaker.tensorflow import TensorFlow
from tests.integ import test_region, timeout, HOSTING_NO_P3_REGIONS
from tests.integ import timeout

horovod_dir = os.path.join(os.path.dirname(__file__), "..", "data", "horovod")


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p3.2xlarge",
 marks=pytest.mark.skipif(
 test_region() in HOSTING_NO_P3_REGIONS, reason="no ml.p3 instances in this region"
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand Down

38 changes: 0 additions & 38 deletions
tests/integ/test_pytorch_train.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,9 @@
from __future__ import absolute_import

import os
import time

import numpy
import pytest
import tests.integ
from tests.integ import DATA_DIR, PYTHON_VERSION, TRAINING_DEFAULT_TIMEOUT_MINUTES
from tests.integ.timeout import timeout, timeout_and_delete_endpoint_by_name

Expand DownExpand Up@@ -80,42 +78,6 @@ def test_deploy_model(pytorch_training_job, sagemaker_session):
 assert output.shape == (batch_size, 10)


@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_async_fit_deploy(sagemaker_session, pytorch_full_version):
 training_job_name = ""
 # TODO: add tests against local mode when it's ready to be used
 instance_type = "ml.p2.xlarge"

 with timeout(minutes=10):
 pytorch = _get_pytorch_estimator(sagemaker_session, pytorch_full_version, instance_type)

 pytorch.fit({"training": _upload_training_data(pytorch)}, wait=False)
 training_job_name = pytorch.latest_training_job.name

 print("Waiting to re-attach to the training job: %s" % training_job_name)
 time.sleep(20)

 if not _is_local_mode(instance_type):
 endpoint_name = "test-pytorch-async-fit-attach-deploy-{}".format(sagemaker_timestamp())

 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 print("Re-attaching now to: %s" % training_job_name)
 estimator = PyTorch.attach(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )
 predictor = estimator.deploy(1, instance_type, endpoint_name=endpoint_name)

 batch_size = 100
 data = numpy.random.rand(batch_size, 1, 28, 28).astype(numpy.float32)
 output = predictor.predict(data)

 assert output.shape == (batch_size, 10)


def _upload_training_data(pytorch):
 return pytorch.sagemaker_session.upload_data(
 path=os.path.join(MNIST_DIR, "training"),
Expand Down

83 changes: 0 additions & 83 deletions
tests/integ/test_tf_cifar.py

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
tests/integ/test_tf_keras.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
@pytest.mark.skipif(
 tests.integ.PYTHON_VERSION != "py2", reason="TensorFlow image supports only python 2."
)
@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_keras(sagemaker_session):
 script_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "source")
 dataset_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "data")
Expand DownExpand Up@@ -60,7 +56,7 @@ def test_keras(sagemaker_session):

 endpoint_name = estimator.latest_training_job.name
 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.p2.xlarge")
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.c4.xlarge")

 data = np.random.randn(32, 32, 3)
 predict_response = predictor.predict(data)
Expand Down

29 changes: 12 additions & 17 deletions
tests/integ/test_tf_script_mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,20 +38,7 @@
TAGS = [{"Key": "some-key", "Value": "some-value"}]


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p2.xlarge",
 marks=pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in this region",
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand DownExpand Up@@ -228,8 +215,15 @@ def _assert_s3_files_exist(s3_url, files):
 raise ValueError("File {} is not found under {}".format(f, s3_url))


def _assert_tags_match(sagemaker_client, resource_arn, tags):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
def _assert_tags_match(sagemaker_client, resource_arn, tags, retries=1):
 actual_tags = None
 for _ in range(retries):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
 if actual_tags:
 break
 else:
 # endpoint tags might take minutes to propagate. Sleeping.
 time.sleep(30)
 assert actual_tags == tags


Expand All@@ -240,7 +234,8 @@ def _assert_model_tags_match(sagemaker_client, model_name, tags):

def _assert_endpoint_tags_match(sagemaker_client, endpoint_name, tags):
 endpoint_description = sagemaker_client.describe_endpoint(EndpointName=endpoint_name)
 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags)

 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags, retries=10)


def _assert_training_job_tags_match(sagemaker_client, training_job_name, tags):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
change: removing unnecessary tests cases#951

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

mvsusp
merged 7 commits into

from

Jul 25, 2019
 Merged


change: removing unnecessary tests cases
#951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
1e7fcc8

Removing unnecessary test case


mvsusp Jul 24, 2019
2b4dcf9

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
09642f5

Update test_tf_script_mode.py


mvsusp Jul 24, 2019
5bdde9f

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 2019
b6a735f

removed additional tests


mvsusp Jul 25, 2019
c819089

Merge branch 'mvs-remove-tf-test' of github.com:aws/sagemaker-python-…


mvsusp Jul 25, 2019
ae4cfc2

Merge branch 'master' into mvs-remove-tf-test


mvsusp Jul 25, 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


15 changes: 2 additions & 13 deletions
tests/integ/test_horovod.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,23 +23,12 @@
import sagemaker.utils
import tests.integ as integ
from sagemaker.tensorflow import TensorFlow
from tests.integ import test_region, timeout, HOSTING_NO_P3_REGIONS
from tests.integ import timeout

horovod_dir = os.path.join(os.path.dirname(__file__), "..", "data", "horovod")


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p3.2xlarge",
 marks=pytest.mark.skipif(
 test_region() in HOSTING_NO_P3_REGIONS, reason="no ml.p3 instances in this region"
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand Down

38 changes: 0 additions & 38 deletions
tests/integ/test_pytorch_train.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,9 @@
from __future__ import absolute_import

import os
import time

import numpy
import pytest
import tests.integ
from tests.integ import DATA_DIR, PYTHON_VERSION, TRAINING_DEFAULT_TIMEOUT_MINUTES
from tests.integ.timeout import timeout, timeout_and_delete_endpoint_by_name

Expand DownExpand Up@@ -80,42 +78,6 @@ def test_deploy_model(pytorch_training_job, sagemaker_session):
 assert output.shape == (batch_size, 10)


@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_async_fit_deploy(sagemaker_session, pytorch_full_version):
 training_job_name = ""
 # TODO: add tests against local mode when it's ready to be used
 instance_type = "ml.p2.xlarge"

 with timeout(minutes=10):
 pytorch = _get_pytorch_estimator(sagemaker_session, pytorch_full_version, instance_type)

 pytorch.fit({"training": _upload_training_data(pytorch)}, wait=False)
 training_job_name = pytorch.latest_training_job.name

 print("Waiting to re-attach to the training job: %s" % training_job_name)
 time.sleep(20)

 if not _is_local_mode(instance_type):
 endpoint_name = "test-pytorch-async-fit-attach-deploy-{}".format(sagemaker_timestamp())

 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 print("Re-attaching now to: %s" % training_job_name)
 estimator = PyTorch.attach(
 training_job_name=training_job_name, sagemaker_session=sagemaker_session
 )
 predictor = estimator.deploy(1, instance_type, endpoint_name=endpoint_name)

 batch_size = 100
 data = numpy.random.rand(batch_size, 1, 28, 28).astype(numpy.float32)
 output = predictor.predict(data)

 assert output.shape == (batch_size, 10)


def _upload_training_data(pytorch):
 return pytorch.sagemaker_session.upload_data(
 path=os.path.join(MNIST_DIR, "training"),
Expand Down

83 changes: 0 additions & 83 deletions
tests/integ/test_tf_cifar.py

View file


Open in desktop


This file was deleted.


6 changes: 1 addition & 5 deletions
tests/integ/test_tf_keras.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
@pytest.mark.skipif(
 tests.integ.PYTHON_VERSION != "py2", reason="TensorFlow image supports only python 2."
)
@pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS,
 reason="no ml.p2 instances in these regions",
)
def test_keras(sagemaker_session):
 script_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "source")
 dataset_path = os.path.join(tests.integ.DATA_DIR, "cifar_10", "data")
Expand DownExpand Up@@ -60,7 +56,7 @@ def test_keras(sagemaker_session):

 endpoint_name = estimator.latest_training_job.name
 with timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.p2.xlarge")
 predictor = estimator.deploy(initial_instance_count=1, instance_type="ml.c4.xlarge")

 data = np.random.randn(32, 32, 3)
 predict_response = predictor.predict(data)
Expand Down

29 changes: 12 additions & 17 deletions
tests/integ/test_tf_script_mode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,20 +38,7 @@
TAGS = [{"Key": "some-key", "Value": "some-value"}]


@pytest.fixture(
 scope="session",
 params=[
 "ml.c4.xlarge",
 pytest.param(
 "ml.p2.xlarge",
 marks=pytest.mark.skipif(
 tests.integ.test_region() in tests.integ.HOSTING_NO_P2_REGIONS
 or tests.integ.test_region() in tests.integ.TRAINING_NO_P2_REGIONS,
 reason="no ml.p2 instances in this region",
 ),
 ),
 ],
)
@pytest.fixture(scope="session", params=["ml.c4.xlarge"])
def instance_type(request):
 return request.param

Expand DownExpand Up@@ -228,8 +215,15 @@ def _assert_s3_files_exist(s3_url, files):
 raise ValueError("File {} is not found under {}".format(f, s3_url))


def _assert_tags_match(sagemaker_client, resource_arn, tags):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
def _assert_tags_match(sagemaker_client, resource_arn, tags, retries=1):
 actual_tags = None
 for _ in range(retries):
 actual_tags = sagemaker_client.list_tags(ResourceArn=resource_arn)["Tags"]
 if actual_tags:
 break
 else:
 # endpoint tags might take minutes to propagate. Sleeping.
 time.sleep(30)
 assert actual_tags == tags


Expand All@@ -240,7 +234,8 @@ def _assert_model_tags_match(sagemaker_client, model_name, tags):

def _assert_endpoint_tags_match(sagemaker_client, endpoint_name, tags):
 endpoint_description = sagemaker_client.describe_endpoint(EndpointName=endpoint_name)
 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags)

 _assert_tags_match(sagemaker_client, endpoint_description["EndpointArn"], tags, retries=10)


def _assert_training_job_tags_match(sagemaker_client, training_job_name, tags):
Expand Down