Skip to content

breaking: deprecate is_version_equal_or_higher and is_version_equal_or_lower #1789

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.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 0 additions & 34 deletions src/sagemaker/fw_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,40 +49,6 @@
SINGLE_GPU_INSTANCE_TYPES = ("ml.p2.xlarge", "ml.p3.2xlarge")


def is_version_equal_or_higher(lowest_version, framework_version):
"""Determine whether the ``framework_version`` is equal to or higher than
``lowest_version``

Args:
lowest_version (List[int]): lowest version represented in an integer
list
framework_version (str): framework version string

Returns:
bool: Whether or not ``framework_version`` is equal to or higher than
``lowest_version``
"""
version_list = [int(s) for s in framework_version.split(".")]
return version_list >= lowest_version[0 : len(version_list)]


def is_version_equal_or_lower(highest_version, framework_version):
"""Determine whether the ``framework_version`` is equal to or lower than
``highest_version``

Args:
highest_version (List[int]): highest version represented in an integer
list
framework_version (str): framework version string

Returns:
bool: Whether or not ``framework_version`` is equal to or lower than
``highest_version``
"""
version_list = [int(s) for s in framework_version.split(".")]
return version_list <= highest_version[0 : len(version_list)]


def validate_source_dir(script, directory):
"""Validate that the source directory exists and it contains the user script
Args:
Expand Down
7 changes: 3 additions & 4 deletions src/sagemaker/mxnet/estimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@

import logging

from packaging.version import Version

from sagemaker.estimator import Framework
from sagemaker.fw_utils import (
framework_name_from_image,
framework_version_from_tag,
is_version_equal_or_higher,
python_deprecation_warning,
validate_version_or_image_args,
warn_if_parameter_server_with_multi_gpu,
Expand Down Expand Up @@ -157,9 +158,7 @@ def __init__(

if "enable_sagemaker_metrics" not in kwargs:
# enable sagemaker metrics for MXNet v1.6 or greater:
if self.framework_version and is_version_equal_or_higher(
[1, 6], self.framework_version
):
if self.framework_version and Version(self.framework_version) >= Version("1.6"):
kwargs["enable_sagemaker_metrics"] = True

super(MXNet, self).__init__(
Expand Down
7 changes: 3 additions & 4 deletions src/sagemaker/pytorch/estimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@

import logging

from packaging.version import Version

from sagemaker.estimator import Framework
from sagemaker.fw_utils import (
framework_name_from_image,
framework_version_from_tag,
is_version_equal_or_higher,
python_deprecation_warning,
validate_version_or_image_args,
)
Expand Down Expand Up @@ -116,9 +117,7 @@ def __init__(

if "enable_sagemaker_metrics" not in kwargs:
# enable sagemaker metrics for PT v1.3 or greater:
if self.framework_version and is_version_equal_or_higher(
[1, 3], self.framework_version
):
if self.framework_version and Version(self.framework_version) >= Version("1.3"):
kwargs["enable_sagemaker_metrics"] = True

super(PyTorch, self).__init__(
Expand Down
2 changes: 1 addition & 1 deletion src/sagemaker/tensorflow/estimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def __init__(

if "enable_sagemaker_metrics" not in kwargs:
# enable sagemaker metrics for TF v1.15 or greater:
if framework_version and fw.is_version_equal_or_higher([1, 15], framework_version):
if framework_version and version.Version(framework_version) >= version.Version("1.15"):
kwargs["enable_sagemaker_metrics"] = True

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