|
1 | 1 | #!/usr/bin/env perl |
2 | 2 | # |
3 | | -# Copyright (c) 2009-2021 Cisco Systems, Inc. All rights reserved |
| 3 | +# Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved |
4 | 4 | # Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. |
5 | 5 | # Copyright (c) 2013 Mellanox Technologies, Inc. |
6 | 6 | # All rights reserved. |
|
43 | 43 | # Data structures to fill up with all the stuff we find |
44 | 44 | my $mca_found; |
45 | 45 | my $mpiext_found; |
46 | | -my $mpicontrib_found; |
47 | 46 | my @subdirs; |
48 | 47 |
|
49 | 48 | # Command line parameters |
@@ -243,7 +242,7 @@ sub process_autogen_subdirs { |
243 | 242 | # Note: there's no real technical reason to defer |
244 | 243 | # processing the subdirs. It's more of an aesthetic |
245 | 244 | # reason -- don't interrupt the current flow of |
246 | | - # finding mca / ext / contribs (which is a nice, fast |
| 245 | + # finding mca / ext (which is a nice, fast |
247 | 246 | # process). Then process the subdirs (which is a slow |
248 | 247 | # process) all at once. |
249 | 248 | push(@subdirs, "$dir/$_"); |
@@ -715,93 +714,6 @@ sub mpiext_run_global { |
715 | 714 | } |
716 | 715 | } |
717 | 716 |
|
718 | | -############################################################################## |
719 | | - |
720 | | -sub mpicontrib_process { |
721 | | - my ($topdir, $contrib_prefix, $contribdir) = @_; |
722 | | - |
723 | | - my $cdir = "$topdir/$contrib_prefix/$contribdir"; |
724 | | - return |
725 | | - if (! -d $cdir); |
726 | | - |
727 | | - # Process this directory (pretty much the same treatment as for |
728 | | - # MCA components, so it's in a sub). |
729 | | - my $found_contrib; |
730 | | - |
731 | | - $found_contrib->{"name"} = $contribdir; |
732 | | - |
733 | | - # Push the results onto the hash array |
734 | | - push(@{$mpicontrib_found}, $found_contrib); |
735 | | - |
736 | | - # Is there an autogen.subdirs in here? |
737 | | - process_autogen_subdirs($cdir); |
738 | | -} |
739 | | - |
740 | | -############################################################################## |
741 | | - |
742 | | -sub mpicontrib_run_global { |
743 | | - my ($contrib_prefix) = @_; |
744 | | - |
745 | | - my $topdir = Cwd::cwd(); |
746 | | - |
747 | | - my $dir = "$topdir/$contrib_prefix"; |
748 | | - opendir(DIR, $dir) || |
749 | | - my_die "Can't open $dir directory"; |
750 | | - foreach my $d (sort(readdir(DIR))) { |
751 | | - # Skip any non-directory, "base", or any dir that begins with "." |
752 | | - next |
753 | | - if (! -d "$dir/$d" || $d eq "base" || substr($d, 0, 1) eq "."); |
754 | | - |
755 | | - # If this directory has a configure.m4, then it's an |
756 | | - # contrib. |
757 | | - if (-f "$dir/$d/configure.m4") { |
758 | | - verbose "=== Found $d MPI contrib"; |
759 | | - |
760 | | - # Check ignore status |
761 | | - if (ignored("$dir/$d")) { |
762 | | - verbose " (ignored)\n"; |
763 | | - } else { |
764 | | - verbose "\n"; |
765 | | - mpicontrib_process($topdir, $contrib_prefix, $d); |
766 | | - } |
767 | | - } |
768 | | - } |
769 | | - closedir(DIR); |
770 | | - debug_dump($mpicontrib_found); |
771 | | - |
772 | | - #----------------------------------------------------------------------- |
773 | | - |
774 | | - $m4 .= "\n$dnl_line |
775 | | -$dnl_line |
776 | | -$dnl_line |
777 | | -
|
778 | | -dnl Open MPI contrib information |
779 | | -$dnl_line\n\n"; |
780 | | - |
781 | | - # Array for all the m4_includes that we'll need to pick up the |
782 | | - # configure.m4's. |
783 | | - my @includes; |
784 | | - my $m4_config_contrib_list; |
785 | | - |
786 | | - # Troll through each of the found contribs |
787 | | - foreach my $contrib (@{$mpicontrib_found}) { |
788 | | - my $c = $contrib->{name}; |
789 | | - push(@includes, "$contrib_prefix/$c/configure.m4"); |
790 | | - $m4_config_contrib_list .= ", $c"; |
791 | | - } |
792 | | - |
793 | | - $m4_config_contrib_list =~ s/^, //; |
794 | | - |
795 | | - # List the M4 and no configure contribs |
796 | | - $m4 .= "dnl List of all MPI contribs |
797 | | -m4_define([ompi_mpicontrib_list], [$m4_config_contrib_list])\n"; |
798 | | - # List out all the m4_include |
799 | | - $m4 .= "\ndnl List of configure.m4 files to include\n"; |
800 | | - foreach my $i (@includes) { |
801 | | - $m4 .= "m4_include([$i])\n"; |
802 | | - } |
803 | | -} |
804 | | - |
805 | 717 | ############################################################################## |
806 | 718 | # Find and remove stale files |
807 | 719 |
|
@@ -1690,15 +1602,11 @@ sub replace_config_sub_guess { |
1690 | 1602 |
|
1691 | 1603 | #--------------------------------------------------------------------------- |
1692 | 1604 |
|
1693 | | -# Find MPI extensions and contribs |
| 1605 | +# Find MPI extensions |
1694 | 1606 | if (!$no_ompi_arg) { |
1695 | 1607 | ++$step; |
1696 | 1608 | verbose "\n$step. Searching for Open MPI extensions\n\n"; |
1697 | 1609 | mpiext_run_global("ompi/mpiext"); |
1698 | | - |
1699 | | - ++$step; |
1700 | | - verbose "\n$step. Searching for Open MPI contribs\n\n"; |
1701 | | - mpicontrib_run_global("ompi/contrib"); |
1702 | 1610 | } |
1703 | 1611 |
|
1704 | 1612 | #--------------------------------------------------------------------------- |
|
0 commit comments