Skip to content
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.

Sign up for GitHub

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

chore: revert Concrete Python to 2.6.0-rc1 #592

Merged
merged 4 commits into from
Apr 5, 2024
Merged

chore: revert Concrete Python to 2.6.0-rc1 #592

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
950f6eb
chore: revert Concrete Python to 2.6.0-rc1
RomanBredehoft Apr 5, 2024
d4778c3
chore: update licenses for macos-latest-xl
RomanBredehoft Apr 5, 2024
d3c6083
chore: update licenses for ubuntu-20.04
RomanBredehoft Apr 5, 2024
d122b8e
chore: update zip files for encrypted data-frames
RomanBredehoft Apr 5, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion deps_licenses/licenses_linux_user.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps_licenses/licenses_linux_user.txt.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
905620023a2816ce93dd58b1bbf71e76
c2b00111ef9bd7ef1c778701ab0dfe4e
2 changes: 1 addition & 1 deletion deps_licenses/licenses_mac_intel_user.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps_licenses/licenses_mac_intel_user.txt.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
905620023a2816ce93dd58b1bbf71e76
c2b00111ef9bd7ef1c778701ab0dfe4e
2 changes: 1 addition & 1 deletion deps_licenses/licenses_mac_silicon_user.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deps_licenses/licenses_mac_silicon_user.txt.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
905620023a2816ce93dd58b1bbf71e76
c2b00111ef9bd7ef1c778701ab0dfe4e
2 changes: 1 addition & 1 deletion docs/references/api/concrete.ml.quantization.quantized_module.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions docs/references/api/concrete.ml.quantization.quantized_module_passes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand Down
37 changes: 19 additions & 18 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading