docker: cleanup and add gdb

Author: mloubout

docker/Dockerfile.amd

@@ -14,29 +14,10 @@ ARG OMPI_BRANCH="v5.0.x"
 RUN rm /etc/apt/sources.list.d/* \
   && apt-get update \
   && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    ca-certificates \
-    git \
-    ssh \
-    make \
-    vim \
-    nano \
-    libtinfo* \
-    initramfs-tools \
-    libelf-dev \
-    numactl \
-    wget \
-    tmux \
-    build-essential \
-    autoconf \
-    automake \
-    libtool \
-    pkg-config \
-    libnuma* \
-    gfortran \
-    flex \
-    hwloc \
-    gdb \
-  && apt-get clean
+    ca-certificates git ssh make vim libtinfo* initramfs-tools libelf-dev \
+    numactl wget tmux build-essential autoconf automake libtool \
+    pkg-config libnuma* gfortran flex hwloc && \
+    apt-get clean
 
 # Requires cmake > 3.22 
 RUN mkdir -p /opt/cmake  \

docker/Dockerfile.cpu

@@ -11,20 +11,15 @@ ARG gcc=""
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Add repo for other python versions
-RUN apt-get update && \
-    apt-get install -y software-properties-common
-
 # Install python
 RUN apt-get update && \
-    apt-get install -y dh-autoreconf python3-venv python3-dev python3-pip gdb
+    apt-get install -y software-properties-common dh-autoreconf python3-venv python3-dev python3-pip
 
 # Install for basic base not containing it
 RUN apt-get install -y vim wget git flex libnuma-dev tmux \
         numactl hwloc curl \
         autoconf libtool build-essential procps software-properties-common
 
-
 # Install compilersx
 RUN if [ -n "$gcc" ]; then \
         apt-get install libgmp-dev libmpc-dev libmpfr-dev libisl-dev binutils texinfo -y && \
@@ -46,10 +41,8 @@ RUN if [ -n "$gcc" ]; then \
 RUN curl https://raw.githubusercontent.com/Azrael3000/tmpi/master/tmpi -o /usr/local/bin/tmpi
 
 # Install OpenGL library, necessary for the installation of GemPy
-RUN apt-get install -y libgl1-mesa-glx | echo "Skipping libgl1-mesa-glx installation, outdated"
-RUN apt-get install -y libgl1 libglx-mesa0 | echo "Skipping libgl1 libglx-mesa0 installation, not recent enough"
-
-RUN apt-get clean && apt-get autoclean && apt-get autoremove  -y && \
+RUN apt-get install -y libgl1-mesa-glx && \
+    apt-get clean && apt-get autoclean && apt-get autoremove  -y && \
     rm -rf /var/lib/apt/lists/*
 
 ARG OMPI_BRANCH="v5.0.x"

docker/Dockerfile.devito

@@ -13,10 +13,6 @@ ARG GROUP_ID=1000
 
 ##################  Install devito ############################################
 
-# Update if outdated and install extras
-RUN apt-get update && \
-    apt-get install -y git cmake libncurses5-dev libncursesw5-dev libdrm-dev libsystemd-dev
-
 # Usefull utilities
 # Nvtop
 RUN git clone https://github.com/Syllo/nvtop.git /app/nvtop && \
@@ -43,15 +39,22 @@ RUN eval "$MPI4PY_FLAGS /venv/bin/pip install --no-cache-dir --verbose -r /app/d
 # Devito
 RUN /venv/bin/pip install --no-cache-dir -e /app/devito[extras,tests] && rm -rf ~/.cache/pip
 
-FROM $base as user
-# COPY is much faster than RUN chown by order of magnitude so we have a final step that
-# just copies the built image into the user.
+FROM $base AS utilities
+
+# Update if outdated and install extras
+RUN apt-get update && apt-get install -y git cmake \
+    libncurses5-dev libncursesw5-dev libdrm-dev libsystemd-dev \
+    python3-gdb gdb
 
 # Last installs (such as gdb needed in user mode) and cleanup
 RUN apt-get update && apt install gdb -y && \
     apt-get clean && apt-get autoclean && apt-get autoremove -y && \
     rm -rf /var/lib/apt/lists/*
 
+FROM utilities as user
+# COPY is much faster than RUN chown by order of magnitude so we have a final step that
+# just copies the built image into the user.
+
 # User/Group Ids
 ARG USER_ID=1000
 ARG GROUP_ID=1000

docker/Dockerfile.intel

@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 # Install python
 RUN apt-get update && \
-    apt-get install -y dh-autoreconf python3-venv python3-dev python3-pip gdb
+    apt-get install -y dh-autoreconf python3-venv python3-dev python3-pip
 
 # Install for basic base not containing it
 RUN apt-get install -y vim wget git flex libnuma-dev tmux \
@@ -23,9 +23,6 @@ RUN curl https://raw.githubusercontent.com/Azrael3000/tmpi/master/tmpi -o /usr/l
 # Install OpenGL library, necessary for the installation of GemPy
 RUN apt-get install -y libgl1-mesa-glx
 
-RUN apt-get clean && apt-get autoclean && apt-get autoremove  -y && \
-    rm -rf /var/lib/apt/lists/*
-
 EXPOSE 8888
 CMD ["/bin/bash"]
 
@@ -56,19 +53,16 @@ RUN apt-get update -y && apt-get dist-upgrade -y && \
             libegl-mesa0 libegl1-mesa libegl1-mesa-dev libgbm1 libgl1-mesa-dev libgl1-mesa-dri \
             libglapi-mesa libgles2-mesa-dev libglx-mesa0 libigdgmm12 libxatracker2 mesa-va-drivers \
             mesa-vdpau-drivers mesa-vulkan-drivers va-driver-all vainfo hwinfo clinfo \
-            # XPU-smi requirements
-            intel-gsc  libmfx-tools intel-metrics-discovery intel-metrics-library \
+            # XPU-SMI
+            pciutils libkmod-dev intel-fw-gpu xpu-smi \
             # Development packages
             libigc-dev intel-igc-cm libigdfcl-dev libigfxcmrt-dev level-zero-dev
 
-# Install xpu-smi for device detection
-RUN wget https://github.com/intel/xpumanager/releases/download/V1.2.39/xpu-smi_1.2.39_20240906.085820.11f3c29a+deb10u1_amd64.deb && \
-    apt install -y ./xpu-smi_1.2.39_20240906.085820.11f3c29a+deb10u1_amd64.deb && \
-    rm xpu-smi_1.2.39_20240906.085820.11f3c29a+deb10u1_amd64.deb
-
 ENV MPI4PY_FLAGS='. /opt/intel/oneapi/setvars.sh intel64 && '
 ENV MPI4PY_RC_RECV_MPROBE=0
 
+RUN apt-get clean && apt-get autoclean && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
+
 ##############################################################
 # ICC image
 # This is a legacy setup that is not built anymore but kept for reference

docker/Dockerfile.nvidia

@@ -16,7 +16,7 @@ ENV DEBIAN_FRONTEND noninteractive
 # Install python
 RUN apt-get update && \
     apt-get install -y -q gpg apt-utils curl wget vim libnuma-dev tmux numactl \
-                          dh-autoreconf python3-venv python3-dev python3-pip gdb
+                          dh-autoreconf python3-venv python3-dev python3-pip
 
 # nodesource: nvdashboard requires nodejs>=10
 RUN curl https://developer.download.nvidia.com/hpc-sdk/ubuntu/DEB-GPG-KEY-NVIDIA-HPC-SDK | gpg --yes --dearmor -o /usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg