Skip to content

Commit 85fc03a

Browse files
committed
Upgrade dislib dependency versions
And improve Dockerfile and requirements_*.txt files
1 parent 67f3ac2 commit 85fc03a

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ ENV LC_ALL=C.UTF-8
88
RUN apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update && \
99
apt-get install -y --no-install-recommends libeigen3-dev protobuf-compiler libprotobuf-dev zlib1g-dev libgtest-dev git && \
1010
rm -rf /var/lib/apt/lists/* && \
11-
python3 -m pip install flake8 parameterized coverage tensorflow torch && \
11+
python3 -m pip install tensorflow torch && \
1212
git clone https://github.com/Blosc/python-blosc2/ /python-blosc2 && cd /python-blosc2 && git checkout v2.5.1 && \
1313
python3 -m pip install --trusted-host pypi.org --trusted-host files.pythonhosted.org --upgrade -r /python-blosc2/requirements-build.txt && \
1414
python3 -m pip install --trusted-host pypi.org --trusted-host files.pythonhosted.org --upgrade -r /python-blosc2/requirements-runtime.txt && \
1515
git submodule update --init --recursive && python3 setup.py build_ext --inplace -- -DDEACTIVATE_AVX2:STRING=ON && \
1616
python3 -m pip install --upgrade setuptools pip && \
17-
python3 -m pip install --upgrade numpy 'pybind11<2.6' pytest && \
18-
python3 -m pip install --trusted-host pypi.org --trusted-host files.pythonhosted.org --upgrade -r /dislib/requirements.txt
17+
python3 -m pip install --upgrade 'pybind11<2.6' && \
18+
python3 -m pip install --trusted-host pypi.org --trusted-host files.pythonhosted.org --upgrade -r /dislib/requirements.txt && \
19+
python3 -m pip install --trusted-host pypi.org --trusted-host files.pythonhosted.org --upgrade -r /dislib/requirements_tests.txt && \
20+
python3 -m pip install --trusted-host pypi.org --trusted-host files.pythonhosted.org --upgrade -r /dislib/requirements_ci.txt
1921

2022
ENV COMPSS_LOAD_SOURCE=false
2123

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
scikit-learn>=1.0.2
2-
scipy>=1.3.0
3-
numpy==1.23.1
1+
scikit-learn>=1.7
2+
scipy>=1.13
3+
numpy>=2.0
44
cvxpy>=1.1.5
55
cbor2>=5.4.0

requirements_ci.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
coverage>=5.5
2+
flake8>=3.8.3

requirements_gpu.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
cupy
2-
torch==1.13.0
2+
torch>2.0

requirements_tests.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ numpydoc>=0.8.0
22
pandas>=0.24.2
33
matplotlib>=2.2.3
44
blosc2==2.5.1
5+
parameterized>= 0.9.0
6+
pytest

0 commit comments

Comments
 (0)