Page MenuHomeHEPForge
Files F7877685

No OneTemporary
Actions

View Options

diff --git a/rivet-bootstrap b/rivet-bootstrap
--- a/rivet-bootstrap
+++ b/rivet-bootstrap
@@ -1,198 +1,181 @@
#! /usr/bin/env bash
test -z "$BUILD_PREFIX" && BUILD_PREFIX="$PWD"
test -z "$INSTALL_PREFIX" && INSTALL_PREFIX="$PWD/local"
test -z "$MAKE" && MAKE="make -j3"
test -z "$INSTALL_GSL" && INSTALL_GSL="1"
-test -z "$INSTALL_BOOST" && INSTALL_BOOST="1"
test -z "$INSTALL_HEPMC" && INSTALL_HEPMC="1"
test -z "$INSTALL_FASTJET" && INSTALL_FASTJET="1"
test -z "$INSTALL_YODA" && INSTALL_YODA="1"
test -z "$INSTALL_RIVET" && INSTALL_RIVET="1"
-test -z "$RIVET_VERSION" && RIVET_VERSION="2.4.3"
-test -z "$YODA_VERSION" && YODA_VERSION="1.5.9"
+test -z "$RIVET_VERSION" && RIVET_VERSION="2.5.0"
+test -z "$YODA_VERSION" && YODA_VERSION="1.6.2"
-test -z "$HEPMC_VERSION" && HEPMC_VERSION="2.06.09"
+test -z "$HEPMC_VERSION" && HEPMC_VERSION="2.06.09" #< TODO: update to 2.07 or 3 when stable releases available
test -z "$FASTJET_VERSION" && FASTJET_VERSION="3.2.0"
-test -z "$BOOST_VERSION" && BOOST_VERSION="1_60_0"
test -z "$GSL_VERSION" && GSL_VERSION="1.16"
## Paths for the case of existing installations
test -z "$GSLPATH" && GSLPATH="/usr"
-test -z "$BOOSTPATH" && BOOSTPATH="/usr"
test -z "$HEPMCPATH" && HEPMCPATH="/usr"
test -z "$FASTJETPATH" && FASTJETPATH="/usr"
test -z "$YODAPATH" && YODAPATH="/usr"
test -z "$RIVET_CONFFLAGS" && RIVET_CONFFLAGS="" #--enable-unvalidated
test -z "$YODA_CONFFLAGS" && YODA_CONFFLAGS=""
if [[ "$INSTALL_RIVETDEV" -eq "1" ]]; then
## For rivetdev we skip the normal yoda/rivet installation
INSTALL_YODA="0"
INSTALL_RIVET="0"
## Might need to install some extra toolkit bits for dev mode
test -z "$INSTALL_AUTOTOOLS" && INSTALL_AUTOTOOLS="1"
test -z "$INSTALL_CYTHON" && INSTALL_CYTHON="1"
fi
## Disable asserts for production running
export CPPFLAGS="$CPPFLAGS -DNDEBUG"
###############
-echo "Running Rivet 2.x bootstrap script"
+echo "Running Rivet bootstrap script"
echo "Building Rivet $RIVET_VERSION, YODA $YODA_VERSION"
## Immediate exit on a command (group) failure and optional debug mode
set -e
test -n "$DEBUG" && set -x
export PATH=$INSTALL_PREFIX/bin:$PATH
function wget_untar { wget --no-check-certificate $1 -O- | tar xz; }
function conf { ./configure --prefix=$INSTALL_PREFIX "$@"; }
function mmi { $MAKE "$@" && $MAKE install; }
## Make installation directory, with an etc subdir so Rivet etc. will install bash completion scripts
mkdir -p $INSTALL_PREFIX/etc/bash_completion.d
-## Install Boost
-if [[ "$INSTALL_BOOST" -eq "1" ]]; then
- cd $BUILD_PREFIX
- test -f boost_$BOOST_VERSION.tar.gz || wget http://downloads.sourceforge.net/boost/boost_$BOOST_VERSION.tar.gz
- test -d boost_$BOOST_VERSION/boost || tar xf boost_$BOOST_VERSION.tar.gz boost_$BOOST_VERSION/boost
- mkdir -p $INSTALL_PREFIX/include
- rm -rf $INSTALL_PREFIX/include/boost
- mv boost_$BOOST_VERSION/boost $INSTALL_PREFIX/include/
- BOOSTPATH=$INSTALL_PREFIX
-fi
-
## Install GSL
if [[ "$INSTALL_GSL" -eq "1" ]]; then
cd $BUILD_PREFIX
test -d gsl-$GSL_VERSION || wget_untar http://ftpmirror.gnu.org/gsl/gsl-$GSL_VERSION.tar.gz
cd gsl-$GSL_VERSION
conf
mmi
GSLPATH=$INSTALL_PREFIX
fi
## Install HepMC
if [[ "$INSTALL_HEPMC" -eq "1" ]]; then
cd $BUILD_PREFIX
test -d HepMC-$HEPMC_VERSION || wget_untar http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-$HEPMC_VERSION.tar.gz
cd HepMC-$HEPMC_VERSION
conf --with-momentum=GEV --with-length=MM
mmi
HEPMCPATH=$INSTALL_PREFIX
fi
## Install FastJet
if [[ "$INSTALL_FASTJET" -eq "1" ]]; then
cd $BUILD_PREFIX
test -d fastjet-$FASTJET_VERSION || wget_untar http://www.fastjet.fr/repo/fastjet-$FASTJET_VERSION.tar.gz
cd fastjet-$FASTJET_VERSION
- conf --enable-shared --enable-allcxxplugins
+ conf --enable-shared --disable-auto-ptr --enable-allcxxplugins
mmi
FASTJETPATH=$INSTALL_PREFIX
fi
## Install YODA
if [[ "$INSTALL_YODA" -eq "1" ]]; then
cd $BUILD_PREFIX
test -d YODA-$YODA_VERSION || wget_untar http://www.hepforge.org/archive/yoda/YODA-$YODA_VERSION.tar.gz
cd YODA-$YODA_VERSION
- conf $YODA_CONFFLAGS --with-boost=$BOOSTPATH
+ conf $YODA_CONFFLAGS
mmi
cp yodaenv.sh $INSTALL_PREFIX/yodaenv.sh
YODAPATH=$INSTALL_PREFIX
fi
## Install Rivet
if [[ "$INSTALL_RIVET" -eq "1" ]]; then
cd $BUILD_PREFIX
test -d Rivet-$RIVET_VERSION || wget_untar http://www.hepforge.org/archive/rivet/Rivet-$RIVET_VERSION.tar.gz
cd Rivet-$RIVET_VERSION
conf $RIVET_CONFFLAGS \
--with-yoda=$YODAPATH \
--with-hepmc=$HEPMCPATH \
--with-fastjet=$FASTJETPATH \
- --with-boost=$BOOSTPATH \
--with-gsl=$GSLPATH
mmi
cp rivetenv.sh rivetenv.csh $INSTALL_PREFIX/
fi
## Following block for dev mode only -- non-developers should ignore
if [[ "$INSTALL_RIVETDEV" -eq "1" ]]; then
## Install autotools
if [[ "$INSTALL_AUTOTOOLS" -eq "1" ]]; then
cd $BUILD_PREFIX
function _build_autotool() {
name=$1-$2
if [ ! -e $name ]; then wget_untar http://ftpmirror.gnu.org/$1/$name.tar.gz; fi
cd $name
./configure --prefix=$INSTALL_PREFIX
mmi
cd ..
}
test -e $INSTALL_PREFIX/bin/m4 || { echo; echo "Building m4"; _build_autotool m4 1.4.17; }
test -e $INSTALL_PREFIX/bin/autoconf || { echo; echo "Building autoconf"; _build_autotool autoconf 2.69; }
test -e $INSTALL_PREFIX/bin/automake || { echo; echo "Building automake"; _build_autotool automake 1.15; }
test -e $INSTALL_PREFIX/bin/libtool || { echo; echo "Building libtool"; _build_autotool libtool 2.4.6; }
fi
## Install hg
if ! which hg > /dev/null; then
cd $BUILD_PREFIX
test -d mercurial-2.8.2 || wget_untar http://mercurial.selenic.com/release/mercurial-2.8.2.tar.gz
cd mercurial-2.8.2
$MAKE PREFIX=$INSTALL_PREFIX install-bin
fi;
## Install Cython
if [[ "$INSTALL_CYTHON" -eq "1" ]]; then
cd $BUILD_PREFIX
test -d Cython-0.23.5 || wget_untar http://cython.org/release/Cython-0.23.5.tar.gz
export PATH=$BUILD_PREFIX/Cython-0.23.5/bin:$PATH
export PYTHONPATH=$BUILD_PREFIX/Cython-0.23.5:$PATH
fi;
## Install dev YODA
cd $BUILD_PREFIX
- hg clone http://yoda.hepforge.org/hg/yoda --insecure
+ hg clone http://yoda.hepforge.org/hg/yoda -b release-1-6 --insecure
cd yoda
hg pull -u --insecure
autoreconf -i
- conf $YODA_CONFFLAGS --with-boost=$BOOSTPATH
+ conf $YODA_CONFFLAGS
mmi
cp yodaenv.sh $INSTALL_PREFIX/yodaenv.sh
YODAPATH=$INSTALL_PREFIX
- ## Install head of 2.4.x Rivet branch
+ ## Install dev Rivet
cd $BUILD_PREFIX
- hg clone https://rivet.hepforge.org/hg/rivet --insecure
+ hg clone https://rivet.hepforge.org/hg/rivet -b release-2-5-x --insecure
cd rivet
- hg up release-2-4-x
hg pull -u --insecure
autoreconf -i
conf $RIVET_CONFFLAGS \
--with-yoda=$YODAPATH \
--with-hepmc=$HEPMCPATH \
--with-fastjet=$FASTJETPATH \
- --with-boost=$BOOSTPATH \
--with-gsl=$GSLPATH
mmi
cp rivetenv.sh rivetenv.csh $INSTALL_PREFIX/
fi
## Announce the build success
echo; echo "All done. Now set some variables in your shell by sourcing $INSTALL_PREFIX/rivetenv.(c)sh"
diff --git a/rivet-bootstrap-lcg b/rivet-bootstrap-lcg
--- a/rivet-bootstrap-lcg
+++ b/rivet-bootstrap-lcg
@@ -1,109 +1,103 @@
#! /usr/bin/env bash
-## Boost and GSL are expected to be installed correctly, as is a sane suite of GNU build tools
+## GSL is expected to be installed and set up correctly, as is a sane suite of GNU build tools
test -z "$BUILD_PREFIX" && BUILD_PREFIX="$PWD"
test -z "$INSTALL_PREFIX" && INSTALL_PREFIX="$PWD/local"
test -z "$MAKE" && MAKE="make -j3"
-test -z "$RIVET_VERSION" && RIVET_VERSION="2.4.3"
-test -z "$YODA_VERSION" && YODA_VERSION="1.5.9"
+test -z "$RIVET_VERSION" && RIVET_VERSION="2.5.0"
+test -z "$YODA_VERSION" && YODA_VERSION="1.6.2"
test -z "$RIVET_CONFFLAGS" && RIVET_CONFFLAGS="" #--enable-unvalidated
test -z "$YODA_CONFFLAGS" && YODA_CONFFLAGS=""
## Disable asserts for production running
export CPPFLAGS="$CPPFLAGS -DNDEBUG"
###############
-echo "Running Rivet 2.x bootstrap script with LCG HepMC, FastJet and Boost"
+echo "Running Rivet bootstrap script with LCG HepMC, FastJet, and GSL"
echo "Building Rivet $RIVET_VERSION, YODA $YODA_VERSION"
## Immediate exit on a command (group) failure and optional debug mode
set -e
test -n "$DEBUG" && set -x
export PATH=$INSTALL_PREFIX/bin:$PATH
function wget_untar { wget --no-check-certificate $1 -O- | tar xz; }
function conf { ./configure --prefix=$INSTALL_PREFIX "$@"; }
function mmi { $MAKE "$@" && $MAKE install; }
## Make installation directory, with an etc subdir so Rivet etc. will install bash completion scripts
mkdir -p $INSTALL_PREFIX/etc/bash_completion.d
## Define LCG platform etc. -- may need to be customised
LCGTAG="x86_64-slc6-gcc48-opt"
LCGVERSION="LCG_82" #< TODO: -> LCG_83
#LCGDIR="/afs/cern.ch/sw/lcg/releases/$LCGVERSION"
LCGDIR="/cvmfs/sft.cern.ch/lcg/releases/$LCGVERSION"
test -d "$LCGDIR" || { echo "LCG AFS filesystem not found: exiting..." 1>&2 ; exit 1; }
## Setup GCC
SETUPCMD_GCC="source $LCGDIR/gcc/4.8.4/x86_64-slc6/setup.sh"
$SETUPCMD_GCC
## Setup Python
SETUPCMD_PYTHON="source $LCGDIR/Python/2.7.10/x86_64-slc6-gcc48-opt/Python-env.sh"
$SETUPCMD_PYTHON
-## Setup Boost
-SETUPCMD_BOOST="source $LCGDIR/Boost/1.59.0_python2.7/x86_64-slc6-gcc48-opt/Boost-env.sh"
-$SETUPCMD_BOOST
-export BOOST_ROOT=$BOOST_HOME #< set value from
## Add local dirs to the paths
PATH=$INSTALL_PREFIX/bin:$PATH
LD_LIBRARY_PATH=$INSTALL_PREFIX/lib:$LD_LIBRARY_PATH
PYTHONPATH=$INSTALL_PREFIX/lib64/python2.7/site-packages:$PYTHONPATH
## LCG locations of standard HEP libraries
HEPMCPATH=$LCGDIR/HepMC/2.06.09/$LCGTAG
-FASTJETPATH=$LCGDIR/fastjet/3.1.1/$LCGTAG #< TODO: update to 3.2.0 when possible
-BOOSTPATH=$LCGDIR/Boost/1.59.0_python2.7/$LCGTAG #< TODO: can set =$BOOST_HOME?
+FASTJETPATH=$LCGDIR/fastjet/3.1.1/$LCGTAG #< TODO: update to 3.2.0 when available
## Install YODA
echo; echo "Building YODA"
cd $BUILD_PREFIX
test -d YODA-$YODA_VERSION || wget_untar http://www.hepforge.org/archive/yoda/YODA-$YODA_VERSION.tar.gz
cd YODA-$YODA_VERSION
-conf $YODA_CONFFLAGS --with-boost=$BOOSTPATH #< TODO: can we remove --with-boost now that BOOST_ROOT is set?
+conf $YODA_CONFFLAGS
mmi
> $INSTALL_PREFIX/yodaenv.sh
## Install setup script with GCC/Python env if on AFS
if [[ "$USE_LCGAFS" = 1 ]]; then
echo "source $GCCSETUP" >> $INSTALL_PREFIX/yodaenv.sh
echo "PATH=$PYTHONBIN:\$PATH" >> $INSTALL_PREFIX/yodaenv.sh
fi
cat yodaenv.sh >> $INSTALL_PREFIX/yodaenv.sh
## Install Rivet
echo; echo "Building Rivet"
cd $BUILD_PREFIX
test -d Rivet-$RIVET_VERSION || wget_untar http://www.hepforge.org/archive/rivet/Rivet-$RIVET_VERSION.tar.gz
cd Rivet-$RIVET_VERSION
-conf $RIVET_CONFFLAGS --with-yoda=$INSTALL_PREFIX \
- --with-hepmc=$HEPMCPATH --with-fastjet=$FASTJETPATH --with-boost=$BOOSTPATH #< TODO: can we remove --with-boost now that BOOST_ROOT is set?
+conf $RIVET_CONFFLAGS --with-yoda=$INSTALL_PREFIX --with-hepmc=$HEPMCPATH --with-fastjet=$FASTJETPATH
mmi
> $INSTALL_PREFIX/rivetenv.sh
## Install setup script with GCC/Python env if on AFS
if [[ "$USE_LCGAFS" = 1 ]]; then
echo "source $GCCSETUP.sh" >> $INSTALL_PREFIX/rivetenv.sh
echo "PATH=$PYTHONBIN:\$PATH" >> $INSTALL_PREFIX/rivetenv.sh
fi
cat rivetenv.sh >> $INSTALL_PREFIX/rivetenv.sh
## Make a top-level environment setup script
> $INSTALL_PREFIX/env.sh
echo $SETUPCMD_GCC >> $INSTALL_PREFIX/env.sh
echo $SETUPCMD_PYTHON >> $INSTALL_PREFIX/env.sh
echo "source $INSTALL_PREFIX/yodaenv.sh" >> $INSTALL_PREFIX/env.sh
echo "source $INSTALL_PREFIX/rivetenv.sh" >> $INSTALL_PREFIX/env.sh
## Announce the build success
echo; echo "All done. Now set some variables in your shell by sourcing $INSTALL_PREFIX/env.(c)sh"

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 19, 4:11 PM (1 d, 15 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3801426
Default Alt Text
(11 KB)

Event Timeline