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

Parallelize view 12 and view 15 as well

parent 0b7c4e68
Branches
No related tags found
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.
...@@ -18,7 +18,7 @@ tan () ...@@ -18,7 +18,7 @@ tan ()
function print_the_help { function print_the_help {
echo "USAGE: $0 -i <PRIM_FILE> " echo "USAGE: $0 -i <PRIM_FILE> <slices ...> "
echo " OPTIONS: " echo " OPTIONS: "
echo " -t,--tag filename tag (default: view1)" echo " -t,--tag filename tag (default: view1)"
exit exit
...@@ -48,12 +48,16 @@ do ...@@ -48,12 +48,16 @@ do
shift # past argument shift # past argument
shift # past value shift # past value
;; ;;
*) # unknown option -[a-zA-Z]*) # unknown option
#POSITIONAL+=("$1") # save it in an array for later #POSITIONAL+=("$1") # save it in an array for later
echo "unknown option $1" echo "unknown option $1"
print_the_help print_the_help
shift # past argument shift # past argument
;; ;;
*) # positional options
#POSITIONAL+=("$1") # save it in an array for later
shift # past argument
;;
esac esac
done done
set -- "${POSITIONAL[@]}" # restore positional parameters set -- "${POSITIONAL[@]}" # restore positional parameters
...@@ -90,7 +94,8 @@ make_slice(){ ...@@ -90,7 +94,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 50 50 2000) ;
for zzz in $@ ;
do do
make_slice ${zzz} & make_slice ${zzz} &
done done
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
function print_the_help { function print_the_help {
echo "USAGE: $0 -i <PRIM_FILE> " echo "USAGE: $0 -i <PRIM_FILE> <slices ...> "
echo " OPTIONS: " echo " OPTIONS: "
echo " -t,--tag filename tag (default: view1)" echo " -t,--tag filename tag (default: view1)"
exit exit
...@@ -53,12 +53,16 @@ do ...@@ -53,12 +53,16 @@ do
shift # past argument shift # past argument
shift # past value shift # past value
;; ;;
*) # unknown option -[a-zA-Z]*) # unknown option
#POSITIONAL+=("$1") # save it in an array for later #POSITIONAL+=("$1") # save it in an array for later
echo "unknown option $1" echo "unknown option $1"
print_the_help print_the_help
shift # past argument shift # past argument
;; ;;
*) # positional options
#POSITIONAL+=("$1") # save it in an array for later
shift # past argument
;;
esac esac
done done
set -- "${POSITIONAL[@]}" # restore positional parameters set -- "${POSITIONAL[@]}" # restore positional parameters
...@@ -104,7 +108,7 @@ make_slice(){ ...@@ -104,7 +108,7 @@ make_slice(){
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_12:detector: dawn_view_12:detector:
extends: .views extends: .views
script: script:
- ./bin/make_dawn_views -t view12 -d scripts/view12 -D - ./bin/make_dawn_views -t view12 -d scripts/view12 -D -- ${SLICE}
parallel:
matrix:
- SLICE: ["50", "100", "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_12: view_12:
stage: test stage: test
......
...@@ -15,3 +15,4 @@ view_14: ...@@ -15,3 +15,4 @@ view_14:
script: script:
- ls -lrth * - ls -lrth *
- ls -lrth images/* - ls -lrth images/*
dawn_view_15:detector: dawn_view_15:detector:
extends: .views extends: .views
script: script:
- ./bin/make_dawn_views -t view15 -d scripts/view15 -D - ./bin/make_dawn_views -t view15 -d scripts/view15 -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_15: view_15:
stage: test stage: test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment