Skip to content

Commit

Permalink
version foo
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert McLay committed Sep 30, 2015
1 parent b8eba56 commit db3f513
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 2 deletions.
28 changes: 28 additions & 0 deletions configure
Expand Up @@ -788,6 +788,7 @@ with_gnu_ld
with_sysroot
enable_libtool_lock
with_phdf5
with_lustreMaxStripesPerFile
with_goodCitzenshipStripes
with_maxStripesPerNode
with_lustre
Expand Down Expand Up @@ -1450,6 +1451,9 @@ Optional Packages:
--with-sysroot=DIR Search for dependent libraries within DIR
(or the compiler's sysroot if not specified).
--with-phdf5 use Parallel HDF5 with test programs
--with-lustreMaxStripesPerFile=ans
Max stripes possible with lustre, Lustre 2.1 ==>
160, Lustre 2.4 ==> 2000 [[160]]
--with-goodCitzenshipStripes=ans
Max number of stripes in automatic mode [[80]]
--with-maxStripesPerNode=ans
Expand Down Expand Up @@ -23271,6 +23275,30 @@ $as_echo "#define LUSTRE_VERSION \$LUSTRE_VERSION" >>confdefs.h



$as_echo "#define LUSTRE_MAX_STRIPES_PER_FILE 160" >>confdefs.h


# Check whether --with-lustreMaxStripesPerFile was given.
if test "${with_lustreMaxStripesPerFile+set}" = set; then :
withval=$with_lustreMaxStripesPerFile; LUSTRE_MAX_STRIPES_PER_FILE="$withval"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: LUSTRE_MAX_STRIPES_PER_FILE=$with_lustreMaxStripesPerFile" >&5
$as_echo "LUSTRE_MAX_STRIPES_PER_FILE=$with_lustreMaxStripesPerFile" >&6; }
cat >>confdefs.h <<_ACEOF
#define LUSTRE_MAX_STRIPES_PER_FILE $with_lustreMaxStripesPerFile
_ACEOF

else
withval="160"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: LUSTRE_MAX_STRIPES_PER_FILE=$withval" >&5
$as_echo "LUSTRE_MAX_STRIPES_PER_FILE=$withval" >&6; }
LUSTRE_MAX_STRIPES_PER_FILE="$withval"
cat >>confdefs.h <<_ACEOF
#define LUSTRE_MAX_STRIPES_PER_FILE $withval
_ACEOF

fi


$as_echo "#define GOOD_CITZENSHIP_STRIPES 80" >>confdefs.h


Expand Down
7 changes: 6 additions & 1 deletion configure.ac
Expand Up @@ -44,16 +44,21 @@ if test x$with_phdf5 != xno; then
fi
AC_SUBST(PHDF5_DIR)

MAX_STRIPES_POSSIBLE=160

# find lustre version
LUSTRE_VERSION=0.0.0
if test -f /proc/fs/lustre/version; then
v=$(cat /proc/fs/lustre/version | grep 'lustre:')
v=$(expr "$v" : 'lustre: *\(.*\)')
LUSTRE_VERSION=$v
if test m4_version_compare($v, [2.4.0]) -ge 0; then
MAX_STRIPES_POSSIBLE=2000
fi
fi
AC_DEFINE(LUSTRE_VERSION, $LUSTRE_VERSION)

AC_DEFINE(LUSTRE_MAX_STRIPES_PER_FILE, 160, [Max stripes possible with lustre])
AC_DEFINE(LUSTRE_MAX_STRIPES_PER_FILE, $MAX_STRIPES_POSSIBLE, [Max stripes possible with lustre])
AC_ARG_WITH(lustreMaxStripesPerFile,
AC_HELP_STRING([--with-lustreMaxStripesPerFile=ans],[Max stripes possible with lustre, Lustre 2.1 ==> 160, Lustre 2.4 ==> 2000 [[160]]]),
LUSTRE_MAX_STRIPES_PER_FILE="$withval"
Expand Down
3 changes: 2 additions & 1 deletion m4/config_summarize.m4
Expand Up @@ -21,6 +21,7 @@ echo '----------------------------------- SUMMARY ------------------------------
echo
echo Package version............... : $PACKAGE-$VERSION
echo
echo Lustre Client Version......... : $LUSTRE_VERSION
echo Fortran compiler.............. : $FC
echo Fortran compiler flags........ : $FCFLAGS
echo C compiler.................... : $CC
Expand Down Expand Up @@ -48,7 +49,7 @@ fi
echo
echo '-------------------------------------------------------------------------------'
if test $LUSTRE_MAX_STRIPES_PER_FILE -gt 160 ; then
if test "$LUSTRE_MAX_STRIPES_PER_FILE" -gt 160 ; then
echo "Warning: Make sure that your Lustre server is running 2.4 or greater."
echo " Otherwise bad thing can happen if the max stripes is wrong."
fi
Expand Down

0 comments on commit db3f513

Please sign in to comment.