From b065d595cd4a12263a4a5baf24163e30ab6cb151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 1 Aug 2024 15:40:58 +0200 Subject: [PATCH 1/2] Extra image for AI with elyra --- .github/workflows/egi-images.yml | 3 ++- single-user-ai/Dockerfile | 13 +++++++++++++ single-user/Dockerfile | 5 ----- 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 single-user-ai/Dockerfile diff --git a/.github/workflows/egi-images.yml b/.github/workflows/egi-images.yml index 0df70cd..dd2f91a 100644 --- a/.github/workflows/egi-images.yml +++ b/.github/workflows/egi-images.yml @@ -17,10 +17,11 @@ jobs: "single-user/Dockerfile" "single-user-panosc/Dockerfile" "single-user-ai4pp/Dockerfile" + "single-user-ai/Dockerfile" base-image: name: Build base image - needs: detect-changes + needs: detect-changes if: needs.detect-changes.outputs.build-base == 1 runs-on: ubuntu-latest outputs: diff --git a/single-user-ai/Dockerfile b/single-user-ai/Dockerfile new file mode 100644 index 0000000..9ba9184 --- /dev/null +++ b/single-user-ai/Dockerfile @@ -0,0 +1,13 @@ +ARG BASE_IMAGE=eginotebooks/base:latest +# hadolint ignore=DL3006 +FROM $BASE_IMAGE + +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +# not installable from mamba for now +RUN pip install --no-cache-dir \ + elyra + +RUN jupyter lab build + +RUN rmdir work diff --git a/single-user/Dockerfile b/single-user/Dockerfile index a635d3c..8a2914b 100644 --- a/single-user/Dockerfile +++ b/single-user/Dockerfile @@ -39,11 +39,6 @@ RUN mamba install -y --quiet \ RUN pip install --no-cache-dir \ eo-learn -# not installable from mamba for now -# XXX: problem with dependency: pydantic -RUN pip install --no-cache-dir \ - elyra - # See https://github.com/mamba-org/mamba/issues/336 # pytorch is not installing properly with mamba RUN mamba install -y pytorch torchvision torchaudio cpuonly -c pytorch -c anaconda -c conda-forge \ From 18a35c50f5ee30b984ed92cf156944e552fb8bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 2 Aug 2024 16:10:41 +0200 Subject: [PATCH 2/2] More components to the extra AI image --- single-user-ai/Dockerfile | 18 ++++++++++++++++++ single-user/Dockerfile | 13 +------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/single-user-ai/Dockerfile b/single-user-ai/Dockerfile index 9ba9184..13d90cc 100644 --- a/single-user-ai/Dockerfile +++ b/single-user-ai/Dockerfile @@ -4,6 +4,24 @@ FROM $BASE_IMAGE SHELL ["/bin/bash", "-o", "pipefail", "-c"] +RUN mamba install -y --quiet \ + tensorflow \ + && conda clean --all + +# See https://github.com/mamba-org/mamba/issues/336 +# pytorch is not installing properly with mamba +RUN mamba install -y pytorch torchvision torchaudio cpuonly -c pytorch -c anaconda -c conda-forge \ + && mamba install -y --quiet fastai -c fastai \ + && conda clean --all + +# packages not in conda +RUN pip install --no-cache-dir \ + tflearn + +# not installable from mamba for now +RUN pip install --no-cache-dir \ + eo-learn + # not installable from mamba for now RUN pip install --no-cache-dir \ elyra diff --git a/single-user/Dockerfile b/single-user/Dockerfile index 8a2914b..7f684a2 100644 --- a/single-user/Dockerfile +++ b/single-user/Dockerfile @@ -35,16 +35,6 @@ RUN mamba install -y --quiet \ jupyter-resource-usage \ && conda clean --all -# not installable from mamba for now -RUN pip install --no-cache-dir \ - eo-learn - -# See https://github.com/mamba-org/mamba/issues/336 -# pytorch is not installing properly with mamba -RUN mamba install -y pytorch torchvision torchaudio cpuonly -c pytorch -c anaconda -c conda-forge \ - && mamba install -y --quiet fastai -c fastai \ - && conda clean --all - # Octave, install on a different environment # Octave from conda won't build packages # see https://discourse.jupyter.org/t/installing-octave-packages-with-binder/4206 @@ -92,8 +82,7 @@ RUN pip install --no-cache-dir \ git+https://github.com/EGI-Foundation/egi-notebooks-addons@0.1.3 \ h5glance \ nbtop \ - panel \ - tflearn + panel # EMSO # python3.7, install on a different environment