Skip to content

Commit

Permalink
fix: use correct torch version for intel mac (#798)
Browse files Browse the repository at this point in the history
Co-authored-by: bcm-at-zama <[email protected]>
  • Loading branch information
bcm-at-zama and bcm-at-zama authored Jul 31, 2024
1 parent 123d619 commit a8eab89
Show file tree
Hide file tree
Showing 12 changed files with 182 additions and 44 deletions.
8 changes: 7 additions & 1 deletion Makefile
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.7.0"
CONCRETE_PYTHON_VERSION="concrete-python==2.7.0.dev20240731"

# Force the installation of Concrete Python's latest version, release-candidates included
# CONCRETE_PYTHON_VERSION="$$(poetry run python \
Expand Down Expand Up @@ -59,6 +59,12 @@ setup_env:
poetry run python -c "import skorch" || true # Details above
poetry run python -c "from brevitas.core.scaling import AccumulatorAwareParameterPreScaling" || true # Details above

# For some issues with Mac Intel
if [[ $$(uname) == "Darwin" ]] && [[ $$(uname -m) == 'x86_64' ]]; then \
poetry run pip uninstall brevitas -y; \
poetry run pip install brevitas; \
fi

.PHONY: sync_env # Synchronise the environment
sync_env:
if [[ $$(poetry --version) != "Poetry (version $(POETRY_VERSION))" ]];then \
Expand Down
2 changes: 1 addition & 1 deletion deps_licenses/licenses_linux_user.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ brevitas, 0.10.2, UNKNOWN
certifi, 2024.6.2, Mozilla Public License 2.0 (MPL 2.0)
charset-normalizer, 3.3.2, MIT License
coloredlogs, 15.0.1, MIT License
concrete-python, 2.7.0, BSD-3-Clause
concrete-python, 2.7.0.dev20240731, BSD-3-Clause
dependencies, 2.0.1, BSD License
dill, 0.3.8, BSD License
filelock, 3.15.3, The Unlicense (Unlicense)
Expand Down
2 changes: 1 addition & 1 deletion deps_licenses/licenses_linux_user.txt.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
787b1ddb8ddf395cb9c2fd08b57b99c0
4c5946ebf8d2349587bb18874b83606e
13 changes: 8 additions & 5 deletions deps_licenses/licenses_mac_intel_user.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
Name, Version, License
Jinja2, 3.1.4, BSD License
MarkupSafe, 2.1.5, BSD License
PyYAML, 6.0.1, MIT License
brevitas, 0.8.0, UNKNOWN
brevitas, 0.10.2, UNKNOWN
certifi, 2024.6.2, Mozilla Public License 2.0 (MPL 2.0)
charset-normalizer, 3.3.2, MIT License
coloredlogs, 15.0.1, MIT License
concrete-python, 2.7.0, BSD-3-Clause
concrete-python, 2.7.0.dev20240731, BSD-3-Clause
dependencies, 2.0.1, BSD License
dill, 0.3.8, BSD License
filelock, 3.15.3, The Unlicense (Unlicense)
flatbuffers, 24.3.25, Apache Software License
fsspec, 2024.6.0, BSD License
huggingface-hub, 0.23.4, Apache Software License
humanfriendly, 10.0, MIT License
hummingbird-ml, 0.4.8, MIT License
hummingbird-ml, 0.4.11, MIT License
idna, 3.7, BSD License
importlib_resources, 6.4.0, Apache Software License
joblib, 1.4.2, BSD License
Expand Down Expand Up @@ -41,10 +43,11 @@ skorch, 0.11.0, new BSD 3-Clause
sympy, 1.12.1, BSD License
tabulate, 0.8.10, MIT License
threadpoolctl, 3.5.0, BSD License
torch, 1.13.1, BSD License
torch, 2.2.2, BSD License
tqdm, 4.66.4, MIT License; Mozilla Public License 2.0 (MPL 2.0)
typing_extensions, 4.5.0, Python Software Foundation License
typing_extensions, 4.12.2, Python Software Foundation License
tzdata, 2024.1, Apache Software License
unfoldNd, 0.2.2, MIT License
urllib3, 2.2.2, MIT License
xgboost, 1.6.2, Apache Software License
z3-solver, 4.13.0.0, MIT License
2 changes: 1 addition & 1 deletion deps_licenses/licenses_mac_intel_user.txt.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1cde59339dad23a5ecae8ac1192e872e
4c5946ebf8d2349587bb18874b83606e
3 changes: 1 addition & 2 deletions deps_licenses/licenses_mac_silicon_user.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ brevitas, 0.10.2, UNKNOWN
certifi, 2024.6.2, Mozilla Public License 2.0 (MPL 2.0)
charset-normalizer, 3.3.2, MIT License
coloredlogs, 15.0.1, MIT License
concrete-python, 2.7.0, BSD-3-Clause
concrete-python, 2.7.0.dev20240731, BSD-3-Clause
dependencies, 2.0.1, BSD License
dill, 0.3.8, BSD License
filelock, 3.15.3, The Unlicense (Unlicense)
Expand Down Expand Up @@ -51,4 +51,3 @@ unfoldNd, 0.2.2, MIT 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
2 changes: 1 addition & 1 deletion deps_licenses/licenses_mac_silicon_user.txt.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
787b1ddb8ddf395cb9c2fd08b57b99c0
4c5946ebf8d2349587bb18874b83606e
127 changes: 110 additions & 17 deletions poetry.lock

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

Loading

0 comments on commit a8eab89

Please sign in to comment.