From d05c4fed94f64af2f6c447daa058c0bdd7905a18 Mon Sep 17 00:00:00 2001
From: Grant Meadors <gdmeadors@gmail.com>
Date: Mon, 11 Feb 2013 06:18:08 -0800
Subject: [PATCH] Making changes to run on Matlab 2012a
---
README | 6 +++++-
bashrc | 3 ++-
createEleutheriaDagSubmitFile.py | 2 +-
run_eleutheria-well.sh | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/README b/README
index 2283684..19bfd32 100644
--- a/README
+++ b/README
@@ -39,7 +39,11 @@ Cache and submit file creation:
Compiling main feedforward program:
0. Call "source bashrc" while logged in as user pulsar@ldas-grid.caltech.edu
-1. Run the Matlab compiler: "mcc -mv eleutheria.m"
+1a. Run the Matlab compiler: "mcc -mv eleutheria.m"
+1b. For better memory performance, run the Matlab 2012a compiler with
+ "/ldcg/matlab_r2012a/bin/mcc -mv -R -nodisplay -R -nojvm -R -singleCompThread eleutheria.m"
+ and note it may only compile on gmeadors, depending on env,
+ but it runs with a sourced bashrc on pulsar.
Submitting main feedforward Condor jobs:
0. Submit to the CIT cluster nodes with "condor_submit_dag EleutheriaDAG.dag"
diff --git a/bashrc b/bashrc
index 89d64ae..b7ea935 100644
--- a/bashrc
+++ b/bashrc
@@ -6,6 +6,7 @@ alias matlab7='/ldcg/matlab_r14_sp3/bin/matlab -nosplash -nodesktop'
alias matlab2007a='/ldcg/matlab_r2007a/bin/matlab -nosplash -nodesktop'
alias matlab2010b='/ldcg/matlab_r2010b/bin/matlab -nosplash -nodesktop'
alias matlab2011a='/ldcg/matlab_r2011a/bin/matlab -nosplash -nodesktop'
+alias matlab2012a='/ldcg/matlab_r2012a/bin/matlab -nosplash -nodesktop'
alias ee='eog'
alias gv='ggv'
@@ -42,7 +43,7 @@ export _CONDOR_DAGMAN_LOG_ON_NFS_IS_ERROR=FALSE
# source ${LSC_DATAGRID_SERVER_LOCATION}/setup.sh
#fi
-export MATLAB_ROOT=/ldcg/matlab_r2010b
+export MATLAB_ROOT=/ldcg/matlab_r2012a
#export ARCH=glnx86
export ARCH=glnxa64
#
diff --git a/createEleutheriaDagSubmitFile.py b/createEleutheriaDagSubmitFile.py
index 929710b..38236b9 100755
--- a/createEleutheriaDagSubmitFile.py
+++ b/createEleutheriaDagSubmitFile.py
@@ -32,7 +32,7 @@ h("output = /home/pulsar/feedforward/" + analysisDate + "/AMPS/eleutheriaLogs/el
h("error = eleutheriaLogs/eleutheria.err.$(tagstring)")
h("log = eleutheriaLogs/eleutheria.dag.log")
h("request_memory = 4 GB")
-h("environment = HOME=/archive/home/pulsar;LD_LIBRARY_PATH=/ldcg/matlab_r2010b/runtime/glnxa64:/ldcg/matlab_r2010b/bin/glnxa64:/ldcg/matlab_r2010b/extern/lib/glnxa64:/ligotools/lib")
+h("environment = HOME=/archive/home/pulsar;LD_LIBRARY_PATH=/ldcg/matlab_r2012a/runtime/glnxa64:/ldcg/matlab_r2012a/bin/glnxa64:/ldcg/matlab_r2012a/extern/lib/glnxa64:/ligotools/lib")
h("notification = never")
h("")
h("arguments = $(argList)")
diff --git a/run_eleutheria-well.sh b/run_eleutheria-well.sh
index 7b48ab5..7f3fbec 100755
--- a/run_eleutheria-well.sh
+++ b/run_eleutheria-well.sh
@@ -23,7 +23,7 @@ echo "------------------------------------------"
# LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${MCRJRE}/client ;
# LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${MCRJRE} ;
# LD_LIBRARY_PATH=/ldcg/matlab_r2011a/runtime/glnxa64:/ldcg/matlab_r2011a/sys/os/glnxa64:/ldcg/matlab_r2011a/bin/glnxa64:/ldcg/matlab_r2011a/extern/lib/glnxa64:/ldcg/matlab_r2011a/sys/java/jre/glnxa64/jre/lib/amd64/native_threads:/ldcg/matlab_r2011a/sys/java/jre/glnxa64/jre/lib/amd64/server:/ldcg/matlab_r2011a/sys/java/jre/glnxa64/jre/lib/amd64:/ldcg/matlab_r2011a/sys/opengl/lib/glnxa64:/opt/lscsoft/lalstochastic/lib64:/opt/lscsoft/lalpulsar/lib64:/opt/lscsoft/lalburst/lib64:/opt/lscsoft/lalinspiral/lib64:/opt/lscsoft/lalxml/lib64:/opt/lscsoft/lalmetaio/lib64:/opt/lscsoft/lalframe/lib64:/opt/lscsoft/lal/lib64:/opt/lscsoft/glue/lib64/python2.4/site-packages:/opt/lscsoft/libframe/lib64:/opt/lscsoft/libmetaio/lib64:/opt/lscsoft/ldas-tools/lib64:/opt/lscsoft/dol/lib64:/opt/lscsoft/root/lib:/opt/lscsoft/root/lib/5.26:/opt/vdt/globus/lib:/ligotools/lib ;
-LD_LIBRARY_PATH=/ldcg/matlab_r2010b/runtime/glnxa64:/ldcg/matlab_r2010b/bin/glnxa64:/ldcg/matlab_r2010b/extern/lib/glnxa64:/ligotools/lib ;
+LD_LIBRARY_PATH=/ldcg/matlab_r2012a/runtime/glnxa64:/ldcg/matlab_r2012a/bin/glnxa64:/ldcg/matlab_r2012a/extern/lib/glnxa64:/ligotools/lib ;
# XAPPLRESDIR=${MCRROOT}/X11/app-defaults ;
export LD_LIBRARY_PATH;
export XAPPLRESDIR;
--
GitLab