Skip to content

Commit 2829cd1

Browse files
committed
Use script mode in 1.13 and older
1 parent 86bc674 commit 2829cd1

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

src/sagemaker/tensorflow/estimator.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -323,12 +323,12 @@ def _validate_args(
323323
)
324324
)
325325

326-
if (not self._script_mode_enabled()) and \
327-
[int(s) for s in self.framework_version.split('.')] >= self._LOWEST_SCRIPT_MODE_ONLY_VERSION:
328-
raise AttributeError(
329-
'Legacy mode is deprecated in versions 1.13 and higher.'
330-
'Please set the script_mode argument to True to use Script Mode'
331-
)
326+
if (not self._script_mode_enabled()) and self._only_script_mode_supported():
327+
logger.warning('Legacy mode is deprecated in versions 1.13 and higher. Using script mode instead.')
328+
self.script_mode = True
329+
330+
def _only_script_mode_supported(self):
331+
return [int(s) for s in self.framework_version.split('.')] >= self._LOWEST_SCRIPT_MODE_ONLY_VERSION
332332

333333
def _validate_requirements_file(self, requirements_file):
334334
if not requirements_file:

tests/unit/test_tf_estimator.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -870,11 +870,10 @@ def test_script_mode_deprecated_args(sagemaker_session):
870870
) in str(e.value)
871871

872872

873-
def test_legacy_mode_deprecation_error(sagemaker_session):
874-
with pytest.raises(AttributeError) as e:
875-
_build_tf(sagemaker_session=sagemaker_session, framework_version='1.13.1',
876-
py_version='py2', script_mode=False)
877-
assert 'Legacy mode is deprecated' in str(e.value)
873+
def test_legacy_mode_deprecated(sagemaker_session):
874+
tf = _build_tf(sagemaker_session=sagemaker_session, framework_version='1.13.1',
875+
py_version='py2', script_mode=False)
876+
assert tf._script_mode_enabled() is True
878877

879878

880879
def test_script_mode_enabled(sagemaker_session):

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ passenv =
5858
commands =
5959
coverage run --source sagemaker -m pytest {posargs}
6060
{env:IGNORE_COVERAGE:} coverage report --fail-under=90 --omit */tensorflow/tensorflow_serving/*
61-
deps = .[test]
61+
extras = test
6262

6363
[testenv:flake8]
6464
basepython = python3

0 commit comments

Comments
 (0)