Unverified Commit e0062866 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

rather than forcing tcp communication for OpenMPI, we disable infiniband... 

rather than forcing tcp communication for OpenMPI, we disable infiniband instead for better stability of tests
parent 00ebbb31

tools/singularity/centos7.def

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ EOF 
        # load MPI by default

        . /etc/profile

        module load mpi

        # restrict OpenMPI to shared memory comm by default

        OMPI_MCA_btl="tcp,self"

        # tell OpenMPI to not try using Infiniband

        OMPI_MCA_btl="^openib"

        # do not warn about unused components as this messes up testing

        OMPI_MCA_btl_base_warn_component_unused="0"

        export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/centos8.def

+2 −2
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ EOF 
        # load MPI by default

        . /etc/profile

        module load mpi

        # restrict OpenMPI to shared memory comm by default

        OMPI_MCA_btl="tcp,self"

        # tell OpenMPI to not try using Infiniband

        OMPI_MCA_btl="^openib"

        # do not warn about unused components as this messes up testing

        OMPI_MCA_btl_base_warn_component_unused="0"

        export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/fedora32_mingw.def

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ EOF 
        # load MPI by default

        . /etc/profile

        module load mpi

        # restrict OpenMPI to shared memory comm by default

        OMPI_MCA_btl="tcp,self"

        # tell OpenMPI to not try using Infiniband

        OMPI_MCA_btl="^openib"

        # do not warn about unused components as this messes up testing

        OMPI_MCA_btl_base_warn_component_unused="0"

        export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/ubuntu16.04.def

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ EOF 
%environment

        LC_ALL=C

        export LC_ALL

        # restrict OpenMPI to shared memory comm by default

        OMPI_MCA_btl="tcp,self"

        # tell OpenMPI to not try using Infiniband

        OMPI_MCA_btl="^openib"

        # do not warn about unused components as this messes up testing

        OMPI_MCA_btl_base_warn_component_unused="0"

        export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/ubuntu18.04.def

+2 −2
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ EOF 
    LC_ALL=C

    export LC_ALL

    export PATH=/usr/lib/ccache:$PATH

    # restrict OpenMPI to shared memory comm by default

    OMPI_MCA_btl="tcp,self"

    # tell OpenMPI to not try using Infiniband

    OMPI_MCA_btl="^openib"

    # do not warn about unused components as this messes up testing

    OMPI_MCA_btl_base_warn_component_unused="0"

    export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

CRA Git | Maintained and supported by SUSTech CRA and CCSE