Skip to content

Commit f1f3d15

Browse files
authored
Merge pull request #12502 from hppritcha/remove_ugni
btl/ugni: remove ugni btl and related doc notes
2 parents 9fcfec2 + 784ed3b commit f1f3d15

32 files changed

+5
-5939
lines changed

VERSION

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,3 @@ libmca_opal_common_cuda_so_version=0:0:0
118118
libmca_opal_common_ofi_so_version=0:0:0
119119
libmca_opal_common_sm_so_version=0:0:0
120120
libmca_opal_common_ucx_so_version=0:0:0
121-
libmca_opal_common_ugni_so_version=0:0:0

config/opal_check_ugni.m4

Lines changed: 0 additions & 83 deletions
This file was deleted.

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ AC_SUBST(libopen_pal_so_version)
172172
AC_SUBST(libmca_opal_common_ofi_so_version)
173173
AC_SUBST(libmca_opal_common_cuda_so_version)
174174
AC_SUBST(libmca_opal_common_sm_so_version)
175-
AC_SUBST(libmca_opal_common_ugni_so_version)
176175
AC_SUBST(libmca_ompi_common_ompio_so_version)
177176
AC_SUBST(libmca_ompi_common_monitoring_so_version)
178177
AC_SUBST(libmca_opal_common_ucx_so_version)

docs/installing-open-mpi/configure-cli-options/networking.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ can be used with ``configure``:
4141
compiler/linker search paths.
4242

4343
Libfabric is the support library for OpenFabrics Interfaces-based
44-
network adapters, such as Cisco usNIC, Intel True Scale PSM, Cray
45-
uGNI, etc.
44+
network adapters, such as Cisco usNIC, Intel True Scale PSM, etc.
4645

4746
* ``--with-libfabric-libdir=DIR``:
4847
Look in directory for the libfabric libraries. By default, Open MPI

docs/release-notes/mpi.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ Other MPI features
156156
#. ``sm``
157157
#. ``smcuda``
158158
#. ``tcp``
159-
#. ``ugni``
160159
#. ``usnic``
161160

162161
#. ``ucx``

docs/release-notes/networks.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ There are multiple MPI network models available in this release:
1717
* ``tcp``: TCP
1818
* ``smcuda``: CUDA-enabled shared memory
1919
* ``usnic``: Cisco usNIC
20-
* ``ugni``: uGNI (Cray Gemini, Aries)
2120

2221
* ``cm`` supports a smaller number of networks (and they cannot be
2322
used together), but may provide better overall MPI performance by
@@ -40,7 +39,6 @@ There are multiple MPI network models available in this release:
4039
UCX currently supports:
4140

4241
* OpenFabrics Verbs (including InfiniBand and RoCE)
43-
* Cray's uGNI
4442
* TCP
4543
* Shared memory
4644
* NVIDIA CUDA drivers
@@ -50,7 +48,7 @@ time, Open MPI will select a default transport as follows:
5048

5149
#. If InfiniBand devices are available, use the UCX PML.
5250
#. If PSM, PSM2, or other tag-matching-supporting Libfabric
53-
transport devices are available (e.g., Cray uGNI), use the ``cm``
51+
transport devices are available, use the ``cm``
5452
PML and a single appropriate corresponding ``mtl`` module.
5553
#. Otherwise, use the ``ob1`` PML and one or more appropriate ``btl``
5654
modules.
@@ -104,8 +102,6 @@ Miscellaneous network notes
104102
Although the usNIC is accessed via the OpenFabrics Libfabric API
105103
stack, this BTL is specific to Cisco usNIC devices.
106104

107-
* uGNI is a Cray library for communicating over the Gemini and Aries
108-
interconnects.
109105

110106
* Linux ``knem`` support is used when the ``sm`` (shared memory) BTL is
111107
compiled with knem support (see the ``--with-knem`` configure option)

docs/tuning-apps/networking/cuda.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Open MPI offers two flavors of CUDA support:
2828
# Check if ucx was built with CUDA support
2929
shell$ ucx_info -v
3030
31-
# configured with: --build=powerpc64le-redhat-linux-gnu --host=powerpc64le-redhat-linux-gnu --program-prefix= --disable-dependency-tracking --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/var/lib --mandir=/usr/share/man --infodir=/usr/share/info --disable-optimizations --disable-logging --disable-debug --disable-assertions --enable-mt --disable-params-check --enable-cma --without-cuda --without-gdrcopy --with-verbs --with-cm --with-knem --with-rdmacm --without-rocm --without-xpmem --without-ugni --without-java
31+
# configured with: --build=powerpc64le-redhat-linux-gnu --host=powerpc64le-redhat-linux-gnu --program-prefix= --disable-dependency-tracking --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/var/lib --mandir=/usr/share/man --infodir=/usr/share/info --disable-optimizations --disable-logging --disable-debug --disable-assertions --enable-mt --disable-params-check --enable-cma --without-cuda --without-gdrcopy --with-verbs --with-cm --with-knem --with-rdmacm --without-rocm --without-xpmem --without-java
3232
3333
If you need to build ucx yourself to include CUDA support, please
3434
see the UCX documentation for `building ucx with Open MPI: <https://openucx.readthedocs.io/en/master/running.html#openmpi-with-ucx>`_

docs/tuning-apps/networking/ofi.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ including (but not limited to):
1616

1717
* AWS EFA
1818
* Cisco usNIC
19-
* Cray uGNI
2019
* Cornelius Networks Omni-Path
2120
* HPE Slingshot 11
2221

ompi/mca/osc/rdma/osc_rdma_component.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ static int ompi_osc_rdma_component_register (void)
246246
MCA_BASE_VAR_SCOPE_GROUP, &mca_osc_rdma_component.locking_mode);
247247
OBJ_RELEASE(new_enum);
248248

249-
ompi_osc_rdma_full_connectivity_btls = "ugni,uct,ofi";
249+
ompi_osc_rdma_full_connectivity_btls = "uct,ofi";
250250
opal_asprintf(&description_str, "Comma-delimited list of BTL component names to allow without verifying "
251251
"connectivity. Do not add a BTL to to this list unless it can reach all "
252252
"processes in any communicator used with an MPI window (default: %s)",

opal/mca/btl/ofi/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ enable RDMA with multiple vendor hardware through one interface. Most
55
of the operations are managed by upper layer (osc/rdma). This BTL is
66
mostly doing the low level work.
77

8-
Tested providers: sockets,psm2,ugni
8+
Tested providers: sockets,psm2
99

1010
## Component
1111

0 commit comments

Comments
 (0)