diff --git a/ci/aws_ami_build_component.yaml b/ci/aws_ami_build_component.yaml index d12170cfce..2969682cee 100644 --- a/ci/aws_ami_build_component.yaml +++ b/ci/aws_ami_build_component.yaml @@ -43,7 +43,7 @@ phases: - virtualenv venv --python=python3.9 - echo "source $(pwd)/venv/bin/activate" >> .bashrc - source venv/bin/activate - - python -m pip install concrete-ml==${CML_VERSION} + - python -m pip install "concrete-ml[dev]==${CML_VERSION}" - name: test steps: @@ -76,8 +76,6 @@ phases: commands: - apt install -y git-lfs - git lfs install - - source venv/bin/activate - - python -m pip install pytest==7.1.1 pandas==2.0.3 tensorflow==2.12.0 tf2onnx==1.13.0 torchvision==0.14.1 transformers==4.40.0 # We disable tests for test_deploy file because the instance does not have AWS CLI setup - name: RunTests diff --git a/deps_licenses/licenses_mac_silicon_user.txt b/deps_licenses/licenses_mac_silicon_user.txt index 66c6556898..91185e711c 100644 --- a/deps_licenses/licenses_mac_silicon_user.txt +++ b/deps_licenses/licenses_mac_silicon_user.txt @@ -48,3 +48,4 @@ tzdata, 2024.1, Apache Software License urllib3, 2.2.2, MIT License xgboost, 1.6.2, Apache Software License z3-solver, 4.13.0.0, MIT License +zipp, 3.19.2, MIT License diff --git a/deps_licenses/licenses_mac_silicon_user.txt.md5 b/deps_licenses/licenses_mac_silicon_user.txt.md5 index 4dfc9a8918..b01182f0fb 100644 --- a/deps_licenses/licenses_mac_silicon_user.txt.md5 +++ b/deps_licenses/licenses_mac_silicon_user.txt.md5 @@ -1 +1 @@ -adb925c3b7be3e651975febcf49b6543 +1cde59339dad23a5ecae8ac1192e872e diff --git a/poetry.lock b/poetry.lock index 6cf1a99bf0..9026ad3b1e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "absl-py" @@ -832,6 +832,37 @@ z3-solver = ">=4.12" dev = ["auditwheel (==5.3.0)", "black (==24.4.0)", "delocate (==0.10.4)", "isort (==5.12.0)", "matplotlib (>=3.7)", "mypy (==1.10.0)", "pillow (>=10.2)", "pybind11 (==2.10.4)", "pydocstyle (==6.3.0)", "pygraphviz (>=1.11)", "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)"] full = ["matplotlib (>=3.7)", "pillow (>=10.2)", "pygraphviz (>=1.11)"] +[[package]] +name = "concrete-python" +version = "2.7.0" +description = "A state-of-the-art homomorphic encryption framework" +optional = false +python-versions = ">=3.8" +files = [ + {file = "concrete_python-2.7.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:136042f0a5eef735cfad9a06d5d417336de2312b4ed7d7b8b6e2f12d0f12765e"}, + {file = "concrete_python-2.7.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:807a6af687680aa2b83900092ce418cefe0b95bd5e050ad29dbde6471c3bead5"}, + {file = "concrete_python-2.7.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:9a92681a4cab83f04d216ed7c0100b968b723b5f4c7a66b180b7f56cdd16f17e"}, + {file = "concrete_python-2.7.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:1c989e0823c21826857f5222a723d0f3feb7fa8ac02099aa779e1f7ae4c51d30"}, +] + +[package.dependencies] +importlib-resources = ">=6.1" +jsonpickle = ">=3.0.3" +networkx = ">=2.6" +numpy = ">=1.23,<2.0" +scipy = ">=1.10" +torch = ">=1.13" +z3-solver = ">=4.12" + +[package.extras] +dev = ["auditwheel (==5.3.0)", "black (==24.4.0)", "delocate (==0.10.4)", "isort (==5.12.0)", "matplotlib (>=3.7)", "mypy (==1.10.0)", "pillow (>=10.2)", "pybind11 (==2.10.4)", "pydocstyle (==6.3.0)", "pygraphviz (>=1.11)", "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)"] +full = ["matplotlib (>=3.7)", "pillow (>=10.2)", "pygraphviz (>=1.11)"] + +[package.source] +type = "legacy" +url = "https://pypi.zama.ai/gpu" +reference = "zama-pypi-gpu" + [[package]] name = "contourpy" version = "1.1.1" @@ -2765,6 +2796,7 @@ description = "Clang Python Bindings, mirrored from the official LLVM repo: http optional = false python-versions = "*" files = [ + {file = "libclang-18.1.1-py2.py3-none-macosx_10_9_x86_64.whl", hash = "sha256:6f14c3f194704e5d09769108f03185fce7acaf1d1ae4bbb2f30a72c2400cb7c5"}, {file = "libclang-18.1.1-py2.py3-none-macosx_11_0_arm64.whl", hash = "sha256:83ce5045d101b669ac38e6da8e58765f12da2d3aafb3b9b98d88b286a60964d8"}, {file = "libclang-18.1.1-py2.py3-none-manylinux2010_x86_64.whl", hash = "sha256:c533091d8a3bbf7460a00cb6c1a71da93bffe148f172c7d03b1c31fbf8aa2a0b"}, {file = "libclang-18.1.1-py2.py3-none-manylinux2014_aarch64.whl", hash = "sha256:54dda940a4a0491a9d1532bf071ea3ef26e6dbaf03b5000ed94dd7174e8f9592"}, @@ -7308,4 +7340,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.11" -content-hash = "0154834379e9d9c6d5d8658aa5ea2ec3b5d44312f5e7d2e6717e872609d65d9b" +content-hash = "ef238fc00f1f41067a1192ff9f8790aea6fb7dc55142ae8ac1160cbd44861e62" diff --git a/pyproject.toml b/pyproject.toml index 09556f4dbe..101756d01f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,18 +58,32 @@ numpy = "1.23.5" protobuf = "3.20.3" pandas = "2.0.3" -# Needed to have the latest Concrete Python versions +# Zama sources [[tool.poetry.source]] name = "zama-pypi-cpu" url = "https://pypi.zama.ai/cpu" priority = "explicit" -[tool.poetry.dev-dependencies] +[[tool.poetry.source]] +name = "zama-pypi-gpu" +url = "https://pypi.zama.ai/gpu" +priority = "explicit" + +# GPU +[tool.poetry.group.gpu] +optional = true + +[tool.poetry.group.gpu.dependencies] +concrete-python = {version="==2.7.0", source = "zama-pypi-gpu", markers = "sys_platform != 'darwin' and platform_machine != 'arm'"} + +# Development dependencies +[tool.poetry.group.dev] +optional = true + +[tool.poetry.group.dev.dependencies] isort = "^5.10.1" black = "^24.3.0" pylint = "^2.13.0" -# Coverage issue -# FIXME: https://github.com/zama-ai/concrete-ml-internal/issues/2541 pytest = "7.4.1" pytest-cov = "^4.1.0" pytest-xdist = "^3.3.1"