- Add the ornl_configure_self_contained to the Makefile.am; this should
show up in the nightly tar-ball. Generalize the self_contained file from compiler, so that it can be called regardless (with intel and cray compiler coming into play...) This commit was SVN r22120.
Этот коммит содержится в:
Rainer Keller
родитель
7425255be5
Коммит
efb67579a0
@ -37,6 +37,7 @@ EXTRA_DIST = \
|
||||
platform/ornl/cray_xt_cnl_romio_debug \
|
||||
platform/ornl/ornl_configure.gnu \
|
||||
platform/ornl/ornl_configure.pgi \
|
||||
platform/ornl/ornl_configure_self_contained \
|
||||
platform/lanl/macosx-dynamic \
|
||||
platform/lanl/macosx-dynamic-optimized \
|
||||
platform/lanl/macosx-static-leopard \
|
||||
|
||||
@ -20,27 +20,44 @@ fi
|
||||
[[ -z ${MPT_DIR} ]] && echo "MPT_DIR is not set. Please load the xt-mpt module"
|
||||
[[ -z ${PE_ENV} ]] && echo "PE_ENV is not set. Please load the PrgEnv module"
|
||||
|
||||
if test "$PE_ENV" != "GNU" ; then
|
||||
echo "PrgEnv module is not GNU"
|
||||
return
|
||||
fi
|
||||
|
||||
###################################################################
|
||||
|
||||
# If the env flags SRCDIR and PREFIX are not set, initialize to default...
|
||||
SRCDIR=${SRCDIR:-..}
|
||||
|
||||
COMPILER=${COMPILER:-gcc}
|
||||
INSTALL_ROOT=/sw/xt5/ompi
|
||||
VERSION=`${SRCDIR}/config/ompi_get_version.sh ${SRCDIR}/VERSION`
|
||||
BUILD=gnu
|
||||
SVER=cnl`echo "${XTOS_VERSION}" | cut -c1-3`
|
||||
CVER=${BUILD}`gcc --version | awk '/gcc/{print $3}'`
|
||||
VERSION=${VERSION:-"`${SRCDIR}/config/ompi_get_version.sh ${SRCDIR}/VERSION`"}
|
||||
SVER=${SVER:-"cnl`echo "${XTOS_VERSION}" | cut -c1-3`"}
|
||||
CVER=${CVER:-"${COMPILER}`gcc --version | awk '/gcc/{print $3}'`"}
|
||||
INSTALL_DIR=${INSTALL_ROOT}/${VERSION}/${SVER}_${CVER}
|
||||
|
||||
PREFIX=${PREFIX:-$INSTALL_DIR}
|
||||
|
||||
###################################################################
|
||||
|
||||
case "$COMPILER" in
|
||||
"cray" )
|
||||
;;
|
||||
"gcc" )
|
||||
;;
|
||||
"intel" )
|
||||
ADD_COMPILER="CC=icc CXX=icpc F77=ifort FC=ifort"
|
||||
;;
|
||||
"pathscale" )
|
||||
ADD_COMPILER="CC=pathcc CXX=pathCC F77=pathf90 FC=pathf90"
|
||||
;;
|
||||
"pgi" )
|
||||
ADD_COMPILER="CC=pgcc CXX=pgCC F77=pgf77 FC=pgf90"
|
||||
ADD_FFLAGS="-Mnomain $PGI/linux86-64/default/lib/pgfmain.o"
|
||||
ADD_FCFLAGS="-Mnomain $PGI/linux86-64/default/lib/pgfmain.o"
|
||||
ADD_LDFLAGS="-L$PGI/linux86-64/default/lib"
|
||||
;;
|
||||
* )
|
||||
echo "Error: Unknown Compiler: $COMPILER"
|
||||
return
|
||||
;;
|
||||
esac
|
||||
|
||||
$SRCDIR/configure \
|
||||
--prefix=$PREFIX \
|
||||
--enable-static --disable-shared --disable-dlopen --disable-pretty-print-stacktrace --disable-pty-support \
|
||||
@ -49,11 +66,12 @@ $SRCDIR/configure \
|
||||
--enable-mca-no-build=timer-catamount,maffinity-first_use,maffinity-libnuma,ess-cnos,filem-rsh,grpcomm-cnos,pml-dr \
|
||||
--with-wrapper-ldflags="-static -L${PE_DIR}/lib/snos64 -L${SE_DIR}/lib/snos64 -L${MPT_DIR}/util/lib" \
|
||||
--with-wrapper-libs="-lpct -lalpslli -lalpsutil -lportals -lpthread -lm" \
|
||||
CPPFLAGS="-I${CATAMOUNT_DIR}/catamount/linux/include -I${PE_DIR}/include" \
|
||||
FFLAGS="-I${PE_DIR}/include" \
|
||||
FCFLAGS="-I${PE_DIR}/include" \
|
||||
LDFLAGS="-L${PE_DIR}/lib/snos64 -L${SE_DIR}/lib/snos64 -L${MPT_DIR}/util/lib" \
|
||||
LIBS="-lrt -lpct -lalpslli -lalpsutil -lportals -lpthread -lm" | tee build.log
|
||||
${ADD_COMPILER} \
|
||||
CPPFLAGS=${ADD_CPPFLAGS}" -I${CATAMOUNT_DIR}/catamount/linux/include -I${PE_DIR}/include" \
|
||||
FFLAGS=${ADD_FFLAGS}" -I${PE_DIR}/include" \
|
||||
FCFLAGS=${ADD_FCFLAGS}" -I${PE_DIR}/include" \
|
||||
LDFLAGS=${ADD_LDFLAGS}" -L${PE_DIR}/lib/snos64 -L${SE_DIR}/lib/snos64 -L${MPT_DIR}/util/lib" \
|
||||
LIBS=${ADD_LIBS}" -lrt -lpct -lalpslli -lalpsutil -lportals -lpthread -lm" | tee build.log
|
||||
|
||||
#
|
||||
# To build orted static, use the libtool-flag -all-static
|
||||
@ -1,62 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Self-contained configure script, that does not rely
|
||||
# on cross-compilation, aka no need for a platforms-file.
|
||||
#
|
||||
|
||||
# Compilation should be done as VPATH
|
||||
if [ -d .svn -o -f AUTHORS ] ; then
|
||||
echo WARNING: Should not compile in source directory
|
||||
echo Please create a directory and adapt SRCDIR in this script
|
||||
return
|
||||
fi
|
||||
|
||||
[[ -z ${XTOS_VERSION} ]] && echo "XTOS_VERSION is not set. Please load the xt-os module"
|
||||
[[ -z ${CATAMOUNT_DIR} ]] && echo "CATAMOUNT_DIR is not set. Please load the xt-catamount module"
|
||||
[[ -z ${PE_DIR} ]] && echo "PE_DIR is not set. Please load the xt-pe module"
|
||||
[[ -z ${SE_DIR} ]] && echo "SE_DIR is not set. Please load the xt-service module"
|
||||
[[ -z ${MPT_DIR} ]] && echo "MPT_DIR is not set. Please load the xt-mpt module"
|
||||
[[ -z ${PE_ENV} ]] && echo "PE_ENV is not set. Please load the PrgEnv module"
|
||||
|
||||
if test "$PE_ENV" != "PATHSCALE" ; then
|
||||
echo "PrgEnv module is not PATHSCALE"
|
||||
return
|
||||
fi
|
||||
|
||||
###################################################################
|
||||
|
||||
# If the env flags SRCDIR and PREFIX are not set, initialize to default...
|
||||
SRCDIR=${SRCDIR:-..}
|
||||
|
||||
INSTALL_ROOT=/sw/xt5/ompi
|
||||
VERSION=`${SRCDIR}/config/ompi_get_version.sh ${SRCDIR}/VERSION`
|
||||
BUILD=pathscale
|
||||
SVER=cnl`echo "${XTOS_VERSION}" | cut -c1-3`
|
||||
CVER=${BUILD}`pathcc -v 2>&1 | awk '/PathScale\(TM\)/{print $5}'`
|
||||
INSTALL_DIR=${INSTALL_ROOT}/${VERSION}/${SVER}_${CVER}
|
||||
|
||||
PREFIX=${PREFIX:-$INSTALL_DIR}
|
||||
|
||||
###################################################################
|
||||
|
||||
$SRCDIR/configure \
|
||||
--prefix=$PREFIX \
|
||||
--enable-static --disable-shared --disable-dlopen --disable-pretty-print-stacktrace --disable-pty-support \
|
||||
--with-threads --with-memory-manager=none \
|
||||
--without-tm --with-alps --with-portals --with-portals-config=cnl_modex \
|
||||
--enable-mca-no-build=timer-catamount,maffinity-first_use,maffinity-libnuma,ess-cnos,filem-rsh,grpcomm-cnos,pml-dr \
|
||||
--with-wrapper-ldflags="-static -L${PE_DIR}/lib/snos64 -L${SE_DIR}/lib/snos64 -L${MPT_DIR}/util/lib" \
|
||||
--with-wrapper-libs="-lpct -lalpslli -lalpsutil -lportals -lpthread -lm" \
|
||||
CC=pathcc CXX=pathCC F77=pathf90 FC=pathf90 \
|
||||
CPPFLAGS="-I${CATAMOUNT_DIR}/catamount/linux/include -I${PE_DIR}/include" \
|
||||
FFLAGS="-I${PE_DIR}/include" \
|
||||
FCFLAGS="-I${PE_DIR}/include" \
|
||||
LDFLAGS="-L${PE_DIR}/lib/snos64 -L${SE_DIR}/lib/snos64 -L${MPT_DIR}/util/lib" \
|
||||
LIBS="-lrt -lpct -lalpslli -lalpsutil -lportals -lpthread -lm" | tee build.log
|
||||
|
||||
#
|
||||
# To build orted static, use the libtool-flag -all-static
|
||||
#
|
||||
make -s -j4 orted_LDFLAGS=-all-static all | tee -a build.log
|
||||
|
||||
# make -s orted_LDFLAGS=-all-static install | tee -a install.log
|
||||
@ -1,65 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Self-contained configure script, that does not rely
|
||||
# on cross-compilation, aka no need for a platforms-file.
|
||||
#
|
||||
# If the env flags SRCDIR and PREFIX are not set, initialize to default...
|
||||
#
|
||||
|
||||
# Compilation should be done as VPATH
|
||||
if [ -d .svn -o -f AUTHORS ] ; then
|
||||
echo WARNING: Should not compile in source directory
|
||||
echo Please create a directory and adapt SRCDIR in this script
|
||||
return
|
||||
fi
|
||||
|
||||
[[ -z ${XTOS_VERSION} ]] && echo "XTOS_VERSION is not set. Please load the xt-os module"
|
||||
[[ -z ${CATAMOUNT_DIR} ]] && echo "CATAMOUNT_DIR is not set. Please load the xt-catamount module"
|
||||
[[ -z ${PE_DIR} ]] && echo "PE_DIR is not set. Please load the xt-pe module"
|
||||
[[ -z ${SE_DIR} ]] && echo "SE_DIR is not set. Please load the xt-service module"
|
||||
[[ -z ${MPT_DIR} ]] && echo "MPT_DIR is not set. Please load the xt-mpt module"
|
||||
[[ -z ${PE_ENV} ]] && echo "PE_ENV is not set. Please load the PrgEnv module"
|
||||
|
||||
if test "$PE_ENV" != "PGI" ; then
|
||||
echo "PrgEnv module is not PGI"
|
||||
return
|
||||
fi
|
||||
|
||||
###################################################################
|
||||
|
||||
# If the env flags SRCDIR and PREFIX are not set, initialize to default...
|
||||
SRCDIR=${SRCDIR:-..}
|
||||
|
||||
INSTALL_ROOT=/sw/xt5/ompi
|
||||
VERSION=`${SRCDIR}/config/ompi_get_version.sh ${SRCDIR}/VERSION`
|
||||
BUILD=pgi
|
||||
SVER=cnl`echo "${XTOS_VERSION}" | cut -c1-3`
|
||||
CVER=${BUILD}`pgcc -V | awk '/pgcc/{print $2}'|sed 's/-/./'`
|
||||
INSTALL_DIR=${INSTALL_ROOT}/${VERSION}/${SVER}_${CVER}
|
||||
|
||||
PREFIX=${PREFIX:-$INSTALL_DIR}
|
||||
|
||||
###################################################################
|
||||
|
||||
$SRCDIR/configure \
|
||||
--prefix=$PREFIX \
|
||||
--enable-static --disable-shared --disable-dlopen --disable-pretty-print-stacktrace --disable-pty-support \
|
||||
--with-threads --with-memory-manager=none \
|
||||
--without-tm --with-alps --with-portals --with-portals-config=cnl_modex \
|
||||
--enable-mca-no-build=timer-catamount,maffinity-first_use,maffinity-libnuma,ess-cnos,filem-rsh,grpcomm-cnos,pml-dr \
|
||||
--with-wrapper-ldflags="-Bstatic -L$PGI/linux86-64/default/lib -L${PE_DIR}/lib/snos64 -L${SE_DIR}/lib/snos64 -L${MPT_DIR}/util/lib/" \
|
||||
--with-wrapper-libs="-lpct -lalpslli -lalpsutil -lportals -lpthread -lm" \
|
||||
CC=pgcc CXX=pgCC F77=pgf77 FC=pgf90 \
|
||||
CPPFLAGS="-I${CATAMOUNT_DIR}/catamount/linux/include -I${PE_DIR}/include" \
|
||||
FFLAGS="-Mnomain $PGI/linux86-64/default/lib/pgfmain.o -I${PE_DIR}/include" \
|
||||
FCFLAGS="-Mnomain $PGI/linux86-64/default/lib/pgfmain.o -I${PE_DIR}/include" \
|
||||
LDFLAGS="-L$PGI/linux86-64/default/lib -L${PE_DIR}/lib/snos64 -L${SE_DIR}/lib/snos64 -L${MPT_DIR}/util/lib -R${MPT_DIR}/util/lib" \
|
||||
LIBS="-lrt -lpct -lalpslli -lalpsutil -lportals -lpthread -lm" | tee build.log
|
||||
|
||||
#
|
||||
# To build orted static, use the libtool-flag -all-static
|
||||
#
|
||||
make -s -j4 orted_LDFLAGS=-all-static all | tee -a build.log
|
||||
|
||||
# make -s orted_LDFLAGS=-all-static install | tee -a install.log
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user