From dc086a795b5a235d103f52d1649bb720d1ed7e45 Mon Sep 17 00:00:00 2001 From: Umut Date: Mon, 6 Mar 2023 10:00:07 +0100 Subject: [PATCH] refactor: rename unserialize to deserialize in Python bindings --- .../lib/Bindings/Python/CompilerAPIModule.cpp | 8 ++++---- .../Python/concrete/compiler/client_parameters.py | 6 +++--- .../Python/concrete/compiler/evaluation_keys.py | 6 +++--- .../Python/concrete/compiler/public_arguments.py | 6 +++--- .../Python/concrete/compiler/public_result.py | 6 +++--- .../compiler/tests/python/test_client_server.py | 12 ++++++------ 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/compilers/concrete-compiler/compiler/lib/Bindings/Python/CompilerAPIModule.cpp b/compilers/concrete-compiler/compiler/lib/Bindings/Python/CompilerAPIModule.cpp index ea9d3c675..69312be9f 100644 --- a/compilers/concrete-compiler/compiler/lib/Bindings/Python/CompilerAPIModule.cpp +++ b/compilers/concrete-compiler/compiler/lib/Bindings/Python/CompilerAPIModule.cpp @@ -227,7 +227,7 @@ void mlir::concretelang::python::populateCompilerAPISubmodule( .def(pybind11::init()); pybind11::class_(m, "ClientParameters") - .def_static("unserialize", + .def_static("deserialize", [](const pybind11::bytes &buffer) { return clientParametersUnserialize(buffer); }) @@ -269,7 +269,7 @@ void mlir::concretelang::python::populateCompilerAPISubmodule( pybind11::class_>( m, "PublicArguments") - .def_static("unserialize", + .def_static("deserialize", [](mlir::concretelang::ClientParameters &clientParameters, const pybind11::bytes &buffer) { return publicArgumentsUnserialize(clientParameters, buffer); @@ -278,7 +278,7 @@ void mlir::concretelang::python::populateCompilerAPISubmodule( return pybind11::bytes(publicArgumentsSerialize(publicArgument)); }); pybind11::class_(m, "PublicResult") - .def_static("unserialize", + .def_static("deserialize", [](mlir::concretelang::ClientParameters &clientParameters, const pybind11::bytes &buffer) { return publicResultUnserialize(clientParameters, buffer); @@ -288,7 +288,7 @@ void mlir::concretelang::python::populateCompilerAPISubmodule( }); pybind11::class_(m, "EvaluationKeys") - .def_static("unserialize", + .def_static("deserialize", [](const pybind11::bytes &buffer) { return evaluationKeysUnserialize(buffer); }) diff --git a/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/client_parameters.py b/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/client_parameters.py index afff47f0d..0d77921d9 100644 --- a/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/client_parameters.py +++ b/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/client_parameters.py @@ -62,7 +62,7 @@ class ClientParameters(WrapperCpp): return self.cpp().serialize() @staticmethod - def unserialize(serialized_params: bytes) -> "ClientParameters": + def deserialize(serialized_params: bytes) -> "ClientParameters": """Unserialize ClientParameters from bytes of serialized_params. Args: @@ -72,10 +72,10 @@ class ClientParameters(WrapperCpp): TypeError: if serialized_params is not of type bytes Returns: - ClientParameters: unserialized object + ClientParameters: deserialized object """ if not isinstance(serialized_params, bytes): raise TypeError( f"serialized_params must be of type bytes, not {type(serialized_params)}" ) - return ClientParameters.wrap(_ClientParameters.unserialize(serialized_params)) + return ClientParameters.wrap(_ClientParameters.deserialize(serialized_params)) diff --git a/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/evaluation_keys.py b/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/evaluation_keys.py index 00220ad04..0b4bf366e 100644 --- a/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/evaluation_keys.py +++ b/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/evaluation_keys.py @@ -41,7 +41,7 @@ class EvaluationKeys(WrapperCpp): return self.cpp().serialize() @staticmethod - def unserialize(serialized_evaluation_keys: bytes) -> "EvaluationKeys": + def deserialize(serialized_evaluation_keys: bytes) -> "EvaluationKeys": """Unserialize EvaluationKeys from bytes. Args: @@ -51,7 +51,7 @@ class EvaluationKeys(WrapperCpp): TypeError: if serialized_evaluation_keys is not of type bytes Returns: - EvaluationKeys: unserialized object + EvaluationKeys: deserialized object """ if not isinstance(serialized_evaluation_keys, bytes): raise TypeError( @@ -59,5 +59,5 @@ class EvaluationKeys(WrapperCpp): f"not {type(serialized_evaluation_keys)}" ) return EvaluationKeys.wrap( - _EvaluationKeys.unserialize(serialized_evaluation_keys) + _EvaluationKeys.deserialize(serialized_evaluation_keys) ) diff --git a/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/public_arguments.py b/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/public_arguments.py index 8fcca1dfa..acbbf59a3 100644 --- a/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/public_arguments.py +++ b/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/public_arguments.py @@ -44,7 +44,7 @@ class PublicArguments(WrapperCpp): return self.cpp().serialize() @staticmethod - def unserialize( + def deserialize( client_parameters: ClientParameters, serialized_args: bytes ) -> "PublicArguments": """Unserialize PublicArguments from bytes of serialized_args. @@ -58,7 +58,7 @@ class PublicArguments(WrapperCpp): TypeError: if serialized_args is not of type bytes Returns: - PublicArguments: unserialized object + PublicArguments: deserialized object """ if not isinstance(client_parameters, ClientParameters): raise TypeError( @@ -69,5 +69,5 @@ class PublicArguments(WrapperCpp): f"serialized_args must be of type bytes, not {type(serialized_args)}" ) return PublicArguments.wrap( - _PublicArguments.unserialize(client_parameters.cpp(), serialized_args) + _PublicArguments.deserialize(client_parameters.cpp(), serialized_args) ) diff --git a/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/public_result.py b/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/public_result.py index 2c4df5980..33d15c27e 100644 --- a/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/public_result.py +++ b/compilers/concrete-compiler/compiler/lib/Bindings/Python/concrete/compiler/public_result.py @@ -40,7 +40,7 @@ class PublicResult(WrapperCpp): return self.cpp().serialize() @staticmethod - def unserialize( + def deserialize( client_parameters: ClientParameters, serialized_result: bytes ) -> "PublicResult": """Unserialize PublicResult from bytes of serialized_result. @@ -54,7 +54,7 @@ class PublicResult(WrapperCpp): TypeError: if serialized_result is not of type bytes Returns: - PublicResult: unserialized object + PublicResult: deserialized object """ if not isinstance(client_parameters, ClientParameters): raise TypeError( @@ -65,5 +65,5 @@ class PublicResult(WrapperCpp): f"serialized_result must be of type bytes, not {type(serialized_result)}" ) return PublicResult.wrap( - _PublicResult.unserialize(client_parameters.cpp(), serialized_result) + _PublicResult.deserialize(client_parameters.cpp(), serialized_result) ) diff --git a/compilers/concrete-compiler/compiler/tests/python/test_client_server.py b/compilers/concrete-compiler/compiler/tests/python/test_client_server.py index 377edf4d5..1546aa617 100644 --- a/compilers/concrete-compiler/compiler/tests/python/test_client_server.py +++ b/compilers/concrete-compiler/compiler/tests/python/test_client_server.py @@ -88,27 +88,27 @@ def test_client_server_end_to_end(mlir, args, expected_result, keyset_cache): evaluation_keys = keyset.get_evaluation_keys() evaluation_keys_serialized = evaluation_keys.serialize() - evaluation_keys_unserialized = EvaluationKeys.unserialize( + evaluation_keys_deserialized = EvaluationKeys.deserialize( evaluation_keys_serialized ) args = ClientSupport.encrypt_arguments(client_parameters, keyset, args) args_serialized = args.serialize() - args_unserialized = PublicArguments.unserialize( + args_deserialized = PublicArguments.deserialize( client_parameters, args_serialized ) result = support.server_call( server_lambda, - args_unserialized, - evaluation_keys_unserialized, + args_deserialized, + evaluation_keys_deserialized, ) result_serialized = result.serialize() - result_unserialized = PublicResult.unserialize( + result_deserialized = PublicResult.deserialize( client_parameters, result_serialized ) output = ClientSupport.decrypt_result( - client_parameters, keyset, result_unserialized + client_parameters, keyset, result_deserialized ) assert np.array_equal(output, expected_result)