comp-chem/cp2k
1
0
Fork 0
mirror of https://github.com/cp2k/cp2k.git synced 2026-07-27 21:55:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Docker: Fix typo in cmake variable and add check for warnings

Browse source
This commit is contained in:
Ole Schütt 2023-01-29 21:07:44 +01:00 • committed by Ole Schütt
parent 755e56aeaf
commit e3281e024b
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tools/docker/Dockerfile.test_cmake
View file

@ -78,7 +78,8 @@ WORKDIR ./build
RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
cmake -DCP2K_USE_VORI=ON -DCP2K_USE_COSMA=NO -DCP2K_USE_LIBXSMM=ON -DCP2K_BLAS_VENDOR=OpenBLAS -DCP2K_USE_SPGLIB=ON -DCP2K_USE_LIBINT2=ON -DCP2K_USE_LIBXC=ON -DCP2k_USE_LIBTORCH=ON .. && \
cmake -Werror=dev -DCP2K_USE_VORI=ON -DCP2K_USE_COSMA=NO -DCP2K_USE_LIBXSMM=ON -DCP2K_BLAS_VENDOR=OpenBLAS -DCP2K_USE_SPGLIB=ON -DCP2K_USE_LIBINT2=ON -DCP2K_USE_LIBXC=ON -DCP2K_USE_LIBTORCH=OFF .. |& tee ./cmake.log && \
! grep -A5 'CMake Warning' ./cmake.log && \
make -j"
COPY ./data ./data
COPY ./tests ./tests

3
tools/docker/generate_dockerfiles.py
View file

@ -402,7 +402,8 @@ WORKDIR ./build
RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
cmake -DCP2K_USE_VORI=ON -DCP2K_USE_COSMA=NO -DCP2K_USE_LIBXSMM=ON -DCP2K_BLAS_VENDOR=OpenBLAS -DCP2K_USE_SPGLIB=ON -DCP2K_USE_LIBINT2=ON -DCP2K_USE_LIBXC=ON -DCP2k_USE_LIBTORCH=ON .. && \
cmake -Werror=dev -DCP2K_USE_VORI=ON -DCP2K_USE_COSMA=NO -DCP2K_USE_LIBXSMM=ON -DCP2K_BLAS_VENDOR=OpenBLAS -DCP2K_USE_SPGLIB=ON -DCP2K_USE_LIBINT2=ON -DCP2K_USE_LIBXC=ON -DCP2K_USE_LIBTORCH=OFF .. |& tee ./cmake.log && \
! grep -A5 'CMake Warning' ./cmake.log && \
make -j"
COPY ./data ./data
COPY ./tests ./tests

2
tools/docker/scripts/install_dbcsr.sh
View file

@ -35,7 +35,7 @@ else
if [ -f dbcsr-${DBCSR_ver}.tar.gz ]; then
echo "dbcsr-${DBCSR_ver}.tar.gz is found"
else
wget "https://github.com/cp2k/dbcsr/archive/refs/tags/v${DBCSR_ver}.tar.gz" -O "dbcsr-${DBCSR_ver}.tar.gz"
wget -q "https://github.com/cp2k/dbcsr/archive/refs/tags/v${DBCSR_ver}.tar.gz" -O "dbcsr-${DBCSR_ver}.tar.gz"
fi
echo "Installing from scratch into ${pkg_install_dir}"
[ -d dbcsr-${DBCSR_ver} ] && rm -rf dbcsr-${DBCSR_ver}