From ca874bc59d5b94d87cd8242282c2589b6363862e Mon Sep 17 00:00:00 2001 From: vsoch Date: Thu, 30 Nov 2023 18:33:31 -0700 Subject: [PATCH 1/5] add linktest metrics container Signed-off-by: vsoch --- .github/workflows/docker-builds.yaml | 1 + linktest/Dockerfile | 56 ++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 linktest/Dockerfile diff --git a/.github/workflows/docker-builds.yaml b/.github/workflows/docker-builds.yaml index e6b5925..e21800b 100644 --- a/.github/workflows/docker-builds.yaml +++ b/.github/workflows/docker-builds.yaml @@ -22,6 +22,7 @@ jobs: ["hpl-spack", "ghcr.io/converged-computing/metric-hpl-spack:latest"], ["hpl", "ghcr.io/converged-computing/metric-hpl:latest"], ["ior", "ghcr.io/converged-computing/metric-ior:latest"], + ["linktest", "ghcr.io/converged-computing/metric-linktest:latest"], ["exaMPM", "ghcr.io/converged-computing/metric-exampm:latest"], ["cabanaPIC", "ghcr.io/converged-computing/metric-cabanapic:latest"], ["charmpp", "ghcr.io/converged-computing/metric-charmpp:latest"], diff --git a/linktest/Dockerfile b/linktest/Dockerfile new file mode 100644 index 0000000..ae38ebb --- /dev/null +++ b/linktest/Dockerfile @@ -0,0 +1,56 @@ +ARG tag=latest +FROM ubuntu:${tag} + +# see https://gitlab.jsc.fz-juelich.de/cstao-public/linktest +# in container, see /opt/linktest/exampleRun.sh +# mpirun --allow-run-as-root -N 2 linktest --mode mpi --num-warmup-messages 10 --num-messages 100 --size-messages $((16*1024*1024)) +# to generate report: +# linktest-report -i pingpong_results_bin.sion -o report.pdf +# TODO: need a way to dump data to text file + +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get update && \ + apt-get -qq install -y --no-install-recommends \ + openssh-client openssh-server \ + locales \ + ca-certificates \ + curl \ + wget \ + apt-utils \ + clang \ + clang-format \ + openmpi-bin libopenmpi-dev \ + git \ + jq \ + python3-dev \ + python3-pip \ + build-essential \ + gcc-multilib \ + g++-multilib \ + python3-numpy \ + python3-matplotlib \ + libgtest-dev && \ + rm -rf /var/lib/apt/lists/* + +RUN wget -O test.tar.gz https://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.7 && \ + tar -xzvg test.tar.gz && \ + cd sionlib && \ + ./configure --prefix=/usr --mpi=openmpi && \ + cd build-linux-gomp10-openmpi && \ + make && make install && \ + git clone https://gitlab.jsc.fz-juelich.de/cstao-public/linktest /opt/linktest && \ + git clone https://github.com/kraused/minipmi /opt/minipmi && \ + cd /opt/minipmi && make && make install && \ + cd /opt/linktest/benchmark && \ + make && make install && \ + cd /opt/linktest/python && \ + python3 setup.py install + +# Hack for ssh for now... +RUN echo " LogLevel ERROR" >> /etc/ssh/ssh_config && \ + echo " StrictHostKeyChecking no" >> /etc/ssh/ssh_config && \ + echo " UserKnownHostsFile=/dev/null" >> /etc/ssh/ssh_config && \ + cd /root && \ + mkdir -p /run/sshd && \ + ssh-keygen -t rsa -N "" -f /root/.ssh/id_rsa && chmod og+rX . && \ + cd .ssh && cat id_rsa.pub > authorized_keys && chmod 644 authorized_keys From d45bbdc439cf2bcc3e23424f55ca0ec604c71e09 Mon Sep 17 00:00:00 2001 From: vsoch Date: Thu, 30 Nov 2023 18:40:00 -0700 Subject: [PATCH 2/5] do not rename Signed-off-by: vsoch --- exaMPM/Dockerfile | 3 +-- linktest/Dockerfile | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/exaMPM/Dockerfile b/exaMPM/Dockerfile index 6f8e5da..201abb4 100644 --- a/exaMPM/Dockerfile +++ b/exaMPM/Dockerfile @@ -18,8 +18,7 @@ RUN apt-get update && \ clang \ clang-format \ doxygen \ - mpich \ - libmpich-dev \ + openmpi-bin libopenmpi-dev \ git \ jq \ build-essential \ diff --git a/linktest/Dockerfile b/linktest/Dockerfile index ae38ebb..77c455a 100644 --- a/linktest/Dockerfile +++ b/linktest/Dockerfile @@ -32,8 +32,10 @@ RUN apt-get update && \ libgtest-dev && \ rm -rf /var/lib/apt/lists/* -RUN wget -O test.tar.gz https://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.7 && \ - tar -xzvg test.tar.gz && \ +RUN wget https://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.7 && \ + filename=$(ls download*) && \ + mv $filename test.tar.gz && \ + tar -xzvf test.tar.gz && \ cd sionlib && \ ./configure --prefix=/usr --mpi=openmpi && \ cd build-linux-gomp10-openmpi && \ From db69a84cea613f541df93fc8140b1350982bedd5 Mon Sep 17 00:00:00 2001 From: vsoch Date: Thu, 30 Nov 2023 18:46:32 -0700 Subject: [PATCH 3/5] gfortran missing now? Signed-off-by: vsoch --- linktest/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/linktest/Dockerfile b/linktest/Dockerfile index 77c455a..401c15d 100644 --- a/linktest/Dockerfile +++ b/linktest/Dockerfile @@ -27,6 +27,7 @@ RUN apt-get update && \ build-essential \ gcc-multilib \ g++-multilib \ + gfortran \ python3-numpy \ python3-matplotlib \ libgtest-dev && \ From 5f22661512c7f9a41ee7bb36eccfdf17e34565c8 Mon Sep 17 00:00:00 2001 From: vsoch Date: Thu, 30 Nov 2023 18:52:24 -0700 Subject: [PATCH 4/5] try again Signed-off-by: vsoch --- linktest/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linktest/Dockerfile b/linktest/Dockerfile index 401c15d..3d59efe 100644 --- a/linktest/Dockerfile +++ b/linktest/Dockerfile @@ -20,6 +20,8 @@ RUN apt-get update && \ clang \ clang-format \ openmpi-bin libopenmpi-dev \ + mpich \ + libmpich-dev \ git \ jq \ python3-dev \ From ae13a8109e76270a8b76c3bb0fb483810adff358 Mon Sep 17 00:00:00 2001 From: vsoch Date: Thu, 30 Nov 2023 18:57:15 -0700 Subject: [PATCH 5/5] remove linktest for now, accidentally updated exampm Signed-off-by: vsoch --- .github/workflows/docker-builds.yaml | 1 - linktest/Dockerfile | 61 ---------------------------- 2 files changed, 62 deletions(-) delete mode 100644 linktest/Dockerfile diff --git a/.github/workflows/docker-builds.yaml b/.github/workflows/docker-builds.yaml index e21800b..e6b5925 100644 --- a/.github/workflows/docker-builds.yaml +++ b/.github/workflows/docker-builds.yaml @@ -22,7 +22,6 @@ jobs: ["hpl-spack", "ghcr.io/converged-computing/metric-hpl-spack:latest"], ["hpl", "ghcr.io/converged-computing/metric-hpl:latest"], ["ior", "ghcr.io/converged-computing/metric-ior:latest"], - ["linktest", "ghcr.io/converged-computing/metric-linktest:latest"], ["exaMPM", "ghcr.io/converged-computing/metric-exampm:latest"], ["cabanaPIC", "ghcr.io/converged-computing/metric-cabanapic:latest"], ["charmpp", "ghcr.io/converged-computing/metric-charmpp:latest"], diff --git a/linktest/Dockerfile b/linktest/Dockerfile deleted file mode 100644 index 3d59efe..0000000 --- a/linktest/Dockerfile +++ /dev/null @@ -1,61 +0,0 @@ -ARG tag=latest -FROM ubuntu:${tag} - -# see https://gitlab.jsc.fz-juelich.de/cstao-public/linktest -# in container, see /opt/linktest/exampleRun.sh -# mpirun --allow-run-as-root -N 2 linktest --mode mpi --num-warmup-messages 10 --num-messages 100 --size-messages $((16*1024*1024)) -# to generate report: -# linktest-report -i pingpong_results_bin.sion -o report.pdf -# TODO: need a way to dump data to text file - -ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && \ - apt-get -qq install -y --no-install-recommends \ - openssh-client openssh-server \ - locales \ - ca-certificates \ - curl \ - wget \ - apt-utils \ - clang \ - clang-format \ - openmpi-bin libopenmpi-dev \ - mpich \ - libmpich-dev \ - git \ - jq \ - python3-dev \ - python3-pip \ - build-essential \ - gcc-multilib \ - g++-multilib \ - gfortran \ - python3-numpy \ - python3-matplotlib \ - libgtest-dev && \ - rm -rf /var/lib/apt/lists/* - -RUN wget https://apps.fz-juelich.de/jsc/sionlib/download.php?version=1.7.7 && \ - filename=$(ls download*) && \ - mv $filename test.tar.gz && \ - tar -xzvf test.tar.gz && \ - cd sionlib && \ - ./configure --prefix=/usr --mpi=openmpi && \ - cd build-linux-gomp10-openmpi && \ - make && make install && \ - git clone https://gitlab.jsc.fz-juelich.de/cstao-public/linktest /opt/linktest && \ - git clone https://github.com/kraused/minipmi /opt/minipmi && \ - cd /opt/minipmi && make && make install && \ - cd /opt/linktest/benchmark && \ - make && make install && \ - cd /opt/linktest/python && \ - python3 setup.py install - -# Hack for ssh for now... -RUN echo " LogLevel ERROR" >> /etc/ssh/ssh_config && \ - echo " StrictHostKeyChecking no" >> /etc/ssh/ssh_config && \ - echo " UserKnownHostsFile=/dev/null" >> /etc/ssh/ssh_config && \ - cd /root && \ - mkdir -p /run/sshd && \ - ssh-keygen -t rsa -N "" -f /root/.ssh/id_rsa && chmod og+rX . && \ - cd .ssh && cat id_rsa.pub > authorized_keys && chmod 644 authorized_keys