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
151db45a
Commit
151db45a
authored
2 years ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
feat: setup reconstruction and detectors with ccache
parent
72efb3e5
No related branches found
No related tags found
1 merge request
!459
feat: setup reconstruction and detectors with ccache
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
containers/jug/setup_detectors.py
+1
-0
1 addition, 0 deletions
containers/jug/setup_detectors.py
containers/jug/xl.Dockerfile
+12
-3
12 additions, 3 deletions
containers/jug/xl.Dockerfile
with
13 additions
and
3 deletions
containers/jug/setup_detectors.py
+
1
−
0
View file @
151db45a
...
...
@@ -122,6 +122,7 @@ if __name__ == '__main__':
detector
=
proj
),
'
&&
'
,
'
cmake -B /tmp/build -S /tmp/det -DCMAKE_CXX_STANDARD=17
'
,
'
-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
'
,
'
-DCMAKE_INSTALL_PREFIX={prefix}
'
.
format
(
prefix
=
prefix
),
'
&&
'
,
'
cmake --build /tmp/build -j$(($(($(nproc)/4))+1)) -- install
'
]
...
...
This diff is collapsed.
Click to expand it.
containers/jug/xl.Dockerfile
+
12
−
3
View file @
151db45a
...
...
@@ -8,6 +8,7 @@ ARG INTERNAL_TAG="testing"
## EIC builder image with spack
## ========================================================================================
FROM
${DOCKER_REGISTRY}${BASE_IMAGE}:${INTERNAL_TAG}
ARG
TARGETPLATFORM
ARG
EICWEB="https://eicweb.phy.anl.gov/api/v4/projects"
ARG
JUGGLER_VERSION="main"
...
...
@@ -20,8 +21,11 @@ ARG JUG_VERSION=1
RUN
cd
/tmp
\
&&
echo
" - jug_xl:
${
JUG_VERSION
}
"
>>
/etc/jug_info
ENV
CCACHE_DIR=/ccache/$TARGETPLATFORM
ADD
${EICWEB}/369/repository/tree?ref=${JUGGLER_VERSION} /tmp/369.json
RUN
cd
/tmp
\
RUN
--mount
=
type
=
cache,target
=
/ccache/
\
cd
/tmp
\
&&
echo
"INSTALLING JUGGLER"
\
&&
git clone
-b
${
JUGGLER_VERSION
}
--depth
1
\
https://eicweb.phy.anl.gov/EIC/juggler.git
\
...
...
@@ -29,6 +33,7 @@ RUN cd /tmp
-DCMAKE_CXX_STANDARD
=
17
\
-DCMAKE_INSTALL_PREFIX
=
/usr/local
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DCMAKE_C_COMPILER_LAUNCHER
=
ccache
-DCMAKE_CXX_COMPILER_LAUNCHER
=
ccache
\
&&
cmake
--build
build
-j12
--
install
\
&&
pushd
juggler
\
&&
echo
" - juggler:
${
JUGGLER_VERSION
}
-
$(
git rev-parse HEAD
)
"
\
...
...
@@ -37,7 +42,8 @@ RUN cd /tmp
&&
rm
-rf
build juggler
ADD
https://api.github.com/repos/eic/eicrecon/commits/${EICRECON_VERSION} /tmp/eicrecon.json
RUN
cd
/tmp
\
RUN
--mount
=
type
=
cache,target
=
/ccache/
\
cd
/tmp
\
&&
echo
"INSTALLING EICRECON"
\
&&
git clone
-b
${
EICRECON_VERSION
}
--depth
1
\
https://github.com/eic/eicrecon.git
\
...
...
@@ -45,6 +51,7 @@ RUN cd /tmp
-DCMAKE_CXX_STANDARD
=
17
\
-DCMAKE_INSTALL_PREFIX
=
/usr/local
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DCMAKE_C_COMPILER_LAUNCHER
=
ccache
-DCMAKE_CXX_COMPILER_LAUNCHER
=
ccache
\
&&
cmake
--build
build
-j12
--
install
\
&&
pushd
eicrecon
\
&&
echo
" - eicrecon:
${
EICRECON_VERSION
}
-
$(
git rev-parse HEAD
)
"
\
...
...
@@ -121,10 +128,12 @@ ADD https://api.github.com/repos/eic/ip6 /tmp/ip6.json
ADD
https://api.github.com/repos/eic/epic /tmp/epic.json
COPY
setup_detectors.py /tmp
COPY
detectors.yaml /tmp
RUN
cd
/tmp
\
RUN
--mount
=
type
=
cache,target
=
/ccache/
\
cd
/tmp
\
&&
[
"z
$NIGHTLY
"
=
"z1"
]
&&
NIGHTLY_FLAG
=
"--nightly"
||
NIGHTLY_FLAG
=
""
\
&&
/tmp/setup_detectors.py
--prefix
/opt/detector
--config
/tmp/detectors.yaml
\
$NIGHTLY_FLAG
\
&&
ccache
--show-stats
\
&&
rm
/tmp/setup_detectors.py
## Hotfix for misbehaving OSG nodes
...
...
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