Skip to content
Snippets Groups Projects
Commit 69256fb8 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Update benchmark for new EIC container

parent 11bb0012
No related branches found
No related tags found
1 merge request!23Update for latest container
...@@ -27,26 +27,33 @@ source options/env.sh ...@@ -27,26 +27,33 @@ source options/env.sh
pushd ${DETECTOR_PREFIX} pushd ${DETECTOR_PREFIX}
## We need an up-to-date copy of the detector ## We need an up-to-date copy of the detector
if [ ! -d ${JUGGLER_DETECTOR} ]; then ## start clean to avoid issues...
if [ -d ${JUGGLER_DETECTOR} ]; then
echo "cleaning up ${JUGGLER_DETECTOR}"
rm -rf ${JUGGLER_DETECTOR}
fi
echo "Fetching ${JUGGLER_DETECTOR}" echo "Fetching ${JUGGLER_DETECTOR}"
git clone -b ${JUGGLER_DETECTOR_VERSION} https://eicweb.phy.anl.gov/EIC/detectors/${JUGGLER_DETECTOR}.git git clone -b ${JUGGLER_DETECTOR_VERSION} https://eicweb.phy.anl.gov/EIC/detectors/${JUGGLER_DETECTOR}.git
else #else
echo "Updating ${JUGGLER_DETECTOR}" #echo "Updating ${JUGGLER_DETECTOR}"
pushd ${JUGGLER_DETECTOR} #pushd ${JUGGLER_DETECTOR}
git pull --ff-only #git pull --ff-only
popd #popd
fi #fi
## We also need an up-to-date copy of the accelerator. For now this is done ## We also need an up-to-date copy of the accelerator. For now this is done
## manually. Down the road we could maybe automize this with cmake ## manually. Down the road we could maybe automize this with cmake
if [ ! -d accelerator ]; then if [ ! -d accelerator ]; then
echo "cleaning up accelerator"
rm -rf accelerator
fi
echo "Fetching accelerator" echo "Fetching accelerator"
git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
else #else
echo "Updating accelerator" # echo "Updating accelerator"
pushd accelerator # pushd accelerator
git pull --ff-only # git pull --ff-only
popd # popd
fi #fi
## Now symlink the accelerator definition into the detector definition ## Now symlink the accelerator definition into the detector definition
echo "Linking accelerator definition into detector definition" echo "Linking accelerator definition into detector definition"
ln -s -f ${DETECTOR_PREFIX}/accelerator/eic ${DETECTOR_PATH}/eic ln -s -f ${DETECTOR_PREFIX}/accelerator/eic ${DETECTOR_PATH}/eic
...@@ -57,7 +64,8 @@ echo "Building and installing the ${JUGGLER_DETECTOR} package" ...@@ -57,7 +64,8 @@ echo "Building and installing the ${JUGGLER_DETECTOR} package"
mkdir -p ${DETECTOR_PREFIX}/build mkdir -p ${DETECTOR_PREFIX}/build
pushd ${DETECTOR_PREFIX}/build pushd ${DETECTOR_PREFIX}/build
cmake ${DETECTOR_PATH} -DCMAKE_INSTALL_PREFIX=${LOCAL_PREFIX} && make -j30 install cmake ${DETECTOR_PATH} -DCMAKE_INSTALL_PREFIX=${LOCAL_PREFIX} -DCMAKE_CXX_STANDARD=17 &&
make -j30 install || exit 1
## ============================================================================= ## =============================================================================
## Step 3: That's all! ## Step 3: That's all!
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment