Skip to content

breaking: rename numpy_to_record_serializer to RecordSerializer #1690

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 6 commits into from
Jul 9, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
40 changes: 22 additions & 18 deletions src/sagemaker/amazon/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,35 @@

from sagemaker.amazon.record_pb2 import Record
from sagemaker.deserializers import BaseDeserializer
from sagemaker.serializers import BaseSerializer
from sagemaker.utils import DeferredError


class numpy_to_record_serializer(object):
"""Placeholder docstring"""
class RecordSerializer(BaseSerializer):
"""Serialize array-like data for an inference request."""
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: might want to be more specific that this is for numpy arrays


def __init__(self, content_type="application/x-recordio-protobuf"):
"""
Args:
content_type:
"""
self.content_type = content_type
CONTENT_TYPE = "application/x-recordio-protobuf"

def serialize(self, data):
"""Serialize array-like data into a buffer containing RecordIO records.
Copy link
Contributor

Choose a reason for hiding this comment

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

same here


def __call__(self, array):
"""
Args:
array:
data (numpy.ndarray): The data to serialize.

Returns:
_io.BytesIO: A buffer containing the data serialized as records.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
_io.BytesIO: A buffer containing the data serialized as records.
io.BytesIO: A buffer containing the data serialized as records.

"""
if len(array.shape) == 1:
array = array.reshape(1, array.shape[0])
assert len(array.shape) == 2, "Expecting a 1 or 2 dimensional array"
buf = io.BytesIO()
write_numpy_to_dense_tensor(buf, array)
buf.seek(0)
return buf
if len(data.shape) == 1:
data = data.reshape(1, data.shape[0])

if len(data.shape) != 2:
raise ValueError("Expected a one or two dimensional array.")

buffer = io.BytesIO()
write_numpy_to_dense_tensor(buffer, data)
buffer.seek(0)

return buffer


class RecordDeserializer(BaseDeserializer):
Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/factorization_machines.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.common import RecordSerializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import gt, isin, ge
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -289,7 +289,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
super(FactorizationMachinesPredictor, self).__init__(
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
serializer=RecordSerializer(),
deserializer=RecordDeserializer(),
)

Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/kmeans.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.common import RecordSerializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import gt, isin, ge, le
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -222,7 +222,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
super(KMeansPredictor, self).__init__(
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
serializer=RecordSerializer(),
deserializer=RecordDeserializer(),
)

Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/knn.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.common import RecordSerializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import ge, isin
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -210,7 +210,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
super(KNNPredictor, self).__init__(
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
serializer=RecordSerializer(),
deserializer=RecordDeserializer(),
)

Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/lda.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.common import RecordSerializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import gt
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -194,7 +194,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
super(LDAPredictor, self).__init__(
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
serializer=RecordSerializer(),
deserializer=RecordDeserializer(),
)

Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/linear_learner.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.common import RecordSerializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import isin, gt, lt, ge, le
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -453,7 +453,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
super(LinearLearnerPredictor, self).__init__(
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
serializer=RecordSerializer(),
deserializer=RecordDeserializer(),
)

Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/ntm.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.common import RecordSerializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import ge, le, isin
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -224,7 +224,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
super(NTMPredictor, self).__init__(
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
serializer=RecordSerializer(),
deserializer=RecordDeserializer(),
)

Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/pca.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.common import RecordSerializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import gt, isin
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -206,7 +206,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
super(PCAPredictor, self).__init__(
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
serializer=RecordSerializer(),
deserializer=RecordDeserializer(),
)

Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/randomcutforest.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.common import RecordSerializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import ge, le
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -183,7 +183,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
super(RandomCutForestPredictor, self).__init__(
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
serializer=RecordSerializer(),
deserializer=RecordDeserializer(),
)

Expand Down
14 changes: 7 additions & 7 deletions tests/unit/test_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,26 @@
RecordDeserializer,
write_numpy_to_dense_tensor,
read_recordio,
numpy_to_record_serializer,
RecordSerializer,
write_spmatrix_to_sparse_tensor,
)
from sagemaker.amazon.record_pb2 import Record


def test_serializer():
s = numpy_to_record_serializer()
s = RecordSerializer()
array_data = [[1.0, 2.0, 3.0], [10.0, 20.0, 30.0]]
buf = s(np.array(array_data))
buf = s.serialize(np.array(array_data))
for record_data, expected in zip(read_recordio(buf), array_data):
record = Record()
record.ParseFromString(record_data)
assert record.features["values"].float64_tensor.values == expected


def test_serializer_accepts_one_dimensional_array():
s = numpy_to_record_serializer()
s = RecordSerializer()
array_data = [1.0, 2.0, 3.0]
buf = s(np.array(array_data))
buf = s.serialize(np.array(array_data))
record_data = next(read_recordio(buf))
record = Record()
record.ParseFromString(record_data)
Expand All @@ -49,8 +49,8 @@ def test_serializer_accepts_one_dimensional_array():

def test_deserializer():
array_data = [[1.0, 2.0, 3.0], [10.0, 20.0, 30.0]]
s = numpy_to_record_serializer()
buf = s(np.array(array_data))
s = RecordSerializer()
buf = s.serialize(np.array(array_data))
d = RecordDeserializer()
for record, expected in zip(d.deserialize(buf, "who cares"), array_data):
assert record.features["values"].float64_tensor.values == expected
Expand Down