From e3281e024bb35180d3a2a853d323285ecfbece49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Sun, 29 Jan 2023 21:07:44 +0100 Subject: [PATCH] Docker: Fix typo in cmake variable and add check for warnings --- tools/docker/Dockerfile.test_cmake | 3 ++- tools/docker/generate_dockerfiles.py | 3 ++- tools/docker/scripts/install_dbcsr.sh | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/docker/Dockerfile.test_cmake b/tools/docker/Dockerfile.test_cmake index b7b7fe3232..c15f3d79e5 100644 --- a/tools/docker/Dockerfile.test_cmake +++ b/tools/docker/Dockerfile.test_cmake @@ -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 diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py index 08de781222..55750f960b 100755 --- a/tools/docker/generate_dockerfiles.py +++ b/tools/docker/generate_dockerfiles.py @@ -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 diff --git a/tools/docker/scripts/install_dbcsr.sh b/tools/docker/scripts/install_dbcsr.sh index 3456103127..cd289fc739 100755 --- a/tools/docker/scripts/install_dbcsr.sh +++ b/tools/docker/scripts/install_dbcsr.sh @@ -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}