From d9b7110336ae66184a82a489576c558762e67641 Mon Sep 17 00:00:00 2001 From: Luis Montero Date: Wed, 27 Dec 2023 09:50:40 +0100 Subject: [PATCH] chore: update concrete-python to 2.5.0-rc2 --- Makefile | 2 +- deps_licenses/licenses_mac_silicon_user.txt | 6 +- .../licenses_mac_silicon_user.txt.md5 | 2 +- poetry.lock | 80 +++++++++++++++++-- pyproject.toml | 3 +- 5 files changed, 81 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index ec377f1f8c..2eb41b33d6 100644 --- 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==2023.12.5" +CONCRETE_PYTHON_VERSION="concrete-python==2.5.0-rc2" # Force the installation of Concrete Python's latest version, release-candidates included # CONCRETE_PYTHON_VERSION="$$(poetry run python \ diff --git a/deps_licenses/licenses_mac_silicon_user.txt b/deps_licenses/licenses_mac_silicon_user.txt index 702ff00ee6..cc3303b96b 100644 --- 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.2.0, MIT License click, 8.1.7, BSD License coloredlogs, 15.0.1, MIT License -concrete-python, 2023.12.5, BSD-3-Clause +concrete-python, 2.5.0rc2, BSD-3-Clause dependencies, 2.0.1, BSD License dill, 0.3.7, BSD License exceptiongroup, 1.1.3, MIT License @@ -23,6 +23,7 @@ huggingface-hub, 0.16.4, Apache Software License humanfriendly, 10.0, MIT License hummingbird-ml, 0.4.8, MIT License idna, 3.4, BSD License +importlib-resources, 6.1.1, Apache Software License iniconfig, 2.0.0, MIT License jmespath, 1.0.1, MIT License joblib, 1.3.2, BSD License @@ -68,4 +69,5 @@ typing_extensions, 4.5.0, Python Software Foundation License urllib3, 1.26.16, MIT License uvicorn, 0.21.1, BSD License xgboost, 1.6.2, Apache Software License -z3-solver, 4.12.3.0, MIT License +z3-solver, 4.12.2.0, MIT License +zipp, 3.16.2, MIT License diff --git a/deps_licenses/licenses_mac_silicon_user.txt.md5 b/deps_licenses/licenses_mac_silicon_user.txt.md5 index cf2bba7847..9063d0a06c 100644 --- a/deps_licenses/licenses_mac_silicon_user.txt.md5 +++ b/deps_licenses/licenses_mac_silicon_user.txt.md5 @@ -1 +1 @@ -b19adb1c64bd8c6e86f8374568b1cca7 +d4f577fed840e4cc3c583cf69668a69a diff --git a/poetry.lock b/poetry.lock index fb241e4ceb..6ff0ed3233 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "absl-py" @@ -796,6 +796,38 @@ lint = ["black (>=22.6.0)", "mdformat (>0.7)", "mdformat-gfm (>=0.3.5)", "ruff ( test = ["pytest"] typing = ["mypy (>=0.990)"] +[[package]] +name = "concrete-python" +version = "2.5.0rc2" +description = "A state-of-the-art homomorphic encryption framework" +optional = false +python-versions = ">=3.8" +files = [ + {file = "concrete_python-2.5.0rc2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8c8605633ecd43ad8b749ff85074227f2345f9d46c752fcb8972cd32ab84702e"}, + {file = "concrete_python-2.5.0rc2-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:6a1c8a9bfc71dc9b72709003255ec8d437fa9912d36414a552dfd4f5008095d3"}, + {file = "concrete_python-2.5.0rc2-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:1cd681db71afecc3f3592fb20ec87d84c3ad4b95e12f7db8a28856960eede185"}, + {file = "concrete_python-2.5.0rc2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c15c692bd58c9af1c9ed636683024adba3a6aad8224c95104fc55b24dc802ef0"}, + {file = "concrete_python-2.5.0rc2-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:d3f56ec30db9391c49d4b7288d6b1eb6f3b75bca345a485cfba95ad00dd8ecca"}, + {file = "concrete_python-2.5.0rc2-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:44eaaa7c14cfd8208daaa775e2a587caf774f4cf771c702b6a1e7778fa5b5da7"}, + {file = "concrete_python-2.5.0rc2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:d4546af6f58e0b565290f96e6efdfbbc2ae2f25649063aafe19c72ac337681c9"}, + {file = "concrete_python-2.5.0rc2-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:372fad620f0063e1bf46fb2c5c8e6dd4f1a792b38a7eab839090d911ca7bc145"}, + {file = "concrete_python-2.5.0rc2-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:6d73446e665a4d659efc95cbf06e504582e400a024ae8451c8a47df31ed91a7b"}, + {file = "concrete_python-2.5.0rc2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:41aab449f981e6eec904156633dd1cf6628fc1b62c23d6e2d59cab964320db01"}, + {file = "concrete_python-2.5.0rc2-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:25360c5b07939c9b700185fafa042d2134e7bcec1cb4baff53c7885defa51f36"}, + {file = "concrete_python-2.5.0rc2-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:cae76016f85a5dc07bc6da44650107e9874326b195e1f033cc296c278bb80306"}, +] + +[package.dependencies] +importlib-resources = ">=6.1" +networkx = ">=2.6" +numpy = ">=1.23" +scipy = ">=1.10" +torch = ">=1.13" +z3-solver = "4.12.2" + +[package.extras] +dev = ["auditwheel (==5.3.0)", "black (==23.1.0)", "delocate (==0.10.4)", "isort (==5.12.0)", "mypy (==1.1.1)", "pybind11 (==2.10.4)", "pydocstyle (==6.3.0)", "pylint (==2.17.1)", "pytest (==7.2.2)", "pytest-cov (==4.0.0)", "pytest-randomly (==3.15.0)", "pytest-xdist (==3.2.1)", "ruff (==0.0.259)", "wheel (==0.40.0)"] + [[package]] name = "contourpy" version = "1.1.0" @@ -1770,21 +1802,21 @@ testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs [[package]] name = "importlib-resources" -version = "6.0.1" +version = "6.1.1" description = "Read resources from Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "importlib_resources-6.0.1-py3-none-any.whl", hash = "sha256:134832a506243891221b88b4ae1213327eea96ceb4e407a00d790bb0626f45cf"}, - {file = "importlib_resources-6.0.1.tar.gz", hash = "sha256:4359457e42708462b9626a04657c6208ad799ceb41e5c58c57ffa0e6a098a5d4"}, + {file = "importlib_resources-6.1.1-py3-none-any.whl", hash = "sha256:e8bf90d8213b486f428c9c39714b920041cb02c184686a3dee24905aaa8105d6"}, + {file = "importlib_resources-6.1.1.tar.gz", hash = "sha256:3893a00122eafde6894c59914446a512f728a0c1a45f9bb9b63721b6bacf0b4a"}, ] [package.dependencies] zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""} [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-ruff"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-ruff", "zipp (>=3.17)"] [[package]] name = "iniconfig" @@ -3456,6 +3488,24 @@ files = [ {file = "nest_asyncio-1.5.7.tar.gz", hash = "sha256:6a80f7b98f24d9083ed24608977c09dd608d83f91cccc24c9d2cba6d10e01c10"}, ] +[[package]] +name = "networkx" +version = "3.1" +description = "Python package for creating and manipulating graphs and networks" +optional = false +python-versions = ">=3.8" +files = [ + {file = "networkx-3.1-py3-none-any.whl", hash = "sha256:4f33f68cb2afcf86f28a45f43efc27a9386b535d567d2127f8f61d51dec58d36"}, + {file = "networkx-3.1.tar.gz", hash = "sha256:de346335408f84de0eada6ff9fafafff9bcda11f0a0dfaa931133debb146ab61"}, +] + +[package.extras] +default = ["matplotlib (>=3.4)", "numpy (>=1.20)", "pandas (>=1.3)", "scipy (>=1.8)"] +developer = ["mypy (>=1.1)", "pre-commit (>=3.2)"] +doc = ["nb2plots (>=0.6)", "numpydoc (>=1.5)", "pillow (>=9.4)", "pydata-sphinx-theme (>=0.13)", "sphinx (>=6.1)", "sphinx-gallery (>=0.12)", "texext (>=0.6.7)"] +extra = ["lxml (>=4.6)", "pydot (>=1.4.2)", "pygraphviz (>=1.10)", "sympy (>=1.10)"] +test = ["codecov (>=2.1)", "pytest (>=7.2)", "pytest-cov (>=4.0)"] + [[package]] name = "notebook" version = "7.0.2" @@ -7062,6 +7112,22 @@ files = [ idna = ">=2.0" multidict = ">=4.0" +[[package]] +name = "z3-solver" +version = "4.12.2.0" +description = "an efficient SMT solver library" +optional = false +python-versions = "*" +files = [ + {file = "z3-solver-4.12.2.0.tar.gz", hash = "sha256:65ab47a0a8ef0bfb80db0670775beb11b32c3c0ae4b35943e44121f4af7ef411"}, + {file = "z3_solver-4.12.2.0-py2.py3-none-macosx_10_16_x86_64.whl", hash = "sha256:127b7c3fcadd61415320ef1b469c22464d3270d25a63c9eb5ee31a0859910826"}, + {file = "z3_solver-4.12.2.0-py2.py3-none-macosx_11_0_arm64.whl", hash = "sha256:f605de84f87cff04de8339a6d007c80167606a4e6904d6ace8208b066f22f4be"}, + {file = "z3_solver-4.12.2.0-py2.py3-none-manylinux2014_aarch64.whl", hash = "sha256:4d252abdeab222f241d273df012f96fb8e5754a60734508c85c791ac5096bdf5"}, + {file = "z3_solver-4.12.2.0-py2.py3-none-manylinux2014_x86_64.whl", hash = "sha256:03921d3021cb6e5dbeaeb94634132a5fbf5403748aa21774efac4047e633af1e"}, + {file = "z3_solver-4.12.2.0-py2.py3-none-win32.whl", hash = "sha256:ea1688e64aada67ec720e2f148c5c41fece2870c55a2901dda36f6b4bb9aec7e"}, + {file = "z3_solver-4.12.2.0-py2.py3-none-win_amd64.whl", hash = "sha256:553af6a989d8943d9a556c4f83ea54b2afc8b4fd58230e97fcc526dc3f97249a"}, +] + [[package]] name = "zipp" version = "3.16.2" @@ -7080,4 +7146,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.11" -content-hash = "049fedceff7e3e89e80a60aa9c6837c6d79cc0c613580ff5402a91146483b054" +content-hash = "f82cc0a59c398814b3d946e3c88eb0e2c534f0af30c4e5c9be79db4453c0ee5c" diff --git a/pyproject.toml b/pyproject.toml index 0515c58210..6ad8504f2c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,8 @@ 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 = "2023.11.5" +concrete-python = "2.5.0-rc2" +z3-solver = "4.12.4.0" setuptools = "65.6.3" skops = {version = "0.5.0"} xgboost = "1.6.2"