Skip to content

Commit

Permalink
Docker: Remove build files to reduce image size
Browse files Browse the repository at this point in the history
  • Loading branch information
oschuett committed Feb 17, 2023
1 parent 04096ff commit 1edf9b7
Show file tree
Hide file tree
Showing 45 changed files with 80 additions and 45 deletions.
10 changes: 4 additions & 6 deletions tools/conventions/test_conventions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@ date --utc --rfc-3339=seconds

(
set -e # abort if error is encountered
cd ../../
make -j ARCH=Linux-x86-64-gfortran VERSION="dumpast" > make_conventions1.out
make -j ARCH=local_warn VERSION="psmp" > make_conventions2.out
)
MAKE_EXIT_CODE=$?

if ((MAKE_EXIT_CODE)); then
cd ../../obj/local_warn/psmp/
echo ""
grep -B 2 Error ./*.warn
grep -B 2 Error ./obj/local_warn/psmp/*.warn
echo ""
echo "Summary: Compilation failed."
echo "Status: FAILED"
Expand All @@ -29,7 +27,7 @@ else

set -o errexit

./analyze_gfortran_ast.py ../../obj/Linux-x86-64-gfortran/dumpast/*.ast > ast.issues
./analyze_gfortran_warnings.py ../../obj/local_warn/psmp/*.warn > warn.issues
./summarize_issues.py --suppressions=conventions.supp ./*.issues
./tools/conventions/analyze_gfortran_ast.py ./obj/Linux-x86-64-gfortran/dumpast/*.ast > ast.issues
./tools/conventions/analyze_gfortran_warnings.py ./obj/local_warn/psmp/*.warn > warn.issues
./tools/conventions/summarize_issues.py --suppressions=./tools/conventions/conventions.supp ./*.issues
fi
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.build_hip_rocm_Mi100
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_hip VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_hip/cp2k.psmp ] || ldd ./exe/local_hip/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.build_hip_rocm_Mi50
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_hip VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_hip/cp2k.psmp ] || ldd ./exe/local_hip/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_aiida
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.sdbg ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=sdbg &> /dev/null || true )"
( make -j ARCH=local VERSION=sdbg &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_arm64-psmp
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local/cp2k.psmp ] || ldd ./exe/local/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_asan-psmp
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_asan VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_asan/cp2k.psmp ] || ldd ./exe/local_asan/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_asan-ssmp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local_asan.ssmp ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_asan VERSION=ssmp &> /dev/null || true )"
( make -j ARCH=local_asan VERSION=ssmp &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_ase
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.sdbg ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=sdbg &> /dev/null || true )"
( make -j ARCH=local VERSION=sdbg &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
21 changes: 5 additions & 16 deletions tools/docker/Dockerfile.test_conventions
Original file line number Diff line number Diff line change
Expand Up @@ -59,30 +59,19 @@ COPY ./tools/toolchain/scripts/arch_base.tmpl \
./scripts/
RUN ./scripts/generate_arch_files.sh && rm -rf ./build

# Install CP2K using local_warn.psmp.
# Run test for conventions.
WORKDIR /opt/cp2k
COPY ./Makefile .
COPY ./src ./src
COPY ./exts ./exts
COPY ./tools/build_utils ./tools/build_utils
RUN /bin/bash -c " \
mkdir -p arch && \
ln -vs /opt/cp2k-toolchain/install/arch/local_warn.psmp ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_warn VERSION=psmp &> /dev/null || true ) && \
( [ ! -f ./exe/local_warn/cp2k.psmp ] || ldd ./exe/local_warn/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting

# Run test for conventions.
COPY ./arch/Linux-x86-64-gfortran.dumpast ./arch/
COPY ./tools/conventions ./tools/conventions
WORKDIR ./tools/conventions
COPY ./arch/Linux-x86-64-gfortran.dumpast ./arch/
RUN /bin/bash -ec " \
ln -vs /opt/cp2k-toolchain/install/arch/local_warn.psmp ./arch/ && \
source /opt/cp2k-toolchain/install/setup && \
./test_conventions.sh |& tee report.log"
./tools/conventions/test_conventions.sh |& tee report.log && \
rm -rf lib obj exe"

# Output the report if the image is old and was therefore pulled from the build cache.
CMD cat $(find ./report.log -mmin +10) | sed '/^Summary:/ s/$/ (cached)/'
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_coverage-pdbg
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_coverage VERSION=pdbg &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_coverage/cp2k.pdbg ] || ldd ./exe/local_coverage/cp2k.pdbg | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_coverage-sdbg
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local_coverage.sdbg ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_coverage VERSION=sdbg &> /dev/null || true )"
( make -j ARCH=local_coverage VERSION=sdbg &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_cuda_A100
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_cuda VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_cuda/cp2k.psmp ] || ldd ./exe/local_cuda/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_cuda_P100
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_cuda VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_cuda/cp2k.psmp ] || ldd ./exe/local_cuda/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_cuda_V100
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_cuda VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_cuda/cp2k.psmp ] || ldd ./exe/local_cuda/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_gcc10
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.ssmp ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=ssmp &> /dev/null || true )"
( make -j ARCH=local VERSION=ssmp &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_gcc11
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.ssmp ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=ssmp &> /dev/null || true )"
( make -j ARCH=local VERSION=ssmp &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_gcc12
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.ssmp ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=ssmp &> /dev/null || true )"
( make -j ARCH=local VERSION=ssmp &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_gcc7
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.ssmp ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=ssmp &> /dev/null || true )"
( make -j ARCH=local VERSION=ssmp &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_gcc8
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.ssmp ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=ssmp &> /dev/null || true )"
( make -j ARCH=local VERSION=ssmp &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_gcc9
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.ssmp ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=ssmp &> /dev/null || true )"
( make -j ARCH=local VERSION=ssmp &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_generic_pdbg
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=pdbg &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local/cp2k.pdbg ] || ldd ./exe/local/cp2k.pdbg | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_generic_psmp
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local/cp2k.psmp ] || ldd ./exe/local/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_generic_sdbg
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.sdbg ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=sdbg &> /dev/null || true )"
( make -j ARCH=local VERSION=sdbg &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_generic_ssmp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.ssmp ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=ssmp &> /dev/null || true )"
( make -j ARCH=local VERSION=ssmp &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_gromacs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.sdbg ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=sdbg &> /dev/null || true )"
( make -j ARCH=local VERSION=sdbg &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_hip_cuda_A100
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_hip VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_hip/cp2k.psmp ] || ldd ./exe/local_hip/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_hip_cuda_P100
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_hip VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_hip/cp2k.psmp ] || ldd ./exe/local_hip/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_hip_cuda_V100
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_hip VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_hip/cp2k.psmp ] || ldd ./exe/local_hip/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_hip_rocm_Mi100
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_hip VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_hip/cp2k.psmp ] || ldd ./exe/local_hip/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_hip_rocm_Mi50
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_hip VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_hip/cp2k.psmp ] || ldd ./exe/local_hip/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_i-pi
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.sdbg ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=sdbg &> /dev/null || true )"
( make -j ARCH=local VERSION=sdbg &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_i386
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ RUN /bin/bash -c " \
ln -vs /opt/cp2k-toolchain/install/arch/local.ssmp ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=ssmp &> /dev/null || true )"
( make -j ARCH=local VERSION=ssmp &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_intel-psmp
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local/cp2k.psmp ] || ldd ./exe/local/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_manual
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local/cp2k.psmp ] || ldd ./exe/local/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
3 changes: 2 additions & 1 deletion tools/docker/Dockerfile.test_minimal
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ COPY ./arch/minimal.sdbg /opt/cp2k/arch/
RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=minimal VERSION=sdbg &> /dev/null || true )"
( make -j ARCH=minimal VERSION=sdbg &> /dev/null || true ) && \
rm -rf lib obj"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_openmpi-psmp
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local/cp2k.psmp ] || ldd ./exe/local/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_pdbg
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=pdbg &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local/cp2k.pdbg ] || ldd ./exe/local/cp2k.pdbg | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_performance
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local/cp2k.psmp ] || ldd ./exe/local/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down
1 change: 1 addition & 0 deletions tools/docker/Dockerfile.test_performance_cuda_A100
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ RUN /bin/bash -c " \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local_cuda VERSION=psmp &> /dev/null || true ) && \
rm -rf lib obj && \
( [ ! -f ./exe/local_cuda/cp2k.psmp ] || ldd ./exe/local_cuda/cp2k.psmp | grep -q libmpi )"
COPY ./data ./data
COPY ./tests ./tests
Expand Down

0 comments on commit 1edf9b7

Please sign in to comment.