Skip to content

Commit 3353f0a

Browse files
authored
Bump toolchains (#218)
Description of changes: * require Boost >= 1.81, CMake >= 3.27.6, Cython >= 3.0.8 * replace the Make build system by the Ninja build system
2 parents 77a3823 + 639d8c2 commit 3353f0a

File tree

5 files changed

+12
-23
lines changed

5 files changed

+12
-23
lines changed

docker/Dockerfile-debian

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm AS image_base
1+
FROM debian:trixie AS image_base
22
RUN apt-get update && \
33
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
44
apt-utils \
@@ -7,7 +7,7 @@ RUN apt-get update && \
77
ccache \
88
curl \
99
cython3 \
10-
gcc-12 g++-12 \
10+
gcc-14 g++-14 \
1111
gdb \
1212
git \
1313
libboost-dev \
@@ -16,8 +16,10 @@ RUN apt-get update && \
1616
libboost-serialization-dev \
1717
libboost-test-dev \
1818
libfftw3-dev \
19+
libfftw3-mpi-dev \
1920
libhdf5-openmpi-dev \
2021
libpython3-dev \
22+
ninja-build \
2123
openmpi-bin \
2224
python3 \
2325
python3-h5py \
@@ -26,6 +28,7 @@ RUN apt-get update && \
2628
python3-pip \
2729
python3-scipy \
2830
python3-setuptools \
31+
python3-venv \
2932
python3-vtk9 \
3033
vim && \
3134
apt-get clean && \

docker/Dockerfile-fedora

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM fedora:41
1+
FROM fedora:42
22
RUN dnf -y install \
33
blas-devel \
44
boost-devel \
@@ -17,6 +17,8 @@ RUN dnf -y install \
1717
lapack-devel \
1818
make \
1919
mpich-devel \
20+
ninja-build \
21+
patch \
2022
python3 \
2123
python3-devel \
2224
python3-Cython \

docker/Dockerfile-ubuntu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ RUN apt-get update && \
55
autoconf \
66
automake \
77
build-essential \
8+
ca-certificates \
89
ccache \
910
clang-19 clang-tidy-19 clang-format-19 llvm-19 libclang-rt-19-dev libomp-19-dev \
1011
cmake \
@@ -41,6 +42,7 @@ RUN apt-get update && \
4142
libopenmpi-dev \
4243
libthrust-dev \
4344
libtool \
45+
ninja-build \
4446
nvidia-cuda-toolkit \
4547
openmpi-bin \
4648
openssh-client \
@@ -83,11 +85,9 @@ RUN apt-get update && \
8385

8486
COPY install-pfft.sh /tmp
8587
COPY install-scafacos.sh /tmp
86-
COPY install-kokkos.sh /tmp
8788

8889
RUN sh /tmp/install-pfft.sh && rm /tmp/install-pfft.sh && \
8990
sh /tmp/install-scafacos.sh && rm /tmp/install-scafacos.sh && \
90-
sh /tmp/install-kokkos.sh && rm /tmp/install-kokkos.sh && \
9191
ldconfig
9292

9393
ENV NVIDIA_VISIBLE_DEVICES=all

docker/Dockerfile-ubuntu-wo-dependencies

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ RUN apt-get update && \
33
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
44
apt-utils \
55
build-essential \
6+
ca-certificates \
67
curl \
78
ccache \
89
cmake \
@@ -16,6 +17,7 @@ RUN apt-get update && \
1617
libboost-serialization-dev \
1718
libboost-test-dev \
1819
libopenmpi-dev \
20+
ninja-build \
1921
openssh-client \
2022
openmpi-bin \
2123
python3 \

docker/install-kokkos.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)