Updated the extrae instrumentation part in the OMPSs install script.

This commit is contained in:
Christoph Niethammer 2011-03-06 20:19:55 +00:00
parent eb1b9ce413
commit 3ff329a95c

View file

@ -32,7 +32,7 @@ mcxx_src_dir="$SRC_POOL/mcxx/mcxx.git"
nanox_src_dir="$SRC_POOL/nanox/nanox.git" nanox_src_dir="$SRC_POOL/nanox/nanox.git"
# enable instrumentation (no|yes) # enable instrumentation (no|yes)
instrumentation="no" instrumentation=${instrumentation:="no"}
# Compiler specifications # Compiler specifications
@ -64,6 +64,13 @@ case ${COMPILER} in
;; ;;
esac esac
if [ "$instrumentation" = "yes" ]; then
module load performance/extrae
echo "Building with EXTRAE_HOME=$EXTRAE_HOME"
sleep 2
withextrae="--with-extrae=$EXTRAE_HOME"
fi
PREFIX="${PREFIX_BASE}/${CATEGORY}/${PACKAGE}/${VERSION}-${COMPILER}-${COMPILER_VERSION}${PACKAGE_DESCRIPTOR}" PREFIX="${PREFIX_BASE}/${CATEGORY}/${PACKAGE}/${VERSION}-${COMPILER}-${COMPILER_VERSION}${PACKAGE_DESCRIPTOR}"
echo "PREFIX: $PREFIX" echo "PREFIX: $PREFIX"
@ -87,55 +94,35 @@ make_package ()
cd $dir cd $dir
echo -n "configuring... " echo -n "configuring... "
if [[ -d build ]] if [[ -d build ]] ; then
then
rm -rf build rm -rf build
fi fi
mkdir build mkdir build
cd build cd build
../configure --prefix=$PREFIX $* || fail ../configure --prefix=$PREFIX $* || fail
echo -n "compiling... " echo -n "compiling... "
make $MK_OPTS || fail make || fail
echo -n "installing... " echo -n "installing... "
make install || fail make install || fail
cd .. cd ..
echo "Success" echo "Success"
} }
if [ "$instrumentation" = "yes" ]; then
echo -n "Installing Extrae instrumentation library... "
echo "Not available yet."
fail
tar zxf $EXTRAE_TAR
make_package ${EXTRAE_TAR%.tar*} --disable-doc
fi
cd $nanox_src_dir cd $nanox_src_dir
# tar jxf $NANOS_TAR
rm -rf autom4te.cache rm -rf autom4te.cache
#git pull #git pull
git checkout master git checkout master
./autogen.sh ./autogen.sh
nanox_version=$(git rev-list -n 1 master) nanox_version=$(git rev-list -n 1 master)
echo $nanox_version
if [ "$instrumentation" = "yes" ]; then
export CXXFLAGS="-DNANOS_INSTRUMENTATION_ENABLED"
export CFLAGS="-DNANOS_INSTRUMENTATION_ENABLED"
withextrae="--with-extrae=$PREFIX"
fi
#tar jxf $MERCURIUM_TAR
cd $mcxx_src_dir cd $mcxx_src_dir
rm -rf autom4te.cache rm -rf autom4te.cache
#git pull #git pull
git checkout master git checkout master
./autogen.sh ./autogen.sh
mcxx_version=$(git rev-list -n 1 master) mcxx_version=$(git rev-list -n 1 master)
echo $mcxx_version
PREFIX="${PREFIX_BASE}/${CATEGORY}/${PACKAGE}/${VERSION}-${COMPILER}-${COMPILER_VERSION}${PACKAGE_DESCRIPTOR}" PREFIX="${PREFIX_BASE}/${CATEGORY}/${PACKAGE}/${VERSION}-${COMPILER}-${COMPILER_VERSION}${PACKAGE_DESCRIPTOR}"