From 896726069d35ff97681b092c5afbfb158144d019 Mon Sep 17 00:00:00 2001 From: Luis Montero Date: Thu, 13 Jun 2024 10:23:18 +0200 Subject: [PATCH] chore: fix new concrete python target --- Makefile | 2 +- deps_licenses/licenses_linux_user.txt.md5 | 2 +- deps_licenses/licenses_mac_intel_user.txt.md5 | 2 +- deps_licenses/licenses_mac_silicon_user.txt | 1 + deps_licenses/licenses_mac_silicon_user.txt.md5 | 2 +- poetry.lock | 9 +++++---- pyproject.toml | 6 +++--- script/make_utils/check_installation_with_all_python.sh | 2 +- script/make_utils/licenses.sh | 2 +- script/make_utils/pytest_pypi_cml.sh | 2 +- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index c790f2a7a..963c8f15c 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ setup_env: echo "Finished installing poetry lock." echo "Installing $(CONCRETE_PYTHON_VERSION)" && \ - poetry run python -m pip install -U --pre --extra-index-url https://pypi.zama.ai "$(CONCRETE_PYTHON_VERSION)" + poetry run python -m pip install -U --pre --extra-index-url https://pypi.zama.ai/cpu "$(CONCRETE_PYTHON_VERSION)" "$(MAKE)" fix_omp_issues_for_intel_mac poetry run python -c "import skorch" || true # Details above diff --git a/deps_licenses/licenses_linux_user.txt.md5 b/deps_licenses/licenses_linux_user.txt.md5 index 5099c4052..057b3cc98 100644 --- a/deps_licenses/licenses_linux_user.txt.md5 +++ b/deps_licenses/licenses_linux_user.txt.md5 @@ -1 +1 @@ -ec95fa3cc4c56a7fe9a9e78bebb8c027 +b2a2deb41357ad7ee04be0409d65cf0c diff --git a/deps_licenses/licenses_mac_intel_user.txt.md5 b/deps_licenses/licenses_mac_intel_user.txt.md5 index 5099c4052..057b3cc98 100644 --- a/deps_licenses/licenses_mac_intel_user.txt.md5 +++ b/deps_licenses/licenses_mac_intel_user.txt.md5 @@ -1 +1 @@ -ec95fa3cc4c56a7fe9a9e78bebb8c027 +b2a2deb41357ad7ee04be0409d65cf0c diff --git a/deps_licenses/licenses_mac_silicon_user.txt b/deps_licenses/licenses_mac_silicon_user.txt index 549ccdf18..dd6551ae8 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.1, 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 5099c4052..057b3cc98 100644 --- a/deps_licenses/licenses_mac_silicon_user.txt.md5 +++ b/deps_licenses/licenses_mac_silicon_user.txt.md5 @@ -1 +1 @@ -ec95fa3cc4c56a7fe9a9e78bebb8c027 +b2a2deb41357ad7ee04be0409d65cf0c diff --git a/poetry.lock b/poetry.lock index 442689a79..95f332606 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" @@ -834,8 +834,8 @@ full = ["matplotlib (>=3.7)", "pillow (>=10.2)", "pygraphviz (>=1.11)"] [package.source] type = "legacy" -url = "https://pypi.zama.ai" -reference = "zama-pypi" +url = "https://pypi.zama.ai/cpu" +reference = "zama-pypi-cpu" [[package]] name = "contourpy" @@ -2769,6 +2769,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"}, @@ -7312,4 +7313,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = ">=3.8.1,<3.11" -content-hash = "02981d101fb6afbef309228023c885ad188ed2caefb0467a20607ef131e9e9a1" +content-hash = "95f193b8c1dba330e0e9e7a5b4c34df2ed9ba938496ac07afc85a12b64c3540a" diff --git a/pyproject.toml b/pyproject.toml index b8f3921e9..6701d74ba 100644 --- 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 = {version="==2.6.2.dev20240605", source = "zama-pypi"} +concrete-python = {version="==2.6.2.dev20240605", source = "zama-pypi-cpu"} setuptools = "65.6.3" skops = {version = "0.5.0"} xgboost = "1.6.2" @@ -56,8 +56,8 @@ pandas = "2.0.3" # Needed to have the latest Concrete Python versions [[tool.poetry.source]] -name = "zama-pypi" -url = "https://pypi.zama.ai/" +name = "zama-pypi-cpu" +url = "https://pypi.zama.ai/cpu" priority = "explicit" [tool.poetry.dev-dependencies] diff --git a/script/make_utils/check_installation_with_all_python.sh b/script/make_utils/check_installation_with_all_python.sh index 268f651c0..4fb307926 100755 --- a/script/make_utils/check_installation_with_all_python.sh +++ b/script/make_utils/check_installation_with_all_python.sh @@ -75,7 +75,7 @@ do # Install the dependencies as PyPI would do using the wheel file PYPI_WHEEL=$(find dist -type f -name "*.whl") - python -m pip install --extra-index-url https://pypi.zama.ai "${PYPI_WHEEL}" + python -m pip install --extra-index-url https://pypi.zama.ai/cpu "${PYPI_WHEEL}" elif [ "$METHOD" == "pip" ] then diff --git a/script/make_utils/licenses.sh b/script/make_utils/licenses.sh index 4f1f9731c..f18e83ff9 100755 --- a/script/make_utils/licenses.sh +++ b/script/make_utils/licenses.sh @@ -131,7 +131,7 @@ then fi poetry install --only main - python -m pip install -U --pre --extra-index-url https://pypi.zama.ai "${CP_VERSION}" + python -m pip install -U --pre --extra-index-url https://pypi.zama.ai/cpu "${CP_VERSION}" python -m pip install pip-licenses # In --format=csv such that the column length (and so, the diff) do not change with longer diff --git a/script/make_utils/pytest_pypi_cml.sh b/script/make_utils/pytest_pypi_cml.sh index 68f4967c4..aee1b77f2 100755 --- a/script/make_utils/pytest_pypi_cml.sh +++ b/script/make_utils/pytest_pypi_cml.sh @@ -67,7 +67,7 @@ if ${USE_PIP_WHEEL}; then # Install the dependencies as PyPI would do using the wheel file as well as the given # Concrete-Python version PYPI_WHEEL=$(find dist -type f -name "*.whl") - python -m pip install --extra-index-url https://pypi.zama.ai "${PYPI_WHEEL}" + python -m pip install --extra-index-url https://pypi.zama.ai/cpu "${PYPI_WHEEL}" else if [ -z "${VERSION}" ]; then python -m pip install concrete-ml