[build] switch to Ubuntu 24.04 in CI and docker

TRIQS · Jun 24, 2024 · 30ff9bb · 30ff9bb
1 parent 45a47c2
commit 30ff9bb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 49 deletions.
diff --git a/Docker/github_ci_dockerfile b/Docker/github_ci_dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 AS base
+FROM ubuntu:24.04 AS base
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
       build-essential \
@@ -8,16 +8,16 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
       cython3 \
       debhelper \
       dh-python \
-      g++-12 \
-      gfortran-12 \
+      g++-13 \
+      gfortran-13 \
       git \
       hdf5-tools \
       libboost-dev \
       libfftw3-dev \
       libgfortran5 \
       libgmp-dev \
       libhdf5-dev \
-      liblapack-dev \
+      libopenblas-dev \
       libnfft3-dev \
       libomp-dev \
       libopenmpi-dev \
@@ -33,6 +33,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
       python3-dev \
       python3-jinja2 \
       python3-mako \
+      python3-mesonpy \
       python3-matplotlib \
       python3-monty \
       python3-mpi4py \
@@ -48,6 +49,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
       python3-sphinx \
       python3-sphinx-rtd-theme \
       python3-tomli \
+      python3-linkify-it \
       python3-venv \
       rsync \
       sudo \
@@ -56,23 +58,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
       apt-get autoclean -y && \
       rm -rf /var/cache/apt/* /var/lib/apt/lists/*
 
-# linkify-it-py (required by sphinx doc build) is not available in Ubuntu 22.04 as package
-# the following manually installs it and its only dependency uc-micro-py
-RUN mkdir -p /src && cd /src \
- && curl -LOOO http://archive.ubuntu.com/ubuntu/pool/universe/u/uc-micro-py/uc-micro-py_1.0.1{-3.dsc,.orig.tar.xz,-3.debian.tar.xz} \
- && dpkg-source -x uc-micro-py_1.0.1-3.dsc \
- && cd uc-micro-py-1.0.1 \
- && DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -b -d -uc -us \
- && cd - \
- && apt-get install ./python3-uc-micro_1.0.1-3_all.deb \
- && curl -LOOO http://archive.ubuntu.com/ubuntu/pool/universe/l/linkify-it-py/linkify-it-py_2.0.0{-1.dsc,.orig.tar.gz,-1.debian.tar.xz} \
- && dpkg-source -x linkify-it-py_2.0.0-1.dsc \
- && cd linkify-it-py-2.0.0/ \
- && DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -b -d -uc -us \
- && cd - \
- && apt-get install ./python3-linkify-it_2.0.0-1_all.deb \
- && cd / && rm -rf /src
-
 # the above is cached by the github action workflow
 FROM base AS pkgs
 
@@ -86,14 +71,14 @@ ARG NCORES=8
 # create source dirs
 RUN cd / && mkdir -p triqs && mkdir -p source
 
-ENV PYTHON_VERSION=3.10 \
-    CC=gcc-12 CXX=g++-12
+ENV PYTHON_VERSION=3.12 \
+    CC=gcc-13 CXX=g++-13
 # triqs
 ENV CPATH=/triqs/include:${CPATH} \
     PATH=/triqs/bin:${PATH} \
     LIBRARY_PATH=/triqs/lib:${LIBRARY_PATH} \
     LD_LIBRARY_PATH=/triqs/lib:${LD_LIBRARY_PATH} \
-    PYTHONPATH=/triqs/lib/python3.10/site-packages:${PYTHONPATH} \
+    PYTHONPATH=/triqs/lib/python3.12/site-packages:${PYTHONPATH} \
     CMAKE_PREFIX_PATH=/triqs/share/cmake:${CMAKE_PREFIX_PATH} \
     CMAKE_BUILD_PARALLEL_LEVEL=${NCORES} \
     CTEST_OUTPUT_ON_FAILURE=1 \
@@ -136,7 +121,7 @@ RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/maxen
     && make -j$NCORES && ctest -j$NCORES && make install
 
 # install sparse-ir into triqs pythonpath
-RUN pip install --no-deps --target /triqs/lib/python3.10/site-packages sparse-ir[xprec]
+RUN pip install --no-deps --target /triqs/lib/python3.12/site-packages sparse-ir[xprec]
 
 # remove source
 RUN cd / && rm -rf source

diff --git a/Docker/openmpi_dockerfile b/Docker/openmpi_dockerfile
@@ -1,5 +1,5 @@
-FROM ubuntu:22.04 AS base
-ARG LLVM=15
+FROM ubuntu:24.04 AS base
+ARG LLVM=16
 
 # This platform includes dependencies for building docs
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -60,35 +60,19 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
       python3-numpydoc \
       python3-pandas \
       python3-pip \
-      python3-pymatgen \
+      python3-mesonpy \
       python3-scipy \
       python3-shapely \
       python3-skimage \
       python3-sphinx \
       python3-sphinx-rtd-theme \
       python3-tomli \
+      python3-linkify-it \
       && \
       apt-get autoremove --purge -y && \
       apt-get autoclean -y && \
       rm -rf /var/cache/apt/* /var/lib/apt/lists/*
 
-# linkify-it-py (required by sphinx doc build) is not available in Ubuntu 22.04 as package
-# the following manually installs it and its only dependency uc-micro-py
-RUN mkdir -p /src && cd /src \
- && curl -LOOO http://archive.ubuntu.com/ubuntu/pool/universe/u/uc-micro-py/uc-micro-py_1.0.1{-3.dsc,.orig.tar.xz,-3.debian.tar.xz} \
- && dpkg-source -x uc-micro-py_1.0.1-3.dsc \
- && cd uc-micro-py-1.0.1 \
- && DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -b -d -uc -us \
- && cd - \
- && apt-get install ./python3-uc-micro_1.0.1-3_all.deb \
- && curl -LOOO http://archive.ubuntu.com/ubuntu/pool/universe/l/linkify-it-py/linkify-it-py_2.0.0{-1.dsc,.orig.tar.gz,-1.debian.tar.xz} \
- && dpkg-source -x linkify-it-py_2.0.0-1.dsc \
- && cd linkify-it-py-2.0.0/ \
- && DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -b -d -uc -us \
- && cd - \
- && apt-get install ./python3-linkify-it_2.0.0-1_all.deb \
- && cd / && rm -rf /src
-
 # install openmpi and compile openmpi manually
 # this is to ensure PMI compatibility with cray systems
 # RUN curl -LO https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.5.tar.gz \
@@ -106,9 +90,9 @@ RUN mkdir -p /src && cd /src \
 #     && rm -rf openmpi-4.1.5.tar.gz openmpi-4.1.5
 
 # install sparse-ir into triqs pythonpath
-RUN pip install --no-deps --target /triqs/lib/python3.10/site-packages sparse-ir[xprec]
+RUN pip install --no-deps --target /triqs/lib/python3.12/site-packages sparse-ir[xprec]
 
-ENV PYTHON_VERSION=3.10 \
+ENV PYTHON_VERSION=3.12 \
     CC=clang-${LLVM} CXX=clang++-${LLVM} CXXFLAGS="-stdlib=libc++"
 RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${LLVM} 60 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM} --slave /usr/bin/clang-cpp clang-cpp /usr/bin/clang-cpp-${LLVM}
 
@@ -120,7 +104,7 @@ ENV OMPI_ALLOW_RUN_AS_ROOT=1
 ENV OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
 ENV OMPI_MCA_rmaps_base_oversubscribe="yes"
 ENV OMPI_MCA_btl_vader_single_copy_mechanism=none
-ARG NCORES=20
+ARG NCORES=4
 
 # create source dirs
 RUN cd / && mkdir -p triqs && mkdir -p source
@@ -178,7 +162,7 @@ ENV CPATH=/triqs/include:/usr/include/mkl:${CPATH} \
     PATH=/triqs/bin:${PATH} \
     LIBRARY_PATH=/triqs/lib:${LIBRARY_PATH} \
     LD_LIBRARY_PATH=/triqs/lib:${LD_LIBRARY_PATH} \
-    PYTHONPATH=/triqs/lib/python3.10/site-packages:${PYTHONPATH} \
+    PYTHONPATH=/triqs/lib/python3.12/site-packages:${PYTHONPATH} \
     CMAKE_PREFIX_PATH=/triqs/share/cmake:${CMAKE_PREFIX_PATH} \
     CMAKE_BUILD_PARALLEL_LEVEL=${NCORES} \
     CTEST_OUTPUT_ON_FAILURE=1 \