Unverified Commit 5827f69d authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

OpenMPI's "sm" transport layer has gone from some newer versions. use "tcp" as... 

OpenMPI's "sm" transport layer has gone from some newer versions. use "tcp" as lowest common denominator
parent 48a9e0d7

tools/singularity/centos7.def

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ EOF 
        . /etc/profile

        . /etc/profile

        module load mpi

        module load mpi

        # restrict OpenMPI to shared memory comm by default

        # restrict OpenMPI to shared memory comm by default

        OMPI_MCA_btl="sm,self"

        OMPI_MCA_btl="tcp,self"

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

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

        OMPI_MCA_btl_base_warn_component_unused="0"

        OMPI_MCA_btl_base_warn_component_unused="0"

        export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

        export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/centos8.def

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ EOF 
        . /etc/profile

        . /etc/profile

        module load mpi

        module load mpi

        # restrict OpenMPI to shared memory comm by default

        # restrict OpenMPI to shared memory comm by default

        OMPI_MCA_btl="sm,self"

        OMPI_MCA_btl="tcp,self"

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

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

        OMPI_MCA_btl_base_warn_component_unused="0"

        OMPI_MCA_btl_base_warn_component_unused="0"

        export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

        export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/fedora32_mingw.def

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ EOF 
        . /etc/profile

        . /etc/profile

        module load mpi

        module load mpi

        # restrict OpenMPI to shared memory comm by default

        # restrict OpenMPI to shared memory comm by default

        OMPI_MCA_btl="sm,self"

        OMPI_MCA_btl="tcp,self"

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

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

        OMPI_MCA_btl_base_warn_component_unused="0"

        OMPI_MCA_btl_base_warn_component_unused="0"

        export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

        export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/ubuntu16.04.def

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ EOF 
        LC_ALL=C

        LC_ALL=C

        export LC_ALL

        export LC_ALL

        # restrict OpenMPI to shared memory comm by default

        # restrict OpenMPI to shared memory comm by default

        OMPI_MCA_btl="sm,self"

        OMPI_MCA_btl="tcp,self"

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

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

        OMPI_MCA_btl_base_warn_component_unused="0"

        OMPI_MCA_btl_base_warn_component_unused="0"

        export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

        export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/ubuntu18.04.def

+1 −1
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ EOF 
    export LC_ALL

    export LC_ALL

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

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

    # restrict OpenMPI to shared memory comm by default

    # restrict OpenMPI to shared memory comm by default

    OMPI_MCA_btl="sm,self"

    OMPI_MCA_btl="tcp,self"

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

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

    OMPI_MCA_btl_base_warn_component_unused="0"

    OMPI_MCA_btl_base_warn_component_unused="0"

    export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

    export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

CRA Git | Maintained and supported by SUSTech CRA and CCSE