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

Jump to bottom

chore: fix new concrete python target #727

Merged
merged 1 commit into from
Jun 13, 2024
Merged

chore: fix new concrete python target #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -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

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 @@
ec95fa3cc4c56a7fe9a9e78bebb8c027
b2a2deb41357ad7ee04be0409d65cf0c
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 @@
ec95fa3cc4c56a7fe9a9e78bebb8c027
b2a2deb41357ad7ee04be0409d65cf0c
1 change: 1 addition & 0 deletions deps_licenses/licenses_mac_silicon_user.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 @@
ec95fa3cc4c56a7fe9a9e78bebb8c027
b2a2deb41357ad7ee04be0409d65cf0c
9 changes: 5 additions & 4 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.

6 changes: 3 additions & 3 deletions 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 = {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"
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion script/make_utils/check_installation_with_all_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/make_utils/licenses.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/make_utils/pytest_pypi_cml.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading