Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eic_container
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
containers
eic_container
Commits
1eedb3ab
Commit
1eedb3ab
authored
3 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Plain Diff
Merge branch '56-use-athena-instead-of-reference_detector' into 'master'
Resolve "use Athena instead of reference_detector" Closes
#56
See merge request
!48
parents
89c9b1e2
e04d7cc2
No related branches found
No related tags found
1 merge request
!48
Resolve "use Athena instead of reference_detector"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
containers/jug/Dockerfile.xl
+8
-9
8 additions, 9 deletions
containers/jug/Dockerfile.xl
with
9 additions
and
10 deletions
.gitlab-ci.yml
+
1
−
1
View file @
1eedb3ab
...
@@ -5,7 +5,7 @@ variables:
...
@@ -5,7 +5,7 @@ variables:
JUGGLER_VERSION
:
"
v1.6.0"
JUGGLER_VERSION
:
"
v1.6.0"
NPDET_VERSION
:
"
v0.5.0"
NPDET_VERSION
:
"
v0.5.0"
EICD_VERSION
:
"
v0.1.0"
EICD_VERSION
:
"
v0.1.0"
DETECTOR_VERSION
:
"
v0.
2
.0"
DETECTOR_VERSION
:
"
v0.
1
.0"
IP6_VERSION
:
"
v0.2.0"
IP6_VERSION
:
"
v0.2.0"
## Spack github version
## Spack github version
...
...
This diff is collapsed.
Click to expand it.
containers/jug/Dockerfile.xl
+
8
−
9
View file @
1eedb3ab
...
@@ -32,25 +32,25 @@ RUN cd /tmp
...
@@ -32,25 +32,25 @@ RUN cd /tmp
&& rm -rf build juggler
&& rm -rf build juggler
## also install detector/ip geometries into opt
## also install detector/ip geometries into opt
## FIXME: need to add proper compact file install directly to the
reference
detector
## FIXME: need to add proper compact file install directly to the
athena
detector
## build
## build
ARG DETECTOR_VERSION="master"
ARG DETECTOR_VERSION="master"
ARG IP6_VERSION="master"
ARG IP6_VERSION="master"
ARG ACCELERATOR_VERSION="master"
ARG ACCELERATOR_VERSION="master"
RUN cd /tmp \
RUN cd /tmp \
&& DETECTOR_PREFIX=/opt/detector \
&& DETECTOR_PREFIX=/opt/detector \
&& DETECTOR_DATA=$DETECTOR_PREFIX/share/
reference_detector
\
&& DETECTOR_DATA=$DETECTOR_PREFIX/share/
athena
\
&& mkdir -p /opt/detector/share/
reference_detector
\
&& mkdir -p /opt/detector/share/
athena
\
&& echo "INSTALLING REFERENCE DETECTOR" \
&& echo "INSTALLING REFERENCE DETECTOR" \
&& git clone -b ${DETECTOR_VERSION} \
&& git clone -b ${DETECTOR_VERSION} \
https://eicweb.phy.anl.gov/EIC/detectors/
reference_detector.git
\
https://eicweb.phy.anl.gov/EIC/detectors/
athena.git
\
&& cmake -B build -S
reference_detector
-DCMAKE_CXX_STANDARD=17 \
&& cmake -B build -S
athena
-DCMAKE_CXX_STANDARD=17
\
-DCMAKE_INSTALL_PREFIX=${DETECTOR_PREFIX} \
-DCMAKE_INSTALL_PREFIX=${DETECTOR_PREFIX} \
&& cmake --build build -j12 -- install \
&& cmake --build build -j12 -- install \
&& cp -r
reference_detector/compact
\
&& cp -r
athena/compact
\
reference_detector/reference_detector.xml
\
athena/athena.xml
\
${DETECTOR_DATA} \
${DETECTOR_DATA} \
&& rm -rf build
reference_detector
\
&& rm -rf build
athena
\
&& echo "INSTALLING IP6 GEOMETRY" \
&& echo "INSTALLING IP6 GEOMETRY" \
&& git clone -b ${IP6_VERSION} \
&& git clone -b ${IP6_VERSION} \
https://eicweb.phy.anl.gov/EIC/detectors/ip6.git \
https://eicweb.phy.anl.gov/EIC/detectors/ip6.git \
...
@@ -63,4 +63,3 @@ RUN cd /tmp
...
@@ -63,4 +63,3 @@ RUN cd /tmp
&& echo "ADDING SETUP SCRIPT" \
&& echo "ADDING SETUP SCRIPT" \
&& echo "export LD_LIBRARY_PATH=/opt/detector/lib:\$LD_LIBRARY_PATH" \
&& echo "export LD_LIBRARY_PATH=/opt/detector/lib:\$LD_LIBRARY_PATH" \
> /opt/detector/setup.sh
> /opt/detector/setup.sh
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment