Merge branch 'conda-forge:main' into 1696-writing-guidelines

Author: Uma-95

src/user/tipsandtricks.rst

@@ -86,25 +86,20 @@ a package from ``conda-forge`` that relies on MPI, ``conda`` will install the MP
 built by ``conda-forge`` and the package will link to those binaries. This setup often either
 does not work at all or functions in unexpected ways on HPC systems.
 
-To solve these issues, ``conda-forge`` has created special dummy builds of the ``mpich`` libraries
-that are simply shell packages with no contents. These packages allow the ``conda`` solver to produce
+To solve these issues, ``conda-forge`` has created special dummy builds of the ``mpich`` and ``openmpi`` 
+libraries that are simply shell packages with no contents. These packages allow the ``conda`` solver to produce
 correct environments while avoiding installing MPI binaries from ``conda-forge``. You can install the
 dummy package with the following command
 
 .. code-block:: shell
 
-    $ conda install mpich=3.3.*=external_*
+    $ conda install mpich=x.y.z=external_*
+    $ conda install openmpi=x.y.z=external_*
 
-As long as you have the local copies of the ``mpich`` library in your linking paths and
-the local version matches the ``conda`` version up to the minor version number (e.g., ``3.3.1``
-matches ``3.3.2`` but not ``3.4.1``), then this procedure should work. At runtime, the ``conda-forge``
-package that depends on MPI should find the local copy of ``mpich`` and link to it.
-
-.. note::
-
-  ``mpich`` has a high degree of ABI compatibility, making this procedure possible.
-  We have not currently implemented this procedure with ``openmpi``, but can do so at a later date
-  as ABI compatibility allows.
+As long as you have the local copies of the ``mpich``/``openmpi`` library in your linking paths and
+the local version matches the ``conda`` version within the proper ABI range, then this procedure should 
+work. At runtime, the ``conda-forge`` package that depends on MPI should find the 
+local copy of ``mpich``/``openmpi`` and link to it.
 
 
 .. _apple_silicon_rosetta: