Skip to content
Snippets Groups Projects
Commit 05788c40 authored by Felix Weiglhofer's avatar Felix Weiglhofer Committed by Pierre-Alain Loizeau
Browse files

Fix online container for DC.

parent 932c352a
No related branches found
No related tags found
1 merge request!1445Fix online container for DC. (clean backport from DC_Oct23)
Pipeline #25045 passed
...@@ -12,6 +12,13 @@ FROM ${REGISTRY}/online_runtime:latest ...@@ -12,6 +12,13 @@ FROM ${REGISTRY}/online_runtime:latest
ARG FAIRSOFT_PATH=/opt/cbm/fairsoft ARG FAIRSOFT_PATH=/opt/cbm/fairsoft
COPY --from=build ${CBMROOT_PATH}/bin ${CBMROOT_PATH}/bin COPY --from=build ${CBMROOT_PATH}/bin ${CBMROOT_PATH}/bin
COPY --from=build ${CBMROOT_PATH}/lib/*.so ${CBMROOT_PATH}/lib/ 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 LD_LIBRARY_PATH=${CBMROOT_PATH}/lib:${FAIRSOFT_PATH}/lib:/opt/rocm/lib:${LD_LIBRARY_PATH}
ENV PATH=${CBMROOT_PATH}/bin:${PATH} ENV PATH=${CBMROOT_PATH}/bin:${PATH}
......
...@@ -18,6 +18,13 @@ function check_arg() { ...@@ -18,6 +18,13 @@ function check_arg() {
check_arg "$user" "user" check_arg "$user" "user"
check_arg "$password" "password" 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. # This script must be run from the CbmRoot top level directory.
# Check for .git, .clang-format, and .gitlab-ci.yml # Check for .git, .clang-format, and .gitlab-ci.yml
if [ ! -d .git ] || [ ! -f .clang-format ] || [ ! -f .gitlab-ci.yml ]; then if [ ! -d .git ] || [ ! -f .clang-format ] || [ ! -f .gitlab-ci.yml ]; then
...@@ -31,6 +38,7 @@ image="cbm_online" ...@@ -31,6 +38,7 @@ image="cbm_online"
build_args=" \ build_args=" \
--build-arg="USER=$user" \ --build-arg="USER=$user" \
--build-arg="PASSWORD=$password" \ --build-arg="PASSWORD=$password" \
--build-arg="TAG=$tag" \
" "
dockerfile="algo/containers/cbm_online/DockerfileBuild" dockerfile="algo/containers/cbm_online/DockerfileBuild"
docker build --progress plain $build_args -f $dockerfile -t cbm_online_builder . docker build --progress plain $build_args -f $dockerfile -t cbm_online_builder .
...@@ -6,6 +6,7 @@ srcdir=cbmroot ...@@ -6,6 +6,7 @@ srcdir=cbmroot
build_type=RelWithDebInfo build_type=RelWithDebInfo
install_prefix=/opt/cbm/cbmroot install_prefix=/opt/cbm/cbmroot
fairsoft_path=/opt/cbm/fairsoft fairsoft_path=/opt/cbm/fairsoft
enable_hip=OFF
rocm_root=/opt/rocm rocm_root=/opt/rocm
hip_archs="gfx906;gfx908" # MI50;MI100 hip_archs="gfx906;gfx908" # MI50;MI100
n_jobs=16 n_jobs=16
...@@ -13,7 +14,7 @@ n_jobs=16 ...@@ -13,7 +14,7 @@ n_jobs=16
cmake_args="-DCMAKE_INSTALL_PREFIX=$install_prefix \ cmake_args="-DCMAKE_INSTALL_PREFIX=$install_prefix \
-DCMAKE_BUILD_TYPE=$build_type \ -DCMAKE_BUILD_TYPE=$build_type \
-DSIMPATH=$fairsoft_path \ -DSIMPATH=$fairsoft_path \
-DXPU_ENABLE_HIP=ON \ -DXPU_ENABLE_HIP=$enable_hip \
-DXPU_ROCM_ROOT=$rocm_root \ -DXPU_ROCM_ROOT=$rocm_root \
-DXPU_HIP_ARCH=$hip_archs \ -DXPU_HIP_ARCH=$hip_archs \
" "
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment