Skip to content

Commit 97e3f40

Browse files
committed
Use script mode in 1.13 and older
1 parent bc238e2 commit 97e3f40

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
@@ -278,12 +278,12 @@ def _validate_args(self, py_version, script_mode, framework_version, training_st
278278
.format(', '.join(_FRAMEWORK_MODE_ARGS), ', '.join(found_args))
279279
)
280280

281-
if (not self._script_mode_enabled()) and \
282-
[int(s) for s in self.framework_version.split('.')] >= self._LOWEST_SCRIPT_MODE_ONLY_VERSION:
283-
raise AttributeError(
284-
'Legacy mode is deprecated in versions 1.13 and higher.'
285-
'Please set the script_mode argument to True to use Script Mode'
286-
)
281+
if (not self._script_mode_enabled()) and self._only_script_mode_supported():
282+
logger.warning('Legacy mode is deprecated in versions 1.13 and higher. Using script mode instead.')
283+
self.script_mode = True
284+
285+
def _only_script_mode_supported(self):
286+
return [int(s) for s in self.framework_version.split('.')] >= self._LOWEST_SCRIPT_MODE_ONLY_VERSION
287287

288288
def _validate_requirements_file(self, requirements_file):
289289
if not requirements_file:

tests/unit/test_tf_estimator.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -738,11 +738,10 @@ def test_script_mode_deprecated_args(sagemaker_session):
738738
assert _deprecated_args_msg('training_steps, evaluation_steps, requirements_file, checkpoint_path') in str(e.value)
739739

740740

741-
def test_legacy_mode_deprecation_error(sagemaker_session):
742-
with pytest.raises(AttributeError) as e:
743-
_build_tf(sagemaker_session=sagemaker_session, framework_version='1.13.1',
744-
py_version='py2', script_mode=False)
745-
assert 'Legacy mode is deprecated' in str(e.value)
741+
def test_legacy_mode_deprecated(sagemaker_session):
742+
tf = _build_tf(sagemaker_session=sagemaker_session, framework_version='1.13.1',
743+
py_version='py2', script_mode=False)
744+
assert tf._script_mode_enabled() is True
746745

747746

748747
def test_script_mode_enabled(sagemaker_session):

tox.ini

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

6262
[testenv:flake8]
6363
basepython = python3

0 commit comments

Comments
 (0)