From b93589e91512b54897739496fd814e640874d374 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 21 Dec 2022 21:11:09 +0000
Subject: [PATCH] feat: remove beam line and accelerator installation
---
.gitlab-ci.yml | 4 ++--
bin/build_detector.sh | 44 -------------------------------------------
2 files changed, 2 insertions(+), 46 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb8e354..0eab7b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,11 +82,11 @@ detector_benchmarks:
parallel:
matrix:
- DETECTOR: 'epic'
- DETECTOR_CONFIG: 'epic_imaging'
+ DETECTOR_CONFIG: 'epic_arches'
DETECTOR_VERSION: 'main'
DETECTOR_REPOSITORYURL: 'https://github.com/eic/epic.git'
- DETECTOR: 'epic'
- DETECTOR_CONFIG: 'epic_sciglass'
+ DETECTOR_CONFIG: 'epic_brycecanyon'
DETECTOR_VERSION: 'main'
DETECTOR_REPOSITORYURL: 'https://github.com/eic/epic.git'
diff --git a/bin/build_detector.sh b/bin/build_detector.sh
index eb9869f..97cbc96 100755
--- a/bin/build_detector.sh
+++ b/bin/build_detector.sh
@@ -47,42 +47,6 @@ if [ -f "${DETECTOR}/requirements.txt" ] ; then
fi
rm -rf "${DETECTOR}/.git"
-## We need an up-to-date copy of the detector
-## start clean to avoid issues...
-if [ -d "${BEAMLINE_CONFIG}" ]; then
- echo "cleaning up ${BEAMLINE_CONFIG}"
- mv "${BEAMLINE_CONFIG}" "$(mktemp)-${BEAMLINE_CONFIG}"
-fi
-echo "Fetching ${BEAMLINE_CONFIG}"
-if [ -n "${BEAMLINE_CONFIG_DEPLOY_TOKEN_USERNAME:-}" -a -n "${BEAMLINE_CONFIG_DEPLOY_TOKEN_PASSWORD:-}" ]; then
- DEPLOY_TOKEN="${BEAMLINE_CONFIG_DEPLOY_TOKEN_USERNAME}:${BEAMLINE_CONFIG_DEPLOY_TOKEN_PASSWORD}@"
- echo "Deploy token for ${BEAMLINE_CONFIG_DEPLOY_TOKEN_USERNAME} is masked in the next line."
-else
- DEPLOY_TOKEN=""
-fi
-echo "git clone -b ${BEAMLINE_CONFIG_VERSION} --depth 1 ${BEAMLINE_REPOSITORYURL:-https://eicweb.phy.anl.gov/EIC/detectors/${BEAMLINE_CONFIG}.git} ${BEAMLINE_CONFIG}"
-git clone -b ${BEAMLINE_CONFIG_VERSION} --depth 1 ${BEAMLINE_REPOSITORYURL:-https://${DEPLOY_TOKEN}eicweb.phy.anl.gov/EIC/detectors/${BEAMLINE_CONFIG}.git} ${BEAMLINE_CONFIG}
-[[ "$?" == "0" ]] || exit 1
-rm -rf "${BEAMLINE_CONFIG}/.git"
-
-## 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
-if [ -d accelerator ]; then
- echo "cleaning up accelerator"
- mv "accelerator" "$(mktemp)-accelerator"
-fi
-echo "Fetching accelerator"
-git clone --depth 1 https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
-[[ "$?" == "0" ]] || exit 1
-rm -rf "accelerator/.git"
-
-## Now symlink the accelerator definition into the detector definition
-echo "Linking accelerator definition into detector definition"
-ln -s -f ${DETECTOR_PREFIX}/accelerator/eic ${DETECTOR_PATH}/eic
-[[ "$?" == "0" ]] || exit 1
-ln -s -f ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG}/${BEAMLINE_CONFIG} ${DETECTOR_PATH}/${BEAMLINE_CONFIG}
-[[ "$?" == "0" ]] || exit 1
-
popd
## =============================================================================
## Step 2: Compile and install the detector definition
@@ -94,14 +58,6 @@ cmake ${DETECTOR_PATH} -DCMAKE_INSTALL_PREFIX=${LOCAL_PREFIX} -DCMAKE_CXX_STANDA
popd
rm -rf ${DETECTOR_PREFIX}/${DETECTOR}_build
-mkdir -p ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG}_build
-pushd ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG}_build
-cmake ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG} -DCMAKE_INSTALL_PREFIX=${LOCAL_PREFIX} -DCMAKE_CXX_STANDARD=17 && make -j$(($(nproc)/4+1)) install || exit 1
-popd
-rm -rf ${DETECTOR_PREFIX}/${BEAMLINE_CONFIG}_build
-
-
-
## =============================================================================
## Step 3: That's all!
echo "Detector build/install complete!"
--
GitLab