Skip to content

Commit a4b2668

Browse files
committed
Update compiler and library dependencies
1 parent f7f8ef2 commit a4b2668

File tree

5 files changed

+20
-11
lines changed

5 files changed

+20
-11
lines changed

docker/Dockerfile-debian

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ RUN apt-get update && \
77
ccache \
88
curl \
99
cython3 \
10+
gcc-12 g++-12 \
1011
gdb \
1112
git \
1213
libboost-dev \
1314
libboost-filesystem-dev \
1415
libboost-mpi-dev \
1516
libboost-serialization-dev \
1617
libboost-test-dev \
18+
libcereal-dev \
1719
libfftw3-dev \
1820
libhdf5-openmpi-dev \
1921
libpython3-dev \

docker/Dockerfile-fedora

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
FROM fedora:40
1+
FROM fedora:41
22
RUN dnf -y install \
33
blas-devel \
44
boost-devel \
55
boost-mpich-devel \
66
ccache \
77
cmake \
8+
cereal-devel \
89
environment-modules \
910
fftw-devel \
1011
fftw-mpich-devel \

docker/Dockerfile-ubuntu

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ RUN apt-get update && \
66
automake \
77
build-essential \
88
ccache \
9-
clang-18 clang-tidy-18 clang-format-18 llvm-18 libclang-rt-18-dev \
9+
clang-18 clang-tidy-18 clang-format-18 llvm-18 libclang-rt-18-dev libomp-18-dev \
1010
cmake \
1111
cmake-format \
1212
curl \
1313
cython3 \
1414
doxygen \
1515
ffmpeg \
1616
gcc-12 g++-12 \
17-
gcc-13 g++-13 \
17+
gcc-14 g++-14 \
1818
gdb \
1919
gfortran \
2020
git \
@@ -32,6 +32,7 @@ RUN apt-get update && \
3232
libboost-mpi-dev \
3333
libboost-serialization-dev \
3434
libboost-test-dev \
35+
libcereal-dev \
3536
libdigest-sha-perl \
3637
libfftw3-dev \
3738
libfftw3-mpi-dev \
@@ -76,6 +77,7 @@ RUN apt-get update && \
7677
python3-vtk9 \
7778
rsync \
7879
texlive-base \
80+
unzip \
7981
vim && \
8082
apt-get clean && \
8183
rm -rf /var/lib/apt/lists/*
@@ -89,9 +91,9 @@ RUN sh /tmp/install-pfft.sh && rm /tmp/install-pfft.sh && \
8991
sh /tmp/install-kokkos.sh && rm /tmp/install-kokkos.sh && \
9092
ldconfig
9193

92-
ENV NVIDIA_VISIBLE_DEVICES all
93-
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
94-
ENV JUPYTER_PLATFORM_DIRS 1
94+
ENV NVIDIA_VISIBLE_DEVICES=all
95+
ENV NVIDIA_DRIVER_CAPABILITIES="compute,utility"
96+
ENV JUPYTER_PLATFORM_DIRS=1
9597

9698
COPY --chown=1000:1000 jupyter_nbconvert_config.json /tmp
9799

@@ -101,8 +103,8 @@ RUN echo | cpan && \
101103
echo | cpan JSON::XS && \
102104
chown -R espresso:espresso /home/espresso/.cpan/
103105
USER espresso
104-
ENV VIRTUAL_ENV "$HOME/venv"
105-
ENV PATH "$HOME/.local/bin:$VIRTUAL_ENV/bin:$PATH"
106+
ENV VIRTUAL_ENV="$HOME/venv"
107+
ENV PATH="$HOME/.local/bin:$VIRTUAL_ENV/bin:$PATH"
106108
RUN cd "${HOME}" && \
107109
python3 -m venv --system-site-packages venv && \
108110
. venv/bin/activate && \

docker/Dockerfile-ubuntu-wo-dependencies

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RUN apt-get update && \
1515
libboost-mpi-dev \
1616
libboost-serialization-dev \
1717
libboost-test-dev \
18+
libcereal-dev \
1819
libopenmpi-dev \
1920
openssh-client \
2021
openmpi-bin \

docker/install-kokkos.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ set -e
44

55
cd /tmp
66

7-
git clone -b 4.3.00 https://github.com/kokkos/kokkos
8-
cd kokkos/
7+
kokkos_version="4.3.00"
8+
curl -Lo ./kokkos-${kokkos_version}.tar.gz https://github.com/kokkos/kokkos/archive/refs/tags/${kokkos_version}.tar.gz
9+
tar xfz ./kokkos-${kokkos_version}.tar.gz
10+
rm ./kokkos-${kokkos_version}.tar.gz
11+
cd kokkos-${kokkos_version}/
912
mkdir build
1013
cd build/
1114
cmake .. -D Kokkos_ENABLE_CUDA=OFF -DKokkos_ENABLE_OPENMP=ON -D CMAKE_POSITION_INDEPENDENT_CODE=ON
1215
make -j $(nproc) install
1316
cd
14-
rm -r /tmp/kokkos
17+
rm -r /tmp/kokkos-${kokkos_version}
1518
ldconfig

0 commit comments

Comments
 (0)