From ba6f0b94fc8e2d6919804588f22d9182010db5dd Mon Sep 17 00:00:00 2001 From: Kristina Thieme Date: Wed, 8 Jan 2025 11:28:41 +0100 Subject: [PATCH] fixed numpy install and github page --- CHANGELOG.md | 5 +++++ Makefile | 2 ++ docs/installation.rst | 3 +++ requirements.txt | 4 ++-- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59288d62..8d170491 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# Version 1.3.4 + +## Installation +- Numpy will be installed via conda instead of pip to fix linkage + # Version 1.3.3 ## Converters diff --git a/Makefile b/Makefile index c150b3c0..92a1bdd5 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,9 @@ FLAKE8 ?= flake8 install: $(PIP) install -e . +# Fix numpy as version 2.1.0 will drop support for Python 3.9 install-dev: + conda install -y numpy=2.0.1 $(PIP) install -e ".[dev]" pre-commit install diff --git a/docs/installation.rst b/docs/installation.rst index f5bc4ead..d50f9f79 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -52,6 +52,9 @@ If you want to contribute to DeepCAVE, you can clone it from GitHub and install While it is generally expected to function correctly on MacOS, some issues may arise due to compatibility with Swig. Specifically, users may encounter problems with the Parallel Coordinates and Importance Plugin on MacOS. + NumPy currently needs to be installed with conda (as opposed to pip) to ensure it being linked to openblas + and not the Mac specific accelerate. The latter, if used, will result in a plugin failure for + Configuration Footprint. Currently, DeepCAVE cannot be run on Windows due to its reliance on a bash script for starting services such as Redis, workers, and the webserver. diff --git a/requirements.txt b/requirements.txt index c4f6fe31..f710af33 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ setuptools==68.2.2 absl-py>=1.0.0 jsonlines>=3.0.0 pandas>=1.3.4 -numpy==2.0.1 # Fix numpy as version 2.1.0 will drop support for Python 3.9 +# numpy needs to be installed via conda instead of pip matplotlib==3.9.0 seaborn>=0.13.0 pyyaml>=6.0.1 @@ -24,7 +24,7 @@ dash==2.0.0 dash-extensions==0.0.71 dash-bootstrap-components==1.0.3 redis>=4.1.4 -rq>=1.10.1 +rq==1.10.1 # Pinned due to https://github.com/plotly/dash/issues/1992 # Pinning might be removed for dash>2.3.0 werkzeug==2.0.3