mirror of
https://develop.openfoam.com/Development/ThirdParty-common.git
synced 2025-12-08 06:57:50 +00:00
ENH: ensure adios_config information reflects installation and is moveable
This commit is contained in:
mark
315
makeADIOS
315
makeADIOS
@ -53,6 +53,7 @@ usage() {
|
|||||||
|
|
||||||
usage: ${0##*/} [OPTION] [adios-VERSION]
|
usage: ${0##*/} [OPTION] [adios-VERSION]
|
||||||
options:
|
options:
|
||||||
|
-cmake PATH With cmake from the path given
|
||||||
-gcc Force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
|
-gcc Force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
|
||||||
-help
|
-help
|
||||||
|
|
||||||
@ -80,7 +81,12 @@ do
|
|||||||
export CC=gcc # use gcc/g++
|
export CC=gcc # use gcc/g++
|
||||||
export CXX=g++
|
export CXX=g++
|
||||||
;;
|
;;
|
||||||
ADIOS-[1-9]* | adios-[1-9]* | ADIOS-git | adios-git)
|
-cmake)
|
||||||
|
[ "$#" -ge 2 ] || die "'$1' option requires an argument"
|
||||||
|
CMAKE_PATH="${2%%/}"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
ADIOS-[1-9]* | adios-[1-9]* | ADIOS-git* | adios-git*)
|
||||||
adiosPACKAGE="${1%%/}"
|
adiosPACKAGE="${1%%/}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
@ -119,86 +125,16 @@ echo ========================================
|
|||||||
echo "Build adios library $adiosPACKAGE for $FOAM_MPI"
|
echo "Build adios library $adiosPACKAGE for $FOAM_MPI"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
# Needs future adjustment
|
|
||||||
# - for shared library
|
|
||||||
# - for mpi-specific library locations
|
|
||||||
if [ -f $ADIOS_ARCH_PATH/include/adios.h \
|
|
||||||
-a -r $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libadios_${FOAM_MPI}.a ]
|
|
||||||
then
|
|
||||||
echo " ADIOS header in $ADIOS_ARCH_PATH/include"
|
|
||||||
### echo " ADIOS libs in $FOAM_EXT_LIBBIN" # dynamic
|
|
||||||
echo " ADIOS libs in $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" # static
|
|
||||||
echo
|
|
||||||
else
|
|
||||||
(
|
|
||||||
# configuration options:
|
|
||||||
unset configOpt
|
|
||||||
|
|
||||||
# Add InfiniBand support
|
#
|
||||||
ibDir=/usr/local/ofed
|
# Manual adjustments to adios config
|
||||||
if [ -d "$ibDir" ]
|
#
|
||||||
then
|
adjustADIOS()
|
||||||
configOpt="$configOpt --with-infiniband=$ibDir"
|
{
|
||||||
fi
|
# Rename libraries according to FOAM_MPI
|
||||||
|
(
|
||||||
|
cd $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH || exit 1
|
||||||
|
|
||||||
# Transport layers
|
|
||||||
if [ -f "/usr/include/bzlib.h" ]
|
|
||||||
then
|
|
||||||
configOpt="$configOpt --with-bzip2=/usr"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "/usr/include/zlib.h" ]
|
|
||||||
then
|
|
||||||
configOpt="$configOpt --with-zlib=/usr"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Other types of support
|
|
||||||
## $configOpt="$configOpt --with-hdf5=..."
|
|
||||||
## $configOpt="$configOpt --with-lustre=..."
|
|
||||||
configOpt="$configOpt --enable-research-transports"
|
|
||||||
|
|
||||||
# end of configuration options
|
|
||||||
# ----------------------------
|
|
||||||
buildDIR=$buildBASE/$adiosPACKAGE
|
|
||||||
|
|
||||||
cd $ADIOS_SOURCE_DIR || exit 1
|
|
||||||
[ -e Makefile ] && make distclean 2>/dev/null
|
|
||||||
|
|
||||||
export GIT_DIR=$ADIOS_SOURCE_DIR/.git
|
|
||||||
|
|
||||||
# Remove any existing build folder and recreate
|
|
||||||
rm -rf $ADIOS_ARCH_DIR
|
|
||||||
rm -rf $buildDIR 2>/dev/null
|
|
||||||
mkdir -p $buildDIR
|
|
||||||
|
|
||||||
[ -f configure ] || {
|
|
||||||
echo "no configure for $adiosPACKAGE ... trying autogen"
|
|
||||||
./autogen.sh
|
|
||||||
}
|
|
||||||
|
|
||||||
# May not work properly with FOAM_MPI = dummy
|
|
||||||
if [ "$FOAM_MPI" = dummy ]
|
|
||||||
then
|
|
||||||
configOpt="$configOpt --without-mpi"
|
|
||||||
else
|
|
||||||
CC=mpicc
|
|
||||||
CXX=mpicxx
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Install into lib64/
|
|
||||||
cd $buildDIR && $ADIOS_SOURCE_DIR/configure \
|
|
||||||
--prefix=$ADIOS_ARCH_PATH \
|
|
||||||
--libdir=$ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
|
|
||||||
--disable-fortran \
|
|
||||||
--with-pic \
|
|
||||||
--without-fastbit \
|
|
||||||
$configOpt \
|
|
||||||
&& make -j $WM_NCOMPPROCS all \
|
|
||||||
&& make install \
|
|
||||||
&& echo "Built: $adiosPACKAGE" \
|
|
||||||
&& cd $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH && \
|
|
||||||
{
|
|
||||||
# Rename according to FOAM_MPI
|
|
||||||
if [ "$FOAM_MPI" != dummy ]
|
if [ "$FOAM_MPI" != dummy ]
|
||||||
then
|
then
|
||||||
\mv -f libadios.a libadios_$FOAM_MPI.a
|
\mv -f libadios.a libadios_$FOAM_MPI.a
|
||||||
@ -210,16 +146,219 @@ else
|
|||||||
echo
|
echo
|
||||||
echo "ADIOS library renamed to libadios_$FOAM_MPI"
|
echo "ADIOS library renamed to libadios_$FOAM_MPI"
|
||||||
echo
|
echo
|
||||||
} && cd $ADIOS_ARCH_PATH/bin && \
|
)
|
||||||
{
|
|
||||||
# We don't need/use XML things
|
# We don't need/use XML things
|
||||||
\rm -f adios_lint
|
\rm -f $ADIOS_ARCH_PATH/bin/adios_lint
|
||||||
$ADIOS_ARCH_PATH/bin/adios_config -m 2>/dev/null || \
|
|
||||||
echo "Warning: Problems running adios_config"
|
# Replace resolved paths with variables
|
||||||
}
|
echo "Adjust prefix for ADIOS"
|
||||||
) || {
|
for i in \
|
||||||
echo "Error building: $adiosPACKAGE"
|
$ADIOS_ARCH_PATH/bin/adios_config \
|
||||||
|
$ADIOS_ARCH_PATH/etc/adios_config.flags \
|
||||||
|
;
|
||||||
|
do
|
||||||
|
[ -f "$i" ] || {
|
||||||
|
echo " no such file - '$i'"
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if sed -i -e 's|'"$WM_THIRD_PARTY_DIR"'|$WM_THIRD_PARTY_DIR|g' $i
|
||||||
|
then
|
||||||
|
echo " '$i'"
|
||||||
|
else
|
||||||
|
echo " problems with '$i'"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# Adjust the config flags file:
|
||||||
|
# * Remove references to Fortran libraries (disabled in configure)
|
||||||
|
# * Remove references to deprecated version 1 API
|
||||||
|
# * Cleanup excessive whitespace
|
||||||
|
# * Handle renamed libraries:
|
||||||
|
# - libadios -> libadios_$FOAM_MPI
|
||||||
|
# - libadios_nompi -> libadios_dummy
|
||||||
|
#
|
||||||
|
echo "Adjust library names for ADIOS"
|
||||||
|
for i in \
|
||||||
|
$ADIOS_ARCH_PATH/etc/adios_config.flags \
|
||||||
|
;
|
||||||
|
do
|
||||||
|
[ -f "$i" ] || {
|
||||||
|
echo " no such file - '$i'"
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if sed -i \
|
||||||
|
-e '/_FLIB=/d' \
|
||||||
|
-e '/_V1_INC=/d' \
|
||||||
|
-e 's| *| |g' \
|
||||||
|
-e 's|\(-ladios[a-z]*_\)nompi |\1dummy |g' \
|
||||||
|
$i
|
||||||
|
then
|
||||||
|
echo " '$i'"
|
||||||
|
else
|
||||||
|
echo " problems with '$i'"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$FOAM_MPI" != dummy ]
|
||||||
|
then
|
||||||
|
sed -i -e 's|\(-ladios[a-z]*\) |\1_'"$FOAM_MPI |g" $i || \
|
||||||
|
echo " problems with '$i'"
|
||||||
|
fi
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#
|
||||||
|
# List ADIOS methods/configuration
|
||||||
|
#
|
||||||
|
listMethods()
|
||||||
|
{
|
||||||
|
[ -f $ADIOS_ARCH_PATH/bin/adios_config ] || {
|
||||||
|
echo "Warning: no adios_config"
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "==============="
|
||||||
|
|
||||||
|
# May have problems listing parallel methods (eg, transport key missing)
|
||||||
|
if $ADIOS_ARCH_PATH/bin/adios_config -m >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
$ADIOS_ARCH_PATH/bin/adios_config -m 2>/dev/null
|
||||||
|
else
|
||||||
|
echo "Warning: could not list parallel methods"
|
||||||
|
# Fallback to serial methods
|
||||||
|
$ADIOS_ARCH_PATH/bin/adios_config -s -m 2>/dev/null
|
||||||
|
fi || echo "Warning: could not list configured methods"
|
||||||
|
echo "==============="
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Needs future adjustment
|
||||||
|
# - for shared library
|
||||||
|
# - for mpi-specific library locations
|
||||||
|
if [ -f $ADIOS_ARCH_PATH/include/adios.h \
|
||||||
|
-a -r $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libadios_${FOAM_MPI}.a ]
|
||||||
|
then
|
||||||
|
echo " ADIOS header in $ADIOS_ARCH_PATH/include"
|
||||||
|
### echo " ADIOS libs in $FOAM_EXT_LIBBIN" # dynamic
|
||||||
|
echo " ADIOS libs in $ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH" # static
|
||||||
|
listMethods
|
||||||
|
elif [ -z "$CMAKE_PATH" ]
|
||||||
|
then
|
||||||
|
echo "Starting build: $adiosPACKAGE (using configure)"
|
||||||
|
echo
|
||||||
|
(
|
||||||
|
# configuration options:
|
||||||
|
unset configOpt
|
||||||
|
|
||||||
|
# Add InfiniBand support
|
||||||
|
ibDir=/usr/local/ofed
|
||||||
|
if [ -d "$ibDir" -a "$FOAM_MPI" != dummy ]
|
||||||
|
then
|
||||||
|
configOpt="$configOpt --with-infiniband=$ibDir"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Transport layers
|
||||||
|
if [ -f "/usr/include/bzlib.h" ]
|
||||||
|
then
|
||||||
|
configOpt="$configOpt --with-bzip2"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f "/usr/include/zlib.h" ]
|
||||||
|
then
|
||||||
|
configOpt="$configOpt --with-zlib"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Other types of support
|
||||||
|
## $configOpt="$configOpt --with-hdf5=..."
|
||||||
|
## $configOpt="$configOpt --with-lustre=..."
|
||||||
|
## configOpt="$configOpt --enable-research-transports"
|
||||||
|
|
||||||
|
# end of configuration options
|
||||||
|
# ----------------------------
|
||||||
|
buildDIR=$buildBASE/$adiosPACKAGE
|
||||||
|
|
||||||
|
cd $ADIOS_SOURCE_DIR || exit 1
|
||||||
|
[ -e Makefile ] && make distclean 2>/dev/null
|
||||||
|
|
||||||
|
export GIT_DIR=$ADIOS_SOURCE_DIR/.git
|
||||||
|
|
||||||
|
# Remove any existing build folder and recreate
|
||||||
|
rm -rf $ADIOS_ARCH_DIR
|
||||||
|
rm -rf $buildDIR 2>/dev/null
|
||||||
|
mkdir -p $buildDIR
|
||||||
|
|
||||||
|
[ -f configure ] || {
|
||||||
|
echo "no configure for $adiosPACKAGE ... trying autogen"
|
||||||
|
./autogen.sh
|
||||||
|
}
|
||||||
|
|
||||||
|
# May not work properly with FOAM_MPI = dummy
|
||||||
|
if [ "$FOAM_MPI" = dummy ]
|
||||||
|
then
|
||||||
|
configOpt="$configOpt --without-mpi"
|
||||||
|
else
|
||||||
|
CC=mpicc
|
||||||
|
CXX=mpicxx
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Install into lib64/
|
||||||
|
cd $buildDIR && $ADIOS_SOURCE_DIR/configure \
|
||||||
|
--prefix=$ADIOS_ARCH_PATH \
|
||||||
|
--libdir=$ADIOS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH \
|
||||||
|
--disable-fortran \
|
||||||
|
--with-pic \
|
||||||
|
--without-fastbit \
|
||||||
|
$configOpt \
|
||||||
|
&& make -j $WM_NCOMPPROCS all \
|
||||||
|
&& make install \
|
||||||
|
&& echo "Built: $adiosPACKAGE" \
|
||||||
|
&& adjustADIOS \
|
||||||
|
&& listMethods
|
||||||
|
) || {
|
||||||
|
echo "Error building: $adiosPACKAGE"
|
||||||
|
}
|
||||||
|
else
|
||||||
|
# CMake options often lag the configure ones
|
||||||
|
echo "Starting build: $adiosPACKAGE (using cmake)"
|
||||||
|
echo
|
||||||
|
(
|
||||||
|
buildDIR=$buildBASE/$adiosPACKAGE
|
||||||
|
cd $ADIOS_SOURCE_DIR || exit 1
|
||||||
|
|
||||||
|
export GIT_DIR=$ADIOS_SOURCE_DIR/.git
|
||||||
|
|
||||||
|
# Remove any existing build folder and recreate
|
||||||
|
rm -rf $ADIOS_ARCH_DIR
|
||||||
|
rm -rf $buildDIR 2>/dev/null
|
||||||
|
mkdir -p $buildDIR
|
||||||
|
|
||||||
|
# May not work properly with FOAM_MPI = dummy
|
||||||
|
if [ "$FOAM_MPI" = dummy ]
|
||||||
|
then
|
||||||
|
configOpt="$configOpt --without-mpi"
|
||||||
|
else
|
||||||
|
CC=mpicc
|
||||||
|
CXX=mpicxx
|
||||||
|
fi
|
||||||
|
|
||||||
|
cmake=$(findCMake)
|
||||||
|
|
||||||
|
# Install into lib64/
|
||||||
|
cd $buildDIR && $cmake \
|
||||||
|
-DCMAKE_INSTALL_PREFIX=$ADIOS_ARCH_PATH \
|
||||||
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DBUILD_FORTRAN:BOOL=FALSE \
|
||||||
|
$ADIOS_SOURCE_DIR \
|
||||||
|
&& make -j $WM_NCOMPPROCS all \
|
||||||
|
&& make install \
|
||||||
|
&& echo "Built: $adiosPACKAGE" \
|
||||||
|
&& adjustADIOS \
|
||||||
|
&& listMethods
|
||||||
|
) || {
|
||||||
|
echo "Error building: $adiosPACKAGE"
|
||||||
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ----------------------------------------------------------------- end-of-file
|
# ----------------------------------------------------------------- end-of-file
|
||||||
|
|||||||
Reference in New Issue
Block a user