Skip to content

v3.0.x: lustre fixes #3483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 18, 2017
Merged

v3.0.x: lustre fixes #3483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0510503
fs/lustre: remove redundant/dead code
jsquyres May 5, 2017
06949c9
ompi_check_lustre.m4: ensure --with-lustre isn't harmful
jsquyres May 5, 2017
59026f9
ompi_check_lustre.m4: trivial updates
jsquyres May 5, 2017
0f20414
ompi_check_lustre.m4: abort if Lustre requested and not found
jsquyres May 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions config/ompi_check_lustre.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
dnl University of Stuttgart. All rights reserved.
dnl Copyright (c) 2004-2006 The Regents of the University of California.
dnl All rights reserved.
dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved
dnl Copyright (c) 2008-2012 University of Houston. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
Expand Down Expand Up @@ -39,16 +39,15 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
check_lustre_configuration="none"
ompi_check_lustre_happy="yes"


# Get some configuration information
AC_ARG_WITH([lustre],
[AC_HELP_STRING([--with-lustre(=DIR)],
[Build Lustre support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
OPAL_CHECK_WITHDIR([lustre], [$with_lustre], [include/lustre/liblustreapi.h])

AS_IF([test -z "$with_lustre"],
AS_IF([test -z "$with_lustre" || test "$with_lustre" = "yes"],
[ompi_check_lustre_dir="/usr"],
[ompi_check_lustre_dir="$with_lustre"])
[ompi_check_lustre_dir=$with_lustre])

if test -e "$ompi_check_lustre_dir/lib64" ; then
ompi_check_lustre_libdir="$ompi_check_lustre_dir/lib64"
Expand Down Expand Up @@ -88,6 +87,6 @@ OPAL_LOG_COMMAND(
AS_IF([test "$ompi_check_lustre_happy" = "yes"],
[$2],
[AS_IF([test ! -z "$with_lustre" && test "$with_lustre" != "no"],
[echo LUSTRE support not found])
$3])
[AC_MSG_ERROR([Lustre support requested but not found. Aborting])])
$3])
])
8 changes: 1 addition & 7 deletions ompi/mca/fs/lustre/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2010-2017 Cisco Systems, Inc. All rights reserved
# Copyright (c) 2008-2012 University of Houston. All rights reserved.
# $COPYRIGHT$
#
Expand All @@ -34,12 +34,6 @@ AC_DEFUN([MCA_ompi_fs_lustre_CONFIG],[
[$1],
[$2])

# AC_CHECK_HEADERS([lustre/liblustreapi.h], [],
# [AC_CHECK_HEADERS([lustre/liblustreapi.h], [], [$2],
# [AC_INCLUDES_DEFAULT])],
# [AC_INCLUDES_DEFAULT])


# substitute in the things needed to build lustre
AC_SUBST([fs_lustre_CPPFLAGS])
AC_SUBST([fs_lustre_LDFLAGS])
Expand Down