Update empty framework_version warning#472

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
laurenyu merged 4 commits into from
Nov 13, 2018
Merged

Update empty framework_version warning #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de0cc46
Update empty framework_version warning
laurenyu Nov 12, 2018
d757bcf
update changelog
laurenyu Nov 12, 2018
6de29fa
Merge branch 'master' into require-framework-version
laurenyu Nov 12, 2018
61df428
add unit tests
laurenyu Nov 12, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ CHANGELOG
* enhancement: Local Mode: support optional input channels
* build: added pylint
* build: upgrade docker-compose to 1.23
* enhancement: Frameworks: update warning for not setting framework_version as we aren't planning a breaking change anymore

1.14.1
======
Expand Down
2 changes: 1 addition & 1 deletion src/sagemaker/chainer/estimator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ def __init__(self, entry_point, use_mpi=None, num_processes=None, process_slots_
**kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
"""
if framework_version is None:
logger.warning(empty_framework_version_warning(CHAINER_VERSION))
logger.warning(empty_framework_version_warning(CHAINER_VERSION, CHAINER_VERSION))
self.framework_version = framework_version or CHAINER_VERSION

super(Chainer, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down
15 changes: 9 additions & 6 deletions src/sagemaker/fw_utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,10 +26,10 @@
instantiated with positional or keyword arguments.
"""

EMPTY_FRAMEWORK_VERSION_WARNING = 'In an upcoming version of the SageMaker Python SDK, ' \
'framework_version will be required to create an estimator. ' \
'Please add framework_version={} to your constructor to avoid ' \
'an error in the future.'
EMPTY_FRAMEWORK_VERSION_WARNING = 'No framework_version specified, defaulting to version {}.'
LATER_FRAMEWORK_VERSION_WARNING = 'This is not the latest supported version. ' \
'If you would like to use version {latest}, ' \
'please add framework_version={latest} to your constructor.'

VALID_PY_VERSIONS = ['py2', 'py3']

Expand DownExpand Up@@ -232,5 +232,8 @@ def model_code_key_prefix(code_location_key_prefix, model_name, image):
return '/'.join(filter(None, [code_location_key_prefix, model_name or training_job_name]))


def empty_framework_version_warning(default_version):
return EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)
def empty_framework_version_warning(default_version, latest_version):

@icywang86ruiicywang86ruiNov 12, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Unit tests please.

@laurenyulaurenyuNov 12, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

added

msgs = [EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)]
if default_version != latest_version:
msgs.append(LATER_FRAMEWORK_VERSION_WARNING.format(latest=latest_version))
return ' '.join(msgs)
3 changes: 2 additions & 1 deletion src/sagemaker/mxnet/estimator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ class MXNet(Framework):

_LOWEST_SCRIPT_MODE_VERSION = ['1', '3']
LAUNCH_PS_ENV_NAME = 'sagemaker_parameter_server_enabled'
LATEST_VERSION = '1.3'

def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_version='py2',
framework_version=None, image_name=None, distributions=None, **kwargs):
Expand DownExpand Up@@ -72,7 +73,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
**kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
"""
if framework_version is None:
logger.warning(empty_framework_version_warning(MXNET_VERSION))
logger.warning(empty_framework_version_warning(MXNET_VERSION, self.LATEST_VERSION))
self.framework_version = framework_version or MXNET_VERSION

super(MXNet, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down
2 changes: 1 addition & 1 deletion src/sagemaker/pytorch/estimator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
**kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
"""
if framework_version is None:
logger.warning(empty_framework_version_warning(PYTORCH_VERSION))
logger.warning(empty_framework_version_warning(PYTORCH_VERSION, PYTORCH_VERSION))
self.framework_version = framework_version or PYTORCH_VERSION

super(PyTorch, self).__init__(entry_point, source_dir, hyperparameters, image_name=image_name, **kwargs)
Expand Down
6 changes: 3 additions & 3 deletions src/sagemaker/tensorflow/estimator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,8 +164,8 @@ class TensorFlow(Framework):
__framework_name__ = 'tensorflow'

def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=None,
py_version='py2',
framework_version=None, requirements_file='', image_name=None, **kwargs):
py_version='py2', framework_version=None, requirements_file='', image_name=None,
**kwargs):
"""Initialize an ``TensorFlow`` estimator.
Args:
training_steps (int): Perform this many steps of training. `None`, the default means train forever.
Expand All@@ -188,7 +188,7 @@ def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=N
**kwargs: Additional kwargs passed to the Framework constructor.
"""
if framework_version is None:
LOGGER.warning(empty_framework_version_warning(TF_VERSION))
LOGGER.warning(empty_framework_version_warning(TF_VERSION, TF_VERSION))
self.framework_version = framework_version or TF_VERSION

super(TensorFlow, self).__init__(image_name=image_name, **kwargs)
Expand Down
10 changes: 10 additions & 0 deletions tests/unit/test_chainer.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -459,3 +459,13 @@ def test_attach_custom_image(sagemaker_session):
estimator = Chainer.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
assert estimator.image_name == training_image
assert estimator.train_image() == training_image


@patch('sagemaker.chainer.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
estimator = Chainer(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
framework_version=None)

assert estimator.framework_version == defaults.CHAINER_VERSION
warning.assert_called_with(defaults.CHAINER_VERSION, defaults.CHAINER_VERSION)
10 changes: 10 additions & 0 deletions tests/unit/test_mxnet.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -395,3 +395,13 @@ def test_estimator_wrong_version_launch_parameter_server(sagemaker_session):
train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
distributions=LAUNCH_PS_DISTRIBUTIONS_DICT, framework_version='1.2.1')
assert 'The distributions option is valid for only versions 1.3 and higher' in str(e)


@patch('sagemaker.mxnet.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
mx = MXNet(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
framework_version=None)

assert mx.framework_version == defaults.MXNET_VERSION
warning.assert_called_with(defaults.MXNET_VERSION, mx.LATEST_VERSION)
10 changes: 10 additions & 0 deletions tests/unit/test_pytorch.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -362,3 +362,13 @@ def test_attach_custom_image(sagemaker_session):
assert estimator.latest_training_job.job_name == 'neo'
assert estimator.image_name == training_image
assert estimator.train_image() == training_image


@patch('sagemaker.pytorch.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
estimator = PyTorch(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
framework_version=None)

assert estimator.framework_version == defaults.PYTORCH_VERSION
warning.assert_called_with(defaults.PYTORCH_VERSION, defaults.PYTORCH_VERSION)
10 changes: 10 additions & 0 deletions tests/unit/test_tf_estimator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -634,3 +634,13 @@ def test_attach_custom_image(sagemaker_session):
estimator = TensorFlow.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
assert estimator.image_name == training_image
assert estimator.train_image() == training_image


@patch('sagemaker.tensorflow.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
estimator = TensorFlow(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
framework_version=None)

assert estimator.framework_version == defaults.TF_VERSION
warning.assert_called_with(defaults.TF_VERSION, defaults.TF_VERSION)
, '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
Update empty framework_version warning#472

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

laurenyu
merged 4 commits into

from

Nov 13, 2018
 Merged


Update empty framework_version warning
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
de0cc46

Update empty framework_version warning


laurenyu Nov 12, 2018
d757bcf

update changelog


laurenyu Nov 12, 2018
6de29fa

Merge branch 'master' into require-framework-version


laurenyu Nov 12, 2018
61df428

add unit tests


laurenyu Nov 12, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ CHANGELOG
* enhancement: Local Mode: support optional input channels
* build: added pylint
* build: upgrade docker-compose to 1.23
* enhancement: Frameworks: update warning for not setting framework_version as we aren't planning a breaking change anymore

1.14.1
======
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/chainer/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ def __init__(self, entry_point, use_mpi=None, num_processes=None, process_slots_
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(CHAINER_VERSION))
 logger.warning(empty_framework_version_warning(CHAINER_VERSION, CHAINER_VERSION))
 self.framework_version = framework_version or CHAINER_VERSION

 super(Chainer, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

15 changes: 9 additions & 6 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,10 +26,10 @@
instantiated with positional or keyword arguments.
"""

EMPTY_FRAMEWORK_VERSION_WARNING = 'In an upcoming version of the SageMaker Python SDK, ' \
 'framework_version will be required to create an estimator. ' \
 'Please add framework_version={} to your constructor to avoid ' \
 'an error in the future.'
EMPTY_FRAMEWORK_VERSION_WARNING = 'No framework_version specified, defaulting to version {}.'
LATER_FRAMEWORK_VERSION_WARNING = 'This is not the latest supported version. ' \
 'If you would like to use version {latest}, ' \
 'please add framework_version={latest} to your constructor.'

VALID_PY_VERSIONS = ['py2', 'py3']

Expand DownExpand Up@@ -232,5 +232,8 @@ def model_code_key_prefix(code_location_key_prefix, model_name, image):
 return '/'.join(filter(None, [code_location_key_prefix, model_name or training_job_name]))


def empty_framework_version_warning(default_version):
 return EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)
def empty_framework_version_warning(default_version, latest_version):
@icywang86ruiicywang86ruiNov 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Unit tests please.
@laurenyulaurenyuNov 12, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

added
 msgs = [EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)]
 if default_version != latest_version:
 msgs.append(LATER_FRAMEWORK_VERSION_WARNING.format(latest=latest_version))
 return ' '.join(msgs)

3 changes: 2 additions & 1 deletion
src/sagemaker/mxnet/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ class MXNet(Framework):

 _LOWEST_SCRIPT_MODE_VERSION = ['1', '3']
 LAUNCH_PS_ENV_NAME = 'sagemaker_parameter_server_enabled'
 LATEST_VERSION = '1.3'

 def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_version='py2',
 framework_version=None, image_name=None, distributions=None, **kwargs):
Expand DownExpand Up@@ -72,7 +73,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(MXNET_VERSION))
 logger.warning(empty_framework_version_warning(MXNET_VERSION, self.LATEST_VERSION))
 self.framework_version = framework_version or MXNET_VERSION

 super(MXNet, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/pytorch/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION))
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION, PYTORCH_VERSION))
 self.framework_version = framework_version or PYTORCH_VERSION

 super(PyTorch, self).__init__(entry_point, source_dir, hyperparameters, image_name=image_name, **kwargs)
Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/tensorflow/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,8 +164,8 @@ class TensorFlow(Framework):
 __framework_name__ = 'tensorflow'

 def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=None,
 py_version='py2',
framework_version=None, requirements_file='', image_name=None, **kwargs):
 py_version='py2', framework_version=None, requirements_file='', image_name=None,
 **kwargs):
 """Initialize an ``TensorFlow`` estimator.
 Args:
 training_steps (int): Perform this many steps of training. `None`, the default means train forever.
Expand All@@ -188,7 +188,7 @@ def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=N
 **kwargs: Additional kwargs passed to the Framework constructor.
 """
 if framework_version is None:
 LOGGER.warning(empty_framework_version_warning(TF_VERSION))
 LOGGER.warning(empty_framework_version_warning(TF_VERSION, TF_VERSION))
 self.framework_version = framework_version or TF_VERSION

 super(TensorFlow, self).__init__(image_name=image_name, **kwargs)
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,3 +459,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = Chainer.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.chainer.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = Chainer(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.CHAINER_VERSION
 warning.assert_called_with(defaults.CHAINER_VERSION, defaults.CHAINER_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -395,3 +395,13 @@ def test_estimator_wrong_version_launch_parameter_server(sagemaker_session):
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 distributions=LAUNCH_PS_DISTRIBUTIONS_DICT, framework_version='1.2.1')
 assert 'The distributions option is valid for only versions 1.3 and higher' in str(e)


@patch('sagemaker.mxnet.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 mx = MXNet(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert mx.framework_version == defaults.MXNET_VERSION
 warning.assert_called_with(defaults.MXNET_VERSION, mx.LATEST_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,3 +362,13 @@ def test_attach_custom_image(sagemaker_session):
 assert estimator.latest_training_job.job_name == 'neo'
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.pytorch.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = PyTorch(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.PYTORCH_VERSION
 warning.assert_called_with(defaults.PYTORCH_VERSION, defaults.PYTORCH_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,3 +634,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = TensorFlow.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.tensorflow.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = TensorFlow(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.TF_VERSION
 warning.assert_called_with(defaults.TF_VERSION, defaults.TF_VERSION)

, '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
Update empty framework_version warning#472

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

laurenyu
merged 4 commits into

from

Nov 13, 2018
 Merged


Update empty framework_version warning
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
de0cc46

Update empty framework_version warning


laurenyu Nov 12, 2018
d757bcf

update changelog


laurenyu Nov 12, 2018
6de29fa

Merge branch 'master' into require-framework-version


laurenyu Nov 12, 2018
61df428

add unit tests


laurenyu Nov 12, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ CHANGELOG
* enhancement: Local Mode: support optional input channels
* build: added pylint
* build: upgrade docker-compose to 1.23
* enhancement: Frameworks: update warning for not setting framework_version as we aren't planning a breaking change anymore

1.14.1
======
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/chainer/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ def __init__(self, entry_point, use_mpi=None, num_processes=None, process_slots_
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(CHAINER_VERSION))
 logger.warning(empty_framework_version_warning(CHAINER_VERSION, CHAINER_VERSION))
 self.framework_version = framework_version or CHAINER_VERSION

 super(Chainer, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

15 changes: 9 additions & 6 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,10 +26,10 @@
instantiated with positional or keyword arguments.
"""

EMPTY_FRAMEWORK_VERSION_WARNING = 'In an upcoming version of the SageMaker Python SDK, ' \
 'framework_version will be required to create an estimator. ' \
 'Please add framework_version={} to your constructor to avoid ' \
 'an error in the future.'
EMPTY_FRAMEWORK_VERSION_WARNING = 'No framework_version specified, defaulting to version {}.'
LATER_FRAMEWORK_VERSION_WARNING = 'This is not the latest supported version. ' \
 'If you would like to use version {latest}, ' \
 'please add framework_version={latest} to your constructor.'

VALID_PY_VERSIONS = ['py2', 'py3']

Expand DownExpand Up@@ -232,5 +232,8 @@ def model_code_key_prefix(code_location_key_prefix, model_name, image):
 return '/'.join(filter(None, [code_location_key_prefix, model_name or training_job_name]))


def empty_framework_version_warning(default_version):
 return EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)
def empty_framework_version_warning(default_version, latest_version):
@icywang86ruiicywang86ruiNov 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Unit tests please.
@laurenyulaurenyuNov 12, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

added
 msgs = [EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)]
 if default_version != latest_version:
 msgs.append(LATER_FRAMEWORK_VERSION_WARNING.format(latest=latest_version))
 return ' '.join(msgs)

3 changes: 2 additions & 1 deletion
src/sagemaker/mxnet/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ class MXNet(Framework):

 _LOWEST_SCRIPT_MODE_VERSION = ['1', '3']
 LAUNCH_PS_ENV_NAME = 'sagemaker_parameter_server_enabled'
 LATEST_VERSION = '1.3'

 def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_version='py2',
 framework_version=None, image_name=None, distributions=None, **kwargs):
Expand DownExpand Up@@ -72,7 +73,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(MXNET_VERSION))
 logger.warning(empty_framework_version_warning(MXNET_VERSION, self.LATEST_VERSION))
 self.framework_version = framework_version or MXNET_VERSION

 super(MXNet, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/pytorch/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION))
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION, PYTORCH_VERSION))
 self.framework_version = framework_version or PYTORCH_VERSION

 super(PyTorch, self).__init__(entry_point, source_dir, hyperparameters, image_name=image_name, **kwargs)
Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/tensorflow/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,8 +164,8 @@ class TensorFlow(Framework):
 __framework_name__ = 'tensorflow'

 def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=None,
 py_version='py2',
framework_version=None, requirements_file='', image_name=None, **kwargs):
 py_version='py2', framework_version=None, requirements_file='', image_name=None,
 **kwargs):
 """Initialize an ``TensorFlow`` estimator.
 Args:
 training_steps (int): Perform this many steps of training. `None`, the default means train forever.
Expand All@@ -188,7 +188,7 @@ def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=N
 **kwargs: Additional kwargs passed to the Framework constructor.
 """
 if framework_version is None:
 LOGGER.warning(empty_framework_version_warning(TF_VERSION))
 LOGGER.warning(empty_framework_version_warning(TF_VERSION, TF_VERSION))
 self.framework_version = framework_version or TF_VERSION

 super(TensorFlow, self).__init__(image_name=image_name, **kwargs)
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,3 +459,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = Chainer.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.chainer.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = Chainer(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.CHAINER_VERSION
 warning.assert_called_with(defaults.CHAINER_VERSION, defaults.CHAINER_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -395,3 +395,13 @@ def test_estimator_wrong_version_launch_parameter_server(sagemaker_session):
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 distributions=LAUNCH_PS_DISTRIBUTIONS_DICT, framework_version='1.2.1')
 assert 'The distributions option is valid for only versions 1.3 and higher' in str(e)


@patch('sagemaker.mxnet.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 mx = MXNet(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert mx.framework_version == defaults.MXNET_VERSION
 warning.assert_called_with(defaults.MXNET_VERSION, mx.LATEST_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,3 +362,13 @@ def test_attach_custom_image(sagemaker_session):
 assert estimator.latest_training_job.job_name == 'neo'
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.pytorch.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = PyTorch(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.PYTORCH_VERSION
 warning.assert_called_with(defaults.PYTORCH_VERSION, defaults.PYTORCH_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,3 +634,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = TensorFlow.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.tensorflow.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = TensorFlow(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.TF_VERSION
 warning.assert_called_with(defaults.TF_VERSION, defaults.TF_VERSION)

, '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
Update empty framework_version warning#472

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

laurenyu
merged 4 commits into

from

Nov 13, 2018
 Merged


Update empty framework_version warning
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
de0cc46

Update empty framework_version warning


laurenyu Nov 12, 2018
d757bcf

update changelog


laurenyu Nov 12, 2018
6de29fa

Merge branch 'master' into require-framework-version


laurenyu Nov 12, 2018
61df428

add unit tests


laurenyu Nov 12, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ CHANGELOG
* enhancement: Local Mode: support optional input channels
* build: added pylint
* build: upgrade docker-compose to 1.23
* enhancement: Frameworks: update warning for not setting framework_version as we aren't planning a breaking change anymore

1.14.1
======
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/chainer/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ def __init__(self, entry_point, use_mpi=None, num_processes=None, process_slots_
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(CHAINER_VERSION))
 logger.warning(empty_framework_version_warning(CHAINER_VERSION, CHAINER_VERSION))
 self.framework_version = framework_version or CHAINER_VERSION

 super(Chainer, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

15 changes: 9 additions & 6 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,10 +26,10 @@
instantiated with positional or keyword arguments.
"""

EMPTY_FRAMEWORK_VERSION_WARNING = 'In an upcoming version of the SageMaker Python SDK, ' \
 'framework_version will be required to create an estimator. ' \
 'Please add framework_version={} to your constructor to avoid ' \
 'an error in the future.'
EMPTY_FRAMEWORK_VERSION_WARNING = 'No framework_version specified, defaulting to version {}.'
LATER_FRAMEWORK_VERSION_WARNING = 'This is not the latest supported version. ' \
 'If you would like to use version {latest}, ' \
 'please add framework_version={latest} to your constructor.'

VALID_PY_VERSIONS = ['py2', 'py3']

Expand DownExpand Up@@ -232,5 +232,8 @@ def model_code_key_prefix(code_location_key_prefix, model_name, image):
 return '/'.join(filter(None, [code_location_key_prefix, model_name or training_job_name]))


def empty_framework_version_warning(default_version):
 return EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)
def empty_framework_version_warning(default_version, latest_version):
@icywang86ruiicywang86ruiNov 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Unit tests please.
@laurenyulaurenyuNov 12, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

added
 msgs = [EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)]
 if default_version != latest_version:
 msgs.append(LATER_FRAMEWORK_VERSION_WARNING.format(latest=latest_version))
 return ' '.join(msgs)

3 changes: 2 additions & 1 deletion
src/sagemaker/mxnet/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ class MXNet(Framework):

 _LOWEST_SCRIPT_MODE_VERSION = ['1', '3']
 LAUNCH_PS_ENV_NAME = 'sagemaker_parameter_server_enabled'
 LATEST_VERSION = '1.3'

 def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_version='py2',
 framework_version=None, image_name=None, distributions=None, **kwargs):
Expand DownExpand Up@@ -72,7 +73,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(MXNET_VERSION))
 logger.warning(empty_framework_version_warning(MXNET_VERSION, self.LATEST_VERSION))
 self.framework_version = framework_version or MXNET_VERSION

 super(MXNet, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/pytorch/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION))
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION, PYTORCH_VERSION))
 self.framework_version = framework_version or PYTORCH_VERSION

 super(PyTorch, self).__init__(entry_point, source_dir, hyperparameters, image_name=image_name, **kwargs)
Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/tensorflow/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,8 +164,8 @@ class TensorFlow(Framework):
 __framework_name__ = 'tensorflow'

 def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=None,
 py_version='py2',
framework_version=None, requirements_file='', image_name=None, **kwargs):
 py_version='py2', framework_version=None, requirements_file='', image_name=None,
 **kwargs):
 """Initialize an ``TensorFlow`` estimator.
 Args:
 training_steps (int): Perform this many steps of training. `None`, the default means train forever.
Expand All@@ -188,7 +188,7 @@ def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=N
 **kwargs: Additional kwargs passed to the Framework constructor.
 """
 if framework_version is None:
 LOGGER.warning(empty_framework_version_warning(TF_VERSION))
 LOGGER.warning(empty_framework_version_warning(TF_VERSION, TF_VERSION))
 self.framework_version = framework_version or TF_VERSION

 super(TensorFlow, self).__init__(image_name=image_name, **kwargs)
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,3 +459,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = Chainer.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.chainer.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = Chainer(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.CHAINER_VERSION
 warning.assert_called_with(defaults.CHAINER_VERSION, defaults.CHAINER_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -395,3 +395,13 @@ def test_estimator_wrong_version_launch_parameter_server(sagemaker_session):
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 distributions=LAUNCH_PS_DISTRIBUTIONS_DICT, framework_version='1.2.1')
 assert 'The distributions option is valid for only versions 1.3 and higher' in str(e)


@patch('sagemaker.mxnet.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 mx = MXNet(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert mx.framework_version == defaults.MXNET_VERSION
 warning.assert_called_with(defaults.MXNET_VERSION, mx.LATEST_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,3 +362,13 @@ def test_attach_custom_image(sagemaker_session):
 assert estimator.latest_training_job.job_name == 'neo'
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.pytorch.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = PyTorch(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.PYTORCH_VERSION
 warning.assert_called_with(defaults.PYTORCH_VERSION, defaults.PYTORCH_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,3 +634,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = TensorFlow.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.tensorflow.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = TensorFlow(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.TF_VERSION
 warning.assert_called_with(defaults.TF_VERSION, defaults.TF_VERSION)

, '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
Update empty framework_version warning#472

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

laurenyu
merged 4 commits into

from

Nov 13, 2018
 Merged


Update empty framework_version warning
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
de0cc46

Update empty framework_version warning


laurenyu Nov 12, 2018
d757bcf

update changelog


laurenyu Nov 12, 2018
6de29fa

Merge branch 'master' into require-framework-version


laurenyu Nov 12, 2018
61df428

add unit tests


laurenyu Nov 12, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ CHANGELOG
* enhancement: Local Mode: support optional input channels
* build: added pylint
* build: upgrade docker-compose to 1.23
* enhancement: Frameworks: update warning for not setting framework_version as we aren't planning a breaking change anymore

1.14.1
======
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/chainer/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ def __init__(self, entry_point, use_mpi=None, num_processes=None, process_slots_
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(CHAINER_VERSION))
 logger.warning(empty_framework_version_warning(CHAINER_VERSION, CHAINER_VERSION))
 self.framework_version = framework_version or CHAINER_VERSION

 super(Chainer, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

15 changes: 9 additions & 6 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,10 +26,10 @@
instantiated with positional or keyword arguments.
"""

EMPTY_FRAMEWORK_VERSION_WARNING = 'In an upcoming version of the SageMaker Python SDK, ' \
 'framework_version will be required to create an estimator. ' \
 'Please add framework_version={} to your constructor to avoid ' \
 'an error in the future.'
EMPTY_FRAMEWORK_VERSION_WARNING = 'No framework_version specified, defaulting to version {}.'
LATER_FRAMEWORK_VERSION_WARNING = 'This is not the latest supported version. ' \
 'If you would like to use version {latest}, ' \
 'please add framework_version={latest} to your constructor.'

VALID_PY_VERSIONS = ['py2', 'py3']

Expand DownExpand Up@@ -232,5 +232,8 @@ def model_code_key_prefix(code_location_key_prefix, model_name, image):
 return '/'.join(filter(None, [code_location_key_prefix, model_name or training_job_name]))


def empty_framework_version_warning(default_version):
 return EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)
def empty_framework_version_warning(default_version, latest_version):
@icywang86ruiicywang86ruiNov 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Unit tests please.
@laurenyulaurenyuNov 12, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

added
 msgs = [EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)]
 if default_version != latest_version:
 msgs.append(LATER_FRAMEWORK_VERSION_WARNING.format(latest=latest_version))
 return ' '.join(msgs)

3 changes: 2 additions & 1 deletion
src/sagemaker/mxnet/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ class MXNet(Framework):

 _LOWEST_SCRIPT_MODE_VERSION = ['1', '3']
 LAUNCH_PS_ENV_NAME = 'sagemaker_parameter_server_enabled'
 LATEST_VERSION = '1.3'

 def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_version='py2',
 framework_version=None, image_name=None, distributions=None, **kwargs):
Expand DownExpand Up@@ -72,7 +73,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(MXNET_VERSION))
 logger.warning(empty_framework_version_warning(MXNET_VERSION, self.LATEST_VERSION))
 self.framework_version = framework_version or MXNET_VERSION

 super(MXNet, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/pytorch/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION))
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION, PYTORCH_VERSION))
 self.framework_version = framework_version or PYTORCH_VERSION

 super(PyTorch, self).__init__(entry_point, source_dir, hyperparameters, image_name=image_name, **kwargs)
Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/tensorflow/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,8 +164,8 @@ class TensorFlow(Framework):
 __framework_name__ = 'tensorflow'

 def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=None,
 py_version='py2',
framework_version=None, requirements_file='', image_name=None, **kwargs):
 py_version='py2', framework_version=None, requirements_file='', image_name=None,
 **kwargs):
 """Initialize an ``TensorFlow`` estimator.
 Args:
 training_steps (int): Perform this many steps of training. `None`, the default means train forever.
Expand All@@ -188,7 +188,7 @@ def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=N
 **kwargs: Additional kwargs passed to the Framework constructor.
 """
 if framework_version is None:
 LOGGER.warning(empty_framework_version_warning(TF_VERSION))
 LOGGER.warning(empty_framework_version_warning(TF_VERSION, TF_VERSION))
 self.framework_version = framework_version or TF_VERSION

 super(TensorFlow, self).__init__(image_name=image_name, **kwargs)
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,3 +459,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = Chainer.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.chainer.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = Chainer(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.CHAINER_VERSION
 warning.assert_called_with(defaults.CHAINER_VERSION, defaults.CHAINER_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -395,3 +395,13 @@ def test_estimator_wrong_version_launch_parameter_server(sagemaker_session):
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 distributions=LAUNCH_PS_DISTRIBUTIONS_DICT, framework_version='1.2.1')
 assert 'The distributions option is valid for only versions 1.3 and higher' in str(e)


@patch('sagemaker.mxnet.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 mx = MXNet(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert mx.framework_version == defaults.MXNET_VERSION
 warning.assert_called_with(defaults.MXNET_VERSION, mx.LATEST_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,3 +362,13 @@ def test_attach_custom_image(sagemaker_session):
 assert estimator.latest_training_job.job_name == 'neo'
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.pytorch.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = PyTorch(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.PYTORCH_VERSION
 warning.assert_called_with(defaults.PYTORCH_VERSION, defaults.PYTORCH_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,3 +634,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = TensorFlow.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.tensorflow.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = TensorFlow(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.TF_VERSION
 warning.assert_called_with(defaults.TF_VERSION, defaults.TF_VERSION)

, '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
Update empty framework_version warning#472

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

laurenyu
merged 4 commits into

from

Nov 13, 2018
 Merged


Update empty framework_version warning
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
de0cc46

Update empty framework_version warning


laurenyu Nov 12, 2018
d757bcf

update changelog


laurenyu Nov 12, 2018
6de29fa

Merge branch 'master' into require-framework-version


laurenyu Nov 12, 2018
61df428

add unit tests


laurenyu Nov 12, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ CHANGELOG
* enhancement: Local Mode: support optional input channels
* build: added pylint
* build: upgrade docker-compose to 1.23
* enhancement: Frameworks: update warning for not setting framework_version as we aren't planning a breaking change anymore

1.14.1
======
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/chainer/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ def __init__(self, entry_point, use_mpi=None, num_processes=None, process_slots_
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(CHAINER_VERSION))
 logger.warning(empty_framework_version_warning(CHAINER_VERSION, CHAINER_VERSION))
 self.framework_version = framework_version or CHAINER_VERSION

 super(Chainer, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

15 changes: 9 additions & 6 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,10 +26,10 @@
instantiated with positional or keyword arguments.
"""

EMPTY_FRAMEWORK_VERSION_WARNING = 'In an upcoming version of the SageMaker Python SDK, ' \
 'framework_version will be required to create an estimator. ' \
 'Please add framework_version={} to your constructor to avoid ' \
 'an error in the future.'
EMPTY_FRAMEWORK_VERSION_WARNING = 'No framework_version specified, defaulting to version {}.'
LATER_FRAMEWORK_VERSION_WARNING = 'This is not the latest supported version. ' \
 'If you would like to use version {latest}, ' \
 'please add framework_version={latest} to your constructor.'

VALID_PY_VERSIONS = ['py2', 'py3']

Expand DownExpand Up@@ -232,5 +232,8 @@ def model_code_key_prefix(code_location_key_prefix, model_name, image):
 return '/'.join(filter(None, [code_location_key_prefix, model_name or training_job_name]))


def empty_framework_version_warning(default_version):
 return EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)
def empty_framework_version_warning(default_version, latest_version):
@icywang86ruiicywang86ruiNov 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Unit tests please.
@laurenyulaurenyuNov 12, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

added
 msgs = [EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)]
 if default_version != latest_version:
 msgs.append(LATER_FRAMEWORK_VERSION_WARNING.format(latest=latest_version))
 return ' '.join(msgs)

3 changes: 2 additions & 1 deletion
src/sagemaker/mxnet/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ class MXNet(Framework):

 _LOWEST_SCRIPT_MODE_VERSION = ['1', '3']
 LAUNCH_PS_ENV_NAME = 'sagemaker_parameter_server_enabled'
 LATEST_VERSION = '1.3'

 def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_version='py2',
 framework_version=None, image_name=None, distributions=None, **kwargs):
Expand DownExpand Up@@ -72,7 +73,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(MXNET_VERSION))
 logger.warning(empty_framework_version_warning(MXNET_VERSION, self.LATEST_VERSION))
 self.framework_version = framework_version or MXNET_VERSION

 super(MXNet, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/pytorch/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION))
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION, PYTORCH_VERSION))
 self.framework_version = framework_version or PYTORCH_VERSION

 super(PyTorch, self).__init__(entry_point, source_dir, hyperparameters, image_name=image_name, **kwargs)
Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/tensorflow/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,8 +164,8 @@ class TensorFlow(Framework):
 __framework_name__ = 'tensorflow'

 def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=None,
 py_version='py2',
framework_version=None, requirements_file='', image_name=None, **kwargs):
 py_version='py2', framework_version=None, requirements_file='', image_name=None,
 **kwargs):
 """Initialize an ``TensorFlow`` estimator.
 Args:
 training_steps (int): Perform this many steps of training. `None`, the default means train forever.
Expand All@@ -188,7 +188,7 @@ def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=N
 **kwargs: Additional kwargs passed to the Framework constructor.
 """
 if framework_version is None:
 LOGGER.warning(empty_framework_version_warning(TF_VERSION))
 LOGGER.warning(empty_framework_version_warning(TF_VERSION, TF_VERSION))
 self.framework_version = framework_version or TF_VERSION

 super(TensorFlow, self).__init__(image_name=image_name, **kwargs)
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,3 +459,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = Chainer.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.chainer.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = Chainer(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.CHAINER_VERSION
 warning.assert_called_with(defaults.CHAINER_VERSION, defaults.CHAINER_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -395,3 +395,13 @@ def test_estimator_wrong_version_launch_parameter_server(sagemaker_session):
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 distributions=LAUNCH_PS_DISTRIBUTIONS_DICT, framework_version='1.2.1')
 assert 'The distributions option is valid for only versions 1.3 and higher' in str(e)


@patch('sagemaker.mxnet.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 mx = MXNet(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert mx.framework_version == defaults.MXNET_VERSION
 warning.assert_called_with(defaults.MXNET_VERSION, mx.LATEST_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,3 +362,13 @@ def test_attach_custom_image(sagemaker_session):
 assert estimator.latest_training_job.job_name == 'neo'
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.pytorch.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = PyTorch(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.PYTORCH_VERSION
 warning.assert_called_with(defaults.PYTORCH_VERSION, defaults.PYTORCH_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,3 +634,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = TensorFlow.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.tensorflow.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = TensorFlow(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.TF_VERSION
 warning.assert_called_with(defaults.TF_VERSION, defaults.TF_VERSION)

, '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
Update empty framework_version warning#472

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

laurenyu
merged 4 commits into

from

Nov 13, 2018
 Merged


Update empty framework_version warning
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
de0cc46

Update empty framework_version warning


laurenyu Nov 12, 2018
d757bcf

update changelog


laurenyu Nov 12, 2018
6de29fa

Merge branch 'master' into require-framework-version


laurenyu Nov 12, 2018
61df428

add unit tests


laurenyu Nov 12, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ CHANGELOG
* enhancement: Local Mode: support optional input channels
* build: added pylint
* build: upgrade docker-compose to 1.23
* enhancement: Frameworks: update warning for not setting framework_version as we aren't planning a breaking change anymore

1.14.1
======
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/chainer/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ def __init__(self, entry_point, use_mpi=None, num_processes=None, process_slots_
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(CHAINER_VERSION))
 logger.warning(empty_framework_version_warning(CHAINER_VERSION, CHAINER_VERSION))
 self.framework_version = framework_version or CHAINER_VERSION

 super(Chainer, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

15 changes: 9 additions & 6 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,10 +26,10 @@
instantiated with positional or keyword arguments.
"""

EMPTY_FRAMEWORK_VERSION_WARNING = 'In an upcoming version of the SageMaker Python SDK, ' \
 'framework_version will be required to create an estimator. ' \
 'Please add framework_version={} to your constructor to avoid ' \
 'an error in the future.'
EMPTY_FRAMEWORK_VERSION_WARNING = 'No framework_version specified, defaulting to version {}.'
LATER_FRAMEWORK_VERSION_WARNING = 'This is not the latest supported version. ' \
 'If you would like to use version {latest}, ' \
 'please add framework_version={latest} to your constructor.'

VALID_PY_VERSIONS = ['py2', 'py3']

Expand DownExpand Up@@ -232,5 +232,8 @@ def model_code_key_prefix(code_location_key_prefix, model_name, image):
 return '/'.join(filter(None, [code_location_key_prefix, model_name or training_job_name]))


def empty_framework_version_warning(default_version):
 return EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)
def empty_framework_version_warning(default_version, latest_version):
@icywang86ruiicywang86ruiNov 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Unit tests please.
@laurenyulaurenyuNov 12, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

added
 msgs = [EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)]
 if default_version != latest_version:
 msgs.append(LATER_FRAMEWORK_VERSION_WARNING.format(latest=latest_version))
 return ' '.join(msgs)

3 changes: 2 additions & 1 deletion
src/sagemaker/mxnet/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ class MXNet(Framework):

 _LOWEST_SCRIPT_MODE_VERSION = ['1', '3']
 LAUNCH_PS_ENV_NAME = 'sagemaker_parameter_server_enabled'
 LATEST_VERSION = '1.3'

 def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_version='py2',
 framework_version=None, image_name=None, distributions=None, **kwargs):
Expand DownExpand Up@@ -72,7 +73,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(MXNET_VERSION))
 logger.warning(empty_framework_version_warning(MXNET_VERSION, self.LATEST_VERSION))
 self.framework_version = framework_version or MXNET_VERSION

 super(MXNet, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/pytorch/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION))
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION, PYTORCH_VERSION))
 self.framework_version = framework_version or PYTORCH_VERSION

 super(PyTorch, self).__init__(entry_point, source_dir, hyperparameters, image_name=image_name, **kwargs)
Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/tensorflow/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,8 +164,8 @@ class TensorFlow(Framework):
 __framework_name__ = 'tensorflow'

 def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=None,
 py_version='py2',
framework_version=None, requirements_file='', image_name=None, **kwargs):
 py_version='py2', framework_version=None, requirements_file='', image_name=None,
 **kwargs):
 """Initialize an ``TensorFlow`` estimator.
 Args:
 training_steps (int): Perform this many steps of training. `None`, the default means train forever.
Expand All@@ -188,7 +188,7 @@ def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=N
 **kwargs: Additional kwargs passed to the Framework constructor.
 """
 if framework_version is None:
 LOGGER.warning(empty_framework_version_warning(TF_VERSION))
 LOGGER.warning(empty_framework_version_warning(TF_VERSION, TF_VERSION))
 self.framework_version = framework_version or TF_VERSION

 super(TensorFlow, self).__init__(image_name=image_name, **kwargs)
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,3 +459,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = Chainer.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.chainer.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = Chainer(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.CHAINER_VERSION
 warning.assert_called_with(defaults.CHAINER_VERSION, defaults.CHAINER_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -395,3 +395,13 @@ def test_estimator_wrong_version_launch_parameter_server(sagemaker_session):
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 distributions=LAUNCH_PS_DISTRIBUTIONS_DICT, framework_version='1.2.1')
 assert 'The distributions option is valid for only versions 1.3 and higher' in str(e)


@patch('sagemaker.mxnet.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 mx = MXNet(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert mx.framework_version == defaults.MXNET_VERSION
 warning.assert_called_with(defaults.MXNET_VERSION, mx.LATEST_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,3 +362,13 @@ def test_attach_custom_image(sagemaker_session):
 assert estimator.latest_training_job.job_name == 'neo'
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.pytorch.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = PyTorch(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.PYTORCH_VERSION
 warning.assert_called_with(defaults.PYTORCH_VERSION, defaults.PYTORCH_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,3 +634,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = TensorFlow.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.tensorflow.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = TensorFlow(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.TF_VERSION
 warning.assert_called_with(defaults.TF_VERSION, defaults.TF_VERSION)

, '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
Update empty framework_version warning#472

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

laurenyu
merged 4 commits into

from

Nov 13, 2018
 Merged


Update empty framework_version warning
#472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
de0cc46

Update empty framework_version warning


laurenyu Nov 12, 2018
d757bcf

update changelog


laurenyu Nov 12, 2018
6de29fa

Merge branch 'master' into require-framework-version


laurenyu Nov 12, 2018
61df428

add unit tests


laurenyu Nov 12, 2018

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


1 change: 1 addition & 0 deletions
CHANGELOG.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ CHANGELOG
* enhancement: Local Mode: support optional input channels
* build: added pylint
* build: upgrade docker-compose to 1.23
* enhancement: Frameworks: update warning for not setting framework_version as we aren't planning a breaking change anymore

1.14.1
======
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/chainer/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ def __init__(self, entry_point, use_mpi=None, num_processes=None, process_slots_
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(CHAINER_VERSION))
 logger.warning(empty_framework_version_warning(CHAINER_VERSION, CHAINER_VERSION))
 self.framework_version = framework_version or CHAINER_VERSION

 super(Chainer, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

15 changes: 9 additions & 6 deletions
src/sagemaker/fw_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,10 +26,10 @@
instantiated with positional or keyword arguments.
"""

EMPTY_FRAMEWORK_VERSION_WARNING = 'In an upcoming version of the SageMaker Python SDK, ' \
 'framework_version will be required to create an estimator. ' \
 'Please add framework_version={} to your constructor to avoid ' \
 'an error in the future.'
EMPTY_FRAMEWORK_VERSION_WARNING = 'No framework_version specified, defaulting to version {}.'
LATER_FRAMEWORK_VERSION_WARNING = 'This is not the latest supported version. ' \
 'If you would like to use version {latest}, ' \
 'please add framework_version={latest} to your constructor.'

VALID_PY_VERSIONS = ['py2', 'py3']

Expand DownExpand Up@@ -232,5 +232,8 @@ def model_code_key_prefix(code_location_key_prefix, model_name, image):
 return '/'.join(filter(None, [code_location_key_prefix, model_name or training_job_name]))


def empty_framework_version_warning(default_version):
 return EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)
def empty_framework_version_warning(default_version, latest_version):
@icywang86ruiicywang86ruiNov 12, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Unit tests please.
@laurenyulaurenyuNov 12, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

added
 msgs = [EMPTY_FRAMEWORK_VERSION_WARNING.format(default_version)]
 if default_version != latest_version:
 msgs.append(LATER_FRAMEWORK_VERSION_WARNING.format(latest=latest_version))
 return ' '.join(msgs)

3 changes: 2 additions & 1 deletion
src/sagemaker/mxnet/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ class MXNet(Framework):

 _LOWEST_SCRIPT_MODE_VERSION = ['1', '3']
 LAUNCH_PS_ENV_NAME = 'sagemaker_parameter_server_enabled'
 LATEST_VERSION = '1.3'

 def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_version='py2',
 framework_version=None, image_name=None, distributions=None, **kwargs):
Expand DownExpand Up@@ -72,7 +73,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(MXNET_VERSION))
 logger.warning(empty_framework_version_warning(MXNET_VERSION, self.LATEST_VERSION))
 self.framework_version = framework_version or MXNET_VERSION

 super(MXNet, self).__init__(entry_point, source_dir, hyperparameters,
Expand Down

2 changes: 1 addition & 1 deletion
src/sagemaker/pytorch/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ def __init__(self, entry_point, source_dir=None, hyperparameters=None, py_versio
 **kwargs: Additional kwargs passed to the :class:`~sagemaker.estimator.Framework` constructor.
 """
 if framework_version is None:
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION))
 logger.warning(empty_framework_version_warning(PYTORCH_VERSION, PYTORCH_VERSION))
 self.framework_version = framework_version or PYTORCH_VERSION

 super(PyTorch, self).__init__(entry_point, source_dir, hyperparameters, image_name=image_name, **kwargs)
Expand Down

6 changes: 3 additions & 3 deletions
src/sagemaker/tensorflow/estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,8 +164,8 @@ class TensorFlow(Framework):
 __framework_name__ = 'tensorflow'

 def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=None,
 py_version='py2',
framework_version=None, requirements_file='', image_name=None, **kwargs):
 py_version='py2', framework_version=None, requirements_file='', image_name=None,
 **kwargs):
 """Initialize an ``TensorFlow`` estimator.
 Args:
 training_steps (int): Perform this many steps of training. `None`, the default means train forever.
Expand All@@ -188,7 +188,7 @@ def __init__(self, training_steps=None, evaluation_steps=None, checkpoint_path=N
 **kwargs: Additional kwargs passed to the Framework constructor.
 """
 if framework_version is None:
 LOGGER.warning(empty_framework_version_warning(TF_VERSION))
 LOGGER.warning(empty_framework_version_warning(TF_VERSION, TF_VERSION))
 self.framework_version = framework_version or TF_VERSION

 super(TensorFlow, self).__init__(image_name=image_name, **kwargs)
Expand Down

10 changes: 10 additions & 0 deletions
tests/unit/test_chainer.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -459,3 +459,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = Chainer.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.chainer.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = Chainer(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.CHAINER_VERSION
 warning.assert_called_with(defaults.CHAINER_VERSION, defaults.CHAINER_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_mxnet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -395,3 +395,13 @@ def test_estimator_wrong_version_launch_parameter_server(sagemaker_session):
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 distributions=LAUNCH_PS_DISTRIBUTIONS_DICT, framework_version='1.2.1')
 assert 'The distributions option is valid for only versions 1.3 and higher' in str(e)


@patch('sagemaker.mxnet.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 mx = MXNet(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert mx.framework_version == defaults.MXNET_VERSION
 warning.assert_called_with(defaults.MXNET_VERSION, mx.LATEST_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_pytorch.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -362,3 +362,13 @@ def test_attach_custom_image(sagemaker_session):
 assert estimator.latest_training_job.job_name == 'neo'
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.pytorch.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = PyTorch(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.PYTORCH_VERSION
 warning.assert_called_with(defaults.PYTORCH_VERSION, defaults.PYTORCH_VERSION)

10 changes: 10 additions & 0 deletions
tests/unit/test_tf_estimator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,3 +634,13 @@ def test_attach_custom_image(sagemaker_session):
 estimator = TensorFlow.attach(training_job_name='neo', sagemaker_session=sagemaker_session)
 assert estimator.image_name == training_image
 assert estimator.train_image() == training_image


@patch('sagemaker.tensorflow.estimator.empty_framework_version_warning')
def test_empty_framework_version(warning, sagemaker_session):
 estimator = TensorFlow(entry_point=SCRIPT_PATH, role=ROLE, sagemaker_session=sagemaker_session,
 train_instance_count=INSTANCE_COUNT, train_instance_type=INSTANCE_TYPE,
 framework_version=None)

 assert estimator.framework_version == defaults.TF_VERSION
 warning.assert_called_with(defaults.TF_VERSION, defaults.TF_VERSION)