Merge pull request #41 from hppritcha/upstream_pr2028

Remove the rtc framework
open-mpi · Oct 24, 2024 · f0d4efa · f0d4efa
2 parents 01103f1 + 45f9a60
commit f0d4efa
Show file tree

Hide file tree

Showing 24 changed files with 173 additions and 1,270 deletions.
diff --git a/contrib/scaling/scaling.pl b/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";

diff --git a/src/mca/ess/base/ess_base_std_prted.c b/src/mca/ess/base/ess_base_std_prted.c
@@ -56,7 +56,6 @@
 #include "src/mca/plm/base/base.h"
 #include "src/mca/prtereachable/base/base.h"
 #include "src/mca/rmaps/base/base.h"
-#include "src/mca/rtc/base/base.h"
 #include "src/mca/schizo/base/base.h"
 #include "src/mca/state/base/base.h"
 #include "src/mca/state/state.h"
@@ -356,19 +355,6 @@ int prte_ess_base_prted_setup(void)
         error = "prte_odls_base_select";
         goto error;
     }
-    /* Open/select the rtc */
-    if (PRTE_SUCCESS
-        != (ret = pmix_mca_base_framework_open(&prte_rtc_base_framework,
-                                               PMIX_MCA_BASE_OPEN_DEFAULT))) {
-        PRTE_ERROR_LOG(ret);
-        error = "prte_rtc_base_open";
-        goto error;
-    }
-    if (PRTE_SUCCESS != (ret = prte_rtc_base_select())) {
-        PRTE_ERROR_LOG(ret);
-        error = "prte_rtc_base_select";
-        goto error;
-    }
     if (PRTE_SUCCESS
         != (ret = pmix_mca_base_framework_open(&prte_rmaps_base_framework,
                                                PMIX_MCA_BASE_OPEN_DEFAULT))) {
@@ -494,7 +480,6 @@ int prte_ess_base_prted_finalize(void)
     (void) pmix_mca_base_framework_close(&prte_plm_base_framework);
     /* make sure our local procs are dead */
     prte_odls.kill_local_procs(NULL);
-    (void) pmix_mca_base_framework_close(&prte_rtc_base_framework);
     (void) pmix_mca_base_framework_close(&prte_odls_base_framework);
     (void) pmix_mca_base_framework_close(&prte_errmgr_base_framework);
     prte_rml_close();

diff --git a/src/mca/ess/hnp/ess_hnp_module.c b/src/mca/ess/hnp/ess_hnp_module.c
@@ -64,7 +64,6 @@
 #include "src/mca/prtereachable/base/base.h"
 #include "src/mca/ras/base/base.h"
 #include "src/mca/rmaps/base/base.h"
-#include "src/mca/rtc/base/base.h"
 #include "src/mca/schizo/base/base.h"
 #include "src/mca/state/base/base.h"
 #include "src/mca/state/state.h"
@@ -376,19 +375,6 @@ static int rte_init(int argc, char **argv)
         error = "prte_odls_base_select";
         goto error;
     }
-    /* Open/select the rtc */
-    ret = pmix_mca_base_framework_open(&prte_rtc_base_framework,
-                                       PMIX_MCA_BASE_OPEN_DEFAULT);
-    if (PRTE_SUCCESS != ret) {
-        PRTE_ERROR_LOG(ret);
-        error = "prte_rtc_base_open";
-        goto error;
-    }
-    if (PRTE_SUCCESS != (ret = prte_rtc_base_select())) {
-        PRTE_ERROR_LOG(ret);
-        error = "prte_rtc_base_select";
-        goto error;
-    }
 
     /* set the pmix_output hnp file location to be in the
      * proc-specific session directory. */
@@ -453,7 +439,6 @@ static int rte_finalize(void)
         /* make sure our local procs are dead */
         prte_odls.kill_local_procs(NULL);
     }
-    (void) pmix_mca_base_framework_close(&prte_rtc_base_framework);
     (void) pmix_mca_base_framework_close(&prte_odls_base_framework);
     prte_rml_close();
     (void) pmix_mca_base_framework_close(&prte_prtereachable_base_framework);

diff --git a/src/mca/odls/base/Makefile.am b/src/mca/odls/base/Makefile.am
@@ -13,7 +13,7 @@
 #                         All rights reserved
 # Copyright (c) 2019      Intel, Inc.  All rights reserved.
 # Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2022      Nanook Consulting.  All rights reserved.
+# Copyright (c) 2022-2024 Nanook Consulting  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -27,6 +27,7 @@ headers += \
 libprtemca_odls_la_SOURCES += \
         base/odls_base_frame.c \
         base/odls_base_select.c \
-        base/odls_base_default_fns.c
+        base/odls_base_default_fns.c \
+        base/odls_base_bind.c
 
 dist_prtedata_DATA += base/help-prte-odls-base.txt
diff --git a/src/mca/odls/base/base.h b/src/mca/odls/base/base.h
@@ -12,7 +12,7 @@
  * Copyright (c) 2011-2020 Cisco Systems, Inc.  All rights reserved
  * Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
  * Copyright (c) 2017-2019 Intel, Inc.  All rights reserved.
- * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
+ * Copyright (c) 2021-2024 Nanook Consulting  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -157,6 +157,10 @@ PRTE_EXPORT void prte_odls_base_start_threads(prte_job_t *jdata);
 
 PRTE_EXPORT void prte_odls_base_harvest_threads(void);
 
+/* Binding support */
+PRTE_EXPORT void prte_odls_base_set(prte_odls_spawn_caddy_t *cd, int write_fd);
+
+
 #define PRTE_ODLS_SET_ERROR(ns, s, j)                                                   \
 do {                                                                                    \
     int _idx;                                                                           \