chore: revert Concrete Python to 2.6.0-rc1 (#592)

zama-ai · Apr 5, 2024 · 8d1d98a · 8d1d98a
1 parent 4db0157
commit 8d1d98a
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ OPEN_PR="true"
 # Force the installation of a Concrete Python version, which is very useful with nightly versions
 # /!\ WARNING /!\: This version should NEVER be a wildcard as it might create some
 # issues when trying to run it in the future.
-CONCRETE_PYTHON_VERSION="concrete-python==2.6.0"
+CONCRETE_PYTHON_VERSION="concrete-python==2.6.0-rc1"
 
 # Force the installation of Concrete Python's latest version, release-candidates included
 # CONCRETE_PYTHON_VERSION="$$(poetry run python \

diff --git 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.3.2, MIT License
 click, 8.1.7, BSD License
 coloredlogs, 15.0.1, MIT License
-concrete-python, 2.6.0, BSD-3-Clause
+concrete-python, 2.6.0rc1, BSD-3-Clause
 dependencies, 2.0.1, BSD License
 dill, 0.3.8, BSD License
 exceptiongroup, 1.2.0, MIT License

diff --git a/deps_licenses/licenses_linux_user.txt.md5 b/deps_licenses/licenses_linux_user.txt.md5
@@ -1 +1 @@
-905620023a2816ce93dd58b1bbf71e76
+c2b00111ef9bd7ef1c778701ab0dfe4e
diff --git a/deps_licenses/licenses_mac_intel_user.txt b/deps_licenses/licenses_mac_intel_user.txt
@@ -9,7 +9,7 @@ certifi, 2023.7.22, Mozilla Public License 2.0 (MPL 2.0)
 charset-normalizer, 3.3.2, MIT License
 click, 8.1.7, BSD License
 coloredlogs, 15.0.1, MIT License
-concrete-python, 2.6.0, BSD-3-Clause
+concrete-python, 2.6.0rc1, BSD-3-Clause
 dependencies, 2.0.1, BSD License
 dill, 0.3.8, BSD License
 exceptiongroup, 1.2.0, MIT License

diff --git a/deps_licenses/licenses_mac_intel_user.txt.md5 b/deps_licenses/licenses_mac_intel_user.txt.md5
@@ -1 +1 @@
-905620023a2816ce93dd58b1bbf71e76
+c2b00111ef9bd7ef1c778701ab0dfe4e
diff --git a/deps_licenses/licenses_mac_silicon_user.txt b/deps_licenses/licenses_mac_silicon_user.txt
@@ -9,7 +9,7 @@ certifi, 2023.7.22, Mozilla Public License 2.0 (MPL 2.0)
 charset-normalizer, 3.3.2, MIT License
 click, 8.1.7, BSD License
 coloredlogs, 15.0.1, MIT License
-concrete-python, 2.6.0, BSD-3-Clause
+concrete-python, 2.6.0rc1, BSD-3-Clause
 dependencies, 2.0.1, BSD License
 dill, 0.3.8, BSD License
 exceptiongroup, 1.2.0, MIT License

diff --git a/deps_licenses/licenses_mac_silicon_user.txt.md5 b/deps_licenses/licenses_mac_silicon_user.txt.md5
@@ -1 +1 @@
-905620023a2816ce93dd58b1bbf71e76
+c2b00111ef9bd7ef1c778701ab0dfe4e
diff --git a/docs/references/api/concrete.ml.quantization.quantized_module.md b/docs/references/api/concrete.ml.quantization.quantized_module.md
@@ -72,7 +72,7 @@ ______________________________________________________________________
 ### <kbd>method</kbd> `bitwidth_and_range_report`
 
 ```python
-bitwidth_and_range_report() → Union[Dict[str, Dict[str, Union[Tuple[int, ], int]]], NoneType]
+bitwidth_and_range_report() → Optional[Dict[str, Dict[str, Union[Tuple[int, ], int]]]]
 ```
 
 Report the ranges and bit-widths for layers that mix encrypted integer values.

diff --git a/docs/references/api/concrete.ml.quantization.quantized_module_passes.md b/docs/references/api/concrete.ml.quantization.quantized_module_passes.md
@@ -41,7 +41,7 @@ ______________________________________________________________________
 ### <kbd>method</kbd> `compute_op_predecessors`
 
 ```python
-compute_op_predecessors() → DefaultDict[Union[QuantizedOp, NoneType], List[Tuple[Union[QuantizedOp, NoneType], str]]]
+compute_op_predecessors() → DefaultDict[Optional[QuantizedOp], List[Tuple[Optional[QuantizedOp], str]]]
 ```
 
 Compute the predecessors for each QuantizedOp in a QuantizedModule.
@@ -61,7 +61,7 @@ ______________________________________________________________________
 ```python
 detect_patterns(
     predecessors: DefaultDict[Optional[QuantizedOp], List[Tuple[Optional[QuantizedOp], str]]]
-) → Dict[QuantizedMixingOp, Tuple[List[Union[QuantizedOp, NoneType]], Union[QuantizedOp, NoneType]]]
+) → Dict[QuantizedMixingOp, Tuple[List[Optional[QuantizedOp]], Optional[QuantizedOp]]]
 ```
 
 Detect the patterns that can be optimized with roundPBS in the QuantizedModule.
@@ -107,7 +107,7 @@ ______________________________________________________________________
 ### <kbd>method</kbd> `process`
 
 ```python
-process() → Dict[QuantizedMixingOp, Tuple[List[Union[QuantizedOp, NoneType]], Union[QuantizedOp, NoneType]]]
+process() → Dict[QuantizedMixingOp, Tuple[List[Optional[QuantizedOp]], Optional[QuantizedOp]]]
 ```
 
 Analyze an ONNX graph and detect Gemm/Conv patterns that can use RoundPBS.
@@ -129,7 +129,7 @@ ______________________________________________________________________
 ```python
 process_patterns(
     valid_paths: Dict[QuantizedMixingOp, Tuple[List[Optional[QuantizedOp]], Optional[QuantizedOp]]]
-) → Dict[QuantizedMixingOp, Tuple[List[Union[QuantizedOp, NoneType]], Union[QuantizedOp, NoneType]]]
+) → Dict[QuantizedMixingOp, Tuple[List[Optional[QuantizedOp]], Optional[QuantizedOp]]]
 ```
 
 Configure the rounding bits of roundPBS for the optimizable operations.

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -34,7 +34,7 @@ readme = "README.md"
 # Investigate if it is better to fix specific versions or use lower and upper bounds  
 # FIXME: https://github.com/zama-ai/concrete-ml-internal/issues/2665
 python = ">=3.8.1,<3.11"
-concrete-python = "2.6.0"
+concrete-python = "2.6.0-rc1"
 setuptools = "65.6.3"
 skops = {version = "0.5.0"}
 xgboost = "1.6.2"

diff --git a/src/concrete/ml/pandas/_client_server_files/client.zip b/src/concrete/ml/pandas/_client_server_files/client.zip
diff --git a/src/concrete/ml/pandas/_client_server_files/server.zip b/src/concrete/ml/pandas/_client_server_files/server.zip
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		905620023a2816ce93dd58b1bbf71e76
		c2b00111ef9bd7ef1c778701ab0dfe4e