Skip to content

Commit 6cdcea8

Browse files
committed
autogen.pl: remove most --no-FOO options
Remove the following CLI options, since they're really not useful any more: * --no-ompi * --no-orte (!) * --no-prrte * --no-oshmem The only --no-FOO option that remains is --no-3rdparty, which takes a comma-delimited listed of values (when you are absolutely sure you do not want to build the in-tree versions of these packages, and will be using externally-installed versions of these packages). As of this commit, the following values are acceptable to --no-3rdparty: * hwloc * libevent * prrte * openpmix (or "pmix") Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
1 parent e5af7ab commit 6cdcea8

File tree

1 file changed

+6
-43
lines changed

1 file changed

+6
-43
lines changed

autogen.pl

Lines changed: 6 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
my @subdirs;
4747

4848
# Command line parameters
49-
my $no_ompi_arg = 0;
50-
my $no_orte_arg = 0;
51-
my $no_prrte_arg = 0;
52-
my $no_oshmem_arg = 0;
5349
my $no_3rdparty_arg = "";
5450
my $quiet_arg = 0;
5551
my $debug_arg = 0;
@@ -1297,11 +1293,7 @@ sub replace_config_sub_guess {
12971293

12981294
# Command line parameters
12991295

1300-
my $ok = Getopt::Long::GetOptions("no-ompi" => \$no_ompi_arg,
1301-
"no-orte" => \$no_orte_arg,
1302-
"no-prrte" => \$no_prrte_arg,
1303-
"no-oshmem" => \$no_oshmem_arg,
1304-
"no-3rdparty=s" => \$no_3rdparty_arg,
1296+
my $ok = Getopt::Long::GetOptions("no-3rdparty=s" => \$no_3rdparty_arg,
13051297
"quiet|q" => \$quiet_arg,
13061298
"debug|d" => \$debug_arg,
13071299
"help|h" => \$help_arg,
@@ -1316,10 +1308,6 @@ sub replace_config_sub_guess {
13161308
print "Invalid command line argument.\n\n"
13171309
if (!$ok);
13181310
print "Options:
1319-
--no-ompi | -no-ompi Do not build the Open MPI layer
1320-
--no-orte | -no-orte Do not build Open MPI's runtime support (alias for --no-prrte)
1321-
--no-prrte | -no-prrte Do not build Open MPI's runtime support
1322-
--no-oshmem | -no-oshmem Do not build the OSHMEM layer
13231311
--no-3rdparty <package> Do not build the listed 3rd-party package (comma separtated list)
13241312
--quiet | -q Do not display normal verbose output
13251313
--debug | -d Output lots of debug information
@@ -1344,24 +1332,6 @@ sub replace_config_sub_guess {
13441332
my $project_name_long = "Open MPI";
13451333
my $project_name_short = "openmpi";
13461334

1347-
if (! -e "ompi") {
1348-
$no_ompi_arg = 1;
1349-
debug "No ompi subdirectory found - will not build MPI layer\n";
1350-
}
1351-
if (! -e "oshmem") {
1352-
$no_oshmem_arg = 1;
1353-
debug "No oshmem subdirectory found - will not build OSHMEM\n";
1354-
}
1355-
# alias --no-orte to --no-prrte
1356-
if ($no_orte_arg == 1) {
1357-
$no_prrte_arg = 1;
1358-
}
1359-
1360-
if ($no_ompi_arg == 1) {
1361-
$project_name_long = "Open Portability Access Layer";
1362-
$project_name_short = "open-pal";
1363-
}
1364-
13651335
my_die "Invalid value for --jobs $automake_jobs. Must be greater than 0."
13661336
if (defined $automake_jobs && $automake_jobs <= 0);
13671337

@@ -1419,9 +1389,6 @@ sub replace_config_sub_guess {
14191389

14201390
my @enabled_3rdparty_packages = ();
14211391
my @disabled_3rdparty_packages = split(/,/, $no_3rdparty_arg);
1422-
if ($no_prrte_arg) {
1423-
push(@disabled_3rdparty_packages, "prrte");
1424-
}
14251392
# Alias: 'openpmix' -> 'pmix'
14261393
if (list_contains("openpmix", @disabled_3rdparty_packages)) {
14271394
push(@disabled_3rdparty_packages, "pmix");
@@ -1583,10 +1550,8 @@ sub replace_config_sub_guess {
15831550
# Top-level projects to examine
15841551
my $projects;
15851552
push(@{$projects}, { name => "opal", dir => "opal", need_base => 1 });
1586-
push(@{$projects}, { name => "ompi", dir => "ompi", need_base => 1 })
1587-
if (!$no_ompi_arg);
1588-
push(@{$projects}, { name => "oshmem", dir => "oshmem", need_base => 1 })
1589-
if (!$no_ompi_arg && !$no_oshmem_arg);
1553+
push(@{$projects}, { name => "ompi", dir => "ompi", need_base => 1 });
1554+
push(@{$projects}, { name => "oshmem", dir => "oshmem", need_base => 1 });
15901555

15911556
$m4 .= "dnl Separate m4 define for each project\n";
15921557
foreach my $p (@$projects) {
@@ -1694,11 +1659,9 @@ sub replace_config_sub_guess {
16941659
#---------------------------------------------------------------------------
16951660

16961661
# Find MPI extensions
1697-
if (!$no_ompi_arg) {
1698-
++$step;
1699-
verbose "\n$step. Searching for Open MPI extensions\n\n";
1700-
mpiext_run_global("ompi/mpiext");
1701-
}
1662+
++$step;
1663+
verbose "\n$step. Searching for Open MPI extensions\n\n";
1664+
mpiext_run_global("ompi/mpiext");
17021665

17031666
#---------------------------------------------------------------------------
17041667

0 commit comments

Comments
 (0)