From a5961a7008cacf0980da34e6470569f517bf7104 Mon Sep 17 00:00:00 2001 From: Umut Date: Thu, 28 Apr 2022 08:24:01 +0200 Subject: [PATCH] refactor: rename compilation configuration to configuration --- concrete/numpy/__init__.py | 2 +- concrete/numpy/compilation/__init__.py | 2 +- concrete/numpy/compilation/circuit.py | 8 ++++---- concrete/numpy/compilation/compiler.py | 8 ++++---- concrete/numpy/compilation/configuration.py | 6 +++--- concrete/numpy/compilation/decorator.py | 6 +++--- tests/compilation/test_configuration.py | 8 ++++---- tests/conftest.py | 6 +++--- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/concrete/numpy/__init__.py b/concrete/numpy/__init__.py index eaf72b147..6a6ed5682 100644 --- a/concrete/numpy/__init__.py +++ b/concrete/numpy/__init__.py @@ -5,7 +5,7 @@ Export everything that users might need. from .compilation import ( Circuit, CompilationArtifacts, - CompilationConfiguration, + Configuration, Compiler, EncryptionStatus, compiler, diff --git a/concrete/numpy/compilation/__init__.py b/concrete/numpy/compilation/__init__.py index b01e3bc31..7bc6b6b99 100644 --- a/concrete/numpy/compilation/__init__.py +++ b/concrete/numpy/compilation/__init__.py @@ -5,5 +5,5 @@ Glue the compilation process together. from .artifacts import CompilationArtifacts from .circuit import Circuit from .compiler import Compiler, EncryptionStatus -from .configuration import CompilationConfiguration +from .configuration import Configuration from .decorator import compiler diff --git a/concrete/numpy/compilation/circuit.py b/concrete/numpy/compilation/circuit.py index 91fa46afe..76538e385 100644 --- a/concrete/numpy/compilation/circuit.py +++ b/concrete/numpy/compilation/circuit.py @@ -23,7 +23,7 @@ from ..dtypes import Integer from ..internal.utils import assert_that from ..representation import Graph from ..values import Value -from .configuration import CompilationConfiguration +from .configuration import Configuration class Circuit: @@ -49,10 +49,10 @@ class Circuit: self, graph: Graph, mlir: str, - configuration: Optional[CompilationConfiguration] = None, + configuration: Optional[Configuration] = None, virtual: bool = False, ): - configuration = configuration if configuration is not None else CompilationConfiguration() + configuration = configuration if configuration is not None else Configuration() self.graph = graph self.mlir = mlir @@ -75,7 +75,7 @@ class Circuit: self._keyset_cache = None if configuration.use_insecure_key_cache: assert_that(configuration.enable_unsafe_features) - location = CompilationConfiguration.insecure_key_cache_location() + location = Configuration.insecure_key_cache_location() if location is not None: self._keyset_cache = KeySetCache.new(str(location)) self._keyset = None diff --git a/concrete/numpy/compilation/compiler.py b/concrete/numpy/compilation/compiler.py index 6871f5176..e86740b5c 100644 --- a/concrete/numpy/compilation/compiler.py +++ b/concrete/numpy/compilation/compiler.py @@ -16,7 +16,7 @@ from ..tracing import Tracer from ..values import Value from .artifacts import CompilationArtifacts from .circuit import Circuit -from .configuration import CompilationConfiguration +from .configuration import Configuration from .utils import fuse @@ -38,7 +38,7 @@ class Compiler: function: Callable parameter_encryption_statuses: Dict[str, EncryptionStatus] - configuration: CompilationConfiguration + configuration: Configuration artifacts: CompilationArtifacts inputset: List[Any] @@ -48,7 +48,7 @@ class Compiler: self, function: Callable, parameter_encryption_statuses: Dict[str, Union[str, EncryptionStatus]], - configuration: Optional[CompilationConfiguration] = None, + configuration: Optional[Configuration] = None, artifacts: Optional[CompilationArtifacts] = None, ): signature = inspect.signature(function) @@ -83,7 +83,7 @@ class Compiler: } self.configuration = ( - configuration if configuration is not None else CompilationConfiguration() + configuration if configuration is not None else Configuration() ) self.artifacts = artifacts if artifacts is not None else CompilationArtifacts() diff --git a/concrete/numpy/compilation/configuration.py b/concrete/numpy/compilation/configuration.py index 3de01d559..355d2f622 100644 --- a/concrete/numpy/compilation/configuration.py +++ b/concrete/numpy/compilation/configuration.py @@ -1,5 +1,5 @@ """ -Declaration of `CompilationConfiguration` class. +Declaration of `Configuration` class. """ from typing import Optional @@ -7,9 +7,9 @@ from typing import Optional _INSECURE_KEY_CACHE_LOCATION: Optional[str] = None -class CompilationConfiguration: +class Configuration: """ - CompilationConfiguration class, to allow the compilation process to be customized. + Configuration class, to allow the compilation process to be customized. """ dump_artifacts_on_unexpected_failures: bool diff --git a/concrete/numpy/compilation/decorator.py b/concrete/numpy/compilation/decorator.py index da201d0b6..6cf3fa0d7 100644 --- a/concrete/numpy/compilation/decorator.py +++ b/concrete/numpy/compilation/decorator.py @@ -8,12 +8,12 @@ from ..representation import Graph from .artifacts import CompilationArtifacts from .circuit import Circuit from .compiler import Compiler, EncryptionStatus -from .configuration import CompilationConfiguration +from .configuration import Configuration def compiler( parameters: Mapping[str, EncryptionStatus], - configuration: Optional[CompilationConfiguration] = None, + configuration: Optional[Configuration] = None, artifacts: Optional[CompilationArtifacts] = None, ): """ @@ -23,7 +23,7 @@ def compiler( parameters (Dict[str, EncryptionStatus]): encryption statuses of the parameters of the function to compile - configuration(Optional[CompilationConfiguration], default = None): + configuration(Optional[Configuration], default = None): configuration to use for compilation artifacts (Optional[CompilationArtifacts], default = None): diff --git a/tests/compilation/test_configuration.py b/tests/compilation/test_configuration.py index c04bbde78..d628057f4 100644 --- a/tests/compilation/test_configuration.py +++ b/tests/compilation/test_configuration.py @@ -1,10 +1,10 @@ """ -Tests of `CompilationConfiguration` class. +Tests of `Configuration` class. """ import pytest -from concrete.numpy.compilation import CompilationConfiguration +from concrete.numpy.compilation import Configuration @pytest.mark.parametrize( @@ -19,10 +19,10 @@ from concrete.numpy.compilation import CompilationConfiguration ) def test_configuration_bad_init(kwargs, expected_error, expected_message): """ - Test `__init__` method of `CompilationConfiguration` class with bad parameters. + Test `__init__` method of `Configuration` class with bad parameters. """ with pytest.raises(expected_error) as excinfo: - CompilationConfiguration(**kwargs) + Configuration(**kwargs) assert str(excinfo.value) == expected_message diff --git a/tests/conftest.py b/tests/conftest.py index 68b9153b5..42c1bd8da 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -91,16 +91,16 @@ class Helpers: """ @staticmethod - def configuration() -> cnp.CompilationConfiguration: + def configuration() -> cnp.Configuration: """ Get the test configuration to use during testing. Returns: - cnp.CompilationConfiguration: + cnp.Configuration: test configuration """ - return cnp.CompilationConfiguration( + return cnp.Configuration( dump_artifacts_on_unexpected_failures=False, enable_unsafe_features=True, use_insecure_key_cache=True,