Skip to content
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.

Sign up for GitHub

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

Remove the rtc framework #41

Merged
merged 1 commit into from
Oct 24, 2024
Merged

Remove the rtc framework #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions contrib/scaling/scaling.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down Expand Up @@ -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";
Expand Down
15 changes: 0 additions & 15 deletions src/mca/ess/base/ess_base_std_prted.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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))) {
Expand Down Expand Up @@ -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();
Expand Down
15 changes: 0 additions & 15 deletions src/mca/ess/hnp/ess_hnp_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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. */
Expand Down Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions src/mca/odls/base/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
6 changes: 5 additions & 1 deletion src/mca/odls/base/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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; \
Expand Down
Loading
Loading