CI: Label log lines of tests run under MPI with process rank (horovod…

…#3827) Signed-off-by: Max H. Gerlach <git@maxgerlach.de>
chongxiaoc · Jan 27, 2023 · 10ddf34 · 10ddf34
1 parent abe639b
commit 10ddf34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile.test.cpu b/Dockerfile.test.cpu
@@ -104,7 +104,7 @@ RUN if [[ ${MPI_KIND} == "OpenMPI" ]]; then \
             cd /tmp && tar -zxf /tmp/openmpi-4.1.4-bin.tar.gz && \
             mkdir openmpi-4.1.4/build && cd openmpi-4.1.4/build && ../configure --prefix=/usr/local && \
             make -j all && make install && ldconfig && \
-            echo "mpirun -allow-run-as-root -np 2 -H localhost:2 -bind-to none -map-by slot -mca mpi_abort_print_stack 1" > /mpirun_command; \
+            echo "mpirun -allow-run-as-root -np 2 -H localhost:2 -bind-to none -map-by slot -mca mpi_abort_print_stack 1 -tag-output" > /mpirun_command; \
     elif [[ ${MPI_KIND} == "ONECCL" ]]; then \
         wget --progress=dot:mega -O /tmp/oneccl.tar.gz https://github.com/oneapi-src/oneCCL/archive/${CCL_PACKAGE}.tar.gz && \
             cd /tmp && tar -zxf oneccl.tar.gz && \
@@ -130,7 +130,7 @@ RUN if [[ ${MPI_KIND} == "OpenMPI" ]]; then \
             chmod +x /mpicc_oneccl; \
     elif [[ ${MPI_KIND} == "MPICH" ]]; then \
         apt-get update -qq && apt-get install -y mpich && \
-            echo "mpirun -np 2" > /mpirun_command; \
+            echo "mpirun -np 2 -l" > /mpirun_command; \
     fi
 
 # Install mpi4py.

diff --git a/Dockerfile.test.gpu b/Dockerfile.test.gpu
@@ -108,10 +108,10 @@ RUN if [[ ${MPI_KIND} == "OpenMPI" ]]; then \
             cd /tmp && tar -zxf /tmp/openmpi-4.1.4-bin.tar.gz && \
             mkdir openmpi-4.1.4/build && cd openmpi-4.1.4/build && ../configure --prefix=/usr/local && \
             make -j all && make install && ldconfig && \
-            echo "mpirun -allow-run-as-root -np 2 -H localhost:2 -bind-to none -map-by slot -mca mpi_abort_print_stack 1" > /mpirun_command; \
+            echo "mpirun -allow-run-as-root -np 2 -H localhost:2 -bind-to none -map-by slot -mca mpi_abort_print_stack 1 -tag-output" > /mpirun_command; \
     elif [[ ${MPI_KIND} == "MPICH" ]]; then \
         apt-get update -qq && apt-get install -y mpich && \
-            echo "mpirun -np 2" > /mpirun_command; \
+            echo "mpirun -np 2 -l" > /mpirun_command; \
     fi
 
 # Set default NCCL parameters