From 05788c40fe1f5e691838afb314946a3192e6b29d Mon Sep 17 00:00:00 2001
From: Felix Weiglhofer <weiglhofer@fias.uni-frankfurt.de>
Date: Wed, 25 Oct 2023 11:46:22 +0000
Subject: [PATCH] Fix online container for DC.
---
algo/containers/cbm_online/Dockerfile | 7 +++++++
algo/containers/cbm_online/make_build_image.sh | 8 ++++++++
algo/containers/cbm_online/scripts/install.sh | 3 ++-
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/algo/containers/cbm_online/Dockerfile b/algo/containers/cbm_online/Dockerfile
index 963008a23a..5085fa041d 100644
--- a/algo/containers/cbm_online/Dockerfile
+++ b/algo/containers/cbm_online/Dockerfile
@@ -12,6 +12,13 @@ FROM ${REGISTRY}/online_runtime:latest
ARG FAIRSOFT_PATH=/opt/cbm/fairsoft
COPY --from=build ${CBMROOT_PATH}/bin ${CBMROOT_PATH}/bin
COPY --from=build ${CBMROOT_PATH}/lib/*.so ${CBMROOT_PATH}/lib/
+ # FIXME HACK FOR DC OCT 23
+ COPY --from=build ${FAIRSOFT_PATH}/lib/libGenVector.so ${FAIRSOFT_PATH}/lib/.
+ COPY --from=build ${FAIRSOFT_PATH}/lib/libGenVector.so.6.26 ${FAIRSOFT_PATH}/lib/.
+ COPY --from=build ${FAIRSOFT_PATH}/lib/libGenVector.so.6.26.10 ${FAIRSOFT_PATH}/lib/.
+ COPY --from=build ${FAIRSOFT_PATH}/lib/libCore.so ${FAIRSOFT_PATH}/lib/.
+ COPY --from=build ${FAIRSOFT_PATH}/lib/libCore.so.6.26 ${FAIRSOFT_PATH}/lib/.
+ COPY --from=build ${FAIRSOFT_PATH}/lib/libCore.so.6.26.10 ${FAIRSOFT_PATH}/lib/.
ENV LD_LIBRARY_PATH=${CBMROOT_PATH}/lib:${FAIRSOFT_PATH}/lib:/opt/rocm/lib:${LD_LIBRARY_PATH}
ENV PATH=${CBMROOT_PATH}/bin:${PATH}
diff --git a/algo/containers/cbm_online/make_build_image.sh b/algo/containers/cbm_online/make_build_image.sh
index 1e229720e0..0ace824b02 100755
--- a/algo/containers/cbm_online/make_build_image.sh
+++ b/algo/containers/cbm_online/make_build_image.sh
@@ -18,6 +18,13 @@ function check_arg() {
check_arg "$user" "user"
check_arg "$password" "password"
+# Set tag as optional third argument
+if [ -z "$3" ]; then
+ tag="$user-debug"
+else
+ tag="$3"
+fi
+
# This script must be run from the CbmRoot top level directory.
# Check for .git, .clang-format, and .gitlab-ci.yml
if [ ! -d .git ] || [ ! -f .clang-format ] || [ ! -f .gitlab-ci.yml ]; then
@@ -31,6 +38,7 @@ image="cbm_online"
build_args=" \
--build-arg="USER=$user" \
--build-arg="PASSWORD=$password" \
+ --build-arg="TAG=$tag" \
"
dockerfile="algo/containers/cbm_online/DockerfileBuild"
docker build --progress plain $build_args -f $dockerfile -t cbm_online_builder .
diff --git a/algo/containers/cbm_online/scripts/install.sh b/algo/containers/cbm_online/scripts/install.sh
index 18a28208de..549dc1a9e9 100755
--- a/algo/containers/cbm_online/scripts/install.sh
+++ b/algo/containers/cbm_online/scripts/install.sh
@@ -6,6 +6,7 @@ srcdir=cbmroot
build_type=RelWithDebInfo
install_prefix=/opt/cbm/cbmroot
fairsoft_path=/opt/cbm/fairsoft
+enable_hip=OFF
rocm_root=/opt/rocm
hip_archs="gfx906;gfx908" # MI50;MI100
n_jobs=16
@@ -13,7 +14,7 @@ n_jobs=16
cmake_args="-DCMAKE_INSTALL_PREFIX=$install_prefix \
-DCMAKE_BUILD_TYPE=$build_type \
-DSIMPATH=$fairsoft_path \
- -DXPU_ENABLE_HIP=ON \
+ -DXPU_ENABLE_HIP=$enable_hip \
-DXPU_ROCM_ROOT=$rocm_root \
-DXPU_HIP_ARCH=$hip_archs \
"
--
GitLab