Docker: Postpone hip/rocm regtests until container execution

cp2k · Mar 11, 2022 · cc8ca8c · cc8ca8c
1 parent 391b09e
commit cc8ca8c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/tools/docker/Dockerfile.test_hip_rocm_Mi100 b/tools/docker/Dockerfile.test_hip_rocm_Mi100
@@ -91,15 +91,10 @@ COPY ./data ./data
 COPY ./tests ./tests
 COPY ./tools/regtesting ./tools/regtesting
 
-# Run regression tests.
+# Postpone running the regression tests until the container is executed.
 ARG TESTOPTS
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
-    TESTOPTS="${TESTOPTS}" \
-    ./test_regtest.sh 'local_hip' 'psmp' |& tee report.log && \
-    rm -rf regtesting"
-
-# 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)/'
+ENV TESTOPTS="${TESTOPTS}"
+CMD ["./test_regtest.sh", "local_hip", "psmp"]
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_hip_rocm_Mi50 b/tools/docker/Dockerfile.test_hip_rocm_Mi50
@@ -91,15 +91,10 @@ COPY ./data ./data
 COPY ./tests ./tests
 COPY ./tools/regtesting ./tools/regtesting
 
-# Run regression tests.
+# Postpone running the regression tests until the container is executed.
 ARG TESTOPTS
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
-    TESTOPTS="${TESTOPTS}" \
-    ./test_regtest.sh 'local_hip' 'psmp' |& tee report.log && \
-    rm -rf regtesting"
-
-# 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)/'
+ENV TESTOPTS="${TESTOPTS}"
+CMD ["./test_regtest.sh", "local_hip", "psmp"]
 
 #EOF
diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py
@@ -61,7 +61,12 @@ def main() -> None:
 
     for gpu_ver in "Mi50", "Mi100":
         with OutputFile(f"Dockerfile.test_hip_rocm_{gpu_ver}", args.check) as f:
-            f.write(toolchain_hip_rocm(gpu_ver=gpu_ver) + regtest("psmp", "local_hip"))
+            # ROCm containers require --device, which is not available for docker build.
+            # https://rocmdocs.amd.com/en/latest/ROCm_Virtualization_Containers/ROCm-Virtualization-&-Containers.html#docker-hub
+            f.write(
+                toolchain_hip_rocm(gpu_ver=gpu_ver)
+                + regtest_postponed("psmp", "local_hip")
+            )
 
     with OutputFile(f"Dockerfile.test_conventions", args.check) as f:
         f.write(toolchain_full() + conventions())
@@ -98,6 +103,22 @@ def regtest(version: str, arch: str = "local") -> str:
     )
 
 
+# ======================================================================================
+def regtest_postponed(version: str, arch: str = "local") -> str:
+    return (
+        install_cp2k(version=version, arch=arch)
+        + fr"""
+# Postpone running the regression tests until the container is executed.
+ARG TESTOPTS
+COPY ./tools/docker/scripts/test_regtest.sh ./
+ENV TESTOPTS="${{TESTOPTS}}"
+CMD ["./test_regtest.sh", "{arch}", "{version}"]
+
+#EOF
+"""
+    )
+
+
 # ======================================================================================
 def performance(arch: str = "local") -> str:
     return (