Skip to content

Commit 72f7515

Browse files
ncollierncollier
committed
Theta updates for non-nt3 workflows
1 parent 931b324 commit 72f7515

File tree

7 files changed

+25
-23
lines changed

7 files changed

+25
-23
lines changed

‎workflows/common/sh/theta_run_logger.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export LD_LIBRARY_PATH="$PYTHONHOME/lib"
99
export PATH="$PYTHONHOME/bin:$PATH"
1010

1111
COMMON=$EMEWS_PROJECT_ROOT/../../../Benchmarks/common
12-
echo $COMMON
1312
PYTHONPATH="$PYTHONHOME/lib/python2.7:$COMMON:"
1413
PYTHONPATH+="$PYTHONHOME/lib/python2.7/site-packages"
1514
export PYTHONPATH

‎workflows/p2b1_mlrMBO/ext/EQ-R/eqr/theta_build_settings.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module load gcc
2-
export PATH=$PATH:/gpfs/mira-home/wozniak/Public/sfw/theta/swig-3.0.12/bin
2+
export PATH=$PATH:/home/wozniak/Public/sfw/theta/swig-3.0.12/bin
33

4-
R_HOME=/home/wozniak/mira-home/Public/sfw/theta/R-3.4.0/lib64/R
4+
R_HOME=/home/wozniak/Public/sfw/theta/R-3.4.0/lib64/R
55
R_INCLUDE=$R_HOME/include
66
R_LIB=$R_HOME/lib
77
R_INSIDE=$R_HOME/library/RInside
88
RCPP=$R_HOME/library/Rcpp
99

1010
#system-wide tcl
11-
TCL_INCLUDE=/gpfs/mira-home/wozniak/Public/sfw/theta/tcl-8.6.1
12-
TCL_LIB=/gpfs/mira-home/wozniak/Public/sfw/theta/tcl-8.6.1/lib
11+
TCL_INCLUDE=/home/wozniak/Public/sfw/theta/tcl-8.6.1
12+
TCL_LIB=/home/wozniak/Public/sfw/theta/tcl-8.6.1/lib
1313
TCL_LIBRARY=tcl8.6
1414

1515
CPPFLAGS=""

‎workflows/p2b1_mlrMBO/scripts/theta_run_model.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export KERAS_BACKEND=theano
4747
#export KMP_AFFINITY=granularity=fine,verbose,compact,1,0
4848
#export OMP_NUM_THREADS=144
4949

50-
export PYTHONHOME="/home/brettin/anaconda2/envs/vrane"
50+
export PYTHONHOME="/lus/theta-fs0/projects/Candle_ECP/ncollier/py2_tf_gcc6.3_eigen3_native"
5151
PYTHON="$PYTHONHOME/bin/python"
5252
export LD_LIBRARY_PATH="$PYTHONHOME/lib"
5353
export PATH="$PYTHONHOME/bin:$PATH"

‎workflows/p2b1_mlrMBO/swift/theta_workflow.sh‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ export TURBINE_JOBNAME="${EXPID}_job"
6565

6666

6767

68-
TCL=/gpfs/mira-home/wozniak/Public/sfw/theta/tcl-8.6.1
69-
export R=/home/wozniak/mira-home/Public/sfw/theta/R-3.4.0/lib64/R
70-
export PY=/gpfs/mira-home/wozniak/Public/sfw/theta/Python-2.7.12
68+
TCL=/home/wozniak/Public/sfw/theta/tcl-8.6.1
69+
export R=/home/wozniak/Public/sfw/theta/R-3.4.0/lib64/R
70+
export PY=/home/wozniak/Public/sfw/theta/Python-2.7.12
7171
export LD_LIBRARY_PATH=$PY/lib:$R/lib:$LD_LIBRARY_PATH
7272
COMMON_DIR=$EMEWS_PROJECT_ROOT/../common/python
7373
PYTHONPATH=$EMEWS_PROJECT_ROOT/python:$BENCHMARK_DIR:$COMMON_DIR
74-
PYTHONHOME=/gpfs/mira-home/wozniak/Public/sfw/theta/Python-2.7.12
74+
PYTHONHOME=/home/wozniak/Public/sfw/theta/Python-2.7.12
7575

76-
export PATH=/gpfs/mira-home/wozniak/Public/sfw/theta/swift-t-pyr/stc/bin:$TCL/bin:$PATH
76+
export PATH=/home/wozniak/Public/sfw/theta/swift-t-pyr/stc/bin:$TCL/bin:$PATH
7777
#$PYTHONHOME/bin:$TCL/bin:$PATH
7878

7979
# Resident task workers and ranks
@@ -87,6 +87,7 @@ CMD_LINE_ARGS="$* -pp=$PROPOSE_POINTS -mi=$MAX_ITERATIONS -mb=$MAX_BUDGET -ds=$D
8787
CMD_LINE_ARGS+="-param_set_file=$PARAM_SET_FILE -script_file=$EMEWS_PROJECT_ROOT/scripts/theta_run_model.sh "
8888
CMD_LINE_ARGS+="-exp_id=$EXPID -log_script=$EMEWS_PROJECT_ROOT/../common/sh/theta_run_logger.sh"
8989

90+
TURBINE_DIR=/home/wozniak/Public/sfw/theta/swift-t-pyr/turbine/lib
9091

9192
# set machine to your scheduler type (e.g. pbs, slurm, cobalt etc.),
9293
# or empty for an immediate non-queued unscheduled run
@@ -106,7 +107,7 @@ log_script
106107
# echo's anything following this to standard out
107108
set -x
108109
WORKFLOW_SWIFT=ai_workflow3.swift
109-
swift-t -n $PROCS $MACHINE -p -I $EQR -r $EQR \
110+
swift-t -n $PROCS $MACHINE -p -I $EQR -r $EQR -r $TURBINE_DIR \
110111
-e LD_LIBRARY_PATH=$LD_LIBRARY_PATH \
111112
-e TURBINE_RESIDENT_WORK_WORKERS=$TURBINE_RESIDENT_WORK_WORKERS \
112113
-e RESIDENT_WORK_RANKS=$RESIDENT_WORK_RANKS \

‎workflows/p3b1_mlrMBO/ext/EQ-R/eqr/theta_build_settings.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module load gcc
2-
export PATH=$PATH:/gpfs/mira-home/wozniak/Public/sfw/theta/swig-3.0.12/bin
2+
export PATH=$PATH:/home/wozniak/Public/sfw/theta/swig-3.0.12/bin
33

4-
R_HOME=/home/wozniak/mira-home/Public/sfw/theta/R-3.4.0/lib64/R
4+
R_HOME=/home/wozniak/Public/sfw/theta/R-3.4.0/lib64/R
55
R_INCLUDE=$R_HOME/include
66
R_LIB=$R_HOME/lib
77
R_INSIDE=$R_HOME/library/RInside
88
RCPP=$R_HOME/library/Rcpp
99

1010
#system-wide tcl
11-
TCL_INCLUDE=/gpfs/mira-home/wozniak/Public/sfw/theta/tcl-8.6.1
12-
TCL_LIB=/gpfs/mira-home/wozniak/Public/sfw/theta/tcl-8.6.1/lib
11+
TCL_INCLUDE=/home/wozniak/Public/sfw/theta/tcl-8.6.1
12+
TCL_LIB=/home/wozniak/Public/sfw/theta/tcl-8.6.1/lib
1313
TCL_LIBRARY=tcl8.6
1414

1515
CPPFLAGS=""

‎workflows/p3b1_mlrMBO/scripts/theta_run_model.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export KMP_SETTINGS=1
4646
export KMP_AFFINITY=granularity=fine,verbose,compact,1,0
4747
export OMP_NUM_THREADS=144
4848

49-
export PYTHONHOME="/home/brettin/anaconda2/envs/vrane"
49+
export PYTHONHOME="/lus/theta-fs0/projects/Candle_ECP/ncollier/py2_tf_gcc6.3_eigen3_native"
5050
PYTHON="$PYTHONHOME/bin/python"
5151
export LD_LIBRARY_PATH="$PYTHONHOME/lib"
5252
export PATH="$PYTHONHOME/bin:$PATH"

‎workflows/p3b1_mlrMBO/swift/theta_workflow.sh‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ export TURBINE_JOBNAME="${EXPID}_job"
6969

7070

7171

72-
TCL=/gpfs/mira-home/wozniak/Public/sfw/theta/tcl-8.6.1
73-
export R=/home/wozniak/mira-home/Public/sfw/theta/R-3.4.0/lib64/R
74-
export PY=/gpfs/mira-home/wozniak/Public/sfw/theta/Python-2.7.12
72+
TCL=/home/wozniak/Public/sfw/theta/tcl-8.6.1
73+
export R=/home/wozniak/Public/sfw/theta/R-3.4.0/lib64/R
74+
export PY=/home/wozniak/Public/sfw/theta/Python-2.7.12
7575
export LD_LIBRARY_PATH=$PY/lib:$R/lib:$LD_LIBRARY_PATH
7676
COMMON_DIR=$EMEWS_PROJECT_ROOT/../common/python
7777
PYTHONPATH=$EMEWS_PROJECT_ROOT/python:$BENCHMARK_DIR:$COMMON_DIR
78-
PYTHONHOME=/gpfs/mira-home/wozniak/Public/sfw/theta/Python-2.7.12
78+
PYTHONHOME=/home/wozniak/Public/sfw/theta/Python-2.7.12
7979

80-
export PATH=/gpfs/mira-home/wozniak/Public/sfw/theta/swift-t-pyr/stc/bin:$TCL/bin:$PATH
80+
export PATH=/home/wozniak/Public/sfw/theta/swift-t-pyr/stc/bin:$TCL/bin:$PATH
8181
#$PYTHONHOME/bin:$TCL/bin:$PATH
8282

8383
# Resident task workers and ranks
@@ -91,6 +91,8 @@ CMD_LINE_ARGS="$* -pp=$PROPOSE_POINTS -mi=$MAX_ITERATIONS -mb=$MAX_BUDGET -ds=$D
9191
CMD_LINE_ARGS+="-param_set_file=$PARAM_SET_FILE -script_file=$EMEWS_PROJECT_ROOT/scripts/theta_run_model.sh "
9292
CMD_LINE_ARGS+="-exp_id=$EXPID -log_script=$EMEWS_PROJECT_ROOT/../common/sh/theta_run_logger.sh"
9393

94+
TURBINE_DIR=/home/wozniak/Public/sfw/theta/swift-t-pyr/turbine/lib
95+
9496
# set machine to your scheduler type (e.g. pbs, slurm, cobalt etc.),
9597
# or empty for an immediate non-queued unscheduled run
9698
MACHINE="theta"
@@ -109,7 +111,7 @@ log_script
109111
# echo's anything following this to standard out
110112
set -x
111113
WORKFLOW_SWIFT=ai_workflow3.swift
112-
swift-t -n $PROCS $MACHINE -p -I $EQR -r $EQR \
114+
swift-t -n $PROCS $MACHINE -p -I $EQR -r $EQR -r $TURBINE_DIR \
113115
-e LD_LIBRARY_PATH=$LD_LIBRARY_PATH \
114116
-e TURBINE_RESIDENT_WORK_WORKERS=$TURBINE_RESIDENT_WORK_WORKERS \
115117
-e RESIDENT_WORK_RANKS=$RESIDENT_WORK_RANKS \

0 commit comments

Comments
 (0)