From 3ebe464bc4a7ae228d802b7ed9d8d8517431810d Mon Sep 17 00:00:00 2001 From: Edgar Gabriel Date: Tue, 24 Apr 2018 13:44:41 -0500 Subject: [PATCH 1/3] config/ompi_check_pvfs2.m4: respect the --without-pvfs2 flag similar patch to the lustre version, abandon the configure macro for the pvfs2 components if the user explicitely told you to do that. Signed-off-by: Edgar Gabriel (cherry picked from commit 26e0894f246c68323047524f54d8c24b807b824e) --- config/ompi_check_pvfs2.m4 | 43 ++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/config/ompi_check_pvfs2.m4 b/config/ompi_check_pvfs2.m4 index 07176f6652a..42123f0643a 100644 --- a/config/ompi_check_pvfs2.m4 +++ b/config/ompi_check_pvfs2.m4 @@ -11,7 +11,7 @@ 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) 2008-2016 University of Houston. All rights reserved. +dnl Copyright (c) 2008-2018 University of Houston. All rights reserved. dnl Copyright (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ @@ -42,27 +42,30 @@ AC_DEFUN([OMPI_CHECK_PVFS2],[ [Build Pvfs2 support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])]) OPAL_CHECK_WITHDIR([pvfs2], [$with_pvfs2], [include/pvfs2.h]) - AS_IF([test -z "$with_pvfs2"], - [ompi_check_pvfs2_dir="/usr/local"], - [ompi_check_pvfs2_dir=$with_pvfs2]) + AS_IF([test "$with_pvfs2" = "no"], + [ompi_check_pvfs2_happy="no"], + [AS_IF([test -z "$with_pvfs2"], + [ompi_check_pvfs2_dir="/usr/local"], + [ompi_check_pvfs2_dir=$with_pvfs2]) - if test -e "$ompi_check_pvfs2_dir/lib64" ; then - ompi_check_pvfs2_libdir="$ompi_check_pvfs2_dir/lib64" - else - ompi_check_pvfs2_libdir="$ompi_check_pvfs2_dir/lib" - fi - - # Add correct -I and -L flags - OPAL_CHECK_PACKAGE([$1], [pvfs2.h], [pvfs2], [PVFS_util_resolve], [], - [$ompi_check_pvfs2_dir], [$ompi_check_pvfs2_libdir], [ompi_check_pvfs2_happy="yes"], - [ompi_check_pvfs2_happy="no"]) + if test -e "$ompi_check_pvfs2_dir/lib64" ; then + ompi_check_pvfs2_libdir="$ompi_check_pvfs2_dir/lib64" + else + ompi_check_pvfs2_libdir="$ompi_check_pvfs2_dir/lib" + fi + # Add correct -I and -L flags + OPAL_CHECK_PACKAGE([$1], [pvfs2.h], [pvfs2], [PVFS_util_resolve], [], + [$ompi_check_pvfs2_dir], [$ompi_check_pvfs2_libdir], + [ompi_check_pvfs2_happy="yes"], + [ompi_check_pvfs2_happy="no"]) + ]) AS_IF([test "$ompi_check_pvfs2_happy" = "yes"], - [$2], - [AS_IF([test ! -z "$with_pvfs2" && test "$with_pvfs2" != "no"], - [echo PVFS2 support not found]) - $3]) - -]) + [$2], + [AS_IF([test ! -z "$with_pvfs2" && test "$with_pvfs2" != "no"], + [echo PVFS2 support not found]) + $3]) + + ]) From aeeaa1ad69df888d245140e9a63a0dfd3e295abc Mon Sep 17 00:00:00 2001 From: Edgar Gabriel Date: Tue, 24 Apr 2018 13:24:32 -0500 Subject: [PATCH 2/3] config/ompi_check_lustre.m4: respect the --without-lustre flag make sure we actually respect if the user set the --without-lustre flag (instead of continuing in the m4 macro as was the case until now). Signed-off-by: Edgar Gabriel (cherry picked from commit aec2b9845ad411f002450c1061b0a2a841a5afc3) --- config/ompi_check_lustre.m4 | 41 ++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/config/ompi_check_lustre.m4 b/config/ompi_check_lustre.m4 index 765e1403666..8c385bfe8fa 100644 --- a/config/ompi_check_lustre.m4 +++ b/config/ompi_check_lustre.m4 @@ -11,7 +11,7 @@ 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-2017 Cisco Systems, Inc. All rights reserved -dnl Copyright (c) 2008-2017 University of Houston. All rights reserved. +dnl Copyright (c) 2008-2018 University of Houston. All rights reserved. dnl Copyright (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ @@ -45,23 +45,26 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[ [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/lustreapi.h]) - AS_IF([test -z "$with_lustre" || test "$with_lustre" = "yes"], - [ompi_check_lustre_dir="/usr"], - [ompi_check_lustre_dir=$with_lustre]) - - if test -e "$ompi_check_lustre_dir/lib64" ; then - ompi_check_lustre_libdir="$ompi_check_lustre_dir/lib64" - else - ompi_check_lustre_libdir="$ompi_check_lustre_dir/lib" - fi - - # Add correct -I and -L flags - OPAL_CHECK_PACKAGE([$1], [lustre/lustreapi.h], [lustreapi], [llapi_file_create], [], - [$ompi_check_lustre_dir], [$ompi_check_lustre_libdir], [ompi_check_lustre_happy="yes"], - [ompi_check_lustre_happy="no"]) - - AC_MSG_CHECKING([for required lustre data structures]) - cat > conftest.c < conftest.c < Date: Tue, 27 Mar 2018 12:10:22 -0500 Subject: [PATCH 3/3] ompio/fs: add summary of supported file systems Add the list of supported file systems to the summary output add the end of configure Signed-off-by: Edgar Gabriel (cherry picked from commit 19b71e4eb66782db039b3808117ceb361719cd6d) --- ompi/mca/fs/lustre/configure.m4 | 2 ++ ompi/mca/fs/pvfs2/configure.m4 | 1 + ompi/mca/fs/ufs/configure.m4 | 29 +++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 ompi/mca/fs/ufs/configure.m4 diff --git a/ompi/mca/fs/lustre/configure.m4 b/ompi/mca/fs/lustre/configure.m4 index d0865dd6710..9e64c6b5351 100644 --- a/ompi/mca/fs/lustre/configure.m4 +++ b/ompi/mca/fs/lustre/configure.m4 @@ -34,6 +34,8 @@ AC_DEFUN([MCA_ompi_fs_lustre_CONFIG],[ [$1], [$2]) + OPAL_SUMMARY_ADD([[OMPIO File Systems]],[[Lustre]],[$1],[$fs_lustre_happy]) + # substitute in the things needed to build lustre AC_SUBST([fs_lustre_CPPFLAGS]) AC_SUBST([fs_lustre_LDFLAGS]) diff --git a/ompi/mca/fs/pvfs2/configure.m4 b/ompi/mca/fs/pvfs2/configure.m4 index 17539ba070f..0f404ea0319 100644 --- a/ompi/mca/fs/pvfs2/configure.m4 +++ b/ompi/mca/fs/pvfs2/configure.m4 @@ -30,6 +30,7 @@ AC_DEFUN([MCA_ompi_fs_pvfs2_CONFIG],[ [fs_pvfs2_happy="yes"], [fs_pvfs2_happy="no"]) + OPAL_SUMMARY_ADD([[OMPIO File Systems]],[[PVFS2/OrangeFS]],[$1],[$fs_pvfs2_happy]) AS_IF([test "$fs_pvfs2_happy" = "yes"], [$1], [$2]) diff --git a/ompi/mca/fs/ufs/configure.m4 b/ompi/mca/fs/ufs/configure.m4 new file mode 100644 index 00000000000..dcc617b55d3 --- /dev/null +++ b/ompi/mca/fs/ufs/configure.m4 @@ -0,0 +1,29 @@ +# -*- shell-script -*- +# +# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana +# University Research and Technology +# Corporation. All rights reserved. +# 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, +# University of Stuttgart. All rights reserved. +# Copyright (c) 2004-2012 The Regents of the University of California. +# All rights reserved. +# Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2008-2018 University of Houston. All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# MCA_fbtl_posix_CONFIG(action-if-can-compile, +# [action-if-cant-compile]) +# ------------------------------------------------ +AC_DEFUN([MCA_ompi_fs_ufs_CONFIG],[ + AC_CONFIG_FILES([ompi/mca/fs/ufs/Makefile]) + + OPAL_SUMMARY_ADD([[OMPIO File Systems]],[[Generic Unix FS]],[$1],[yes]) +])dnl