Skip to content

Commit 736712f

Browse files
committed
[build] bump gcc to ver 14 and llvm to 20 for triqs unstable compat
1 parent 19a69a9 commit 736712f

3 files changed

Lines changed: 35 additions & 7 deletions

File tree

Docker/github_ci_dockerfile

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM ubuntu:24.04 AS base
2+
ARG LLVM=20
23

34
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
45
build-essential \
@@ -8,27 +9,35 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
89
cython3 \
910
debhelper \
1011
dh-python \
11-
g++-13 \
12-
gfortran-13 \
12+
clang-${LLVM} \
13+
clang-tools-${LLVM} \
14+
gcc-14 \
15+
g++-14 \
16+
gfortran-14 \
1317
git \
1418
hdf5-tools \
1519
libboost-dev \
20+
libc++-${LLVM}-dev \
21+
libc++abi-${LLVM}-dev \
22+
libclang-${LLVM}-dev \
1623
libfftw3-dev \
1724
libgfortran5 \
1825
libgmp-dev \
1926
libhdf5-dev \
2027
libopenblas-dev \
2128
libnfft3-dev \
22-
libomp-dev \
29+
libomp-${LLVM}-dev \
2330
libopenmpi-dev \
2431
libpython3-dev \
32+
llvm-${LLVM}-dev \
2533
openmpi-bin \
2634
openmpi-common \
2735
openmpi-doc \
2836
openssl \
2937
pandoc \
3038
python-is-python3 \
3139
python3-ase \
40+
python3-clang-${LLVM} \
3241
python3-decorator \
3342
python3-dev \
3443
python3-jinja2 \
@@ -73,7 +82,8 @@ ARG NCORES=8
7382
RUN cd / && mkdir -p triqs && mkdir -p source
7483

7584
ENV PYTHON_VERSION=3.12 \
76-
CC=gcc-13 CXX=g++-13
85+
CC=gcc-14 CXX=g++-14 \
86+
CLANG_CC=clang-${LLVM} CLANG_CXX=clang++-${LLVM}
7787
# triqs
7888
ENV CPATH=/triqs/include:${CPATH} \
7989
PATH=/triqs/bin:${PATH} \
@@ -86,15 +96,27 @@ ENV CPATH=/triqs/include:${CPATH} \
8696
CTEST_PARALLEL_LEVEL=${NCORES} \
8797
TRIQS_ROOT=/triqs
8898

99+
RUN cd /source && git clone -b unstable --depth 1 https://github.com/flatironinstitute/clair.git \
100+
&& cd clair && mkdir -p build && cd build \
101+
&& CXXFLAGS="" cmake ../ -DCMAKE_INSTALL_PREFIX=/triqs \
102+
-DCMAKE_C_COMPILER=$CLANG_CC \
103+
-DCMAKE_CXX_COMPILER=$CLANG_CXX \
104+
-DBuild_Tests=OFF \
105+
&& make -j$NCORES && make install
106+
89107
RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/triqs \
90108
&& cd triqs && mkdir -p build && cd build \
91109
&& cmake ../ -DCMAKE_INSTALL_PREFIX=/triqs \
110+
-DCMAKE_C_COMPILER=$CC \
111+
-DCMAKE_CXX_COMPILER=$CXX \
92112
&& make -j$NCORES && ctest -j$NCORES && make install
93113

94114
# dft_tools
95115
RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/dft_tools.git \
96116
&& cd dft_tools && mkdir -p build && cd build \
97117
&& cmake ../ \
118+
-DCMAKE_C_COMPILER=$CC \
119+
-DCMAKE_CXX_COMPILER=$CXX \
98120
&& make -j$NCORES && ctest -j$NCORES && make install
99121

100122
# cthyb
@@ -132,4 +154,3 @@ RUN pip install --no-deps --target /triqs/lib/python3.12/site-packages sparse-ir
132154

133155
# remove source
134156
RUN cd / && rm -rf source
135-

Docker/openmpi_dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM --platform=linux/amd64 ubuntu:24.04 AS base
2-
ARG LLVM=19
2+
ARG LLVM=20
33

44
# This platform includes dependencies for building docs
55
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -168,6 +168,14 @@ ENV CPATH=/triqs/include:/usr/include/mkl:${CPATH} \
168168
BLA_VENDOR=Intel10_64_dyn \
169169
TRIQS_ROOT=/triqs
170170

171+
RUN cd /source && git clone -b unstable --depth 1 https://github.com/flatironinstitute/clair.git clair.src \
172+
&& mkdir -p clair.build && cd clair.build \
173+
&& cmake ../clair.src -DCMAKE_INSTALL_PREFIX=/triqs \
174+
-DCMAKE_C_COMPILER=$CC \
175+
-DCMAKE_CXX_COMPILER=$CXX \
176+
-DBuild_Tests=OFF \
177+
&& make -j$NCORES && make install
178+
171179
RUN cd /source && git clone -b unstable --depth 1 https://github.com/TRIQS/triqs triqs.src \
172180
&& mkdir -p triqs.build && cd triqs.build \
173181
&& cmake ../triqs.src -DCMAKE_INSTALL_PREFIX=/triqs \

test/python/test_observables.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ def test_add_dmft_observables_one_impurity_one_band(self):
187187

188188
observables = add_dmft_observables(observables, general_params, solver_params, map_imp_solver, solver_type_per_imp, None, it, solvers, h_int,
189189
previous_mu, sum_k, density_mat, shell_multiplicity, E_bandcorr)
190-
print(observables['orb_Z'])
191190
expected_observables = {'iteration': [1], 'mu': [1.56], 'E_tot': [10.43], 'E_bandcorr': [10.43],
192191
'E_int': [[]], 'E_corr_en': [0.0], 'E_dft': [0.0], 'E_DC': [[0.0]],
193192
'orb_gb2': [{'up': [[-0.0250]], 'down': [[-0.0498]]}], 'imp_gb2': [{'up': [-0.0250], 'down': [-0.0498]}],

0 commit comments

Comments
 (0)