Skip to content

Commit 8241651

Browse files
hyoohyoo
committed
make TURBINE_OUTPUT_ROOT overwritable and build TURBINE_OUTPUT
1 parent 9e07404 commit 8241651

22 files changed

+44
-24
lines changed

‎workflows/nt3_mlrMBO/swift/ai_workflow.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ fi
5757
#export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
5858

5959
export EXPID=$1
60-
export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
60+
export TURBINE_OUTPUT_ROOT=${TURBINE_OUTPUT_ROOT:-$EMEWS_PROJECT_ROOT/experiments}
61+
export TURBINE_OUTPUT=$TURBINE_OUTPUT_ROOT/$EXPID
6162
check_directory_exists
6263

6364
export TURBINE_JOBNAME="${EXPID}_job"

‎workflows/nt3_mlrMBO/swift/cori_workflow.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ fi
5555
#export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
5656

5757
export EXPID=$1
58-
export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
58+
export TURBINE_OUTPUT_ROOT=${TURBINE_OUTPUT_ROOT:-$EMEWS_PROJECT_ROOT/experiments}
59+
export TURBINE_OUTPUT=$TURBINE_OUTPUT_ROOT/$EXPID
5960
check_directory_exists
6061

6162
export TURBINE_JOBNAME="${EXPID}_job"

‎workflows/nt3_mlrMBO/swift/cori_workflow3.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ fi
5555
#export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
5656

5757
export EXPID=$1
58-
#export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
59-
export TURBINE_OUTPUT=${TURBINE_OUTPUT:-/project/projectdirs/m2759/pbalapra/experiments/$EXPID}
58+
export TURBINE_OUTPUT_ROOT=${TURBINE_OUTPUT_ROOT:-$EMEWS_PROJECT_ROOT/experiments}
59+
export TURBINE_OUTPUT=$TURBINE_OUTPUT_ROOT/$EXPID
6060
check_directory_exists
6161

6262
export TURBINE_JOBNAME="${EXPID}_job"

‎workflows/nt3_mlrMBO/swift/theta_workflow.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ fi
5959
export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
6060

6161
export EXPID=$1
62-
export TURBINE_OUTPUT=${TURBINE_OUTPUT:-/lus/theta-fs0/projects/Candle_ECP/experiments/$EXPID}
63-
#export TURBINE_OUTPUT=$EMEWS_PROJECT_ROOT/experiments/$EXPID
62+
export TURBINE_OUTPUT_ROOT=${TURBINE_OUTPUT_ROOT:-$EMEWS_PROJECT_ROOT/experiments}
63+
export TURBINE_OUTPUT=$TURBINE_OUTPUT_ROOT/$EXPID
6464
check_directory_exists
6565

6666
export TURBINE_JOBNAME="${EXPID}_job"

‎workflows/nt3_mlrMBO/swift/workflow.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ fi
5757
#export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
5858

5959
export EXPID=$1
60-
export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
60+
export TURBINE_OUTPUT_ROOT=${TURBINE_OUTPUT_ROOT:-$EMEWS_PROJECT_ROOT/experiments}
61+
export TURBINE_OUTPUT=$TURBINE_OUTPUT_ROOT/$EXPID
6162
check_directory_exists
6263

6364
export TURBINE_JOBNAME="${EXPID}_job"

‎workflows/p1b1_mlrMBO/swift/cooley_workflow.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ export EMEWS_PROJECT_ROOT=$( cd $( dirname $0 )/.. ; /bin/pwd )
1616
source "${EMEWS_PROJECT_ROOT}/etc/emews_utils.sh"
1717

1818
export EXPID=$1
19-
export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
19+
export TURBINE_OUTPUT_ROOT=${TURBINE_OUTPUT_ROOT:-$EMEWS_PROJECT_ROOT/experiments}
20+
export TURBINE_OUTPUT=$TURBINE_OUTPUT_ROOT/$EXPID
2021
check_directory_exists
2122

2223
# TODO edit the number of processes as required.

‎workflows/p1b1_mlrMBO/swift/cori_workflow.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ fi
5454
#export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
5555

5656
export EXPID=$1
57-
export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
57+
export TURBINE_OUTPUT_ROOT=${TURBINE_OUTPUT_ROOT:-$EMEWS_PROJECT_ROOT/experiments}
58+
export TURBINE_OUTPUT=$TURBINE_OUTPUT_ROOT/$EXPID
5859
check_directory_exists
5960

6061
export TURBINE_JOBNAME="${EXPID}_job"

‎workflows/p1b1_mlrMBO/swift/workflow.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ export EMEWS_PROJECT_ROOT=$( cd $( dirname $0 )/.. ; /bin/pwd )
1616
source "${EMEWS_PROJECT_ROOT}/etc/emews_utils.sh"
1717

1818
export EXPID=$1
19-
export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
19+
export TURBINE_OUTPUT_ROOT=${TURBINE_OUTPUT_ROOT:-$EMEWS_PROJECT_ROOT/experiments}
20+
export TURBINE_OUTPUT=$TURBINE_OUTPUT_ROOT/$EXPID
2021
check_directory_exists
2122

2223
# TODO edit the number of processes as required.

‎workflows/p1b3_mlrMBO/swift/ai_theta_workflow3.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ fi
5757
#export TURBINE_LOG=1 TURBINE_DEBUG=1 ADLB_DEBUG=1
5858

5959
export EXPID=$1
60-
export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
60+
export TURBINE_OUTPUT_ROOT=${TURBINE_OUTPUT_ROOT:-$EMEWS_PROJECT_ROOT/experiments}
61+
export TURBINE_OUTPUT=$TURBINE_OUTPUT_ROOT/$EXPID
6162
check_directory_exists
6263

6364
export TURBINE_JOBNAME="${EXPID}_job"

‎workflows/p1b3_mlrMBO/swift/ai_workflow.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ export EMEWS_PROJECT_ROOT=$( cd $( dirname $0 )/.. ; /bin/pwd )
1616
source "${EMEWS_PROJECT_ROOT}/etc/emews_utils.sh"
1717

1818
export EXPID=$1
19-
export TURBINE_OUTPUT=${TURBINE_OUTPUT:-$EMEWS_PROJECT_ROOT/experiments/$EXPID}
19+
export TURBINE_OUTPUT_ROOT=${TURBINE_OUTPUT_ROOT:-$EMEWS_PROJECT_ROOT/experiments}
20+
export TURBINE_OUTPUT=$TURBINE_OUTPUT_ROOT/$EXPID
2021
check_directory_exists
2122

2223
# TODO edit the number of processes as required.

0 commit comments

Comments
 (0)