46
46
my @subdirs ;
47
47
48
48
# 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;
53
49
my $no_3rdparty_arg = " " ;
54
50
my $quiet_arg = 0;
55
51
my $debug_arg = 0;
@@ -1297,11 +1293,7 @@ sub replace_config_sub_guess {
1297
1293
1298
1294
# Command line parameters
1299
1295
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 ,
1305
1297
" quiet|q" => \$quiet_arg ,
1306
1298
" debug|d" => \$debug_arg ,
1307
1299
" help|h" => \$help_arg ,
@@ -1316,10 +1308,6 @@ sub replace_config_sub_guess {
1316
1308
print " Invalid command line argument.\n\n "
1317
1309
if (!$ok );
1318
1310
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
1323
1311
--no-3rdparty <package> Do not build the listed 3rd-party package (comma separtated list)
1324
1312
--quiet | -q Do not display normal verbose output
1325
1313
--debug | -d Output lots of debug information
@@ -1344,24 +1332,6 @@ sub replace_config_sub_guess {
1344
1332
my $project_name_long = " Open MPI" ;
1345
1333
my $project_name_short = " openmpi" ;
1346
1334
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
-
1365
1335
my_die " Invalid value for --jobs $automake_jobs . Must be greater than 0."
1366
1336
if (defined $automake_jobs && $automake_jobs <= 0);
1367
1337
@@ -1419,9 +1389,6 @@ sub replace_config_sub_guess {
1419
1389
1420
1390
my @enabled_3rdparty_packages = ();
1421
1391
my @disabled_3rdparty_packages = split (/ ,/ , $no_3rdparty_arg );
1422
- if ($no_prrte_arg ) {
1423
- push (@disabled_3rdparty_packages , " prrte" );
1424
- }
1425
1392
# Alias: 'openpmix' -> 'pmix'
1426
1393
if (list_contains(" openpmix" , @disabled_3rdparty_packages )) {
1427
1394
push (@disabled_3rdparty_packages , " pmix" );
@@ -1583,10 +1550,8 @@ sub replace_config_sub_guess {
1583
1550
# Top-level projects to examine
1584
1551
my $projects ;
1585
1552
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 });
1590
1555
1591
1556
$m4 .= " dnl Separate m4 define for each project\n " ;
1592
1557
foreach my $p (@$projects ) {
@@ -1694,11 +1659,9 @@ sub replace_config_sub_guess {
1694
1659
# ---------------------------------------------------------------------------
1695
1660
1696
1661
# 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" );
1702
1665
1703
1666
# ---------------------------------------------------------------------------
1704
1667
0 commit comments