Skip to content

Update networking.rst #12938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions config/ompi_check_psm2.m4
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
# and Technology (RIST). All rights reserved.
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
# reserved.
# Copyright (c) 2021 Triad National Security, LLC. All rights
# Copyright (c) 2020 Cornelis Network, Inc. All rights reserved.
# Copyright (c) 2021 Triad National Security, LLC. All rights
# reserved.
# Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
# $COPYRIGHT$
Expand All @@ -37,10 +38,10 @@ AC_DEFUN([OMPI_CHECK_PSM2],[

AC_ARG_WITH([psm2],
[AS_HELP_STRING([--with-psm2(=DIR)],
[Build PSM2 (Intel PSM2) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
[Build PSM2 (Cornelis PSM2) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
AC_ARG_WITH([psm2-libdir],
[AS_HELP_STRING([--with-psm2-libdir=DIR],
[Search for PSM (Intel PSM2) libraries in DIR])])
[Search for PSM (Cornelis PSM2) libraries in DIR])])

AC_ARG_ENABLE([psm2-version-check],
[AS_HELP_STRING([--disable-psm2-version-check],
Expand Down Expand Up @@ -81,7 +82,7 @@ AC_DEFUN([OMPI_CHECK_PSM2],[

CPPFLAGS="${opal_psm2_CPPFLAGS_save}"

OPAL_SUMMARY_ADD([Transports], [Intel Omnipath (PSM2)], [], [${$1_SUMMARY}])
OPAL_SUMMARY_ADD([Transports], [Cornelis Omnipath (PSM2)], [], [${$1_SUMMARY}])

AS_IF([test "$ompi_check_psm2_happy" = "yes"],
[$2],
Expand Down
10 changes: 5 additions & 5 deletions docs/installing-open-mpi/configure-cli-options/networking.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ can be used with ``configure``:
compiler/linker search paths.

Libfabric is the support library for OpenFabrics Interfaces-based
network adapters, such as Cisco usNIC, Intel True Scale PSM, etc.
network adapters, such as Cisco usNIC, Cornelis Networks True Scale PSM, etc.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since PSMv1 (as opposed to PSM support in general, nevermind that PSM2 and PSM3 are different things) support is no longer in OMPI, can remove "Cornelis Networks True Scale PSM".


* ``--with-libfabric-libdir=DIR``:
Look in directory for the libfabric libraries. By default, Open MPI
Expand All @@ -68,12 +68,12 @@ can be used with ``configure``:
Set configuration values for Portals 4

* ``--with-psm=<directory>``:
Specify the directory where the QLogic InfiniPath / Intel True Scale
Specify the directory where the QLogic InfiniPath / Cornelis Netorks True Scale
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PSM(v1) MTL was removed in commit 0348d14; this bullet for --with-psm and the next bullet for --with-psm-libdir should be removed.

PSM library and header files are located. This option is generally
only necessary if the PSM headers and libraries are not in default
compiler/linker search paths.

PSM is the support library for QLogic InfiniPath and Intel True Scale
PSM is the support library for QLogic InfiniPath and Cornelis Netorks True Scale
network adapters.

* ``--with-psm-libdir=DIR``:
Expand All @@ -82,12 +82,12 @@ can be used with ``configure``:
option is only needed for special configurations.

* ``--with-psm2=DIR``:
Specify the directory where the Intel Omni-Path PSM2 library and
Specify the directory where the Cornelis Networks Omni-Path PSM2 library and
header files are located. This option is generally only necessary
if the PSM2 headers and libraries are not in default compiler/linker
search paths.

PSM is the support library for Intel Omni-Path network adapters.
PSM is the support library for Cornelis Networks Omni-Path network adapters.

* ``--with-psm2-libdir=DIR``:
Look in directory for the PSM2 libraries. By default, Open MPI will
Expand Down
Loading