Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
detector_benchmarks
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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
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
EIC
benchmarks
detector_benchmarks
Commits
1dc555dc
Commit
1dc555dc
authored
4 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Patches
Plain Diff
Update for latest container
parent
11bb0012
No related branches found
No related tags found
1 merge request
!23
Update for latest container
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+7
-1
7 additions, 1 deletion
.gitlab-ci.yml
options/env.sh
+1
-1
1 addition, 1 deletion
options/env.sh
util/build_detector.sh
+25
-17
25 additions, 17 deletions
util/build_detector.sh
with
33 additions
and
19 deletions
.gitlab-ci.yml
+
7
−
1
View file @
1dc555dc
...
@@ -2,7 +2,13 @@ image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
...
@@ -2,7 +2,13 @@ image: eicweb.phy.anl.gov:4567/eic/juggler/juggler:$JUGGLER_TAG
default
:
default
:
before_script
:
before_script
:
-
git clone https://eicweb.phy.anl.gov/EIC/detectors/topside.git && mkdir topside/build && cd topside/build && cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j20 install && cd ../..
-
git clone https://eicweb.phy.anl.gov/EIC/detectors/topside.git
&& mkdir topside/build
&& cd topside/build
&& cmake ../. -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=/usr/local
&& make -j20 install
&& cd ../..
|| exit
1
artifacts
:
artifacts
:
expire_in
:
72 hours
expire_in
:
72 hours
paths
:
paths
:
...
...
This diff is collapsed.
Click to expand it.
options/env.sh
+
1
−
1
View file @
1dc555dc
...
@@ -34,7 +34,7 @@ if [ ! -n "${JUGGLER_DETECTOR}" ] ; then
...
@@ -34,7 +34,7 @@ if [ ! -n "${JUGGLER_DETECTOR}" ] ; then
fi
fi
if
[
!
-n
"
${
JUGGLER_DETECTOR_VERSION
}
"
]
;
then
if
[
!
-n
"
${
JUGGLER_DETECTOR_VERSION
}
"
]
;
then
export
JUGGLER_DETECTOR_VERSION
=
"
v0.0.1
"
export
JUGGLER_DETECTOR_VERSION
=
"
master
"
fi
fi
...
...
This diff is collapsed.
Click to expand it.
util/build_detector.sh
+
25
−
17
View file @
1dc555dc
...
@@ -27,26 +27,33 @@ source options/env.sh
...
@@ -27,26 +27,33 @@ source options/env.sh
pushd
${
DETECTOR_PREFIX
}
pushd
${
DETECTOR_PREFIX
}
## We need an up-to-date copy of the detector
## We need an up-to-date copy of the detector
if
[
!
-d
${
JUGGLER_DETECTOR
}
]
;
then
## start clean to avoid issues...
echo
"Fetching
${
JUGGLER_DETECTOR
}
"
if
[
-d
${
JUGGLER_DETECTOR
}
]
;
then
git clone
-b
${
JUGGLER_DETECTOR_VERSION
}
https://eicweb.phy.anl.gov/EIC/detectors/
${
JUGGLER_DETECTOR
}
.git
echo
"cleaning up
${
JUGGLER_DETECTOR
}
"
else
rm
-rf
${
JUGGLER_DETECTOR
}
echo
"Updating
${
JUGGLER_DETECTOR
}
"
pushd
${
JUGGLER_DETECTOR
}
git pull
--ff-only
popd
fi
fi
echo
"Fetching
${
JUGGLER_DETECTOR
}
"
git clone
-b
${
JUGGLER_DETECTOR_VERSION
}
https://eicweb.phy.anl.gov/EIC/detectors/
${
JUGGLER_DETECTOR
}
.git
#else
#echo "Updating ${JUGGLER_DETECTOR}"
#pushd ${JUGGLER_DETECTOR}
#git pull --ff-only
#popd
#fi
## We also need an up-to-date copy of the accelerator. For now this is done
## 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
## manually. Down the road we could maybe automize this with cmake
if
[
!
-d
accelerator
]
;
then
if
[
-d
accelerator
]
;
then
echo
"Fetching accelerator"
echo
"cleaning up accelerator"
git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
rm
-rf
accelerator
else
echo
"Updating accelerator"
pushd
accelerator
git pull
--ff-only
popd
fi
fi
echo
"Fetching accelerator"
git clone https://eicweb.phy.anl.gov/EIC/detectors/accelerator.git
#else
# echo "Updating accelerator"
# pushd accelerator
# git pull --ff-only
# popd
#fi
## Now symlink the accelerator definition into the detector definition
## Now symlink the accelerator definition into the detector definition
echo
"Linking accelerator definition into detector definition"
echo
"Linking accelerator definition into detector definition"
ln
-s
-f
${
DETECTOR_PREFIX
}
/accelerator/eic
${
DETECTOR_PATH
}
/eic
ln
-s
-f
${
DETECTOR_PREFIX
}
/accelerator/eic
${
DETECTOR_PATH
}
/eic
...
@@ -57,7 +64,8 @@ echo "Building and installing the ${JUGGLER_DETECTOR} package"
...
@@ -57,7 +64,8 @@ echo "Building and installing the ${JUGGLER_DETECTOR} package"
mkdir
-p
${
DETECTOR_PREFIX
}
/build
mkdir
-p
${
DETECTOR_PREFIX
}
/build
pushd
${
DETECTOR_PREFIX
}
/build
pushd
${
DETECTOR_PREFIX
}
/build
cmake
${
DETECTOR_PATH
}
-DCMAKE_INSTALL_PREFIX
=
${
LOCAL_PREFIX
}
&&
make
-j30
install
cmake
${
DETECTOR_PATH
}
-DCMAKE_INSTALL_PREFIX
=
${
LOCAL_PREFIX
}
-DCMAKE_CXX_STANDARD
=
17
&&
make
-j30
install
||
exit
1
## =============================================================================
## =============================================================================
## Step 3: That's all!
## Step 3: That's all!
...
...
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