Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
Copyright (c) 2004-2010 The University of Tennessee and The University
of Tennessee Research Foundation. All rights
reserved.
Copyright (c) 2004-2010 High Performance Computing Center Stuttgart,
Copyright (c) 2004-2010 High Performance Computing Center Stuttgart,
University of Stuttgart. All rights reserved.
Copyright (c) 2004-2008 The Regents of the University of California.
All rights reserved.
Copyright (c) 2006-2010 Los Alamos National Security, LLC. All rights
reserved.
reserved.
Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved.
Copyright (c) 2006-2010 Voltaire, Inc. All rights reserved.
Copyright (c) 2006-2011 Sandia National Laboratories. All rights reserved.
Expand All @@ -26,7 +26,7 @@ Copyright (c) 2006-2010 The University of Houston. All rights reserved.
Copyright (c) 2006-2009 Myricom, Inc. All rights reserved.
Copyright (c) 2007-2008 UT-Battelle, LLC. All rights reserved.
Copyright (c) 2007-2010 IBM Corporation. All rights reserved.
Copyright (c) 1998-2005 Forschungszentrum Juelich, Juelich Supercomputing
Copyright (c) 1998-2005 Forschungszentrum Juelich, Juelich Supercomputing
Centre, Federal Republic of Germany
Copyright (c) 2005-2008 ZIH, TU Dresden, Federal Republic of Germany
Copyright (c) 2007 Evergrid, Inc. All rights reserved.
Expand Down
6 changes: 3 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
# Copyright (c) 2004-2005 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2012-2015 Los Alamos National Security, Inc. All rights reserved.
# Copyright (c) 2014 Intel, Inc. All rights reserved.
# $COPYRIGHT$
#
#
# Additional copyrights may follow
#
#
# $HEADER$
#

Expand Down
44 changes: 22 additions & 22 deletions autogen.pl
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
# All rights reserved.
# Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
# $COPYRIGHT$
#
#
# Additional copyrights may follow
#
#
# $HEADER$
#

Expand Down Expand Up @@ -74,7 +74,7 @@
my $patch_prog = "patch";
# Solaris "patch" doesn't understand unified diffs, and will cause
# autogen.pl to hang with a "File to patch:" prompt. Default to Linux
# "patch", but use "gpatch" on Solaris.
# "patch", but use "gpatch" on Solaris.
if ($^O eq "solaris") {
$patch_prog = "gpatch";
}
Expand Down Expand Up @@ -247,7 +247,7 @@ sub mca_process_component {
$found_component->{"name"} = $component;

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

# Is there an autogen.subdirs in here?
Expand All @@ -274,7 +274,7 @@ sub ignored {
$unignore .= $_
while (<UNIGNORE>);
close(UNIGNORE);

$ignored = 0
if ($unignore =~ /^$username$/m ||
$unignore =~ /^$username\@$hostname$/m ||
Expand Down Expand Up @@ -307,13 +307,13 @@ sub mca_process_framework {
# Look for component directories in this framework
if (-d $dir) {
$mca_found->{$pname}->{$framework}->{found} = 1;
opendir(DIR, $dir) ||
opendir(DIR, $dir) ||
my_die "Can't open $dir directory";
foreach my $d (readdir(DIR)) {
# Skip any non-directory, "base", or any dir that
# begins with "."
next
if (! -d "$dir/$d" || $d eq "base" ||
if (! -d "$dir/$d" || $d eq "base" ||
substr($d, 0, 1) eq ".");

# Skip any component that doesn't have a configure.m4
Expand All @@ -328,7 +328,7 @@ sub mca_process_framework {

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

# Skip if specifically excluded
# Skip if specifically excluded
if (exists($exclude_list->{$framework}) &&
$exclude_list->{$framework}[0] eq $d) {
verbose " => Excluded\n";
Expand Down Expand Up @@ -415,7 +415,7 @@ sub mca_process_project {
# Look for framework directories in this project
my $dir = "$topdir/$pdir/mca";
if (-d $dir) {
opendir(DIR, $dir) ||
opendir(DIR, $dir) ||
my_die "Can't open $dir directory";
my @my_dirs = readdir(DIR);
@my_dirs = sort(@my_dirs);
Expand Down Expand Up @@ -493,7 +493,7 @@ sub mca_run_global {
# Does this project have a configure.m4 file?
push(@includes, "$pdir/configure.m4")
if (exists($mca_found->{$p}->{"configure.m4"}));

# Print out project-level info
my @mykeys = keys(%{$mca_found->{$pname}});
@mykeys = sort(@mykeys);
Expand Down Expand Up @@ -553,7 +553,7 @@ sub mca_run_global {
}
$m4_config_component_list =~ s/^, //;
$no_config_component_list =~ s/^, //;

$m4 .= "dnl Components in the $pname / $f framework
m4_define([mca_${pname}_${f}_m4_config_component_list], [$m4_config_component_list])
m4_define([mca_${pname}_${f}_no_config_component_list], [$no_config_component_list])
Expand All @@ -576,7 +576,7 @@ sub mca_run_global {

sub mpiext_process_extension {
my ($topdir, $ext_prefix, $extdir) = @_;

my $edir = "$topdir/$ext_prefix/$extdir";
return
if (! -d $edir);
Expand All @@ -602,13 +602,13 @@ sub mpiext_run_global {
my $topdir = Cwd::cwd();

my $dir = "$topdir/$ext_prefix";
opendir(DIR, $dir) ||
opendir(DIR, $dir) ||
my_die "Can't open $dir directory";
foreach my $d (readdir(DIR)) {
# Skip any non-directory, "base", or any dir that begins with "."
next
if (! -d "$dir/$d" || $d eq "base" || substr($d, 0, 1) eq ".");

# If this directory has a configure.m4, then it's an
# extension.
if (-f "$dir/$d/configure.m4") {
Expand Down Expand Up @@ -663,7 +663,7 @@ sub mpiext_run_global {

sub mpicontrib_process {
my ($topdir, $contrib_prefix, $contribdir) = @_;

my $cdir = "$topdir/$contrib_prefix/$contribdir";
return
if (! -d $cdir);
Expand All @@ -689,13 +689,13 @@ sub mpicontrib_run_global {
my $topdir = Cwd::cwd();

my $dir = "$topdir/$contrib_prefix";
opendir(DIR, $dir) ||
opendir(DIR, $dir) ||
my_die "Can't open $dir directory";
foreach my $d (readdir(DIR)) {
# Skip any non-directory, "base", or any dir that begins with "."
next
if (! -d "$dir/$d" || $d eq "base" || substr($d, 0, 1) eq ".");

# If this directory has a configure.m4, then it's an
# extension.
if (-f "$dir/$d/configure.m4") {
Expand Down Expand Up @@ -821,7 +821,7 @@ sub find_and_check {
if ($pn > $mn) {
verbose " ==> ACCEPTED\n";
return;
}
}
# If the version is lower, we're done.
elsif ($pn < $mn ||
($pn == $mn && $pa lt $ma)) {
Expand Down Expand Up @@ -931,13 +931,13 @@ sub patch_autotools_output {
# Similar issue as above -- fix the case statements that handle the Sun
# Fortran version strings.
#
# Note: we have to use octal escapes to match '*Sun\ F*) and the
# Note: we have to use octal escapes to match '*Sun\ F*) and the
# four succeeding lines in the bourne shell switch statement.
# \ = 134
# ) = 051
# * = 052
#
# Below is essentially an upstream patch for Libtool which we want
# Below is essentially an upstream patch for Libtool which we want
# made available to Open MPI users running older versions of Libtool

foreach my $tag (("", "_FC")) {
Expand Down Expand Up @@ -1066,7 +1066,7 @@ sub patch_autotools_output {
$dnl_line
dnl This file is automatically created by autogen.pl; it should not
dnl be edited by hand!!
dnl
dnl
dnl Generated by $username at " . localtime(time) . "
dnl on $full_hostname.
$dnl_line\n\n";
Expand Down Expand Up @@ -1269,7 +1269,7 @@ sub patch_autotools_output {
# Remove the old m4 file and write the new one
verbose "==> Writing m4 file with autogen.pl results\n";
unlink($m4_output_file);
open(M4, ">$m4_output_file") ||
open(M4, ">$m4_output_file") ||
my_die "Can't open $m4_output_file";
print M4 $m4;
close(M4);
Expand Down
6 changes: 3 additions & 3 deletions config/Makefile.options
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
# Copyright (c) 2004-2005 The University of Tennessee and The University
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# $COPYRIGHT$
#
#
# Additional copyrights may follow
#
#
# $HEADER$
#

Expand Down
10 changes: 5 additions & 5 deletions config/c_get_alignment.m4
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ dnl Corporation. All rights reserved.
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
dnl of Tennessee Research Foundation. All rights
dnl reserved.
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved.
dnl Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl $COPYRIGHT$
dnl
dnl
dnl Additional copyrights may follow
dnl
dnl
dnl $HEADER$
dnl

# OPAL_C_GET_ALIGN(type, config_var)
# ----------------------------------
# Determine datatype alignment.
# Determine datatype alignment.
# First arg is type, 2nd arg is config var to define.
AC_DEFUN([OPAL_C_GET_ALIGNMENT],[
AC_CACHE_CHECK([alignment of $1],
Expand All @@ -39,7 +39,7 @@ AC_DEFUN([OPAL_C_GET_ALIGNMENT],[
[AC_MSG_WARN([*** Problem running configure test!])
AC_MSG_WARN([*** See config.log for details.])
AC_MSG_ERROR([*** Cannot continue.])],
[ # cross compile - do a non-executable test. Trick
[ # cross compile - do a non-executable test. Trick
# taken from the Autoconf 2.59c. Switch to using
# AC_CHECK_ALIGNOF when we can require Autoconf 2.60.
_AC_COMPUTE_INT([(long int) offsetof (opal__type_alignof_, y)],
Expand Down
2 changes: 1 addition & 1 deletion config/ompi_check_libfca.m4
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dnl

# OMPI_CHECK_FCA(prefix, [action-if-found], [action-if-not-found])
# --------------------------------------------------------
# check if fca support can be found. sets prefix_{CPPFLAGS,
# check if fca support can be found. sets prefix_{CPPFLAGS,
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
# support, otherwise executes action-if-not-found
AC_DEFUN([OMPI_CHECK_FCA],[
Expand Down
2 changes: 1 addition & 1 deletion config/ompi_check_libhcoll.m4
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dnl

# OMPI_CHECK_HCOLL(prefix, [action-if-found], [action-if-not-found])
# --------------------------------------------------------
# check if hcoll support can be found. sets prefix_{CPPFLAGS,
# check if hcoll support can be found. sets prefix_{CPPFLAGS,
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
# support, otherwise executes action-if-not-found
AC_DEFUN([OMPI_CHECK_HCOLL],[
Expand Down
4 changes: 2 additions & 2 deletions config/ompi_check_lustre.m4
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dnl

# OMPI_CHECK_LUSTRE(prefix, [action-if-found], [action-if-not-found])
# --------------------------------------------------------
# check if LUSTRE support can be found. sets prefix_{CPPFLAGS,
# check if LUSTRE support can be found. sets prefix_{CPPFLAGS,
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
# support, otherwise executes action-if-not-found
AC_DEFUN([OMPI_CHECK_LUSTRE],[
Expand All @@ -32,7 +32,7 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
check_lustre_LDFLAGS=
check_lustre_LIBS=

check_lustre_save_LIBS="$LIBS"
check_lustre_save_LIBS="$LIBS"
check_lustre_save_LDFLAGS="$LDFLAGS"
check_lustre_save_CPPFLAGS="$CPPFLAGS"

Expand Down
2 changes: 1 addition & 1 deletion config/ompi_check_mxm.m4
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dnl

# OMPI_CHECK_MXM(prefix, [action-if-found], [action-if-not-found])
# --------------------------------------------------------
# check if MXM support can be found. sets prefix_{CPPFLAGS,
# check if MXM support can be found. sets prefix_{CPPFLAGS,
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
# support, otherwise executes action-if-not-found
AC_DEFUN([OMPI_CHECK_MXM],[
Expand Down
18 changes: 9 additions & 9 deletions config/ompi_check_plfs.m4
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dnl

# OMPI_CHECK_PLFS(prefix, [action-if-found], [action-if-not-found])
# --------------------------------------------------------
# check if PLFS support can be found. sets prefix_{CPPFLAGS,
# check if PLFS support can be found. sets prefix_{CPPFLAGS,
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
# support, otherwise executes action-if-not-found
AC_DEFUN([OMPI_CHECK_PLFS],[
Expand All @@ -32,7 +32,7 @@ AC_DEFUN([OMPI_CHECK_PLFS],[
check_plfs_LDFLAGS=
check_plfs_LIBS=

check_plfs_save_LIBS="$LIBS"
check_plfs_save_LIBS="$LIBS"
check_plfs_save_LDFLAGS="$LDFLAGS"
check_plfs_save_CPPFLAGS="$CPPFLAGS"

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

AC_ARG_WITH([plfs-libs],
AC_ARG_WITH([plfs-libs],
[AC_HELP_STRING([--with-plfs-libs=LIBS],
[Libraries to link with for plfs])])

Expand All @@ -57,29 +57,29 @@ AC_DEFUN([OMPI_CHECK_PLFS],[
temp_with_plfs_libs="$with_plfs_libs"
AS_IF([test -z "$with_plfs_libs"],
[with_plfs_libs="plfs pthread"])

# Add correct -I and -L flags
AS_IF([test -d "$with_plfs/include"],
[check_plfs_CPPFLAGS="-I$with_plfs/include"
$1_CPPFLAGS="$check_plfs_CPPFLAGS"
CPPFLAGS="$CPPFLAGS $check_plfs_CPPFLAGS"],
[ompi_check_plfs_happy="no"])

AS_IF([test "$ompi_check_plfs_happy" = "yes"],
[AS_IF([test -d "$with_plfs/lib"],
[check_plfs_LDFLAGS="-L$with_plfs/lib"
$1_LDFLAGS="$check_plfs_LDFLAGS"
LDFLAGS="$LDFLAGS $check_plfs_LDFLAGS"],
[ompi_check_plfs_happy="no"])
[ompi_check_plfs_happy="no"])
],[])

# Try to find all the plfs libraries
AS_IF([test "$ompi_check_plfs_happy" = "yes"],
[ AS_IF([test -n "$with_plfs_libs"]
[for lib in $with_plfs_libs ; do
check_plfs_LIBS="$check_plfs_LIBS -l$lib"
done])
done])

$1_LIBS="$check_plfs_LIBS"
LIBS="$LIBS $check_plfs_LIBS"

Expand Down
2 changes: 1 addition & 1 deletion config/ompi_check_psm.m4
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dnl

# OMPI_CHECK_PSM(prefix, [action-if-found], [action-if-not-found])
# --------------------------------------------------------
# check if PSM support can be found. sets prefix_{CPPFLAGS,
# check if PSM support can be found. sets prefix_{CPPFLAGS,
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
# support, otherwise executes action-if-not-found
AC_DEFUN([OMPI_CHECK_PSM],[
Expand Down
Loading