Skip to content
Snippets Groups Projects
Commit a11a67e8 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

Make view14 parallel (one slice per job)

parent 67b88f09
Branches
Tags
No related merge requests found
This commit is part of merge request !170. Comments created here will be created in the context of that merge request.
...@@ -58,8 +58,10 @@ parser.add_argument('-t', '--tag', type=str, ...@@ -58,8 +58,10 @@ parser.add_argument('-t', '--tag', type=str,
parser.add_argument('--timeout', type=int, parser.add_argument('--timeout', type=int,
default=60, default=60,
help='Timeout in seconds') help='Timeout in seconds')
parser.add_argument('passthrough', nargs='*')
args = parser.parse_args() args = parser.parse_known_args()
macro = 'macro/dawn_picture.mac' if args.detector_only else 'macro/dawn_picture2.mac' macro = 'macro/dawn_picture.mac' if args.detector_only else 'macro/dawn_picture2.mac'
...@@ -157,7 +159,7 @@ prim_file = os.path.abspath(prim_file) ...@@ -157,7 +159,7 @@ prim_file = os.path.abspath(prim_file)
owd = os.getcwd() owd = os.getcwd()
os.chdir(args.dawn_dir) os.chdir(args.dawn_dir)
subprocess.run(['pwd']) subprocess.run(['pwd'])
subprocess.run(['./generate_eps', '-t', args.tag, '-i', prim_file]) subprocess.run(['./generate_eps', '-t', args.tag, '-i', prim_file] + args.passthrough)
subprocess.run(['ls', '-lrth']) subprocess.run(['ls', '-lrth'])
# upload the results # upload the results
......
...@@ -36,7 +36,7 @@ INPUT_FILE="../../g4_0000.prim" ...@@ -36,7 +36,7 @@ INPUT_FILE="../../g4_0000.prim"
POSITIONAL=() POSITIONAL=()
while [[ $# -gt 0 ]] while [[ $# -gt 0 ]]
do do
key="$1" key="$1"tag
case $key in case $key in
-h|--help) -h|--help)
...@@ -102,7 +102,8 @@ make_slice(){ ...@@ -102,7 +102,8 @@ make_slice(){
rm "${FILE_TAG}_temp0.prim" rm "${FILE_TAG}_temp0.prim"
rm "${FILE_TAG}.prim" rm "${FILE_TAG}.prim"
} }
for zzz in $(seq 150 50 2000) ;
for zzz in $@ ;
do do
make_slice ${zzz} make_slice ${zzz}
done done
......
dawn_view_14:detector: dawn_view_14:detector:
extends: .views extends: .views
script: script:
- ./bin/make_dawn_views -t view14 -d scripts/view14 -D - ./bin/make_dawn_views -t view14 -d scripts/view14 -D -- ${SLICE}
parallel:
matrix:
- SLICE: ["150", "200", "250", "300", "350", "400", "450", "500", "550", "600", "650", "700", "750", "800", "850", "900", "950", "1000", "1050", "1100", "1150", "1200", "1250", "1300", "1350", "1400", "1450", "1500", "1550", "1600", "1650", "1700", "1750", "1800", "1850", "1900", "1950", "2000"]
view_14: view_14:
stage: collect stage: collect
...@@ -12,4 +15,3 @@ view_14: ...@@ -12,4 +15,3 @@ view_14:
script: script:
- ls -lrth * - ls -lrth *
- ls -lrth images/* - ls -lrth images/*
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment