Skip to content

v5.0.x: Remove smartmatch warnings from autogen.pl #9709

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

Merged
gpaulsen merged 2 commits into from
Dec 2, 2021
Merged

v5.0.x: Remove smartmatch warnings from autogen.pl #9709

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37932df
Remove use of smartmatch in autogen.pl
bwbarrett Nov 20, 2021
9addf00
Print hwloc version in autogen.pl
bwbarrett Nov 20, 2021
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
25 changes: 19 additions & 6 deletions autogen.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,18 @@ sub debug_dump {

##############################################################################

sub list_contains {
my $searched_string = shift;
foreach my $str (@_) {
if ($searched_string eq $str) {
return 1;
}
}
return 0;
}

##############################################################################

sub read_config_params {
my ($filename, $dir_prefix) = @_;

Expand Down Expand Up @@ -1571,15 +1583,16 @@ sub replace_config_sub_guess {
dnl 3rd-party package information\n";

# Extract the OMPI options to exclude them when processing PMIx and PRRTE
if ( ! ("pmix" ~~ @disabled_3rdparty_packages && "prrte" ~~ @disabled_3rdparty_packages) ) {
if ( ! (list_contains("pmix", @disabled_3rdparty_packages) &&
list_contains("prrte", @disabled_3rdparty_packages))) {
safe_system("./config/extract-3rd-party-configure.pl -p . -n \"OMPI\" -l > config/auto-generated-ompi-exclude.ini");
}

# these are fairly one-off, so we did not try to do anything
# generic. Sorry :).

verbose "=== Libevent\n";
if ("libevent" ~~ @disabled_3rdparty_packages) {
if (list_contains("libevent", @disabled_3rdparty_packages)) {
verbose "--- Libevent disabled\n";
} else {
my $libevent_directory = "libevent-" . $libevent_version;
Expand All @@ -1594,7 +1607,7 @@ sub replace_config_sub_guess {
}

verbose "=== hwloc\n";
if ("hwloc" ~~ @disabled_3rdparty_packages) {
if (list_contains("hwloc", @disabled_3rdparty_packages)) {
verbose "--- hwloc disabled\n";
} else {
my $hwloc_directory = "hwloc-" . $hwloc_version;
Expand All @@ -1605,11 +1618,11 @@ sub replace_config_sub_guess {
$m4 .= "m4_define([package_hwloc], [1])\n";
$m4 .= "m4_define([hwloc_tarball], [" . $hwloc_tarball . "])\n";
$m4 .= "m4_define([hwloc_directory], [" . $hwloc_directory . "])\n";
verbose "--- hwloc enabled\n";
verbose "--- hwloc enabled (" . $hwloc_version . ")\n";
}

verbose "=== PMIx\n";
if ("pmix" ~~ @disabled_3rdparty_packages) {
if (list_contains("pmix", @disabled_3rdparty_packages)) {
verbose "--- PMIx disabled\n";
} else {
# sanity check pmix files exist
Expand All @@ -1628,7 +1641,7 @@ sub replace_config_sub_guess {
}

verbose "=== PRRTE\n";
if ("prrte" ~~ @disabled_3rdparty_packages) {
if (list_contains("prrte", @disabled_3rdparty_packages)) {
verbose "--- PRRTE disabled\n";
} else {
# sanity check prrte files exist
Expand Down