diff --git a/Makefile b/Makefile index cf441033fb..7ac1a8fad5 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ OPEN_PR="true" # If one wants to force the installation of a given rc version # /!\ WARNING /!\: This version should NEVER be a wildcard as it might create some # issues when trying to run it in the future. -CP_VERSION_SPEC_FOR_RC="concrete-python==2.4.0" +CP_VERSION_SPEC_FOR_RC="concrete-python==2.5.0rc1" # If one wants to use the last RC version # CP_VERSION_SPEC_FOR_RC="$$(poetry run python \ diff --git a/deps_licenses/licenses_linux_user.txt b/deps_licenses/licenses_linux_user.txt index 94dddb0ce9..ae2ac541c5 100644 --- a/deps_licenses/licenses_linux_user.txt +++ b/deps_licenses/licenses_linux_user.txt @@ -9,7 +9,7 @@ certifi, 2023.7.22, Mozilla Public License 2.0 (MPL 2.0) charset-normalizer, 3.2.0, MIT License click, 8.1.7, BSD License coloredlogs, 15.0.1, MIT License -concrete-python, 2.4.0, BSD-3-Clause +concrete-python, 2.5.0rc1, BSD-3-Clause dependencies, 2.0.1, BSD License dill, 0.3.7, BSD License exceptiongroup, 1.1.3, MIT License diff --git a/deps_licenses/licenses_linux_user.txt.md5 b/deps_licenses/licenses_linux_user.txt.md5 index f0ff1e35ea..98e17f95b3 100644 --- a/deps_licenses/licenses_linux_user.txt.md5 +++ b/deps_licenses/licenses_linux_user.txt.md5 @@ -1 +1 @@ -5ea389d8b97dc534603abf9b77ff8a40 +23c5d6fb1d7ce0d5200ecf9fb6d4aeb0 diff --git a/src/concrete/ml/common/utils.py b/src/concrete/ml/common/utils.py index 77230f15df..47de281f98 100644 --- a/src/concrete/ml/common/utils.py +++ b/src/concrete/ml/common/utils.py @@ -37,7 +37,7 @@ # Use new VL with .simulate() by default once CP's multi-parameter/precision bug is fixed # TODO: https://github.com/zama-ai/concrete-ml-internal/issues/3856 # Indicate if the old simulation method should be used when simulating FHE executions -USE_OLD_VL = True +USE_OLD_VL = False # Debug option for testing round PBS optimization # Setting this option to true will make quantizers "round half up" diff --git a/src/concrete/ml/quantization/quantized_module.py b/src/concrete/ml/quantization/quantized_module.py index 7f87b597de..1ebc552b4d 100644 --- a/src/concrete/ml/quantization/quantized_module.py +++ b/src/concrete/ml/quantization/quantized_module.py @@ -207,7 +207,7 @@ def check_model_is_compiled(self): raise AttributeError( "The quantized module is not compiled. Please run compile(...) first before " "executing it in FHE." - ) + ) # pragma: no cover @property def post_processing_params(self) -> Dict[str, Any]: @@ -696,7 +696,7 @@ def compile( if not USE_OLD_VL: self.fhe_circuit.enable_fhe_simulation() # pragma: no cover - self._is_compiled = True + self._is_compiled = True # pragma: no cover return self.fhe_circuit diff --git a/src/concrete/ml/sklearn/base.py b/src/concrete/ml/sklearn/base.py index 4d7ae7251a..467af490be 100644 --- a/src/concrete/ml/sklearn/base.py +++ b/src/concrete/ml/sklearn/base.py @@ -640,7 +640,8 @@ def predict(self, X: Data, fhe: Union[FheMode, str] = FheMode.DISABLE) -> numpy. # If the old simulation method should be used if USE_OLD_VL: predict_method = partial( - self.fhe_circuit.graph, p_error=self.fhe_circuit.p_error + self.fhe_circuit.graph, + p_error=self.fhe_circuit.p_error, # pragma: no cover ) # Else, use the official simulation method