From fa36f93466624b2c435b0ded74524acffb2698d1 Mon Sep 17 00:00:00 2001 From: KIMB-technologies Date: Fri, 4 Oct 2024 16:19:09 +0200 Subject: [PATCH] Arm64 builds locally --- build-images.sh | 2 +- docker/Dockerfile | 5 ++- docker/requirements-frozen.txt | 78 +++++++++++++++++----------------- vars.sh | 2 +- 4 files changed, 44 insertions(+), 43 deletions(-) diff --git a/build-images.sh b/build-images.sh index 3b8fdb7..315650a 100755 --- a/build-images.sh +++ b/build-images.sh @@ -46,7 +46,7 @@ done; if [ "$requirements" == "requirements.txt" ]; then # extract requirements-frozen.txt - cid=$(docker create "tag_image") + cid=$(docker create "$tag_image") docker cp "$cid:/ums-agenten/requirements.txt" "$SCRIPTPATH/docker/requirements-frozen.txt" docker rm "$cid" fi; diff --git a/docker/Dockerfile b/docker/Dockerfile index c72e003..393c13e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,10 +1,11 @@ ARG FROM_IMAGE + +FROM $FROM_IMAGE + ARG H_GID ARG H_UID ARG PIP_REQ_FILE -FROM $FROM_IMAGE - RUN apt update && \ DEBIAN_FRONTEND=noninteractive TZ=Europe/Berlin apt-get install -y tzdata \ && cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime \ diff --git a/docker/requirements-frozen.txt b/docker/requirements-frozen.txt index 0eb3395..8c390e4 100644 --- a/docker/requirements-frozen.txt +++ b/docker/requirements-frozen.txt @@ -1,73 +1,73 @@ -accelerate==0.31.0 -aiohttp==3.9.5 +accelerate==0.34.2 +aiohappyeyeballs==2.4.3 +aiohttp==3.10.8 aiosignal==1.3.1 apricot-select==0.6.1 -attrs==23.2.0 +attrs==24.2.0 beautifulsoup4==4.12.3 -certifi==2024.6.2 +certifi==2024.8.30 charset-normalizer==3.3.2 click==8.1.7 -contourpy==1.2.1 +contourpy==1.3.0 cycler==0.12.1 -datasets==2.20.0 +datasets==3.0.1 dill==0.3.8 -faiss-cpu==1.8.0 +faiss-cpu==1.8.0.post1 filelock==3.13.1 -fonttools==4.53.0 +fonttools==4.54.1 frozenlist==1.4.1 fsspec==2024.2.0 -gensim==4.3.2 -huggingface-hub==0.23.4 -idna==3.7 +gensim==4.3.3 +huggingface-hub==0.25.1 +idna==3.10 Jinja2==3.1.3 joblib==1.4.2 -kiwisolver==1.4.5 +kiwisolver==1.4.7 llvmlite==0.43.0 MarkupSafe==2.1.5 -matplotlib==3.9.0 +matplotlib==3.9.2 mpmath==1.3.0 -multidict==6.0.5 +multidict==6.1.0 multiprocess==0.70.16 networkx==3.2.1 -nltk==3.8.1 +nltk==3.9.1 nose==1.3.7 numba==0.60.0 -numpy==2.0.0 +numpy==1.26.4 packaging==24.1 -pandas==2.2.2 -pdoc==14.5.0 -peft==0.11.1 -pillow==10.3.0 -pomegranate==1.0.4 +pandas==2.2.3 +pdoc==14.7.0 +peft==0.13.0 +pillow==10.4.0 +pomegranate==1.1.0 psutil==6.0.0 -pyarrow==16.1.0 -pyarrow-hotfix==0.6 +pyarrow==17.0.0 Pygments==2.18.0 -pyparsing==3.1.2 +pyparsing==3.1.4 PyPDF2==3.0.1 python-dateutil==2.9.0.post0 -pytz==2024.1 -PyYAML==6.0.1 -regex==2024.5.15 +pytz==2024.2 +PyYAML==6.0.2 +regex==2024.9.11 requests==2.32.3 -safetensors==0.4.3 -scikit-learn==1.5.0 +safetensors==0.4.5 +scikit-learn==1.5.2 scipy==1.13.1 setuptools==68.1.2 six==1.16.0 -smart-open==7.0.4 -soupsieve==2.5 +smart-open==7.0.5 +soupsieve==2.6 sympy==1.12 threadpoolctl==3.5.0 -tokenizers==0.19.1 -torch==2.3.1 -tqdm==4.66.4 -transformers==4.41.2 +tokenizers==0.20.0 +torch==2.4.1 +tqdm==4.66.5 +transformers==4.45.1 typing_extensions==4.9.0 -tzdata==2024.1 -urllib3==2.2.2 +tzdata==2024.2 +urllib3==2.2.3 wheel==0.42.0 wikipedia==1.4.0 wrapt==1.16.0 -xxhash==3.4.1 -yarl==1.9.4 +xxhash==3.5.0 +yarl==1.13.1 diff --git a/vars.sh b/vars.sh index ff7406d..1dc3785 100755 --- a/vars.sh +++ b/vars.sh @@ -5,5 +5,5 @@ IMAGE_REGISTRY="git.chai.uni-hamburg.de" IMAGE_OWNER="ums-agenten" IMAGE_NAME="base-image" -PLATFORMS="arm64 amd64 gpu" +PLATFORMS="amd64 gpu arm64" CPU_BASEIMAGE="ubuntu:24.04" \ No newline at end of file