Skip to content

Commit 764eb9e

Browse files
committed
Purge trailing whitespace
This commit is intended to simplify master -> 2.x cherry-picking. Trailing whitespace was first purged from master in commit open-mpi/ompi@869041f Signed-off-by: Nathan Hjelm <[email protected]>
1 parent 91f90b2 commit 764eb9e

File tree

4,479 files changed

+35011
-34988
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,479 files changed

+35011
-34988
lines changed

LICENSE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
1111
Copyright (c) 2004-2010 The University of Tennessee and The University
1212
of Tennessee Research Foundation. All rights
1313
reserved.
14-
Copyright (c) 2004-2010 High Performance Computing Center Stuttgart,
14+
Copyright (c) 2004-2010 High Performance Computing Center Stuttgart,
1515
University of Stuttgart. All rights reserved.
1616
Copyright (c) 2004-2008 The Regents of the University of California.
1717
All rights reserved.
1818
Copyright (c) 2006-2010 Los Alamos National Security, LLC. All rights
19-
reserved.
19+
reserved.
2020
Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved.
2121
Copyright (c) 2006-2010 Voltaire, Inc. All rights reserved.
2222
Copyright (c) 2006-2011 Sandia National Laboratories. All rights reserved.
@@ -26,7 +26,7 @@ Copyright (c) 2006-2010 The University of Houston. All rights reserved.
2626
Copyright (c) 2006-2009 Myricom, Inc. All rights reserved.
2727
Copyright (c) 2007-2008 UT-Battelle, LLC. All rights reserved.
2828
Copyright (c) 2007-2010 IBM Corporation. All rights reserved.
29-
Copyright (c) 1998-2005 Forschungszentrum Juelich, Juelich Supercomputing
29+
Copyright (c) 1998-2005 Forschungszentrum Juelich, Juelich Supercomputing
3030
Centre, Federal Republic of Germany
3131
Copyright (c) 2005-2008 ZIH, TU Dresden, Federal Republic of Germany
3232
Copyright (c) 2007 Evergrid, Inc. All rights reserved.

Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
# Copyright (c) 2004-2005 The University of Tennessee and The University
66
# of Tennessee Research Foundation. All rights
77
# reserved.
8-
# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
8+
# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
1212
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2012-2015 Los Alamos National Security, Inc. All rights reserved.
1414
# Copyright (c) 2014 Intel, Inc. All rights reserved.
1515
# $COPYRIGHT$
16-
#
16+
#
1717
# Additional copyrights may follow
18-
#
18+
#
1919
# $HEADER$
2020
#
2121

autogen.pl

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
# Copyright (c) 2015 Research Organization for Information Science
99
# and Technology (RIST). All rights reserved.
1010
# $COPYRIGHT$
11-
#
11+
#
1212
# Additional copyrights may follow
13-
#
13+
#
1414
# $HEADER$
1515
#
1616

@@ -76,7 +76,7 @@
7676
my $patch_prog = "patch";
7777
# Solaris "patch" doesn't understand unified diffs, and will cause
7878
# autogen.pl to hang with a "File to patch:" prompt. Default to Linux
79-
# "patch", but use "gpatch" on Solaris.
79+
# "patch", but use "gpatch" on Solaris.
8080
if ($^O eq "solaris") {
8181
$patch_prog = "gpatch";
8282
}
@@ -251,7 +251,7 @@ sub mca_process_component {
251251
$found_component->{"name"} = $component;
252252

253253
# Push the results onto the $mca_found hash array
254-
push(@{$mca_found->{$pname}->{$framework}->{"components"}},
254+
push(@{$mca_found->{$pname}->{$framework}->{"components"}},
255255
$found_component);
256256

257257
# Is there an autogen.subdirs in here?
@@ -278,7 +278,7 @@ sub ignored {
278278
$unignore .= $_
279279
while (<UNIGNORE>);
280280
close(UNIGNORE);
281-
281+
282282
$ignored = 0
283283
if ($unignore =~ /^$username$/m ||
284284
$unignore =~ /^$username\@$hostname$/m ||
@@ -311,13 +311,13 @@ sub mca_process_framework {
311311
# Look for component directories in this framework
312312
if (-d $dir) {
313313
$mca_found->{$pname}->{$framework}->{found} = 1;
314-
opendir(DIR, $dir) ||
314+
opendir(DIR, $dir) ||
315315
my_die "Can't open $dir directory";
316316
foreach my $d (readdir(DIR)) {
317317
# Skip any non-directory, "base", or any dir that
318318
# begins with "."
319319
next
320-
if (! -d "$dir/$d" || $d eq "base" ||
320+
if (! -d "$dir/$d" || $d eq "base" ||
321321
substr($d, 0, 1) eq ".");
322322

323323
# Skip any component that doesn't have a configure.m4
@@ -332,7 +332,7 @@ sub mca_process_framework {
332332

333333
verbose "--- Found $pname / $framework / $d component\n";
334334

335-
# Skip if specifically excluded
335+
# Skip if specifically excluded
336336
if (exists($exclude_list->{$framework}) &&
337337
$exclude_list->{$framework}[0] eq $d) {
338338
verbose " => Excluded\n";
@@ -419,7 +419,7 @@ sub mca_process_project {
419419
# Look for framework directories in this project
420420
my $dir = "$topdir/$pdir/mca";
421421
if (-d $dir) {
422-
opendir(DIR, $dir) ||
422+
opendir(DIR, $dir) ||
423423
my_die "Can't open $dir directory";
424424
my @my_dirs = readdir(DIR);
425425
@my_dirs = sort(@my_dirs);
@@ -497,7 +497,7 @@ sub mca_run_global {
497497
# Does this project have a configure.m4 file?
498498
push(@includes, "$pdir/configure.m4")
499499
if (exists($mca_found->{$p}->{"configure.m4"}));
500-
500+
501501
# Print out project-level info
502502
my @mykeys = keys(%{$mca_found->{$pname}});
503503
@mykeys = sort(@mykeys);
@@ -557,7 +557,7 @@ sub mca_run_global {
557557
}
558558
$m4_config_component_list =~ s/^, //;
559559
$no_config_component_list =~ s/^, //;
560-
560+
561561
$m4 .= "dnl Components in the $pname / $f framework
562562
m4_define([mca_${pname}_${f}_m4_config_component_list], [$m4_config_component_list])
563563
m4_define([mca_${pname}_${f}_no_config_component_list], [$no_config_component_list])
@@ -580,7 +580,7 @@ sub mca_run_global {
580580

581581
sub mpiext_process_extension {
582582
my ($topdir, $ext_prefix, $extdir) = @_;
583-
583+
584584
my $edir = "$topdir/$ext_prefix/$extdir";
585585
return
586586
if (! -d $edir);
@@ -606,13 +606,13 @@ sub mpiext_run_global {
606606
my $topdir = Cwd::cwd();
607607

608608
my $dir = "$topdir/$ext_prefix";
609-
opendir(DIR, $dir) ||
609+
opendir(DIR, $dir) ||
610610
my_die "Can't open $dir directory";
611611
foreach my $d (readdir(DIR)) {
612612
# Skip any non-directory, "base", or any dir that begins with "."
613613
next
614614
if (! -d "$dir/$d" || $d eq "base" || substr($d, 0, 1) eq ".");
615-
615+
616616
# If this directory has a configure.m4, then it's an
617617
# extension.
618618
if (-f "$dir/$d/configure.m4") {
@@ -667,7 +667,7 @@ sub mpiext_run_global {
667667

668668
sub mpicontrib_process {
669669
my ($topdir, $contrib_prefix, $contribdir) = @_;
670-
670+
671671
my $cdir = "$topdir/$contrib_prefix/$contribdir";
672672
return
673673
if (! -d $cdir);
@@ -693,13 +693,13 @@ sub mpicontrib_run_global {
693693
my $topdir = Cwd::cwd();
694694

695695
my $dir = "$topdir/$contrib_prefix";
696-
opendir(DIR, $dir) ||
696+
opendir(DIR, $dir) ||
697697
my_die "Can't open $dir directory";
698698
foreach my $d (readdir(DIR)) {
699699
# Skip any non-directory, "base", or any dir that begins with "."
700700
next
701701
if (! -d "$dir/$d" || $d eq "base" || substr($d, 0, 1) eq ".");
702-
702+
703703
# If this directory has a configure.m4, then it's an
704704
# extension.
705705
if (-f "$dir/$d/configure.m4") {
@@ -825,7 +825,7 @@ sub find_and_check {
825825
if ($pn > $mn) {
826826
verbose " ==> ACCEPTED\n";
827827
return;
828-
}
828+
}
829829
# If the version is lower, we're done.
830830
elsif ($pn < $mn ||
831831
($pn == $mn && $pa lt $ma)) {
@@ -941,13 +941,13 @@ sub patch_autotools_output {
941941
# Similar issue as above -- fix the case statements that handle the Sun
942942
# Fortran version strings.
943943
#
944-
# Note: we have to use octal escapes to match '*Sun\ F*) and the
944+
# Note: we have to use octal escapes to match '*Sun\ F*) and the
945945
# four succeeding lines in the bourne shell switch statement.
946946
# \ = 134
947947
# ) = 051
948948
# * = 052
949949
#
950-
# Below is essentially an upstream patch for Libtool which we want
950+
# Below is essentially an upstream patch for Libtool which we want
951951
# made available to Open MPI users running older versions of Libtool
952952

953953
foreach my $tag (("", "_FC")) {
@@ -1090,7 +1090,7 @@ sub patch_autotools_output {
10901090
$dnl_line
10911091
dnl This file is automatically created by autogen.pl; it should not
10921092
dnl be edited by hand!!
1093-
dnl
1093+
dnl
10941094
dnl Generated by $username at " . localtime(time) . "
10951095
dnl on $full_hostname.
10961096
$dnl_line\n\n";
@@ -1293,7 +1293,7 @@ sub patch_autotools_output {
12931293
# Remove the old m4 file and write the new one
12941294
verbose "==> Writing m4 file with autogen.pl results\n";
12951295
unlink($m4_output_file);
1296-
open(M4, ">$m4_output_file") ||
1296+
open(M4, ">$m4_output_file") ||
12971297
my_die "Can't open $m4_output_file";
12981298
print M4 $m4;
12991299
close(M4);

config/Makefile.options

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
# Copyright (c) 2004-2005 The University of Tennessee and The University
77
# of Tennessee Research Foundation. All rights
88
# reserved.
9-
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
9+
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
1010
# University of Stuttgart. All rights reserved.
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
1313
# $COPYRIGHT$
14-
#
14+
#
1515
# Additional copyrights may follow
16-
#
16+
#
1717
# $HEADER$
1818
#
1919

config/c_get_alignment.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ dnl Corporation. All rights reserved.
66
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
77
dnl of Tennessee Research Foundation. All rights
88
dnl reserved.
9-
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
9+
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
1010
dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
1313
dnl Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
1414
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
1515
dnl $COPYRIGHT$
16-
dnl
16+
dnl
1717
dnl Additional copyrights may follow
18-
dnl
18+
dnl
1919
dnl $HEADER$
2020
dnl
2121

2222
# OPAL_C_GET_ALIGN(type, config_var)
2323
# ----------------------------------
24-
# Determine datatype alignment.
24+
# Determine datatype alignment.
2525
# First arg is type, 2nd arg is config var to define.
2626
AC_DEFUN([OPAL_C_GET_ALIGNMENT],[
2727
AC_CACHE_CHECK([alignment of $1],
@@ -39,7 +39,7 @@ AC_DEFUN([OPAL_C_GET_ALIGNMENT],[
3939
[AC_MSG_WARN([*** Problem running configure test!])
4040
AC_MSG_WARN([*** See config.log for details.])
4141
AC_MSG_ERROR([*** Cannot continue.])],
42-
[ # cross compile - do a non-executable test. Trick
42+
[ # cross compile - do a non-executable test. Trick
4343
# taken from the Autoconf 2.59c. Switch to using
4444
# AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
4545
_AC_COMPUTE_INT([(long int) offsetof (opal__type_alignof_, y)],

config/ompi_check_libfca.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dnl
1313

1414
# OMPI_CHECK_FCA(prefix, [action-if-found], [action-if-not-found])
1515
# --------------------------------------------------------
16-
# check if fca support can be found. sets prefix_{CPPFLAGS,
16+
# check if fca support can be found. sets prefix_{CPPFLAGS,
1717
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
1818
# support, otherwise executes action-if-not-found
1919
AC_DEFUN([OMPI_CHECK_FCA],[

config/ompi_check_libhcoll.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dnl
1313

1414
# OMPI_CHECK_HCOLL(prefix, [action-if-found], [action-if-not-found])
1515
# --------------------------------------------------------
16-
# check if hcoll support can be found. sets prefix_{CPPFLAGS,
16+
# check if hcoll support can be found. sets prefix_{CPPFLAGS,
1717
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
1818
# support, otherwise executes action-if-not-found
1919
AC_DEFUN([OMPI_CHECK_HCOLL],[

config/ompi_check_lustre.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dnl
2323

2424
# OMPI_CHECK_LUSTRE(prefix, [action-if-found], [action-if-not-found])
2525
# --------------------------------------------------------
26-
# check if LUSTRE support can be found. sets prefix_{CPPFLAGS,
26+
# check if LUSTRE support can be found. sets prefix_{CPPFLAGS,
2727
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
2828
# support, otherwise executes action-if-not-found
2929
AC_DEFUN([OMPI_CHECK_LUSTRE],[
@@ -32,7 +32,7 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
3232
check_lustre_LDFLAGS=
3333
check_lustre_LIBS=
3434

35-
check_lustre_save_LIBS="$LIBS"
35+
check_lustre_save_LIBS="$LIBS"
3636
check_lustre_save_LDFLAGS="$LDFLAGS"
3737
check_lustre_save_CPPFLAGS="$CPPFLAGS"
3838

config/ompi_check_mxm.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dnl
1212

1313
# OMPI_CHECK_MXM(prefix, [action-if-found], [action-if-not-found])
1414
# --------------------------------------------------------
15-
# check if MXM support can be found. sets prefix_{CPPFLAGS,
15+
# check if MXM support can be found. sets prefix_{CPPFLAGS,
1616
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
1717
# support, otherwise executes action-if-not-found
1818
AC_DEFUN([OMPI_CHECK_MXM],[

config/ompi_check_plfs.m4

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dnl
2323

2424
# OMPI_CHECK_PLFS(prefix, [action-if-found], [action-if-not-found])
2525
# --------------------------------------------------------
26-
# check if PLFS support can be found. sets prefix_{CPPFLAGS,
26+
# check if PLFS support can be found. sets prefix_{CPPFLAGS,
2727
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
2828
# support, otherwise executes action-if-not-found
2929
AC_DEFUN([OMPI_CHECK_PLFS],[
@@ -32,7 +32,7 @@ AC_DEFUN([OMPI_CHECK_PLFS],[
3232
check_plfs_LDFLAGS=
3333
check_plfs_LIBS=
3434

35-
check_plfs_save_LIBS="$LIBS"
35+
check_plfs_save_LIBS="$LIBS"
3636
check_plfs_save_LDFLAGS="$LDFLAGS"
3737
check_plfs_save_CPPFLAGS="$CPPFLAGS"
3838

@@ -46,7 +46,7 @@ AC_DEFUN([OMPI_CHECK_PLFS],[
4646
[Build Plfs support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
4747
OPAL_CHECK_WITHDIR([plfs], [$with_plfs], [include/plfs.h])
4848

49-
AC_ARG_WITH([plfs-libs],
49+
AC_ARG_WITH([plfs-libs],
5050
[AC_HELP_STRING([--with-plfs-libs=LIBS],
5151
[Libraries to link with for plfs])])
5252

@@ -57,29 +57,29 @@ AC_DEFUN([OMPI_CHECK_PLFS],[
5757
temp_with_plfs_libs="$with_plfs_libs"
5858
AS_IF([test -z "$with_plfs_libs"],
5959
[with_plfs_libs="plfs pthread"])
60-
60+
6161
# Add correct -I and -L flags
6262
AS_IF([test -d "$with_plfs/include"],
6363
[check_plfs_CPPFLAGS="-I$with_plfs/include"
6464
$1_CPPFLAGS="$check_plfs_CPPFLAGS"
6565
CPPFLAGS="$CPPFLAGS $check_plfs_CPPFLAGS"],
6666
[ompi_check_plfs_happy="no"])
67-
67+
6868
AS_IF([test "$ompi_check_plfs_happy" = "yes"],
6969
[AS_IF([test -d "$with_plfs/lib"],
7070
[check_plfs_LDFLAGS="-L$with_plfs/lib"
7171
$1_LDFLAGS="$check_plfs_LDFLAGS"
7272
LDFLAGS="$LDFLAGS $check_plfs_LDFLAGS"],
73-
[ompi_check_plfs_happy="no"])
73+
[ompi_check_plfs_happy="no"])
7474
],[])
75-
75+
7676
# Try to find all the plfs libraries
7777
AS_IF([test "$ompi_check_plfs_happy" = "yes"],
7878
[ AS_IF([test -n "$with_plfs_libs"]
7979
[for lib in $with_plfs_libs ; do
8080
check_plfs_LIBS="$check_plfs_LIBS -l$lib"
81-
done])
82-
81+
done])
82+
8383
$1_LIBS="$check_plfs_LIBS"
8484
LIBS="$LIBS $check_plfs_LIBS"
8585

0 commit comments

Comments
 (0)