Extract the install prefix from the shared library.

.github/workflows/builds.yaml

@@ -22,8 +22,16 @@ jobs:
     - name: Build OpenPMIx
       run: |
         cd openpmix/master
+        # Homebrew doesn't install Libevent's (or libev's) header or
+        # library files into a default search location.  Shrug.  So
+        # use pkg-config to get the location and explicitly pass it to
+        # configure.
+        libevent_cppflags=$(pkg-config libevent --cflags)
+        libevent_ldflags=$(pkg-config libevent --libs | perl -pe 's/^.*(-L[^ ]+).*$/\1/')
         ./autogen.pl
-        ./configure --prefix=$RUNNER_TEMP/pmixinstall
+        ./configure --prefix=$RUNNER_TEMP/pmixinstall \
+            CPPFLAGS=$libevent_cppflags \
+            LDFLAGS=$libevent_ldflags
         make -j
         make install
     - name: Git clone PRRTE
@@ -37,6 +45,11 @@ jobs:
 
         sphinx=
         if test "${{ matrix.sphinx }}" = sphinx; then
+            # The macos Github Action environment gets angry at us if
+            # we try to pip install into the global environment.  So
+            # make a virtual environment and install sphinx into that.
+            python -m venv venv
+            . ./venv/bin/activate
             pip3 install -r docs/requirements.txt
             sphinx=--enable-sphinx
         fi
@@ -48,7 +61,16 @@ jobs:
             c=../configure
         fi
 
-        $c --prefix=$RUNNER_TEMP/prteinstall --with-pmix=$RUNNER_TEMP/pmixinstall $sphinx
+        # Homebrew doesn't install Libevent's (or libev's) header or
+        # library files into a default search location.  Shrug.  So
+        # use pkg-config to get the location and explicitly pass it to
+        # configure.
+        libevent_cppflags=$(pkg-config libevent --cflags)
+        libevent_ldflags=$(pkg-config libevent --libs | perl -pe 's/^.*(-L[^ ]+).*$/\1/')
+
+        $c --prefix=$RUNNER_TEMP/prteinstall --with-pmix=$RUNNER_TEMP/pmixinstall $sphinx \
+            CPPFLAGS=$libevent_cppflags \
+            LDFLAGS=$libevent_ldflags
         make -j
         make install
         make uninstall

VERSION

@@ -23,7 +23,7 @@ release=0
 # List in x.y.z format.
 
 pmix_min_version=4.2.4
-hwloc_min_version=1.11.0
+hwloc_min_version=2.1.0
 event_min_version=2.0.21
 automake_min_version=1.13.4
 autoconf_min_version=2.69.0
@@ -37,7 +37,7 @@ flex_min_version=2.5.4
 # requirement is that it must be entirely printable ASCII characters
 # and have no white space.
 
-greek=a1
+greek=ompi-a1
 
 # If repo_rev is empty, then the repository version number will be
 # obtained during "make dist" via the "git describe --tags --always"

config/prte_check_cflags.m4

@@ -2,7 +2,7 @@ dnl -*- shell-script -*-
 dnl
 dnl Copyright (c) 2021 IBM Corporation.  All rights reserved.
 dnl
-dnl Copyright (c) 2021      Nanook Consulting.  All rights reserved.
+dnl Copyright (c) 2021-2024 Nanook Consulting  All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -40,3 +40,15 @@ AC_MSG_CHECKING(if $CC supports ([$1]))
                 AC_MSG_RESULT([yes])
             fi
 ])
+
+
+AC_DEFUN([_PRTE_CHECK_LTO_FLAG], [
+    chkflg=`echo $1 | grep -- -flto`
+    if test -n "$chkflg"; then
+        AC_MSG_WARN([Configure has detected the presence of the -flto])
+        AC_MSG_WARN([compiler directive in $2. PRRTE does not currently])
+        AC_MSG_WARN([support this flag as it conflicts with the])
+        AC_MSG_WARN([plugin architecture of the PRRTE code base.])
+        AC_MSG_ERROR([Please remove this directive and re-run configure.])
+    fi
+])

configure.ac

@@ -931,6 +931,19 @@ CPPFLAGS="$CPP_INCLUDES $CPPFLAGS $PRTE_FINAL_CPPFLAGS"
 LDFLAGS="$LDFLAGS $PRTE_FINAL_LDFLAGS"
 LIBS="$LIBS $PRTE_FINAL_LIBS"
 
+
+# We do not currently support the "lto" optimizer as it
+# aggregates all the headers from our plugins, resulting
+# in a configuration that generates warnings/errors when
+# passed through their optimizer phase. We therefore check
+# for the flag, and if found, output a message explaining
+# the situation and aborting configure
+_PRTE_CHECK_LTO_FLAG($CPPFLAGS, CPPFLAGS)
+_PRTE_CHECK_LTO_FLAG($CFLAGS, CFLAGS)
+_PRTE_CHECK_LTO_FLAG($LDFLAGS, LDFLAGS)
+_PRTE_CHECK_LTO_FLAG($LIBS, LIBS)
+
+
 # restore any user-provided Werror flags
 AS_IF([test ! -z "$PRTE_CFLAGS_cache"], [CFLAGS="$CFLAGS $PRTE_CFLAGS_cache"])
 

contrib/scaling/scaling.pl

@@ -135,7 +135,7 @@
             push @starters, $starter;
             $opt = $starteroptionlist[$idx] . " --npernode " . $ppn;
             if ($multiplier gt 1) {
-                $opt = $opt . " --mca rtc ^hwloc --mca ras_base_multiplier " . $multiplier;
+                $opt = $opt . " --bind-to none --mca ras_base_multiplier " . $multiplier;
             }
             push @starteroptions, $opt;
         } elsif ($useaprun && $starter eq "aprun") {
@@ -294,7 +294,7 @@ ()
     if ($starter eq "prun") {
         my $dvm = "prte-dvm --system-server";
         if ($multiplier gt 1) {
-            $dvm = $dvm . " --mca rtc ^hwloc --mca ras_base_multiplier " . $multiplier;
+            $dvm = $dvm . " --bind-to none --mca ras_base_multiplier " . $multiplier;
         }
         # need to start it
         print "##DVM: Launching $dvm\n";

docs/conf.py

@@ -86,6 +86,15 @@
 if key in os.environ and os.environ[key] == 'True':
     print("PRRTE: found ReadTheDocs build environment")
 
+    # Tell Jinja2 templates the build is running on Read the Docs
+    if "html_context" not in globals():
+        html_context = {}
+    html_context["READTHEDOCS"] = True
+
+    # Define the canonical URL if you are using a custom domain on
+    # Read the Docs
+    html_baseurl = os.environ.get("READTHEDOCS_CANONICAL_URL", "")
+
     rtd_v = os.environ['READTHEDOCS_VERSION']
     if os.environ['READTHEDOCS_VERSION_TYPE'] == 'external':
         # Make "release" be shorter than the full "prte_ver" value.

src/docs/show-help-files/build-dummy-ini-files.py

@@ -2,7 +2,7 @@
 #
 # Copyright 2023 Jeffrey M. Squyres.  All rights reserved.
 #
-# Copyright (c) 2023      Nanook Consulting.  All rights reserved.
+# Copyright (c) 2023-2024 Nanook Consulting  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -57,7 +57,7 @@
     # Find all the "[section]" lines.
     sections = list()
     for line in src_rst:
-        match = re.search('\s*\[(.+)\]\s*$', line)
+        match = re.search(r"\s*\[(.+)\]\s*$", line)
         if match:
             sections.append(match.group(1))
 

src/docs/show-help-files/help-prte-hwloc-base.rst

@@ -81,7 +81,6 @@ additional information may be of help:
 .. code::
 
    Message:     %s
-   Cache level: %d
 
 [missing-cpulist]