From 64745dee69dd80559258c1745e8d0d60e30030d3 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 14 Aug 2021 15:41:24 -0500
Subject: [PATCH] Make view14 parallel (one slice per job)
---
bin/make_dawn_views | 6 ++++--
scripts/view14/generate_eps | 5 +++--
views/view14.yml | 6 ++++--
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/bin/make_dawn_views b/bin/make_dawn_views
index 0901aa8d..9fd1d4ca 100755
--- a/bin/make_dawn_views
+++ b/bin/make_dawn_views
@@ -58,8 +58,10 @@ parser.add_argument('-t', '--tag', type=str,
parser.add_argument('--timeout', type=int,
default=60,
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'
@@ -157,7 +159,7 @@ prim_file = os.path.abspath(prim_file)
owd = os.getcwd()
os.chdir(args.dawn_dir)
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'])
# upload the results
diff --git a/scripts/view14/generate_eps b/scripts/view14/generate_eps
index f89a18fa..2e70ce54 100755
--- a/scripts/view14/generate_eps
+++ b/scripts/view14/generate_eps
@@ -36,7 +36,7 @@ INPUT_FILE="../../g4_0000.prim"
POSITIONAL=()
while [[ $# -gt 0 ]]
do
- key="$1"
+ key="$1"tag
case $key in
-h|--help)
@@ -102,7 +102,8 @@ make_slice(){
rm "${FILE_TAG}_temp0.prim"
rm "${FILE_TAG}.prim"
}
-for zzz in $(seq 100 200 2000) ;
+
+for zzz in $@ ;
do
make_slice ${zzz}
done
diff --git a/views/view14.yml b/views/view14.yml
index de135eb0..9f6c6209 100644
--- a/views/view14.yml
+++ b/views/view14.yml
@@ -1,7 +1,10 @@
dawn_view_14:detector:
extends: .views
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:
stage: collect
@@ -12,4 +15,3 @@ view_14:
script:
- ls -lrth *
- ls -lrth images/*
-
--
GitLab