From 797cc2e6475702597bb2d04233c220410b661a58 Mon Sep 17 00:00:00 2001 From: Yuki Iwai Date: Sat, 12 Oct 2024 18:39:33 +0900 Subject: [PATCH 1/2] Upgrade debian version to bookworm Signed-off-by: Yuki Iwai --- build/base/Dockerfile | 2 +- build/base/intel-builder.Dockerfile | 4 ++-- build/base/mpich-builder.Dockerfile | 2 +- build/base/openmpi-builder.Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/base/Dockerfile b/build/base/Dockerfile index 9e8363c0..af0c21a4 100644 --- a/build/base/Dockerfile +++ b/build/base/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM debian:bookworm ARG port=2222 diff --git a/build/base/intel-builder.Dockerfile b/build/base/intel-builder.Dockerfile index 3510b995..f9072ad1 100644 --- a/build/base/intel-builder.Dockerfile +++ b/build/base/intel-builder.Dockerfile @@ -2,7 +2,7 @@ FROM bash AS downloader RUN wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB -O key.PUB -FROM debian:bullseye +FROM debian:bookworm COPY --from=downloader key.PUB /tmp/key.PUB @@ -16,7 +16,7 @@ RUN apt update \ && apt autoremove -y \ && apt update \ && apt install -y --no-install-recommends \ - libstdc++-10-dev binutils procps clang \ + libstdc++-12-dev binutils procps clang \ intel-oneapi-compiler-dpcpp-cpp \ intel-oneapi-mpi-devel \ && rm -rf /var/lib/apt/lists/* diff --git a/build/base/mpich-builder.Dockerfile b/build/base/mpich-builder.Dockerfile index 5880b8aa..d6f25e93 100644 --- a/build/base/mpich-builder.Dockerfile +++ b/build/base/mpich-builder.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye as builder +FROM debian:bookworm as builder RUN apt update \ && apt install -y --no-install-recommends \ diff --git a/build/base/openmpi-builder.Dockerfile b/build/base/openmpi-builder.Dockerfile index 5cec38b2..a548d519 100644 --- a/build/base/openmpi-builder.Dockerfile +++ b/build/base/openmpi-builder.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye as builder +FROM debian:bookworm as builder RUN apt update \ && apt install -y --no-install-recommends \ From 0470b995abbf03f839731ecab6ec8f372ea42193 Mon Sep 17 00:00:00 2001 From: Yuki Iwai Date: Sat, 12 Oct 2024 20:19:53 +0900 Subject: [PATCH 2/2] Add obviously verifications if all Ranks reached final phase in the pi example Signed-off-by: Yuki Iwai --- examples/v2beta1/pi/pi.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/v2beta1/pi/pi.cc b/examples/v2beta1/pi/pi.cc index 381cea0b..fed4573a 100644 --- a/examples/v2beta1/pi/pi.cc +++ b/examples/v2beta1/pi/pi.cc @@ -46,6 +46,7 @@ int main(int argc, char *argv[]) { double pi = 4 * (double)total_count / (double)(worker_tests) / (double)(workers); printf("pi is approximately %.16lf\n", pi); } + MPI_Barrier(MPI_COMM_WORLD); MPI_Finalize(); return 0; }